bootstrap 2 integration complete.

Dmitriy Zaporozhets
1 parent 2587de74
Showing 3 changed files with 3 additions and 13 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap.scss
app/views/keys/index.html.haml
@@ -9,8 +9,8 @@
 .container { 
   padding-top:0;
   z-index:5;
-  min-width:$min_app_width;
-  padding:0 20px
+  padding:0 20px;
+  min-width: $min_app_width;
 }
  
 .container .content { 
@@ -118,16 +118,6 @@ table {
   &.primary { 
     @extend .btn-primary;
   }
-  &.btn-danger { 
-    background:#DD4B39;
-    color:white;
-    border-color:#990000;
-    text-shadow:0 0 1px #111;
-    &:hover { 
-      color:white;
-      background:#DD0000;
-    }
-  }
   &.danger { 
     @extend .btn-danger;
   }
@@ -4,6 +4,6 @@
  
 %br
  
-%table#keys-table
+%table#keys-table.table
   - @keys.each do |key|
     = render(:partial => 'show', :locals => {:key => key})
...	...	@@ -9,8 +9,8 @@
9	9	.container {
10	10	padding-top:0;
11	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	16	.container .content {
...	...
...	...	@@ -118,16 +118,6 @@ table {
118	118	&.primary {
119	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	121	&.danger {
132	122	@extend .btn-danger;
133	123	}
...	...
...	...	@@ -4,6 +4,6 @@
4	4
5	5	%br
6	6
7		-%table#keys-table
	7	+%table#keys-table.table
8	8	- @keys.each do \|key\|
9	9	= render(:partial => 'show', :locals => {:key => key})
...	...