deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bootstrap 2 integration complete.

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-10 20:50:27 +03:00
parent 2587de74df
commit 8f22834c4e
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/common.scss
View file

@ -9,8 +9,8 @@
.container { .container {
padding-top:0; padding-top:0;
z-index:5; z-index:5;
min-width:$min_app_width; padding:0 20px;
padding:0 20px min-width: $min_app_width;
} }
.container .content { .container .content {

10
app/assets/stylesheets/gitlab_bootstrap.scss
View file

@ -118,16 +118,6 @@ table {
&.primary { &.primary {
@extend .btn-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 { &.danger {
@extend .btn-danger; @extend .btn-danger;
} }

2
app/views/keys/index.html.haml
View file

@ -4,6 +4,6 @@
%br %br
%table#keys-table %table#keys-table.table
- @keys.each do |key| - @keys.each do |key|
= render(:partial => 'show', :locals => {:key => key}) = render(:partial => 'show', :locals => {:key => key})