mirror of
https://github.com/openvk/openvk
synced 2024-12-23 09:01:15 +03:00
Merge branch 'master' of https://github.com/openvk/openvk
This commit is contained in:
commit
62d5d97857
4 changed files with 15 additions and 15 deletions
|
@ -12,6 +12,7 @@
|
||||||
{/block}
|
{/block}
|
||||||
|
|
||||||
{block content}
|
{block content}
|
||||||
|
{var author = $note->getOwner()}
|
||||||
<style>
|
<style>
|
||||||
#userContent img {
|
#userContent img {
|
||||||
max-width: 245pt;
|
max-width: 245pt;
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
{block tabs}
|
{block tabs}
|
||||||
<form style="margin-left: 12px;">
|
<form style="margin-left: 12px;">
|
||||||
<input name="query" class="header_search_input" placeholder="{_"header_search"}" value="{$_GET['query'] ?? ''}" style="width: 90%" />
|
<input name="query" class="header_search_input" placeholder="{_"header_search"}" value="{$_GET['query'] ?? ''}" style="width: 86%" />
|
||||||
<input type="submit" class="button" value="{_"search_button"}" style="width: 7%" />
|
<input type="submit" class="button" value="{_"search_button"}" style="width: 7.5%" />
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<p style="margin-left: 15px;">
|
<p style="margin-left: 15px;">
|
||||||
|
|
|
@ -25,17 +25,17 @@ class DateTime
|
||||||
|
|
||||||
if($this->timestamp >= strtotime("midnight")) { # Today
|
if($this->timestamp >= strtotime("midnight")) { # Today
|
||||||
if($diff->h >= 1)
|
if($diff->h >= 1)
|
||||||
return tr("time_today") . tr("time_at_sp") . ovk_strftime_safe("%X", $this->timestamp);
|
return tr("time_today") . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp);
|
||||||
else if($diff->i < 2)
|
else if($diff->i < 2)
|
||||||
return tr("time_just_now");
|
return tr("time_just_now");
|
||||||
else
|
else
|
||||||
return $diff->i === 5 ? tr("time_exactly_five_minutes_ago") : tr("time_minutes_ago", $diff->i);
|
return $diff->i === 5 ? tr("time_exactly_five_minutes_ago") : tr("time_minutes_ago", $diff->i);
|
||||||
} else if($this->timestamp >= strtotime("-1day midnight")) { # Yesterday
|
} else if($this->timestamp >= strtotime("-1day midnight")) { # Yesterday
|
||||||
return tr("time_yesterday") . tr("time_at_sp") . ovk_strftime_safe("%X", $this->timestamp);
|
return tr("time_yesterday") . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp);
|
||||||
} else if(ovk_strftime_safe("%Y", $this->timestamp) === ovk_strftime_safe("%Y")) { # In this year
|
} else if(ovk_strftime_safe("%Y", $this->timestamp) === ovk_strftime_safe("%Y", time())) { # In this year
|
||||||
return ovk_strftime_safe("%e %h ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp);
|
return ovk_strftime_safe("%e %h ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp);
|
||||||
} else {
|
} else {
|
||||||
return ovk_strftime_safe("%e %B %Y ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %X", $this->timestamp);
|
return ovk_strftime_safe("%e %B %Y ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -214,7 +214,7 @@ a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.page_yellowheader a {
|
.page_yellowheader a {
|
||||||
color: #C8BF85;
|
color: #696029;
|
||||||
}
|
}
|
||||||
|
|
||||||
.page_content {
|
.page_content {
|
||||||
|
@ -1785,18 +1785,18 @@ body.scrolled .toTop:hover {
|
||||||
.hover-box:hover {
|
.hover-box:hover {
|
||||||
background-color: #C0CAD5;
|
background-color: #C0CAD5;
|
||||||
}
|
}
|
||||||
|
|
||||||
.summaryBar {
|
.summaryBar {
|
||||||
border-bottom: 1px solid #DAE2E8;
|
border-bottom: 1px solid #DAE2E8;
|
||||||
clear: both;
|
clear: both;
|
||||||
padding: 0 10px;
|
padding: 11px 10px;
|
||||||
padding-top: 11px;
|
|
||||||
padding-top: 11px;
|
|
||||||
color: black;
|
color: black;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
margin-left: -12px;
|
margin-left: -12px;
|
||||||
margin-right: -12px;
|
margin-right: -12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.summaryBar .summary {
|
.summaryBar .summary {
|
||||||
color: #45688E;
|
color: #45688E;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
@ -1804,20 +1804,19 @@ body.scrolled .toTop:hover {
|
||||||
padding-bottom: 4px;
|
padding-bottom: 4px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note_header {
|
.note_header {
|
||||||
background: #f7f7f7;
|
background: #f7f7f7;
|
||||||
border-bottom: solid 1px #DAE1E8;
|
border-bottom: solid 1px #DAE1E8;
|
||||||
border-top: solid 1px #45688E;
|
border-top: solid 1px #45688E;
|
||||||
padding: 4px 6px 5px 6px;
|
padding: 4px 6px 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note_header .note_title {
|
.note_header .note_title {
|
||||||
color: #45688E;
|
color: #45688E;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
line-height: 15px;
|
line-height: 15px;
|
||||||
margin: 0px;
|
margin: 0;
|
||||||
padding: 0px 0px 1px 0px;
|
padding: 0 0 1px 0;
|
||||||
}
|
}
|
||||||
.page_yellowheader a {
|
|
||||||
color: #696029;
|
|
||||||
}
|
|
Loading…
Reference in a new issue