From b86b8965f1d06a2dfbeeb97ee9c21c39603ebbb9 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Feb 2016 12:05:19 +1100 Subject: [PATCH 1/3] Reduced the heigh of the tabs, adjusted padding on h3 --- public/sass/components/_tabbed_view.scss | 1 + public/sass/components/_tabs.scss | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss index 00fcf4c54ff..a45d4be220b 100644 --- a/public/sass/components/_tabbed_view.scss +++ b/public/sass/components/_tabbed_view.scss @@ -28,6 +28,7 @@ margin-left: $spacer*2; float: left; font-style: italic; + padding-top: 0.2rem; } .tabbed-view-close-btn { diff --git a/public/sass/components/_tabs.scss b/public/sass/components/_tabs.scss index 35db17bd3ac..05988c7c763 100644 --- a/public/sass/components/_tabs.scss +++ b/public/sass/components/_tabs.scss @@ -44,19 +44,18 @@ } .gf-tabs-link { - padding: 0.80rem 1rem 0.60rem 1rem; + padding: 0.60rem 1rem 0.50rem 1rem; margin-right: $spacer/2; line-height: $line-height-base; border: 1px solid transparent; position: relative; - top: 3px; + top: 5px; @include border-radius(2px 2px 0 0); &:hover, &:focus { - border-color: rgba(216, 131, 40, 0.77); - color: $link-color; + color: $link-hover-color; } &.active, From 9d96382eccdeda24d77ce4332c0e6eabf0fb415e Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Feb 2016 12:30:36 +1100 Subject: [PATCH 2/3] Reduced height of tabs and nav-tabs elsewhere --- public/sass/components/_navs.scss | 27 +++++++++++++++++------- public/sass/components/_tabbed_view.scss | 4 ++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss index 938288e8953..edf35044a4a 100644 --- a/public/sass/components/_navs.scss +++ b/public/sass/components/_navs.scss @@ -55,16 +55,22 @@ // Actual tabs (as links) .nav-tabs > li > a { - color: $text-color; - padding-top: 8px; - padding-bottom: 8px; + // color: $text-color; + // padding-top: 8px; + // padding-bottom: 8px; + // line-height: $line-height-base; + // border: 1px solid transparent; + // @include border-radius(4px 4px 0 0); + + padding: 0.40rem 1rem 0.35rem 1rem; + margin-right: $spacer/2; line-height: $line-height-base; border: 1px solid transparent; - @include border-radius(4px 4px 0 0); + position: relative; + &:hover, &:focus { - border-color: $divider-border-color; - color: $link-color; + color: $link-hover-color; } } @@ -72,9 +78,14 @@ .nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus { + // @include border-radius(3px); + // border: 1px solid $divider-border-color; + // background-color: transparent; + // border-bottom: 1px solid $panel-bg; + // color: $link-hover-color; + @include border-radius(3px); - border: 1px solid $divider-border-color; - background-color: transparent; + border-color: $divider-border-color; border-bottom: 1px solid $panel-bg; color: $link-color; } diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss index a45d4be220b..75a0c991d45 100644 --- a/public/sass/components/_tabbed_view.scss +++ b/public/sass/components/_tabbed_view.scss @@ -25,7 +25,7 @@ } .tabbed-view-title { - margin-left: $spacer*2; + margin-left: $spacer*1.5; float: left; font-style: italic; padding-top: 0.2rem; @@ -48,7 +48,7 @@ } .tabbed-view-body { - padding: $spacer*2; + padding: $spacer*1.5; min-height: 250px; } From 7ca8db15d9e5158204fae5ba03a23d308c0071b7 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 25 Feb 2016 12:36:03 +1100 Subject: [PATCH 3/3] Removed commented out old code --- public/sass/components/_navs.scss | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss index edf35044a4a..4bb02d7b514 100644 --- a/public/sass/components/_navs.scss +++ b/public/sass/components/_navs.scss @@ -55,13 +55,6 @@ // Actual tabs (as links) .nav-tabs > li > a { - // color: $text-color; - // padding-top: 8px; - // padding-bottom: 8px; - // line-height: $line-height-base; - // border: 1px solid transparent; - // @include border-radius(4px 4px 0 0); - padding: 0.40rem 1rem 0.35rem 1rem; margin-right: $spacer/2; line-height: $line-height-base; @@ -78,12 +71,6 @@ .nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus { - // @include border-radius(3px); - // border: 1px solid $divider-border-color; - // background-color: transparent; - // border-bottom: 1px solid $panel-bg; - // color: $link-hover-color; - @include border-radius(3px); border-color: $divider-border-color; border-bottom: 1px solid $panel-bg;