diff --git a/Gemfile b/Gemfile index 0061f8e46..cf7363393 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ group :test do gem 'shoulda', '2.11.3' end -gem 'plek', '1.5.0' +gem 'plek', '1.7.0' gem 'jasmine', '1.1.2' gem 'govuk_frontend_toolkit', '0.39.0' diff --git a/Gemfile.lock b/Gemfile.lock index 4929499b4..75d7ffb1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM nokogiri (1.6.0) mini_portile (~> 0.5.0) null_logger (0.0.1) - plek (1.5.0) + plek (1.7.0) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) @@ -185,7 +185,7 @@ DEPENDENCIES jasmine (= 1.1.2) logstasher (= 0.4.1) mocha (= 0.13.3) - plek (= 1.5.0) + plek (= 1.7.0) rails (= 3.2.16) sass (= 3.2.1) sass-rails (= 3.2.5) diff --git a/app/assets/javascripts/core.js b/app/assets/javascripts/core.js index 605ce80e7..8012aa49b 100644 --- a/app/assets/javascripts/core.js +++ b/app/assets/javascripts/core.js @@ -7,13 +7,6 @@ function recordOutboundLink(e) { $(document).ready(function() { $('.print-link a').attr('target', '_blank'); - // header search toggle - $('.js-header-toggle').on('click', function(e) { - e.preventDefault(); - $($(e.target).attr('href')).toggleClass('js-visible'); - $(this).toggleClass('js-hidden'); - }); - var $searchFocus = $('.js-search-focus'); $searchFocus.each(function(i, el){ if($(el).val() !== ''){ diff --git a/app/assets/stylesheets/_header.scss b/app/assets/stylesheets/_header.scss index 7516d5d8b..11c2c06b6 100644 --- a/app/assets/stylesheets/_header.scss +++ b/app/assets/stylesheets/_header.scss @@ -18,29 +18,6 @@ } } &.with-proposition { - .header-wrapper { - .header-global { - @include media(desktop){ - float: left; - width: 33.33%; - - .header-logo, - .site-search { - width: 100%; - } - } - } - .header-proposition { - @include media(desktop){ - width: 66.66%; - float: left; - } - .content { - margin: 0 15px; - } - } - } - #search { margin-top: 4px; } @@ -202,99 +179,6 @@ } &.js-visible { display: block; } } - - .header-proposition { - padding-top: 10px; - @include media(desktop){ - padding-top: 0; - } - #proposition-name { - @include core-24; - font-weight: bold; - color: $white; - text-decoration: none; - } - a.menu { - @include core-16; - color: $white; - display: block; - float: right; - text-decoration: none; - padding-top: 6px; - @include media(desktop){ - display: none; - } - &:hover { - text-decoration: underline; - } - &:after { - display: inline-block; - font-size: 8px; - height: 8px; - padding-left: 5px; - vertical-align: middle; - content: " \25BC"; - } - &.js-hidden:after { - content: " \25B2"; - } - } - #proposition-menu { - margin-top: 5px; - } - #proposition-links { - clear: both; - @extend %contain-floats; - margin: 2px 0 0 0; - padding: 0; - - .js-enabled & { - display: none; - @include media(desktop){ - display: block; - } - &.js-visible { - display: block; - } - } - - li { - float: left; - width: 50%; - padding: 3px 0; - border-bottom: 1px solid $grey-2; - - @include media(desktop){ - display: block; - width: auto; - padding: 0 15px 0 0; - border-bottom: 0; - - &.clear-child { - clear: left; - } - } - - a { - color: $white; - text-decoration: none; - @include bold-14; - - @include media(desktop) { - @include bold-16; - line-height: 23px; - } - - &:hover { - text-decoration: underline; - } - &.active { - color: $turquoise; - } - } - } - } - } } /* Global browser prompt message */ diff --git a/app/assets/stylesheets/organisations.scss b/app/assets/stylesheets/organisations.scss index 6983ba0bc..30c811e42 100644 --- a/app/assets/stylesheets/organisations.scss +++ b/app/assets/stylesheets/organisations.scss @@ -45,11 +45,15 @@ border-color: $colour; } +.attorney-generals-office { + @include organisation-logo-border($attorney-generals-office) +} + .cabinet-office { @include organisation-logo-border($cabinet-office) } -.department-for-business-innovation-and-skills { +.department-for-business-innovation-skills { @include organisation-logo-border($department-for-business-innovation-skills) } @@ -57,7 +61,7 @@ @include organisation-logo-border($department-for-communities-and-local-government) } -.department-for-culture-media-and-sport { +.department-for-culture-media-sport { @include organisation-logo-border($department-for-culture-media-sport) } @@ -65,11 +69,11 @@ @include organisation-logo-border($department-for-education) } -.department-for-energy-and-climate-change { +.department-of-energy-climate-change { @include organisation-logo-border($department-of-energy-climate-change) } -.department-for-environment-food-and-rural-affairs { +.department-for-environment-food-rural-affairs { @include organisation-logo-border($department-for-environment-food-rural-affairs) } @@ -81,22 +85,34 @@ @include organisation-logo-border($department-for-international-development) } -.department-for-work-and-pensions { - @include organisation-logo-border($department-for-work-pensions) -} - .department-for-transport { @include organisation-logo-border($department-for-transport) } -.home-office { - @include organisation-logo-border($home-office) +.department-for-work-pensions { + @include organisation-logo-border($department-for-work-pensions) } -.foreign-and-commonwealth-office { +.foreign-commonwealth-office { @include organisation-logo-border($foreign-commonwealth-office) } +.hm-government { + @include organisation-logo-border($hm-government) +} + +.hm-revenue-customs { + @include organisation-logo-border($hm-revenue-customs) +} + +.hm-treasury { + @include organisation-logo-border($hm-treasury) +} + +.home-office { + @include organisation-logo-border($home-office) +} + .ministry-of-defence { @include organisation-logo-border($ministry-of-defence) } @@ -105,14 +121,36 @@ @include organisation-logo-border($ministry-of-justice) } -.treasury { - @include organisation-logo-border($hm-treasury) +.northern-ireland-office { + @include organisation-logo-border($northern-ireland-office) } -/* Agencies */ +.office-of-the-advocate-general-for-scotland { + @include organisation-logo-border($office-of-the-advocate-general-for-scotland) +} -.hm-revenue-customs { - @include organisation-logo-border($hm-revenue-customs) +.office-of-the-leader-of-the-house-of-lords { + @include organisation-logo-border($office-of-the-leader-of-the-house-of-lords) +} + +.scotland-office { + @include organisation-logo-border($scotland-office) +} + +.the-office-of-the-leader-of-the-house-of-commons { + @include organisation-logo-border($the-office-of-the-leader-of-the-house-of-commons) +} + +.uk-export-finance { + @include organisation-logo-border($uk-export-finance) +} + +.uk-trade-investment { + @include organisation-logo-border($uk-trade-investment) +} + +.wales-office { + @include organisation-logo-border($wales-office) } /* Crests */ diff --git a/public/robots.txt b/public/robots.txt index 5de21a1b7..32eb8a05e 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,5 +1,5 @@ User-agent: * -Disallow: /*/print +Disallow: /*/print$ # Don't allow indexing of search results Disallow: /search? # We only allow indexing of the licence-finder landing page