diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-08-27 13:19:50 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-08-27 13:19:50 -0500 |
| commit | cd86aa0580a4b2d1cb1789726ad219aba8d21723 (patch) | |
| tree | f27641d2d5c562836f15f520d552f226ac88db94 | |
| parent | 6b523a0287494164ba5037b9fdb9f5ae8b752138 (diff) | |
| download | gitlab-ce-23315-warn-before-applying-issue-templates.tar.gz | |
Update CSS to match alert specs23315-warn-before-applying-issue-templates
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 18 | ||||
| -rw-r--r-- | app/views/shared/form_elements/_apply_template_warning.html.haml | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 38345cb66db..4da3a253e6f 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -210,26 +210,24 @@ li.note { @mixin message($background-color, $border-color, $text-color) { border-left: 4px solid $border-color; color: $text-color; - padding: 10px; - margin-bottom: 10px; - background: $background-color; - padding-left: 20px; + padding: $gl-padding $gl-padding-24; + margin-bottom: $gl-padding-12; + background-color: $background-color; &.centered { text-align: center; } -} - -.warning_message { - @include message($orange-100, $orange-200, $orange-700); .close { font-size: $gl-font-size-large; - color: $orange-700; - cursor: pointer; + color: inherit; } } +.warning_message { + @include message($orange-100, $orange-200, $orange-800); +} + .danger_message { @include message($red-100, $red-200, $red-900); } diff --git a/app/views/shared/form_elements/_apply_template_warning.html.haml b/app/views/shared/form_elements/_apply_template_warning.html.haml index 73244cafc2c..3b18d09645b 100644 --- a/app/views/shared/form_elements/_apply_template_warning.html.haml +++ b/app/views/shared/form_elements/_apply_template_warning.html.haml @@ -2,13 +2,13 @@ .offset-sm-2.col-sm-10 .warning_message.mb-0{ role: 'alert' } - %span.js-close-btn.close{ "aria-hidden": true, "aria-label": _("Close") } + %btn.js-close-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") } = icon("times") %p = _("Applying a template will replace the existing issue description. Any changes you have made will be lost.") - %button.js-override-template.btn.btn-warning{ type: 'button' } + %button.js-override-template.btn.btn-warning.mr-2{ type: 'button' } = _("Apply template") %button.js-close-btn.btn.btn-inverted{ type: 'button' } = _("Cancel") |