diff options
| -rw-r--r-- | app/assets/stylesheets/gl_bootstrap.scss | 15 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 6 | ||||
| -rw-r--r-- | app/views/shared/_issues.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_merge_requests.html.haml | 2 |
4 files changed, 17 insertions, 8 deletions
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss index f46dfbf1127..e4256a53248 100644 --- a/app/assets/stylesheets/gl_bootstrap.scss +++ b/app/assets/stylesheets/gl_bootstrap.scss @@ -227,7 +227,10 @@ ul.breadcrumb { * */ .panel { + @include border-radius(0px); + .panel-heading { + @include border-radius(0px); font-size: 14px; line-height: 18px; @@ -248,4 +251,16 @@ ul.breadcrumb { background: #FFF; } } + + &.panel-small { + .panel-heading { + padding: 6px 15px; + } + } + + &.panel-default { + .panel-heading { + background-color: #EEE; + } + } } diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index cac4cb66aa4..5d716ddec3b 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -106,12 +106,6 @@ } .mr-state-widget { - @include border-radius(0px); - - .panel-heading { - @include border-radius(0px); - } - .panel-body { h4 { margin-top: 0px; diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index d36e96dc49a..e976f897dc9 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,6 +1,6 @@ - if @issues.any? - @issues.group_by(&:project).each do |group| - .panel.panel-default.panel.panel-default-small + .panel.panel-default.panel-small - project = group[0] .panel-heading = link_to_project project diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 954b16cfdb5..39a1ee38f8e 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,6 +1,6 @@ - if @merge_requests.any? - @merge_requests.group_by(&:target_project).each do |group| - .panel.panel-default.panel.panel-default-small + .panel.panel-default.panel-small - project = group[0] .panel-heading = link_to_project project |