LPS-38298 - Source formatting

aperrelli · Jul 29, 2013 · ece7e61 · ece7e61
1 parent a30cd5c
commit ece7e61
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/portal-web/docroot/html/portlet/dockbar/view.jsp b/portal-web/docroot/html/portlet/dockbar/view.jsp
@@ -102,7 +102,11 @@ String toggleControlsState = GetterUtil.getString(SessionClicks.get(request, "li
 
 							<%@ include file="/html/portal/layout/view/control_panel_site_selector.jspf" %>
 
-							/ <liferay-ui:message key="site-administration" />
+							<span class="divider">/</span>
+
+							<span class="site-administration-title">
+								<liferay-ui:message key="site-administration" />
+							</span>
 						</c:when>
 						<c:otherwise>
 							<a href="<%= themeDisplay.getURLControlPanel() %>">

diff --git a/portal-web/docroot/html/themes/control_panel/_diffs/css/custom.css b/portal-web/docroot/html/themes/control_panel/_diffs/css/custom.css
@@ -64,30 +64,30 @@ $dockbarOpenGradientStart: #0EA6F9;
 
 	.control-panel-bar-secondary {
 		padding-top: 1.1em;
-	}
 
-	.control-panel-bar-secondary.nav-pills {
-		li {
-			margin-right: 20px;
+		&.nav-pills {
+			li {
+				margin-right: 20px;
 
-			a {
-				font-size: 15px;
-				font-weight: normal;
-				margin: 0;
-				padding: 10px 10px 11px;
+				a {
+					font-size: 15px;
+					font-weight: normal;
+					margin: 0;
+					padding: 10px 10px 11px;
 
-				&:hover {
-					background: #E5F5FC;
+					&:hover {
+						background: #E5F5FC;
+					}
 				}
 			}
-		}
-
-		> .active > a {
-			background: #009AE5;
-			color: #FFF;
 
-			&:hover {
+			> .active > a {
 				background: #009AE5;
+				color: #FFF;
+
+				&:hover {
+					background: #009AE5;
+				}
 			}
 		}
 	}
@@ -208,6 +208,15 @@ $dockbarOpenGradientStart: #0EA6F9;
 					text-shadow: none;
 				}
 
+				.control-panel-site-selector {
+					margin-top: 0;
+
+					.caret {
+						border-top-color: #FFF;
+						margin-top: -4px;
+					}
+				}
+
 				.control-panel-back-link {
 					margin: 0 15px;