Download as
Browse Code »

Commit 5ba00d950bb15fde71f58ac08ec22e04cc9437d6

Authored by Dmitriy Zaporozhets
1 parent d54d3324
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Add old ui-box style to panels 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 17 additions and 8 deletions   Show diff stats
app/assets/stylesheets/gl_bootstrap.scss
  Diff comments   View file @5ba00d9
@@ -227,7 +227,10 @@ ul.breadcrumb { @@ -227,7 +227,10 @@ ul.breadcrumb {
227 * 227 *
228 */ 228 */
229 .panel { 229 .panel {
  230 + @include border-radius(0px);
  231 +
230 .panel-heading { 232 .panel-heading {
  233 + @include border-radius(0px);
231 font-size: 14px; 234 font-size: 14px;
232 line-height: 18px; 235 line-height: 18px;
233 236
@@ -248,4 +251,16 @@ ul.breadcrumb { @@ -248,4 +251,16 @@ ul.breadcrumb {
248 background: #FFF; 251 background: #FFF;
249 } 252 }
250 } 253 }
  254 +
  255 + &.panel-small {
  256 + .panel-heading {
  257 + padding: 6px 15px;
  258 + }
  259 + }
  260 +
  261 + &.panel-default {
  262 + .panel-heading {
  263 + background-color: #EEE;
  264 + }
  265 + }
251 } 266 }
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @5ba00d9
@@ -106,12 +106,6 @@ @@ -106,12 +106,6 @@
106 } 106 }
107 107
108 .mr-state-widget { 108 .mr-state-widget {
109 - @include border-radius(0px);  
110 -  
111 - .panel-heading {  
112 - @include border-radius(0px);  
113 - }  
114 -  
115 .panel-body { 109 .panel-body {
116 h4 { 110 h4 {
117 margin-top: 0px; 111 margin-top: 0px;
app/views/shared/_issues.html.haml
  Diff comments   View file @5ba00d9
1 - if @issues.any? 1 - if @issues.any?
2 - @issues.group_by(&:project).each do |group| 2 - @issues.group_by(&:project).each do |group|
3 - .panel.panel-default.panel.panel-default-small 3 + .panel.panel-default.panel-small
4 - project = group[0] 4 - project = group[0]
5 .panel-heading 5 .panel-heading
6 = link_to_project project 6 = link_to_project project
app/views/shared/_merge_requests.html.haml
  Diff comments   View file @5ba00d9
1 - if @merge_requests.any? 1 - if @merge_requests.any?
2 - @merge_requests.group_by(&:target_project).each do |group| 2 - @merge_requests.group_by(&:target_project).each do |group|
3 - .panel.panel-default.panel.panel-default-small 3 + .panel.panel-default.panel-small
4 - project = group[0] 4 - project = group[0]
5 .panel-heading 5 .panel-heading
6 = link_to_project project 6 = link_to_project project