From 774262175aa9497ba16422e0d6c179156dd9c779 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 19 Jun 2015 16:19:02 +0200 Subject: [PATCH] cleanup tabs.sass --- app/styles/app.scss | 1 - app/styles/app/modules/tabs.sass | 45 +++++++++++ app/styles/app/tabs.sass | 132 ------------------------------- 3 files changed, 45 insertions(+), 133 deletions(-) delete mode 100644 app/styles/app/tabs.sass diff --git a/app/styles/app.scss b/app/styles/app.scss index 894130a7..764e55ba 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -20,7 +20,6 @@ @import "app/popup"; // @import "app/pro"; @import "app/settings"; -@import "app/tabs"; @import "app/components/travis-switch"; @import "app/components/sync-button"; diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 2d90aa8d..0c2561f2 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -75,3 +75,48 @@ li float: left margin-right: 1em + + +#main + .tabs + border-bottom: 3px solid #f5f5f6 + li + height: 29px + background-color: #f5f5f6 + margin-right: 0 + overflow: hidden + &:hover + background-color: #e1e8eb + a + text-decoration: none + + .active + display: block + background-color: $tab-active-bg + border-bottom-color: $tab-active-bg + &:hover + background-color: $tab-active-bg + a + color: #6c878e + @media #{$medium-up} + display: inline-block + + #builds + a + display: inline + +.tabs--main + #tab_build, + #tab_job, + #tab_request, + #tab_requests, + #tab_caches, + #tab_settings + display: none + &.active + display: inline-block + +#profile + #main + .tab + margin: 30px 0 0 12px diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass deleted file mode 100644 index 9990abe7..00000000 --- a/app/styles/app/tabs.sass +++ /dev/null @@ -1,132 +0,0 @@ -/* - * It's a nightmare to overwrite this - * @todo refactor and get rid of all IDs - */ - - -// .tabs -// @include resetul -// li -// height: 28px -// vertical-align: top -// background-color: $tab-nav-inactive-bg -// border-radius: 4px 4px 0px 0px -// padding: 0 12px 0 12px -// margin-right: 10px -// white-space: nowrap -// cursor: pointer -// @media #{$medium-up} -// height: 29px -// li -// display: inline-block -// &:hover -// background-color: $tab-nav-inactive-bg-hover - -// .active -// background-color: $color-bg-tab-active -// border-bottom-color: $color-bg-tab-active - -// a -// color: $color-text -// font-weight: 600 - -// h5 -// margin: 0 -// font-size: $font-size-small -// font-weight: normal -// line-height: 30px -// text-align: center - -// a -// display: block -// color: #a8a9ab - - -// #left - -// .tabs -// margin: -28px 20px 0 15px - -// #tab_search:not(.active) -// display: none - -// #tab_recent.hidden -// display: none - -// #tab_owned -// display: none -// #tab_owned.display -// display: inline-block -// #tab_new -// display: none -// height: 25px -// width: 26px -// margin-top: 3px -// float: right -// margin-right: 0 -// padding: 0 5px 0 5px - -// h5 -// line-height: 25px - -// #tab_new.display -// display: inline-block - -#main - .tabs - border-bottom: 3px solid #f5f5f6 - li - height: 29px - background-color: #f5f5f6 - margin-right: 0 - overflow: hidden - &:hover - background-color: #e1e8eb - a - text-decoration: none - - .active - display: block - background-color: $tab-active-bg - border-bottom-color: $tab-active-bg - &:hover - background-color: $tab-active-bg - a - color: #6c878e - @media #{$medium-up} - display: inline-block - - #builds - a - display: inline - -.tabs--main - #tab_build, - #tab_job, - #tab_request, - #tab_requests, - #tab_caches, - #tab_settings - display: none - &.active - display: inline-block - -#profile - #main - .tab - margin: 30px 0 0 12px - -// #right -// .tabs -// margin-left: -3px - -// .active -// background-color: $color-bg-right -// border-bottom-color: $color-bg-right -// h5 -// font-weight: bold - -// @media handheld, only screen and (max-device-width: 980px) -// #main -// #tab_branches -// display: none