James Allen 12 лет назад
Родитель
Сommit
ac4b3663cb

+ 14 - 15
services/web/app/views/layout/footer.jade

@@ -4,34 +4,33 @@ footer.site-footer
 	.container
 		.row
 			ul.col-md-6
-				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
+					li.dropdown.dropup.subdued
 						a.dropdown-toggle(
 							href="#",
 							data-toggle="dropdown",
 							aria-haspopup="true",
-							aria-expanded="false"
-						) #{translate("language")}
-							|  
+							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}
 
-			ul.col-md-3
+			ul.col-md-6.text-right
 
 				each item in nav.right_footer
 					li

+ 3 - 1
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)}
-
+				
+				
+				
 

+ 1 - 1
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"
 	)

+ 5 - 8
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
+			a(href=recomendSubdomain.url+currentUrl) !{translate("click_here_to_view_sl_in_lng", {lngName:"<strong>" + translate(recomendSubdomain.lngCode) + "</strong>"})} 
+				img(src="/img/flags/24/#{recomendSubdomain.lngCode}.png")
+			button.close.pull-right
+				span(aria-hidden="true", ng-click="dismiss()") &times;
+				span.sr-only Close

+ 3 - 2
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;
     }
 
 }

+ 0 - 3
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;