diff options
| author | Himanshu Kapoor <hkapoor@gitlab.com> | 2019-08-14 10:45:51 +0530 |
|---|---|---|
| committer | Himanshu Kapoor <hkapoor@gitlab.com> | 2019-08-14 10:45:51 +0530 |
| commit | 152ae45e87270dc44c54a688240c2466a44205d0 (patch) | |
| tree | 62e8d277b92a29ca9d72c54ccbc864a939e0f5f5 | |
| parent | b45d30743ba38417d6ea54299dd35acf9b109d37 (diff) | |
| download | gitlab-ce-59829-fix-style-lint-wiki.tar.gz | |
Replace classes with utility classes59829-fix-style-lint-wiki
In the effort to have cleaner CSS, I have removed
some redundant classes like `.edit-wiki-page-slug-tip`
and replaced them with utility classes from
Bootstrap and common.scss
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/_new.html.haml | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index 8e2e733feb9..379df1c4db1 100644 --- a/app/assets/stylesheets/pages/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss @@ -1,10 +1,3 @@ -.new-wiki-page .new-wiki-page-slug-tip, -.wiki-form .edit-wiki-page-slug-tip { - display: inline-block; - max-width: 100%; - margin-top: 5px; -} - .title .edit-wiki-header { width: 780px; margin-left: auto; diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 66a614b0197..858731b2dda 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -14,7 +14,7 @@ .col-sm-12 = f.text_field :title, class: 'form-control qa-wiki-title-textbox', value: @page.title - if @page.persisted? - %span.edit-wiki-page-slug-tip + %span.d-inline-block.mw-100.prepend-top-5 = icon('lightbulb-o') = s_("WikiEditPageTip|Tip: You can move this page by adding the path to the beginning of the title.") = link_to icon('question-circle'), help_page_path('user/project/wiki/index', anchor: 'moving-a-wiki-page'), target: '_blank' diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml index dc12e368b35..2c675c0de9c 100644 --- a/app/views/projects/wikis/_new.html.haml +++ b/app/views/projects/wikis/_new.html.haml @@ -11,7 +11,7 @@ = label_tag :new_wiki_path do %span= s_("WikiPage|Page slug") = text_field_tag :new_wiki_path, nil, placeholder: s_("WikiNewPagePlaceholder|how-to-setup"), class: 'form-control', required: true, :'data-wikis-path' => project_wikis_path(@project), autofocus: true - %span.new-wiki-page-slug-tip + %span.d-inline-block.mw-100.prepend-top-5 = icon('lightbulb-o') = s_("WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories.") .form-actions |