From 59f52f5ad1aa91a6d5f111d813abdd0d6f36f480 Mon Sep 17 00:00:00 2001 From: telly Date: Tue, 7 Apr 2015 14:35:43 +0100 Subject: [PATCH] DN|JA: Fix in page nav on mobile --- app/src/sass/demo/_menu.scss | 18 ++++++++++++++---- .../sass/toolkit/components/_inPageNav.scss | 7 +++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/src/sass/demo/_menu.scss b/app/src/sass/demo/_menu.scss index 8568689d..54778f10 100644 --- a/app/src/sass/demo/_menu.scss +++ b/app/src/sass/demo/_menu.scss @@ -1,18 +1,28 @@ .main-menu.tabs-container.main-menu .primary [role=tablist]{ margin-bottom: 0; + > li.selected a, > li:hover a{ border:0; } } -.main-menu.tabs-container.main-menu .tabs{ - margin-top: 0; - margin-bottom: 0; - border:0; + +.main-menu.tabs-container.main-menu{ + &, + .tabs-container, + .tabpanel{ + margin: 0; + } + + .tabs{ + border: 0; + } } + .main-menu .tabpanel{ border-bottom: 1px solid #ccc; } + .secondary-menu, #toolkit-menu-tabs.stick{ position: fixed; diff --git a/app/src/sass/toolkit/components/_inPageNav.scss b/app/src/sass/toolkit/components/_inPageNav.scss index 72056d40..0319c523 100644 --- a/app/src/sass/toolkit/components/_inPageNav.scss +++ b/app/src/sass/toolkit/components/_inPageNav.scss @@ -3,6 +3,8 @@ $tab-height: 45px; .tabpanel { display: none; width: 100%; + margin-top: 20px; + &.selected { display: block; } @@ -20,7 +22,7 @@ $tab-height: 45px; display: none; position: absolute; right: 0; - top: 21px; + top: 1px; z-index:10; a { @@ -98,15 +100,16 @@ $tab-height: 45px; .tabs-container.page-nav { position: relative; + margin: 20px 0; .tabs { position: relative; - margin: 20px 0; padding-right: 46px; border-bottom: solid 1px #dcdcdc; border-top: solid 1px #dcdcdc; } + &.whole-page .tabs { border-top: 0; }