diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-06 18:33:00 -0700 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
| commit | 6ee2069768279a9f9e03ae20f10b906a807a5eb7 (patch) | |
| tree | 3bdb357976a3143912063c5f9a9ae2b8a14aaa8f /app | |
| parent | 04e798a5154b2b2a86288f51081da8495f96bee5 (diff) | |
| download | gitlab-ce-6ee2069768279a9f9e03ae20f10b906a807a5eb7.tar.gz | |
Fix lint errors
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 6 | ||||
| -rw-r--r-- | app/helpers/notes_helper.rb | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index a7958467a14..789df42fb66 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -21,7 +21,7 @@ text-align: left; padding: 10px $gl-padding; word-wrap: break-word; - border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0 0; .file-actions { float: right; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 185137a4012..1ebbd9b0e57 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -81,7 +81,7 @@ $provider-btn-not-active-color: #4688f1; $white-light: #fff; $white-normal: #ededed; -$white-dark: #ECECEC; +$white-dark: #ececec; $gray-light: #faf9f9; $gray-normal: #f5f5f5; @@ -203,8 +203,8 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color; /* * Buttons */ -$btn-active-gray: #ECECEC; -$btn-placeholder-gray: #C7C7C7; +$btn-active-gray: #ececec; +$btn-placeholder-gray: #c7c7c7; $btn-white-active: #848484; /* diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index d86954c105e..95072b5373f 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -69,9 +69,7 @@ module NotesHelper line_type: line_type } - button_tag class: 'btn btn-text-field js-discussion-reply-button', - data: data, title: 'Add a reply' do - link_text = 'Reply...' - end + button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', + data: data, title: 'Add a reply' end end |