diff --git a/services/web/app/views/layout/footer.jade b/services/web/app/views/layout/footer.jade index 39d9849be9..ebd4a69b72 100644 --- a/services/web/app/views/layout/footer.jade +++ b/services/web/app/views/layout/footer.jade @@ -4,34 +4,33 @@ footer.site-footer .container .row ul.col-md-6 + + if Object.keys(settings.i18n.subdomainLang).length > 1 + li.dropdown.dropup.subdued + a.dropdown-toggle( + href="#", + data-toggle="dropdown", + aria-haspopup="true", + aria-expanded="false", + tooltip="#{translate('language')}" + ) + img(src="/img/flags/24/#{currentLngCode}.png") + + ul.dropdown-menu(role="menu") + li.dropdown-header #{translate("language")} + each subdomainDetails, subdomain in settings.i18n.subdomainLang + li.lngOption + a.menu-indent(href=subdomainDetails.url+currentUrl) #{translate(subdomainDetails.lngCode)} + img(src="/img/flags/24/#{subdomainDetails.lngCode}.png") + each item in nav.left_footer li if item.url a(href=item.url, class=item.class) !{item.text} else | !{item.text} - - - .col-md-3 - if Object.keys(settings.i18n.subdomainLang).length > 1 - .dropdown.dropup.subdued - a.dropdown-toggle( - href="#", - data-toggle="dropdown", - aria-haspopup="true", - aria-expanded="false" - ) #{translate("language")} - |   - img(src="/img/flags/24/#{currentLngCode}.png") - ul.dropdown-menu(role="menu") - each subdomainDetails, subdomain in settings.i18n.subdomainLang - li.lngOption - a.menu-indent(href=subdomainDetails.url+currentUrl) #{translate(subdomainDetails.lngCode)} - - img(src="/img/flags/24/#{subdomainDetails.lngCode}.png") - - ul.col-md-3 + ul.col-md-6.text-right each item in nav.right_footer li diff --git a/services/web/app/views/layout/navbar.jade b/services/web/app/views/layout/navbar.jade index bebc297e8f..5095dae7ca 100644 --- a/services/web/app/views/layout/navbar.jade +++ b/services/web/app/views/layout/navbar.jade @@ -31,5 +31,7 @@ nav.navbar.navbar-default a(href=item.url, class=item.class) !{translate(item.text)} else | !{translate(item.text)} - + + + diff --git a/services/web/app/views/project/list/side-bar.jade b/services/web/app/views/project/list/side-bar.jade index 6206adb376..c560ebc3c3 100644 --- a/services/web/app/views/project/list/side-bar.jade +++ b/services/web/app/views/project/list/side-bar.jade @@ -1,5 +1,5 @@ .dropdown - a.btn.dropdown-toggle( + a.btn.btn-primary.dropdown-toggle( href="#", data-toggle="dropdown" ) diff --git a/services/web/app/views/translations/translation_message.jade b/services/web/app/views/translations/translation_message.jade index 0fbea3a638..204eaa2435 100644 --- a/services/web/app/views/translations/translation_message.jade +++ b/services/web/app/views/translations/translation_message.jade @@ -1,11 +1,8 @@ - if(typeof(recomendSubdomain) != "undefined") span(ng-controller="TranslationsPopupController", ng-cloak) .translations-message(ng-hide="hidei18nNotification") - .container - .row - .col-md-12 - a(href=recomendSubdomain.url+currentUrl) #{translate("click_here_to_view_sl_in_lng", {lngName:translate(recomendSubdomain.lngCode)})} - img(src="/img/flags/32/#{recomendSubdomain.lngCode}.png") - button.close - span(aria-hidden="true", ng-click="dismiss()") × - span.sr-only Close \ No newline at end of file + a(href=recomendSubdomain.url+currentUrl) !{translate("click_here_to_view_sl_in_lng", {lngName:"" + translate(recomendSubdomain.lngCode) + ""})} + img(src="/img/flags/24/#{recomendSubdomain.lngCode}.png") + button.close.pull-right + span(aria-hidden="true", ng-click="dismiss()") × + span.sr-only Close \ No newline at end of file diff --git a/services/web/public/stylesheets/app/translations.less b/services/web/public/stylesheets/app/translations.less index d05d43d9c9..3b79b94aff 100644 --- a/services/web/public/stylesheets/app/translations.less +++ b/services/web/public/stylesheets/app/translations.less @@ -1,13 +1,14 @@ .translations-message { padding: (@line-height-computed / 4) (@line-height-computed / 2); - background-color: @state-success-bg; + background-color: @state-warning-bg; color: #333; border-bottom: 1px solid @toolbar-border-color; text-align:center; img { - padding-left: 20px; + vertical-align: text-bottom; + margin-bottom: -1px; } } \ No newline at end of file diff --git a/services/web/public/stylesheets/components/footer.less b/services/web/public/stylesheets/components/footer.less index a2fcbdef99..10d3a3f19c 100644 --- a/services/web/public/stylesheets/components/footer.less +++ b/services/web/public/stylesheets/components/footer.less @@ -13,9 +13,6 @@ footer.site-footer { font-size: 1.2rem; } } - ul:last-child { - text-align: right; - } li.lngOption { text-align: left;