Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-11-11 01:19:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/openvk/openvk

Browse source
This commit is contained in:
KosFurler 2022-01-24 18:20:54 +03:00
commit 62d5d97857
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Web/Presenters/templates/Notes/View.xml
View file

@ -12,6 +12,7 @@
{/block}
{block content}
{var author = $note->getOwner()}
<style>
#userContent img {
max-width: 245pt;

4
Web/Presenters/templates/Topics/Board.xml
View file

@ -14,8 +14,8 @@
{block tabs}
<form style="margin-left: 12px;">
<input name="query" class="header_search_input" placeholder="{_"header_search"}" value="{$_GET['query'] ?? ''}" style="width: 90%" />
<input type="submit" class="button" value="{_"search_button"}" style="width: 7%" />
<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.5%" />
</form>
<p style="margin-left: 15px;">

8
Web/Util/DateTime.php
View file

@ -25,17 +25,17 @@ class DateTime
if($this->timestamp >= strtotime("midnight")) { # Today
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)
return tr("time_just_now");
else
return $diff->i === 5 ? tr("time_exactly_five_minutes_ago") : tr("time_minutes_ago", $diff->i);
} else if($this->timestamp >= strtotime("-1day midnight")) { # Yesterday
return tr("time_yesterday") . tr("time_at_sp") . ovk_strftime_safe("%X", $this->timestamp);
} else if(ovk_strftime_safe("%Y", $this->timestamp) === ovk_strftime_safe("%Y")) { # In this year
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", time())) { # In this year
return ovk_strftime_safe("%e %h ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp);
} 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);
}
}

17
Web/static/css/style.css
View file

@ -214,7 +214,7 @@ a {
}
.page_yellowheader a {
color: #C8BF85;
color: #696029;
}
.page_content {
@ -1785,18 +1785,18 @@ body.scrolled .toTop:hover {
.hover-box:hover {
background-color: #C0CAD5;
}
.summaryBar {
border-bottom: 1px solid #DAE2E8;
clear: both;
padding: 0 10px;
padding-top: 11px;
padding-top: 11px;
padding: 11px 10px;
color: black;
font-weight: normal;
line-height: normal;
margin-left: -12px;
margin-right: -12px;
}
.summaryBar .summary {
color: #45688E;
font-weight: bold;
@ -1804,20 +1804,19 @@ body.scrolled .toTop:hover {
padding-bottom: 4px;
display: inline-block;
}
.note_header {
background: #f7f7f7;
border-bottom: solid 1px #DAE1E8;
border-top: solid 1px #45688E;
padding: 4px 6px 5px 6px;
}
.note_header .note_title {
color: #45688E;
font-size: 13px;
font-weight: bold;
line-height: 15px;
margin: 0px;
padding: 0px 0px 1px 0px;
}
.page_yellowheader a {
color: #696029;
margin: 0;
padding: 0 0 1px 0;
}