diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 0c77ed4..85819f0 100755 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -12,6 +12,7 @@ body.modal-open { | Main menu |------------------------------------------------------------------------------ */ + .menu .user-panel { float: right; margin-right: 15px; @@ -222,6 +223,10 @@ body.modal-open { right: 185px; } +#userName { + white-space: nowrap; +} + /* |------------------------------------------------------------------------------ | Questions list @@ -259,6 +264,52 @@ body.modal-open { z-index: 0; } +#question-list .help { + width: 330px; + position: absolute; + border: 1px solid #ccc; + border-radius: 10px; + z-index: 132; + background-color: #fff; + padding: 10px; + display: none; + top: 44px; + left: 50%; + margin-left: -165px; +} + +#question-list .question-form:hover .help { + display: block; +} + +#question-list .help:before { + border-left: 20px solid transparent; + border-right: 20px solid transparent; + border-bottom: 15px solid #fff; + margin-left: -30px; + position: absolute; + content: ''; + width: 0; + height: 0; + left: 53%; + bottom: 100%; + z-index: 1; +} + +#question-list .help:after { + border-left: 22px solid transparent; + border-right: 22px solid transparent; + border-bottom: 16px solid #ccc; + position: absolute; + content: ''; + width: 0; + height: 0; + left: 53%; + bottom: 100%; + z-index: 0; + margin-left: -32px; +} + /* |------------------------------------------------------------------------------ | Votes block @@ -1369,6 +1420,16 @@ div .fa-05 { } } +@media (max-width: 710px) { + #userName { + display: none; + } + + #userProfile { + padding-right: 0; + } +} + @media (max-width: 767px) { .container { width: 96%; diff --git a/public/js/locales/dev.json b/public/js/locales/dev.json index 7e4847b..2858574 100644 --- a/public/js/locales/dev.json +++ b/public/js/locales/dev.json @@ -44,7 +44,8 @@ "tagInfo": "To search by tags enter: ", "folderInfo": "To search by folders enter: ", "tagInfoSpan": "\"tag:tag title\"", - "folderInfoSpan": "\"folder:folder title\"" + "folderInfoSpan": "\"folder:folder title\"", + "searchInfo": "To search by tags enter: \"tag:tag title\".
To search by folders enter: \"folder:folder title\"" }, "ui": { "save": "Save", diff --git a/public/js/locales/en.json b/public/js/locales/en.json index b2a00f4..ed72678 100644 --- a/public/js/locales/en.json +++ b/public/js/locales/en.json @@ -43,7 +43,8 @@ "tagInfo": "To search by tags enter: ", "folderInfo": "To search by folders enter: ", "tagInfoSpan": "\"tag:tag title\"", - "folderInfoSpan": "\"folder:folder title\"" + "folderInfoSpan": "\"folder:folder title\"", + "searchInfo": "To search by tags enter: \"tag:tag title\".
To search by folders enter: \"folder:folder title\"" }, "ui": { "save": "Save", diff --git a/public/js/locales/ru.json b/public/js/locales/ru.json index c24123d..ba327da 100644 --- a/public/js/locales/ru.json +++ b/public/js/locales/ru.json @@ -43,7 +43,8 @@ "tagInfo": "Для поиска по тегам введите: ", "folderInfo": "Для поиска по папкам введите: ", "tagInfoSpan": "\"tag:название тега\"", - "folderInfoSpan": "\"folder:название папки\"" + "folderInfoSpan": "\"folder:название папки\"", + "searchInfo": "Для поиска по тегам введите: \"tag:tag title\".
Для поиска по папкам введите: \"folder:folder title\"" }, "ui": { "save": "Сохранить", diff --git a/public/js/locales/uk.json b/public/js/locales/uk.json index 22576e7..13d9e35 100644 --- a/public/js/locales/uk.json +++ b/public/js/locales/uk.json @@ -43,7 +43,8 @@ "tagInfo": "Для пошуку по тегам введіть: ", "folderInfo": "Для пошуку по розділам введіть: ", "tagInfoSpan": "\"tag:назва тега\"", - "folderInfoSpan": "\"folder:назва розділу\"" + "folderInfoSpan": "\"folder:назва розділу\"", + "searchInfo": "Для пошуку по тегам введіть: \"tag:tag title\".
Для пошуку по розділам введіть: \"folder:folder title\"" }, "ui": { "save": "Зберегти", diff --git a/public/js/views/templates/question/collection.tpl b/public/js/views/templates/question/collection.tpl index 68e3545..094f50d 100755 --- a/public/js/views/templates/question/collection.tpl +++ b/public/js/views/templates/question/collection.tpl @@ -1,7 +1,12 @@ -
+
-
+
+ <%= _t("search.searchInfo") %> +