From e2213ae4a37f9e04d955fb6b73d657ea475452e6 Mon Sep 17 00:00:00 2001 From: Paul Craig Date: Thu, 16 Feb 2017 14:56:20 +0000 Subject: [PATCH] Fix styles for forgotten password link Our secondary action links have a few context dependent styles, so I've added a new one and I've pulled them into their own file. Also removed a duplicated import. --- app/assets/scss/_brief_submission.scss | 9 --------- app/assets/scss/_secondary-action-link.scss | 13 +++++++++++++ app/assets/scss/application.scss | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 app/assets/scss/_secondary-action-link.scss diff --git a/app/assets/scss/_brief_submission.scss b/app/assets/scss/_brief_submission.scss index 73b24620f..2b84867dd 100644 --- a/app/assets/scss/_brief_submission.scss +++ b/app/assets/scss/_brief_submission.scss @@ -80,12 +80,3 @@ ol.steps { @extend %markdown-description; padding-bottom: 30px; } - -.secondary-action-link { - margin-top: 30px; -} - -button.button-save + .secondary-action-link, -input.button-save + .secondary-action-link { - margin-top: 5px; -} diff --git a/app/assets/scss/_secondary-action-link.scss b/app/assets/scss/_secondary-action-link.scss new file mode 100644 index 000000000..e041b6897 --- /dev/null +++ b/app/assets/scss/_secondary-action-link.scss @@ -0,0 +1,13 @@ +.secondary-action-link { + margin-top: 30px; +} + +.question + .secondary-action-link { + margin-top: -36px; + margin-bottom: 40px; +} + +.button-save + .secondary-action-link, +.button-save + .secondary-action-link-bigger { + margin-top: 5px; +} diff --git a/app/assets/scss/application.scss b/app/assets/scss/application.scss index dedbd68d8..78d377590 100644 --- a/app/assets/scss/application.scss +++ b/app/assets/scss/application.scss @@ -42,7 +42,6 @@ $path: "/static/images/"; @import "toolkit/forms/_textboxes.scss"; @import "toolkit/forms/_validation.scss"; @import "toolkit/search/_search-result.scss"; -@import "toolkit/_secondary-action-link.scss"; #wrapper { @extend %site-width-container; @@ -62,6 +61,7 @@ $path: "/static/images/"; @import "_service-page.scss"; @import "_index-page.scss"; @import "_search-page.scss"; +@import "_secondary-action-link.scss"; @import "_pagination.scss"; @import "_publication.scss"; @import "_supplier-a-to-z.scss";