diff --git a/docs/_components/example/_example.scss b/docs/_components/example/_example.scss index 4da9402..66018bb 100644 --- a/docs/_components/example/_example.scss +++ b/docs/_components/example/_example.scss @@ -3,8 +3,8 @@ border: 0; border-right: 1px solid $govuk-border-colour; display: block; - padding: govuk-spacing(4); max-width: calc(100% - govuk-spacing(4) * 2); + padding: govuk-spacing(4); resize: both; width: 100%; } diff --git a/x-govuk/components/masthead/_button.scss b/x-govuk/components/masthead/_button.scss index a6c3eef..a13dbbc 100644 --- a/x-govuk/components/masthead/_button.scss +++ b/x-govuk/components/masthead/_button.scss @@ -6,26 +6,26 @@ $x-govuk-button-inverse-hover-background-colour: govuk-tint($x-govuk-masthead-ba .x-govuk-button--inverse:link, .x-govuk-button--inverse:visited { @include govuk-responsive-margin(6, "top"); - color: $x-govuk-masthead-background-colour; background-color: $x-govuk-masthead-colour; box-shadow: 0 $x-govuk-button-shadow-size 0 $x-govuk-button-inverse-shadow-colour; + color: $x-govuk-masthead-background-colour; margin-bottom: 0; } .x-govuk-button--inverse:hover { - color: $x-govuk-masthead-background-colour; background-color: $x-govuk-button-inverse-hover-background-colour; + color: $x-govuk-masthead-background-colour; } .x-govuk-button--inverse:focus:not(:hover) { - color: $govuk-focus-text-colour; background-color: $govuk-focus-colour; + color: $govuk-focus-text-colour; } .x-govuk-button--inverse:active, .x-govuk-button--inverse:focus { - border-color: $govuk-focus-colour; - color: $x-govuk-masthead-background-colour; background-color: $x-govuk-button-inverse-hover-background-colour; + border-color: $govuk-focus-colour; box-shadow: inset 0 0 0 2px $govuk-focus-colour; + color: $x-govuk-masthead-background-colour; } diff --git a/x-govuk/components/masthead/_masthead.scss b/x-govuk/components/masthead/_masthead.scss index 54e9bc9..1686267 100644 --- a/x-govuk/components/masthead/_masthead.scss +++ b/x-govuk/components/masthead/_masthead.scss @@ -9,10 +9,10 @@ $x-govuk-masthead-colour: govuk-colour("white"); .x-govuk-masthead { @include govuk-responsive-padding(7, "bottom"); - padding-top: 0; - color: $x-govuk-masthead-colour; background-color: $x-govuk-masthead-background-colour; + color: $x-govuk-masthead-colour; margin-top: govuk-spacing(-2); + padding-top: 0; } .x-govuk-masthead__title { diff --git a/x-govuk/components/masthead/_tag.scss b/x-govuk/components/masthead/_tag.scss index 4b20141..8e37d76 100644 --- a/x-govuk/components/masthead/_tag.scss +++ b/x-govuk/components/masthead/_tag.scss @@ -1,4 +1,4 @@ .x-govuk-tag--inverse { - color: $x-govuk-masthead-background-colour; background-color: $x-govuk-masthead-colour; + color: $x-govuk-masthead-background-colour; } diff --git a/x-govuk/components/primary-navigation/_primary-navigation.scss b/x-govuk/components/primary-navigation/_primary-navigation.scss index d058647..255f787 100644 --- a/x-govuk/components/primary-navigation/_primary-navigation.scss +++ b/x-govuk/components/primary-navigation/_primary-navigation.scss @@ -22,10 +22,10 @@ box-sizing: border-box; display: block; float: left; - line-height: 55px; height: 55px; - position: relative; + line-height: 55px; margin-right: govuk-spacing(6); + position: relative; } .x-govuk-primary-navigation__item--current { diff --git a/x-govuk/components/related-navigation/_related-navigation.scss b/x-govuk/components/related-navigation/_related-navigation.scss index b3d4bd7..fc77721 100644 --- a/x-govuk/components/related-navigation/_related-navigation.scss +++ b/x-govuk/components/related-navigation/_related-navigation.scss @@ -5,8 +5,8 @@ .x-govuk-related-navigation__main-heading { @include govuk-font(19, $weight: bold); - margin-top: govuk-spacing(3); margin-bottom: govuk-spacing(2); + margin-top: govuk-spacing(3); } .x-govuk-related-navigation__sub-heading { @@ -18,9 +18,9 @@ .x-govuk-related-navigation__sub-heading--footer { @include govuk-font(19, $weight: bold); border-top: 0; - padding-top: 0; - margin-top: govuk-spacing(3); margin-bottom: govuk-spacing(2); + margin-top: govuk-spacing(3); + padding-top: 0; } .x-govuk-related-navigation__main-heading + .x-govuk-related-navigation__sub-heading { @@ -38,10 +38,10 @@ } .x-govuk-related-navigation__link-list { - padding: 0; - margin: 0; list-style: none; + margin: 0; margin-bottom: 1.25em; + padding: 0; } .x-govuk-related-navigation__link {