From 12c1d52f16005d189a1b33d1a47b0ef0f6bf1db0 Mon Sep 17 00:00:00 2001 From: Mark Triggs Date: Thu, 28 Apr 2016 10:23:50 +1000 Subject: [PATCH] SAK-30814 Use consecutive headers in sites drawer --- .../pack/src/webapp/vm/morpheus/moresites.vm | 10 ++++----- .../sass/modules/more-sites/_base.scss | 21 +++++++++++++------ 2 files changed, 20 insertions(+), 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 index db6e0243ef0f..711a2b4bbb67 100644 --- 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 @@
@@ -70,9 +70,9 @@ #if ($tabsSites.tabsMoreTermsLeftPane.get($termKey).size() > 0)
#if ( !$termKey || $termKey == "" ) -

${rloader.sit_notermkey}

+

${rloader.sit_notermkey}

#else -

$termKey

+

$termKey

#end
    @@ -90,7 +90,7 @@ #if ($tabsSites.tabsMoreTermsRightPane.get($termKey).size() > 0)
    #if ( $termKey && $termKey != "" ) -

    $termKey

    +

    $termKey

      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 index 8874d0703805..08751c9c4150 100644 --- 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; } }