diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-12-21 12:04:20 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-01-04 10:25:13 -0600 |
| commit | 6a0dee0d785b11736d7724579deb76805353d737 (patch) | |
| tree | 6128b25b305c4d75bfdf145b3b2f46b8fd8d9659 | |
| parent | 96c7ad5be489768098e2a1929f688d660309a192 (diff) | |
| download | gitlab-ce-jivl-activate-repo-cookie-preferences.tar.gz | |
Added preview imagesjivl-activate-repo-cookie-preferences
| -rw-r--r-- | app/assets/images/multi-editor-off.png | bin | 0 -> 4884 bytes | |||
| -rw-r--r-- | app/assets/images/multi-editor-on.png | bin | 0 -> 5464 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profiles/preferences.scss | 6 | ||||
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 4 | ||||
| -rw-r--r-- | spec/features/projects/user_edits_files_spec.rb | 2 |
6 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/images/multi-editor-off.png b/app/assets/images/multi-editor-off.png Binary files differnew file mode 100644 index 00000000000..82a6127f853 --- /dev/null +++ b/app/assets/images/multi-editor-off.png diff --git a/app/assets/images/multi-editor-on.png b/app/assets/images/multi-editor-on.png Binary files differnew file mode 100644 index 00000000000..2bcd29abf13 --- /dev/null +++ b/app/assets/images/multi-editor-on.png diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 1d6c7a5c472..f7853909f56 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -727,3 +727,8 @@ Popup $popup-triangle-size: 15px; $popup-triangle-border-size: 1px; $popup-box-shadow-color: rgba(90, 90, 90, 0.05); + +/* +Multi file editor +*/ +$border-color-settings: #e1e1e1; diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss index 39d61d4a763..68d40b56133 100644 --- a/app/assets/stylesheets/pages/profiles/preferences.scss +++ b/app/assets/stylesheets/pages/profiles/preferences.scss @@ -28,7 +28,11 @@ .preview { font-size: 0; - margin-bottom: 10px; + + img { + border: 1px solid $border-color-settings; + border-radius: 4px; + } } } diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 4f5ce795770..65328791ce5 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -9,11 +9,11 @@ %p Unlock an additional editing experience which makes it possible to edit and commit multiple files .col-lg-8.multi-file-editor-options = label_tag do - .preview= image_tag "white-scheme-preview.png" + .preview.append-bottom-10= image_tag "multi-editor-off.png" = f.radio_button :multi_file, "off", checked: true Off = label_tag do - .preview= image_tag "white-scheme-preview.png" + .preview.append-bottom-10= image_tag "multi-editor-on.png" = f.radio_button :multi_file, "on", checked: false On diff --git a/spec/features/projects/user_edits_files_spec.rb b/spec/features/projects/user_edits_files_spec.rb index 87191a67df5..05c2be473da 100644 --- a/spec/features/projects/user_edits_files_spec.rb +++ b/spec/features/projects/user_edits_files_spec.rb @@ -34,7 +34,7 @@ describe 'User edits files' do visit(project_blob_path(project, binary_file)) page.within '.content' do - expect(page).not_to have_link('edit') + expect(page).not_to have_link('edit') end end |
