diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index 03497e3..e9b8568 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -23,7 +23,7 @@ &.disabled { color: #fff; - background: #29B; + background: $primary_color; } } @@ -39,7 +39,7 @@ &.disabled { color: #fff; - background: #29B; + background: $primary_color; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/nav.scss b/app/assets/stylesheets/gitlab_bootstrap/nav.scss index 2eaef61..0fc8b21 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/nav.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/nav.scss @@ -16,7 +16,7 @@ padding: 12px; } > .active > a { - border-color: #29B; + border-color: $primary_color; border-radius: 0; background: #F1F1F1; color: $style_color; diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 4876af2..40f35b6 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -124,7 +124,7 @@ color: #777; padding: 10px; min-height: 22px; - border-left: 5px solid #5AB9C3; + border-left: 5px solid $primary_color; margin-bottom: 20px; background: #f9f9f9; @@ -133,10 +133,10 @@ } .btn-new-mr { - @extend .btn-info; + @extend .btn-primary; @extend .small; @extend .pull-right; - margin: -3px; + margin: -2px; } } @@ -152,7 +152,7 @@ .filter_icon { a { text-align:center; - border-left: 3px solid #29B; + border-left: 3px solid $primary_color; background: #f9f9f9; margin-bottom: 10px; float: left; diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 824d4da..1e11ebb 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,8 +1,8 @@ = render 'clone_panel' -= render "events/event_last_push", event: @last_push .row .span9 + = render "events/event_last_push", event: @last_push .content_list= render @events .loading.hide .span3 -- libgit2 0.21.2