From 9f032b9c2ac897151150d77d68dd7cd36c1ad990 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 21 Apr 2015 16:35:45 +0300 Subject: Move header css from pages to generic Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/generic/header.scss | 239 +++++++++++++++++++++++++++++ app/assets/stylesheets/pages/header.scss | 239 ----------------------------- 2 files changed, 239 insertions(+), 239 deletions(-) create mode 100644 app/assets/stylesheets/generic/header.scss delete mode 100644 app/assets/stylesheets/pages/header.scss diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss new file mode 100644 index 00000000000..e88d35939ed --- /dev/null +++ b/app/assets/stylesheets/generic/header.scss @@ -0,0 +1,239 @@ +/* + * Application Header + * + */ +header { + &.navbar-gitlab { + z-index: 100; + margin-bottom: 0; + min-height: 40px; + border: none; + width: 100%; + + .navbar-inner { + background: #FFF; + border-bottom: 1px solid #DDD; + filter: none; + + .title { + color: #555; + + a { + color: #555; + &:hover { + text-decoration: underline; + } + } + } + + .app_logo { + @media (max-width: $screen-md-max) { + width: 52px; + h3 { + display: none; + } + } + border-bottom: 1px solid transparent; + margin-bottom: -1px; + + a { + padding: 5px 8px; + + img { + float: left; + } + + h3 { + width: 158px; + float: left; + margin: 0; + margin-left: 20px; + font-size: 18px; + line-height: 34px; + font-weight: normal; + } + } + } + + .nav > li > a { + color: #666; + font-size: 14px; + line-height: 32px; + padding: 6px 10px; + + &:hover, &:focus, &:active { + background: none; + } + } + + /** NAV block with links and profile **/ + .nav { + float: right; + margin-right: 0; + } + + .navbar-toggle { + color: $style_color; + margin: 0; + padding: 10px; + border-radius: 0; + + button i { font-size: 22px; } + + &.collapsed { background-color: transparent !important;} + + &:hover { + background-color: #EEE; + } + } + } + + .turbolink-spinner { + font-size: 20px; + margin-right: 10px; + } + + @media (max-width: $screen-xs-max) { + border-width: 0; + font-size: 18px; + + .title { + @include str-truncated(70%); + } + + .navbar-collapse { + margin-top: 47px; + padding-right: 0; + padding-left: 0; + } + + .navbar-nav { + margin: 5px 0; + + .visible-xs, .visable-sm { + display: table-cell !important; + } + } + + li { + display: table-cell; + width: 1%; + + a { + text-align: center; + font-size: 18px !important; + } + } + } + } + + .container { + width: 100% !important; + padding: 0px; + } + + /** + * + * Logo holder + * + */ + .app_logo { + float: left; + margin-right: 9px; + + a { + float: left; + height: 46px; + width: 100%; + + img { + width: 36px; + height: 36px; + } + } + &:hover { + background-color: #EEE; + } + } + + /** + * + * Project / Area name + * + */ + .title { + position: relative; + float: left; + margin: 0; + margin-left: 25px; + font-size: 18px; + line-height: 44px; + font-weight: normal; + + @include str-truncated(37%); + } + + .profile-pic { + padding: 0px !important; + width: 46px; + height: 46px; + margin-left: 5px; + img { + width: 46px; + height: 46px; + } + } + + /** + * + * Search box + * + */ + .search { + margin-right: 10px; + margin-left: 10px; + margin-top: 8px; + + form { + margin: 0; + padding: 0; + } + + .search-input { + background-image: image-url("icon-search.png"); + background-repeat: no-repeat; + background-position: 10px; + height: inherit; + padding: 4px 6px; + padding-left: 25px; + font-size: 13px; + @include border-radius(3px); + border: 1px solid #DDD; + box-shadow: none; + @include transition(all 0.15s ease-in 0s); + background-color: #f5f5f5; + } + } +} + +.search .search-input { + width: 300px; + &:focus { + width: 330px; + } +} + +@media (max-width: 1200px) { + .search .search-input { + width: 200px; + &:focus { + width: 230px; + } + } +} + +@media (max-width: $screen-xs-max) { + #nprogress .spinner { + right: 35px !important; + } +} diff --git a/app/assets/stylesheets/pages/header.scss b/app/assets/stylesheets/pages/header.scss deleted file mode 100644 index e88d35939ed..00000000000 --- a/app/assets/stylesheets/pages/header.scss +++ /dev/null @@ -1,239 +0,0 @@ -/* - * Application Header - * - */ -header { - &.navbar-gitlab { - z-index: 100; - margin-bottom: 0; - min-height: 40px; - border: none; - width: 100%; - - .navbar-inner { - background: #FFF; - border-bottom: 1px solid #DDD; - filter: none; - - .title { - color: #555; - - a { - color: #555; - &:hover { - text-decoration: underline; - } - } - } - - .app_logo { - @media (max-width: $screen-md-max) { - width: 52px; - h3 { - display: none; - } - } - border-bottom: 1px solid transparent; - margin-bottom: -1px; - - a { - padding: 5px 8px; - - img { - float: left; - } - - h3 { - width: 158px; - float: left; - margin: 0; - margin-left: 20px; - font-size: 18px; - line-height: 34px; - font-weight: normal; - } - } - } - - .nav > li > a { - color: #666; - font-size: 14px; - line-height: 32px; - padding: 6px 10px; - - &:hover, &:focus, &:active { - background: none; - } - } - - /** NAV block with links and profile **/ - .nav { - float: right; - margin-right: 0; - } - - .navbar-toggle { - color: $style_color; - margin: 0; - padding: 10px; - border-radius: 0; - - button i { font-size: 22px; } - - &.collapsed { background-color: transparent !important;} - - &:hover { - background-color: #EEE; - } - } - } - - .turbolink-spinner { - font-size: 20px; - margin-right: 10px; - } - - @media (max-width: $screen-xs-max) { - border-width: 0; - font-size: 18px; - - .title { - @include str-truncated(70%); - } - - .navbar-collapse { - margin-top: 47px; - padding-right: 0; - padding-left: 0; - } - - .navbar-nav { - margin: 5px 0; - - .visible-xs, .visable-sm { - display: table-cell !important; - } - } - - li { - display: table-cell; - width: 1%; - - a { - text-align: center; - font-size: 18px !important; - } - } - } - } - - .container { - width: 100% !important; - padding: 0px; - } - - /** - * - * Logo holder - * - */ - .app_logo { - float: left; - margin-right: 9px; - - a { - float: left; - height: 46px; - width: 100%; - - img { - width: 36px; - height: 36px; - } - } - &:hover { - background-color: #EEE; - } - } - - /** - * - * Project / Area name - * - */ - .title { - position: relative; - float: left; - margin: 0; - margin-left: 25px; - font-size: 18px; - line-height: 44px; - font-weight: normal; - - @include str-truncated(37%); - } - - .profile-pic { - padding: 0px !important; - width: 46px; - height: 46px; - margin-left: 5px; - img { - width: 46px; - height: 46px; - } - } - - /** - * - * Search box - * - */ - .search { - margin-right: 10px; - margin-left: 10px; - margin-top: 8px; - - form { - margin: 0; - padding: 0; - } - - .search-input { - background-image: image-url("icon-search.png"); - background-repeat: no-repeat; - background-position: 10px; - height: inherit; - padding: 4px 6px; - padding-left: 25px; - font-size: 13px; - @include border-radius(3px); - border: 1px solid #DDD; - box-shadow: none; - @include transition(all 0.15s ease-in 0s); - background-color: #f5f5f5; - } - } -} - -.search .search-input { - width: 300px; - &:focus { - width: 330px; - } -} - -@media (max-width: 1200px) { - .search .search-input { - width: 200px; - &:focus { - width: 230px; - } - } -} - -@media (max-width: $screen-xs-max) { - #nprogress .spinner { - right: 35px !important; - } -} -- cgit v1.2.1