diff --git a/app/assets/javascripts/dropdown.js b/app/assets/javascripts/dropdown.js new file mode 100644 index 000000000..c5a2c8e02 --- /dev/null +++ b/app/assets/javascripts/dropdown.js @@ -0,0 +1,18 @@ +(function(Modules) { + "use strict"; + + Modules.Dropdown = function() { + + this.start = function(component) { + + $('.dropdown-toggle', component) + .on( + 'click', () => $(component).toggleClass('js-closed') + ) + .trigger('click'); + + }; + + }; + +})(window.GOVUK.Modules); diff --git a/app/assets/stylesheets/components/dropdown.scss b/app/assets/stylesheets/components/dropdown.scss new file mode 100644 index 000000000..8be3a0bd5 --- /dev/null +++ b/app/assets/stylesheets/components/dropdown.scss @@ -0,0 +1,60 @@ +%dropdown, +.dropdown { + + position: relative; + + .js-enabled &-toggle { + + color: $link-colour; + position: relative; + padding-left: 20px; + cursor: pointer; + + &:hover { + color: $link-hover-colour; + text-decoration: underline; + } + + &::before { + content: '▼'; + font-size: 12px; + position: absolute; + top: 1px; + left: -1px; + } + + } + + .js-closed &-toggle::before { + content: '▶'; + left: -1px; + top: 2px; + } + + a { + + display: block; + margin-top: 3px; + + .js-enabled & { + + padding-left: 20px; + + &:hover { + text-decoration: underline; + } + + } + + } + + &.js-closed { + + a { + left: -9999em; + position: absolute; + } + + } + +} diff --git a/app/assets/stylesheets/components/management-navigation.scss b/app/assets/stylesheets/components/management-navigation.scss new file mode 100644 index 000000000..d0e3f97a6 --- /dev/null +++ b/app/assets/stylesheets/components/management-navigation.scss @@ -0,0 +1,36 @@ +.management-navigation { + + @extend %site-width-container; + @include core-16(); + border-bottom: 1px solid $border-colour; + padding: 10px 0 8px; + + a { + + &:link, + &:visited { + text-decoration: none; + } + + &:hover { + color: $link-hover-colour; + text-decoration: underline; + } + + } + + &-account { + + @include media(tablet) { + + text-align: right; + + a { + margin-left: 20px; + } + + } + + } + +} diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss index 5e462cd03..ed3a62268 100644 --- a/app/assets/stylesheets/components/navigation.scss +++ b/app/assets/stylesheets/components/navigation.scss @@ -1,6 +1,6 @@ .navigation { - padding: $gutter 0 0 0; + padding: 3px 0 0 0; li { @include core-16(); @@ -21,6 +21,7 @@ a:hover { color: $link-hover-colour; + text-decoration: underline; } } diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index bcd47c542..7343f9348 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -42,6 +42,8 @@ @import 'components/banner'; @import 'components/textbox'; @import 'components/browse-list'; +@import 'components/management-navigation'; +@import 'components/dropdown'; @import 'views/job'; diff --git a/app/assets/stylesheets/views/job.scss b/app/assets/stylesheets/views/job.scss index 35d54e57d..b2984e864 100644 --- a/app/assets/stylesheets/views/job.scss +++ b/app/assets/stylesheets/views/job.scss @@ -1,3 +1,4 @@ .job-totals { + margin-top: $gutter; margin-bottom: $gutter; } diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index c127da3f7..923c59870 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -31,13 +31,6 @@
BETA
- {% if current_user.is_authenticated() %} - - {% endif %} {% endblock %} @@ -53,20 +46,41 @@ {% endif %} {% block content %} -
- {% with messages = get_flashed_messages() %} - {% if messages %} -
- -
- {% endif %} - {% endwith %} - {% block fullwidth_content %}{% endblock %} -
+ + {% if current_user.is_authenticated() %} + + {% endif %} + +
+ {% with messages = get_flashed_messages() %} + {% if messages %} +
+ +
+ {% endif %} + {% endwith %} + {% block fullwidth_content %}{% endblock %} +
{% endblock %} {% block body_end %} diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 3fab88acb..feb59a310 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -1,5 +1,7 @@ diff --git a/app/templates/views/dashboard.html b/app/templates/views/dashboard.html index 4049689e4..ba22e7414 100644 --- a/app/templates/views/dashboard.html +++ b/app/templates/views/dashboard.html @@ -8,8 +8,6 @@ {% block maincolumn_content %} -

Service name

-