SAK-30814 Use consecutive headers in sites drawer

bizzkriss · Apr 28, 2016 · 12c1d52 · 12c1d52
1 parent ed646ba
commit 12c1d52
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm
@@ -32,9 +32,9 @@
         <div id="selectSite">
             <!-- View all sites, add new site, preferences -->
             <ul class="tab-bar">
-                <li class="tab-btn active" data-tab-target="otherSitesCategorWrap">${rloader.sit_worksites}</li>
+                <li class="tab-btn active" data-tab-target="otherSitesCategorWrap"><h2 class="favorites-tab-label">${rloader.sit_worksites}</h2></li>
                 <li class="organizeFavorites tab-btn" data-tab-target="organizeFavorites">
-                    <span class="favorites-desktop">${rloader.moresite_organize_favorites}</span><span class="favorites-mobile">${rloader.moresite_favorites}</span> <span class="favoriteCount"></span></li>
+                    <h2 class="favorites-tab-label"><span class="favorites-desktop">${rloader.moresite_organize_favorites}</span><span class="favorites-mobile">${rloader.moresite_favorites}</span> <span class="favoriteCount"></span></h2></li>
             </ul>
 
             <div class="tab-pane">
@@ -70,9 +70,9 @@
                             #if ($tabsSites.tabsMoreTermsLeftPane.get($termKey).size() > 0)
                                 <div class="fav-sites-term">
                                     #if ( !$termKey || $termKey == "" )
-                                        <h4>${rloader.sit_notermkey}</h4>
+                                        <h3 class="favorites-term-header">${rloader.sit_notermkey}</h3>
                                     #else
-                                        <h4>$termKey</h4>
+                                        <h3 class="favorites-term-header">$termKey</h3>
                                     #end
 
                                     <ul class="otherSitesCategorList favoriteSiteList">
@@ -90,7 +90,7 @@
                             #if ($tabsSites.tabsMoreTermsRightPane.get($termKey).size() > 0)
                                 <div class="fav-sites-term">
                                     #if ( $termKey && $termKey != "" )
-                                        <h4>$termKey</h4>
+                                        <h3 class="favorites-term-header">$termKey</h3>
 
                                         <ul class="otherSitesCategorList favoriteSiteList">
                                             <!-- anchor "my workspace" to the top of the list -->

diff --git a/reference/library/src/morpheus-master/sass/modules/more-sites/_base.scss b/reference/library/src/morpheus-master/sass/modules/more-sites/_base.scss
@@ -73,10 +73,6 @@ body.active-more-sites{
 }
 
 #selectSite{
-	h4{
-		font-size: 1.8em;
-  		margin: 1.5em 0 0.6em 0;
-	}
 	.tab-pane{
 		overflow-y: auto;
 		overflow-x: hidden;
@@ -120,11 +116,24 @@ body.active-more-sites{
 		z-index: 2;
 	}
 
+
+	.tab-bar .favorites-tab-label {
+		font-weight: $default-font-weight;
+		font-size: $default-font-size;
+		margin: 0.2em;
+	}
+
+
         #selectSite-navbar{
 		overflow: hidden;
 		margin: 0;
 		padding: 0;
         }
+
+	.favorites-term-header {
+		font-size: 1.8em;
+  		margin: 1.5em 0 0.6em 0;
+	}
 }
 
 ul#otherSitesMenu{
@@ -172,7 +181,7 @@ ul#otherSitesMenu{
 			width: 100%;
 			float: none;
 		}
-		.fav-sites-term:first-child h4{
+		.fav-sites-term:first-child .favorites-term-header{
 			margin-top: 0;
 		}
 	}
@@ -184,7 +193,7 @@ ul#otherSitesMenu{
 			width: 100%;
 			float: none;
 		}
-		.fav-sites-term:first-child h4{
+		.fav-sites-term:first-child .favorites-term-header{
 			margin-top: 0;
 		}
 	}