diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-02 19:42:42 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-28 19:11:11 +0300 |
commit | ee02856d59bcf7998041eaf0bb3d69643203ca35 (patch) | |
tree | 93a6c30108d47a1d996ddee9dc352fe1b51ff53a /app/views/projects/blob | |
parent | 7d79a943529aad64005b7a95bee1b8a32709ec89 (diff) | |
download | gitlab-ce-ee02856d59bcf7998041eaf0bb3d69643203ca35.tar.gz |
Added soft wrap logic and button to editor
Added tests
Added awesomeeeeee icons
Diffstat (limited to 'app/views/projects/blob')
-rw-r--r-- | app/views/projects/blob/_editor.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 0237e152b54..f225b1be59e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -21,6 +21,10 @@ = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitignore_names } } ) .gitlab-ci-yml-selector.js-gitlab-ci-yml-selector-wrap.hidden = dropdown_tag("Choose a GitLab CI Yaml template", options: { toggle_class: 'js-gitlab-ci-yml-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitlab_ci_ymls } } ) + = button_tag class: 'soft-wrap-toggle btn', type: 'button' do + = custom_icon('icon_soft_wrap', klass: 'soft-wrap-icon') + = custom_icon('icon_no_wrap', klass: 'no-wrap-icon hidden') + %span Soft wrap .encoding-selector = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2' |