Download as
Browse Code »

Commit 8f22834c4ed08f29d9ab2a5c1be58fc6da62402a

Authored by Dmitriy Zaporozhets
1 parent 2587de74
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

bootstrap 2 integration complete.

Showing 3 changed files with 3 additions and 13 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @8f22834
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
9 .container { 9 .container {
10 padding-top:0; 10 padding-top:0;
11 z-index:5; 11 z-index:5;
12 - min-width:$min_app_width;  
13 - padding:0 20px 12 + padding:0 20px;
  13 + min-width: $min_app_width;
14 } 14 }
15 15
16 .container .content { 16 .container .content {
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @8f22834
@@ -118,16 +118,6 @@ table { @@ -118,16 +118,6 @@ table {
118 &.primary { 118 &.primary {
119 @extend .btn-primary; 119 @extend .btn-primary;
120 } 120 }
121 - &.btn-danger {  
122 - background:#DD4B39;  
123 - color:white;  
124 - border-color:#990000;  
125 - text-shadow:0 0 1px #111;  
126 - &:hover {  
127 - color:white;  
128 - background:#DD0000;  
129 - }  
130 - }  
131 &.danger { 121 &.danger {
132 @extend .btn-danger; 122 @extend .btn-danger;
133 } 123 }
app/views/keys/index.html.haml
  Diff comments   View file @8f22834
@@ -4,6 +4,6 @@ @@ -4,6 +4,6 @@
4 4
5 %br 5 %br
6 6
7 -%table#keys-table 7 +%table#keys-table.table
8 - @keys.each do |key| 8 - @keys.each do |key|
9 = render(:partial => 'show', :locals => {:key => key}) 9 = render(:partial => 'show', :locals => {:key => key})