aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--juick-www/src/main/resources/messages_ru.properties2
-rw-r--r--juick-www/src/main/static/style.css18
2 files changed, 4 insertions, 16 deletions
diff --git a/juick-www/src/main/resources/messages_ru.properties b/juick-www/src/main/resources/messages_ru.properties
index 105b3505..a1c19bea 100644
--- a/juick-www/src/main/resources/messages_ru.properties
+++ b/juick-www/src/main/resources/messages_ru.properties
@@ -11,7 +11,7 @@ link.allMessages=Обзор
link.withPhotos=Фото
link.my=Моя лента
link.privateMessages=Приватные
-link.discuss=Обсуждения
+link.discuss=Диалоги
link.recommended=Рекомендации
link.postMessage=Написать
link.logout=Выйти
diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css
index 00a0d9ad..b352af9c 100644
--- a/juick-www/src/main/static/style.css
+++ b/juick-www/src/main/static/style.css
@@ -159,12 +159,13 @@ body > header {
}
#global {
flex-grow: 1;
+ display: flex;
}
#global a {
color: #888;
display: inline-block;
font-size: 13pt;
- padding: 14px;
+ padding: 14px 6px;
}
#global li {
display: inline-block;
@@ -173,7 +174,7 @@ body > header {
background-color: #fff;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.16);
cursor: pointer;
- transition: background-color 0.2s ease-in;
+ transition: box-shadow 0.2s ease-in;
}
#search {
margin: 12px 20px 12px 0;
@@ -185,18 +186,9 @@ body > header {
padding: 4px;
}
@media screen and (max-width: 850px) {
- body > header a {
- font-size: 12pt;
- }
#logo {
display: none;
}
- #global {
- margin-left: 10px;
- }
- #global li {
- margin-right: 10px;
- }
#search {
display: inline-block;
float: none;
@@ -524,10 +516,6 @@ article .tags > a,
#content .title2 h2 {
font-size: 11pt;
}
- #global a {
- padding-left: 6px;
- padding-right: 6px;
- }
.title2-right {
line-height: initial;
}