diff options
author | tauriedavis <taurie@gitlab.com> | 2016-11-08 12:48:28 -0800 |
---|---|---|
committer | tauriedavis <taurie@gitlab.com> | 2016-11-09 17:24:17 -0800 |
commit | d81d67bae44f189adddd1f4fb489a44e274e21b5 (patch) | |
tree | b442ecfe14951d96edf9a4064e4cbcbd3e8c207c /app/assets/stylesheets | |
parent | c6d010986724faf10b46453d66eaca38a948fabf (diff) | |
download | gitlab-ce-d81d67bae44f189adddd1f4fb489a44e274e21b5.tar.gz |
19205 Redesign group page header to match new navigation19205-group-header-redesign
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 25 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 30 |
3 files changed, 23 insertions, 34 deletions
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index c1ed43bc20f..9391661a595 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -71,7 +71,7 @@ display: none; } - .group-right-buttons { + .group-buttons { display: none; } diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 4375e29c8db..57d028cec8c 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -10,7 +10,6 @@ } .group-row { - .stats { float: right; line-height: $list-text-height; @@ -23,36 +22,18 @@ } .ldap-group-links { - .form-actions { margin-bottom: $gl-padding; } } -.groups-cover-block { - - .container-fluid { - position: relative; - } - - .group-right-buttons { - position: absolute; - right: 16px; - - .btn { - @include btn-gray; - padding: 3px 10px; - background-color: $background-color; - } - } - - .group-avatar { - border: 0; +.group-buttons { + .notification-dropdown { + display: inline-block; } } .groups-header { - @media (min-width: $screen-sm-min) { .nav-links { width: 35%; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index f7d54564530..ad46a2a9128 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -86,7 +86,8 @@ } } -.project-home-panel { +.project-home-panel, +.group-home-panel { padding-top: 24px; padding-bottom: 24px; @@ -94,7 +95,8 @@ border-bottom: 1px solid $border-color; } - .project-avatar { + .project-avatar, + .group-avatar { float: none; margin: 0 auto; border: none; @@ -104,7 +106,8 @@ } } - .project-title { + .project-title, + .group-title { margin-top: 10px; margin-bottom: 10px; font-size: 24px; @@ -118,10 +121,11 @@ } } - .project-home-desc { + .project-home-desc, + .group-home-desc { margin-left: auto; margin-right: auto; - margin-bottom: 15px; + margin-bottom: 0; max-width: 700px; > p { @@ -141,13 +145,18 @@ } } -.project-repo-buttons { - font-size: 0; +.project-repo-buttons, +.group-buttons { + margin-top: 15px; .btn { @include btn-gray; padding: 3px 10px; + &:last-child { + margin-left: 0; + } + .fa { color: $layout-link-gray; } @@ -168,7 +177,8 @@ } } - .project-repo-btn-group, + .download-button, + .dropdown-toggle, .notification-dropdown, .project-dropdown { margin-left: 10px; @@ -474,9 +484,7 @@ a.deploy-project-label { margin-right: $gl-padding; } - &.project-repo-buttons-right { - margin-top: 10px; - + &.right { @media (min-width: $screen-md-min) { float: right; margin-top: 0; |