diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-10 20:50:27 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-10 20:50:27 +0300 |
| commit | 8f22834c4ed08f29d9ab2a5c1be58fc6da62402a (patch) | |
| tree | f412d15b5f5b4ec58ec6ae5e2d07f226ba5b4fee | |
| parent | 2587de74df824b8c81b9d51a3bd47fd246173e29 (diff) | |
| download | gitlab-ce-8f22834c4ed08f29d9ab2a5c1be58fc6da62402a.tar.gz | |
bootstrap 2 integration complete.
| -rw-r--r-- | app/assets/stylesheets/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap.scss | 10 | ||||
| -rw-r--r-- | app/views/keys/index.html.haml | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e5465816b28..9fb9de4b2ec 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -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 { diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 50ca028fea2..fd436018c3b 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -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; } diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml index 5df24af7124..2e2bfaab308 100644 --- a/app/views/keys/index.html.haml +++ b/app/views/keys/index.html.haml @@ -4,6 +4,6 @@ %br -%table#keys-table +%table#keys-table.table - @keys.each do |key| = render(:partial => 'show', :locals => {:key => key}) |