diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-02 19:42:42 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-01 00:01:47 +0300 |
| commit | 61afa65d4e5e1ea908d90e45364fbb4e0bcfeb56 (patch) | |
| tree | c06f220d8d2c008571bde362b8d487f1a546c00d /app/views/projects/blob/_editor.html.haml | |
| parent | e81f89ee5a36dcda5680a459d29256899a6f7e00 (diff) | |
| download | gitlab-ce-61afa65d4e5e1ea908d90e45364fbb4e0bcfeb56.tar.gz | |
Added soft wrap logic and button to editor
Added tests
Added awesomeeeeee icons
Diffstat (limited to 'app/views/projects/blob/_editor.html.haml')
| -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' |