Download as
Browse Code »

Commit 65f0ed4d264e7015ac9259d82913876c6e198a5d

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

Increase usage of $primary_color variable

Showing 4 changed files with 8 additions and 8 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @65f0ed4
... ... @@ -23,7 +23,7 @@
23 23  
24 24 &.disabled {
25 25 color: #fff;
26   - background: #29B;
  26 + background: $primary_color;
27 27 }
28 28 }
29 29  
... ... @@ -39,7 +39,7 @@
39 39  
40 40 &.disabled {
41 41 color: #fff;
42   - background: #29B;
  42 + background: $primary_color;
43 43 }
44 44 }
45 45  
... ...
app/assets/stylesheets/gitlab_bootstrap/nav.scss
  Diff comments   View file @65f0ed4
... ... @@ -16,7 +16,7 @@
16 16 padding: 12px;
17 17 }
18 18 > .active > a {
19   - border-color: #29B;
  19 + border-color: $primary_color;
20 20 border-radius: 0;
21 21 background: #F1F1F1;
22 22 color: $style_color;
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @65f0ed4
... ... @@ -124,7 +124,7 @@
124 124 color: #777;
125 125 padding: 10px;
126 126 min-height: 22px;
127   - border-left: 5px solid #5AB9C3;
  127 + border-left: 5px solid $primary_color;
128 128 margin-bottom: 20px;
129 129 background: #f9f9f9;
130 130  
... ... @@ -133,10 +133,10 @@
133 133 }
134 134  
135 135 .btn-new-mr {
136   - @extend .btn-info;
  136 + @extend .btn-primary;
137 137 @extend .small;
138 138 @extend .pull-right;
139   - margin: -3px;
  139 + margin: -2px;
140 140 }
141 141 }
142 142  
... ... @@ -152,7 +152,7 @@
152 152 .filter_icon {
153 153 a {
154 154 text-align:center;
155   - border-left: 3px solid #29B;
  155 + border-left: 3px solid $primary_color;
156 156 background: #f9f9f9;
157 157 margin-bottom: 10px;
158 158 float: left;
... ...
app/views/projects/show.html.haml
  Diff comments   View file @65f0ed4
1 1 = render 'clone_panel'
2   -= render "events/event_last_push", event: @last_push
3 2  
4 3 .row
5 4 .span9
  5 + = render "events/event_last_push", event: @last_push
6 6 .content_list= render @events
7 7 .loading.hide
8 8 .span3
... ...