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

SCSS refactoring & cleanup. First iteration

Browse source
This commit is contained in:
randx 2012-08-29 21:23:43 +03:00
parent 35fbc4d3bb
commit 1dd938d20c
17 changed files with 717 additions and 1269 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/keys/_form.html.haml
View file

@ -19,6 +19,6 @@
.actions
= f.submit 'Save', class: "primary btn"
= link_to "Cancel", keys_path, class: "btn"
= f.submit 'Save', class: "btn save-btn"
= link_to "Cancel", keys_path, class: "btn cancel-btn"

4
app/views/merge_requests/show/_mr_title.html.haml
View file

@ -1,9 +1,9 @@
%h3.page_title
= "Merge Request ##{@merge_request.id}:"
 
%span.pretty_label.branch= @merge_request.source_branch
%span.label_branch= @merge_request.source_branch
→
%span.pretty_label.branch= @merge_request.target_branch
%span.label_branch= @merge_request.target_branch
%span.right
- if @merge_request.merged?

2
app/views/profile/password.html.haml
View file

@ -16,4 +16,4 @@
= f.label :password_confirmation
.input= f.password_field :password_confirmation
.actions
= f.submit 'Save', class: "btn primary"
= f.submit 'Save', class: "btn save-btn"

2
app/views/profile/show.html.haml
View file

@ -67,4 +67,4 @@
= link_to "Add Public Key", new_key_path, class: "btn small right"
.form-actions
= f.submit 'Save', class: "btn-primary btn"
= f.submit 'Save', class: "btn save-btn"