From 7e12f7319d1cca8effe8e9bc56b07a5f4515e5e2 Mon Sep 17 00:00:00 2001 From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:02:38 +0100 Subject: [PATCH] Feature/css cleanup (#144) * Development (#143) * Added test project * Added ADR docs * Added basic unit tests * added ADR * updated folder structure * restructure * Added architecture diagram * More unit tests * Added DI test * Added contentful model for richtext * Updated content service (#82) * Updated content service * uncommented tests * undid spacing change --------- Co-authored-by: Simon FIRTH Co-authored-by: Tom Whittington * Created contentful stub * Updated to query builder * Add renderer for rich text content (#75) * add renderer for rich text content * Add interface for content renderer * remove unused using statements * refactor: use partial views to handle rich text rendering * Add new project for e2e cypress tests * remove magic strings * wip: Add mock content for e2e tests * Update page heading and add support for subheadings * update mockContent for e2e tests * add rich text support for horizontal rule * add support for embedded image assets * Add support for embedded video * add support for embedded vimeo player * Changed views to use explicit models * Added dev settings to gitignore * Removed main --------- Co-authored-by: Tom Whittington * updated e2e and app settings * Updated tests * Fixed/ added some tests for coverage * Added tests for HttpClients * Added service tests * Refactored tests --------- Co-authored-by: Tom Whittington * Feature/ rework/linking (#86) * Lowered HR to Hr * Added support for linking to content --------- Co-authored-by: Tom Whittington * wip: render linked entry and asset from within rich text * wip: render download component * display corresponding icon for download filetype * update e2e tests * Feature/ rework/embedded entries (#87) * Added basic support for embeddedEntries * Added includes to configuration * Updated tests for new model * Simplified include logic * Fixed client test --------- Co-authored-by: Tom Whittington * update entry partial * revert ContentService changes * use target variable in entry partial * tweak entry partial * update file icons * Added terraform scripts * add accordion component * Added workflows and actions * adding missing WAF and updated contentful environment * update integration tests * wip: add accessibility tweaks, accessibilty tests and page layout updates * Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91) * Updated DfeFrontend * Added basic card support * Card cleanup * Added grid container * Updated svgs --------- Co-authored-by: Tom Whittington * use dfe container width and update header styling * updated workflow * TF changes to get inital build going * fixed tflint * removed unused vars from pr-check * added dev environment * lock updated * reformatted locals.tf * terraform-docs: automated action * include hero in header * fix e2e tests * Updated JS + CSS files * add support for multiple accordion sections * resolve assets for e2e testing * Capitalise development branch name (#93) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Feature/app insights (#97) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Added application insights + secret management * Feature/vault (#98) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Added application insights + secret management * modified matrix deploy to run on completed PR * Added Keyvault secret API to application startup * fixed YAML * modifed matrix deloy (#100) * Updated workflow so it can be manually fired (#102) * modifed matrix deloy * changed to workflow dispatch * removed env * changed keyvault name * changed keyvault name * re-added env * Adding landing page (#104) * Created temp home page * updated is Preview to true for home page * Preview mode bug fixes for home page --------- Co-authored-by: Tom Whittington * Added mapping layer to produce cleaner models (#96) * Added basic caching layer (#106) Co-authored-by: Tom Whittington * Added cache clear endpoint and ignoring cache when in preview (#107) * Added cache clear endpoint and ignoring cache when in preview * Added some tests for caching * modifed cache controller to API type + respond with OK * removed unused controller map --------- Co-authored-by: Tom Whittington Co-authored-by: simonjfirth * add gtm and clarity tracking to application * remove unnecessary ms clarity tag * add cookie consent banner * remove comments * change consent cookie values to true or false * add download last updated date and update styling * Feature/model mapping refactor (#110) * Model rework for better testability * Added better tests for model mapping --------- Co-authored-by: Tom Whittington * Feature/plantech prep (#112) * Model rework for better testability * Added better tests for model mapping * Made modifications to allow c&s to run as part of plantech --------- Co-authored-by: Tom Whittington * Made app settings not publish * Removed some code smells * Explicit types in tests * Feature/update contentful (#113) * Updated contentful secret value to it doesn't collide with PT integration * removed temp code * Cleaned up some more smells (#114) * Cleaned up some more smells * changed to index --------- Co-authored-by: Tom Whittington * Hidden cookie banner (#115) Co-authored-by: Tom Whittington * Added default page to handle base route (#116) * feat: removed header text (#117) Co-authored-by: Tom Whittington * feat: allowed accordions to display richtext (#118) Co-authored-by: Tom Whittington * feat: added support for excel sheets (#119) Co-authored-by: Tom Whittington * feat: added back to top button (#120) Co-authored-by: Tom Whittington * Update download component mapping and styling * Added citation block (#121) * feat: added citation block * fix: fixed tests --------- Co-authored-by: Tom Whittington * feat: use current tab (#122) Co-authored-by: Tom Whittington * Updated styling to elements and added missing classes (#123) * feature: add feedback banner to all pages * Removed route sitemap base route which was causing a multiple route match in PT (#125) * add thankyou message to feedback banner * feat: render or hide feedback banner based on contentful boolean * wip: reenable content cookies to test conditional rendering for feedback banner * Feature/side nav (#128) * Started to create vertical navigation * First draft of unit tests * update to tests * cleaned unit tests * Updated JS + CSS files * Cleanup * Update to broken unit tests * reverted flag * removed ref * removed unused controller tests --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * remove comment * Added basic print button (#130) Co-authored-by: Tom Whittington * add plan tech name to header (#131) * Tidy up (#132) * Added basic sonar check (#135) * Added basic sonar check * Build and test enabled * Removed manual trigger on deploy * Removed push builds * Fixed branch name --------- Co-authored-by: Tom Whittington * feat: update beta banner feedback link * feat: added basic retry on contentful api calls (#137) Co-authored-by: Tom Whittington * Added support for plantech cookies (#139) Co-authored-by: Tom Whittington * Added new blocks and some refactors (#138) (#141) * Added test project * Added ADR docs * Added basic unit tests * added ADR * updated folder structure * restructure * Added architecture diagram * More unit tests * Added DI test * Added contentful model for richtext * Updated content service (#82) * Updated content service * uncommented tests * undid spacing change --------- * Created contentful stub * Updated to query builder * Add renderer for rich text content (#75) * add renderer for rich text content * Add interface for content renderer * remove unused using statements * refactor: use partial views to handle rich text rendering * Add new project for e2e cypress tests * remove magic strings * wip: Add mock content for e2e tests * Update page heading and add support for subheadings * update mockContent for e2e tests * add rich text support for horizontal rule * add support for embedded image assets * Add support for embedded video * add support for embedded vimeo player * Changed views to use explicit models * Added dev settings to gitignore * Removed main --------- * updated e2e and app settings * Updated tests * Fixed/ added some tests for coverage * Added tests for HttpClients * Added service tests * Refactored tests --------- * Feature/ rework/linking (#86) * Lowered HR to Hr * Added support for linking to content --------- * wip: render linked entry and asset from within rich text * wip: render download component * display corresponding icon for download filetype * update e2e tests * Feature/ rework/embedded entries (#87) * Added basic support for embeddedEntries * Added includes to configuration * Updated tests for new model * Simplified include logic * Fixed client test --------- * update entry partial * revert ContentService changes * use target variable in entry partial * tweak entry partial * update file icons * Added terraform scripts * add accordion component * Added workflows and actions * adding missing WAF and updated contentful environment * update integration tests * wip: add accessibility tweaks, accessibilty tests and page layout updates * Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91) * Updated DfeFrontend * Added basic card support * Card cleanup * Added grid container * Updated svgs --------- * use dfe container width and update header styling * updated workflow * TF changes to get inital build going * fixed tflint * removed unused vars from pr-check * added dev environment * lock updated * reformatted locals.tf * terraform-docs: automated action * include hero in header * fix e2e tests * Updated JS + CSS files * add support for multiple accordion sections * resolve assets for e2e testing * Capitalise development branch name (#93) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Feature/app insights (#97) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Added application insights + secret management * Feature/vault (#98) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Added application insights + secret management * modified matrix deploy to run on completed PR * Added Keyvault secret API to application startup * fixed YAML * modifed matrix deloy (#100) * Updated workflow so it can be manually fired (#102) * modifed matrix deloy * changed to workflow dispatch * removed env * changed keyvault name * changed keyvault name * re-added env * Adding landing page (#104) * Created temp home page * updated is Preview to true for home page * Preview mode bug fixes for home page --------- * Added mapping layer to produce cleaner models (#96) * Added basic caching layer (#106) * Added cache clear endpoint and ignoring cache when in preview (#107) * Added cache clear endpoint and ignoring cache when in preview * Added some tests for caching * modifed cache controller to API type + respond with OK * removed unused controller map --------- * add gtm and clarity tracking to application * remove unnecessary ms clarity tag * add cookie consent banner * remove comments * change consent cookie values to true or false * add download last updated date and update styling * Feature/model mapping refactor (#110) * Model rework for better testability * Added better tests for model mapping --------- * Feature/plantech prep (#112) * Model rework for better testability * Added better tests for model mapping * Made modifications to allow c&s to run as part of plantech --------- * Made app settings not publish * Removed some code smells * Explicit types in tests * Feature/update contentful (#113) * Updated contentful secret value to it doesn't collide with PT integration * removed temp code * Cleaned up some more smells (#114) * Cleaned up some more smells * changed to index --------- * Hidden cookie banner (#115) * Added default page to handle base route (#116) * feat: removed header text (#117) * feat: allowed accordions to display richtext (#118) * feat: added support for excel sheets (#119) * feat: added back to top button (#120) * Update download component mapping and styling * Added citation block (#121) * feat: added citation block * fix: fixed tests --------- * feat: use current tab (#122) * Updated styling to elements and added missing classes (#123) * feature: add feedback banner to all pages * Removed route sitemap base route which was causing a multiple route match in PT (#125) * add thankyou message to feedback banner * feat: render or hide feedback banner based on contentful boolean * wip: reenable content cookies to test conditional rendering for feedback banner * Feature/side nav (#128) * Started to create vertical navigation * First draft of unit tests * update to tests * cleaned unit tests * Updated JS + CSS files * Cleanup * Update to broken unit tests * reverted flag * removed ref * removed unused controller tests --------- * remove comment * Added basic print button (#130) * add plan tech name to header (#131) * Tidy up (#132) * Added basic sonar check (#135) * Added basic sonar check * Build and test enabled * Removed manual trigger on deploy * Removed push builds * Fixed branch name --------- * feat: update beta banner feedback link * feat: added basic retry on contentful api calls (#137) --------- Co-authored-by: Tom Whittington Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Added new blocks and some refactors (#138) (#142) * Added test project * Added ADR docs * Added basic unit tests * added ADR * updated folder structure * restructure * Added architecture diagram * More unit tests * Added DI test * Added contentful model for richtext * Updated content service (#82) * Updated content service * uncommented tests * undid spacing change --------- * Created contentful stub * Updated to query builder * Add renderer for rich text content (#75) * add renderer for rich text content * Add interface for content renderer * remove unused using statements * refactor: use partial views to handle rich text rendering * Add new project for e2e cypress tests * remove magic strings * wip: Add mock content for e2e tests * Update page heading and add support for subheadings * update mockContent for e2e tests * add rich text support for horizontal rule * add support for embedded image assets * Add support for embedded video * add support for embedded vimeo player * Changed views to use explicit models * Added dev settings to gitignore * Removed main --------- * updated e2e and app settings * Updated tests * Fixed/ added some tests for coverage * Added tests for HttpClients * Added service tests * Refactored tests --------- * Feature/ rework/linking (#86) * Lowered HR to Hr * Added support for linking to content --------- * wip: render linked entry and asset from within rich text * wip: render download component * display corresponding icon for download filetype * update e2e tests * Feature/ rework/embedded entries (#87) * Added basic support for embeddedEntries * Added includes to configuration * Updated tests for new model * Simplified include logic * Fixed client test --------- * update entry partial * revert ContentService changes * use target variable in entry partial * tweak entry partial * update file icons * Added terraform scripts * add accordion component * Added workflows and actions * adding missing WAF and updated contentful environment * update integration tests * wip: add accessibility tweaks, accessibilty tests and page layout updates * Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91) * Updated DfeFrontend * Added basic card support * Card cleanup * Added grid container * Updated svgs --------- * use dfe container width and update header styling * updated workflow * TF changes to get inital build going * fixed tflint * removed unused vars from pr-check * added dev environment * lock updated * reformatted locals.tf * terraform-docs: automated action * include hero in header * fix e2e tests * Updated JS + CSS files * add support for multiple accordion sections * resolve assets for e2e testing * Capitalise development branch name (#93) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Feature/app insights (#97) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Added application insights + secret management * Feature/vault (#98) * Capitalise development branch name * force workflow to appear in actions * Matrix deploy push * made context root * moved docker file location * adjusted docker file location * lowercase dockerfile name * moved docker file * updated matrix deploy * updated deploy script * updated image name * revision create change * Added env variable * updated to main * updated cli version * removed env * updated workflow to dispatch * Added application insights + secret management * modified matrix deploy to run on completed PR * Added Keyvault secret API to application startup * fixed YAML * modifed matrix deloy (#100) * Updated workflow so it can be manually fired (#102) * modifed matrix deloy * changed to workflow dispatch * removed env * changed keyvault name * changed keyvault name * re-added env * Adding landing page (#104) * Created temp home page * updated is Preview to true for home page * Preview mode bug fixes for home page --------- * Added mapping layer to produce cleaner models (#96) * Added basic caching layer (#106) * Added cache clear endpoint and ignoring cache when in preview (#107) * Added cache clear endpoint and ignoring cache when in preview * Added some tests for caching * modifed cache controller to API type + respond with OK * removed unused controller map --------- * add gtm and clarity tracking to application * remove unnecessary ms clarity tag * add cookie consent banner * remove comments * change consent cookie values to true or false * add download last updated date and update styling * Feature/model mapping refactor (#110) * Model rework for better testability * Added better tests for model mapping --------- * Feature/plantech prep (#112) * Model rework for better testability * Added better tests for model mapping * Made modifications to allow c&s to run as part of plantech --------- * Made app settings not publish * Removed some code smells * Explicit types in tests * Feature/update contentful (#113) * Updated contentful secret value to it doesn't collide with PT integration * removed temp code * Cleaned up some more smells (#114) * Cleaned up some more smells * changed to index --------- * Hidden cookie banner (#115) * Added default page to handle base route (#116) * feat: removed header text (#117) * feat: allowed accordions to display richtext (#118) * feat: added support for excel sheets (#119) * feat: added back to top button (#120) * Update download component mapping and styling * Added citation block (#121) * feat: added citation block * fix: fixed tests --------- * feat: use current tab (#122) * Updated styling to elements and added missing classes (#123) * feature: add feedback banner to all pages * Removed route sitemap base route which was causing a multiple route match in PT (#125) * add thankyou message to feedback banner * feat: render or hide feedback banner based on contentful boolean * wip: reenable content cookies to test conditional rendering for feedback banner * Feature/side nav (#128) * Started to create vertical navigation * First draft of unit tests * update to tests * cleaned unit tests * Updated JS + CSS files * Cleanup * Update to broken unit tests * reverted flag * removed ref * removed unused controller tests --------- * remove comment * Added basic print button (#130) * add plan tech name to header (#131) * Tidy up (#132) * Added basic sonar check (#135) * Added basic sonar check * Build and test enabled * Removed manual trigger on deploy * Removed push builds * Fixed branch name --------- * feat: update beta banner feedback link * feat: added basic retry on contentful api calls (#137) --------- Co-authored-by: Tom Whittington Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Tom Whittington Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Removed duplicate css and changed column width of additional parts --------- Co-authored-by: Tom Whittington Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../Views/Content/CsIndex.cshtml | 4 +- .../wwwroot/css/cands-site.css | 533 ++++-------------- 2 files changed, 104 insertions(+), 433 deletions(-) diff --git a/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml b/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml index 8ae4e3f..b1567d9 100644 --- a/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml +++ b/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml @@ -30,9 +30,7 @@ { } - - -
+ @if (Model.HasCitation) { diff --git a/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css b/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css index 8b89f4d..ec40241 100644 --- a/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css +++ b/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css @@ -10,160 +10,63 @@ video { position: relative; } - .attachment:after { - content: ''; - display: block; - clear: both; - } - .attachment:after { - content: ''; - display: block; - clear: both; - } - .attachment:after { - content: ''; - display: block; - clear: both; - } +.attachment:after { + content: ''; + display: block; + clear: both; +} - .attachment .attachment-title { - font-weight: 400; - font-size: 1.6875rem; - line-height: 1.1111111111; - margin: 0 0 15px; - } - .attachment .attachment-title { - font-weight: 400; - font-size: 1.6875rem; - line-height: 1.1111111111; - margin: 0 0 15px; - } - .attachment .attachment-title { - font-weight: 400; - font-size: 1.6875rem; - line-height: 1.1111111111; - margin: 0 0 15px; - } +.attachment .attachment-title { + font-weight: 400; + font-size: 1.6875rem; + line-height: 1.1111111111; + margin: 0 0 15px; +} - .attachment .attachment-title .attachment-link { - line-height: 1.29; - } - .attachment .attachment-title .attachment-link { - line-height: 1.29; - } - .attachment .attachment-title .attachment-link { - line-height: 1.29; - } - - .attachment .attachment-details { - padding-left: 134px; - } - .attachment .attachment-details { - padding-left: 134px; - } - .attachment .attachment-details { - padding-left: 134px; - } +.attachment .attachment-title .attachment-link { + line-height: 1.29; +} - .attachment .attachment-thumbnail { - position: relative; - float: left; - margin-right: 25px; - margin-bottom: 15px; - padding: 5px; - display: block; - max-height: 140px; - max-width: 99px; - border: #e6e6e6; - outline: 5px solid #e6e6e6; - background: #ffffff; - box-shadow: 0 2px 2px #999999; - fill: #d8d8d8; - stroke: #d8d8d8; - } - .attachment .attachment-thumbnail { - position: relative; - float: left; - margin-right: 25px; - margin-bottom: 15px; - padding: 5px; - display: block; - max-height: 140px; - max-width: 99px; - border: #e6e6e6; - outline: 5px solid #e6e6e6; - background: #ffffff; - box-shadow: 0 2px 2px #999999; - fill: #d8d8d8; - stroke: #d8d8d8; - } - .attachment .attachment-thumbnail { - position: relative; - float: left; - margin-right: 25px; - margin-bottom: 15px; - padding: 5px; - display: block; - max-height: 140px; - max-width: 99px; - border: #e6e6e6; - outline: 5px solid #e6e6e6; - background: #ffffff; - box-shadow: 0 2px 2px #999999; - fill: #d8d8d8; - stroke: #d8d8d8; - } +.attachment .attachment-details { + padding-left: 134px; +} - .attachment .attachment-metadata { - font-weight: 400; - font-size: 1.1875rem; - line-height: 1.32; - margin: 0 0 15px; - color: #505a5f; - } - .attachment .attachment-metadata { - font-weight: 400; - font-size: 1.1875rem; - line-height: 1.32; - margin: 0 0 15px; - color: #505a5f; - } - .attachment .attachment-metadata { - font-weight: 400; - font-size: 1.1875rem; - line-height: 1.32; - margin: 0 0 15px; - color: #505a5f; - } - .attachment .attachment-metadata:last-of-type { - margin-bottom: 0; - } - .attachment .attachment-metadata:last-of-type { - margin-bottom: 0; - } - .attachment .attachment-metadata:last-of-type { - margin-bottom: 0; - } - - .attachment .attachment-metadata .attachment-attribute { - word-wrap: break-word; - overflow-wrap: break-word; - text-decoration: none; - cursor: help; - } - .attachment .attachment-metadata .attachment-attribute { - word-wrap: break-word; - overflow-wrap: break-word; - text-decoration: none; - cursor: help; - } - .attachment .attachment-metadata .attachment-attribute { - word-wrap: break-word; - overflow-wrap: break-word; - text-decoration: none; - cursor: help; - } +.attachment .attachment-thumbnail { + position: relative; + float: left; + margin-right: 25px; + margin-bottom: 15px; + padding: 5px; + display: block; + max-height: 140px; + max-width: 99px; + border: #e6e6e6; + outline: 5px solid #e6e6e6; + background: #ffffff; + box-shadow: 0 2px 2px #999999; + fill: #d8d8d8; + stroke: #d8d8d8; +} + +.attachment .attachment-metadata { + font-weight: 400; + font-size: 1.1875rem; + line-height: 1.32; + margin: 0 0 15px; + color: #505a5f; +} + +.attachment .attachment-metadata:last-of-type { + margin-bottom: 0; +} + +.attachment .attachment-metadata .attachment-attribute { + word-wrap: break-word; + overflow-wrap: break-word; + text-decoration: none; + cursor: help; +} .attachment-thumbnail { display: block; @@ -247,15 +150,9 @@ video { line-height: 1.25; } - .gem-c-metadata a { - font-family: sans-serif; - } - .gem-c-metadata a { - font-family: sans-serif; - } - .gem-c-metadata a { - font-family: sans-serif; - } + .gem-c-metadata a { + font-family: sans-serif; + } .gem-c-metadata--inverse-padded .gem-c-metadata__list { margin: 15px; @@ -269,15 +166,9 @@ video { margin-top: 0; } - .gem-c-metadata__term .gem-c-metadata__definition { - line-height: 1.4; - } - .gem-c-metadata__term .gem-c-metadata__definition { - line-height: 1.4; - } - .gem-c-metadata__term .gem-c-metadata__definition { - line-height: 1.4; - } + .gem-c-metadata__term .gem-c-metadata__definition { + line-height: 1.4; + } .gem-c-metadata__definition:not(:last-of-type) { margin-bottom: 5px; @@ -307,48 +198,24 @@ video { color: #ffffff; } - .gem-c-metadata-inverse a:link, - .gem-c-metadata-inverse a:hover, - .gem-c-metadata-inverse a:visited, - .gem-c-metadata-inverse a:active { - color: #ffffff; - } - .gem-c-metadata-inverse a:link, - .gem-c-metadata-inverse a:hover, - .gem-c-metadata-inverse a:visited, - .gem-c-metadata-inverse a:active { - color: #ffffff; - } - .gem-c-metadata-inverse a:link, - .gem-c-metadata-inverse a:hover, - .gem-c-metadata-inverse a:visited, - .gem-c-metadata-inverse a:active { - color: #ffffff; - } +.gem-c-metadata-inverse a:link, +.gem-c-metadata-inverse a:hover, +.gem-c-metadata-inverse a:visited, +.gem-c-metadata-inverse a:active { + color: #ffffff; +} - .gem-c-metadata-inverse a:focus { - color: #0b0c0c; - } - .gem-c-metadata-inverse a:focus { - color: #0b0c0c; - } - .gem-c-metadata-inverse a:focus { - color: #0b0c0c; - } +.gem-c-metadata-inverse a:focus { + color: #0b0c0c; +} .gem-c-metadata-inverse-padded { padding: 10px; } - .gem-c-metadata-inverse-padded .gem-c-metadata-inverse.gem-c-metadata__list { - margin: 10px; - } - .gem-c-metadata-inverse-padded .gem-c-metadata-inverse.gem-c-metadata__list { - margin: 10px; - } - .gem-c-metadata-inverse-padded .gem-c-metadata-inverse.gem-c-metadata__list { - margin: 10px; - } +.gem-c-metadata-inverse-padded .gem-c-metadata-inverse.gem-c-metadata__list { + margin: 10px; +} .gem-c-metadata__definition { margin: 0; @@ -418,15 +285,15 @@ dl.gem-c-metadata__list { line-height: 1.14286; } - .dfe-vertical-nav .dfe-vertical-nav--section-header { - color: #505a5f; - font-size: 19px; - line-height: 1.25; - font-weight: 600; - color: #505a5f; - margin-bottom: 15px; - padding-top: 0; - } +.dfe-vertical-nav .dfe-vertical-nav--section-header { + color: #505a5f; + font-size: 19px; + line-height: 1.25; + font-weight: 600; + color: #505a5f; + margin-bottom: 15px; + padding-top: 0; +} @media (min-width: 40.0625em) { .dfe-vertical-nav { @@ -468,9 +335,9 @@ dl.gem-c-metadata__list { line-height: 1.25; } - .dfe-vertical-nav__section-item:hover { - border-left: 4px solid #347ca9; - } +.dfe-vertical-nav__section-item:hover { + border-left: 4px solid #347ca9; +} .dfe-vertical-nav__link:focus { background: inherit; @@ -504,221 +371,27 @@ dl.gem-c-metadata__list { color: #003a69; } - .dfe-vertical-nav__section-item--current .dfe-vertical-nav__link:hover { - text-decoration: none; - } +.dfe-vertical-nav__section-item--current .dfe-vertical-nav__link:hover { + text-decoration: none; +} .dfe-vertical-nav__section--nested { margin-bottom: 5px; } - .dfe-vertical-nav__section--nested .dfe-vertical-nav__link { - padding-left: 20px; - font-weight: 400; - margin-bottom: 0; - margin-top: -5px; - } - - .dfe-vertical-nav__section--nested .dfe-vertical-nav__section-item::before { - content: "�"; - margin-left: -20px; - color: #505a5f; - } - -.dfe-vertical-nav--count { - float: right; - background: #b1b4b6; - padding: 9px 5px 9px 5px; - border-radius: 0; - color: #0b0c0c; - font-weight: 700; - min-width: 25px; - text-align: center; - font-size: 12px; -} - -@media print { - .dfe-vertical-nav__theme { - font-family: sans-serif; - } -} - -@media (min-width: 40.0625em) { - .dfe-vertical-nav__theme { - font-size: 19px; - font-size: 1.1875rem; - line-height: 1.31579; - } - - .dfe-vertical-nav--count { - padding: 12px 8px 12px 8px; - } -} - -.dfe-vertical-nav__section .dfe-vertical-nav__section-item--current--child-active .dfe-vertical-nav__link { - font-weight: 400; -} - -.dfe-vertical-nav__section .dfe-vertical-nav__section { - margin-bottom: 0; -} - - .dfe-vertical-nav__section .dfe-vertical-nav__section .dfe-vertical-nav__section-item { - border-left: none; - } - - - .dfe-vertical-nav__section .dfe-vertical-nav__section.dfe-vertical-nav__section-item--current { - border-left: none; - background: #347ca9; - } - - .dfe-vertical-nav__section .dfe-vertical-nav__section.dfe-vertical-nav__section-item--current .dfe-vertical-nav__link { - font-weight: 700; - } - -.print-link-button { - background: url(/assets/icon-print.png) no-repeat 10px 50%; - background-size: 16px 18px; - padding: 10px 10px 10px 36px; - border: 1px solid #b1b4b6; - color: #1d70b8; - cursor: pointer; - margin: 0; - margin-bottom: 15px; +.dfe-vertical-nav__section--nested .dfe-vertical-nav__link { + padding-left: 20px; font-weight: 400; - font-size: 14px; - font-size: 0.875rem; - line-height: 1.1429; -} - -.print-button { - margin-top: 2rem; -} - -.govuk-list.govuk-list--bullet li .govuk-body { margin-bottom: 0; + margin-top: -5px; } - - - -.dfe-vertical-nav { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - font-weight: 400; - font-size: 16px; - font-size: 0.875rem; - line-height: 1.14286; +.dfe-vertical-nav__section--nested .dfe-vertical-nav__section-item::before { + content: "�"; + margin-left: -20px; + color: #505a5f; } - .dfe-vertical-nav .dfe-vertical-nav--section-header { - color: #505a5f; - font-size: 19px; - line-height: 1.25; - font-weight: 600; - color: #505a5f; - margin-bottom: 15px; - padding-top: 0; - } - -@media (min-width: 40.0625em) { - .dfe-vertical-nav { - padding-left: 15px; - } -} - -@media print { - .dfe-vertical-nav { - font-size: 14pt; - line-height: 1.2; - } -} - -@media (min-width: 40.0625em) { - .dfe-vertical-nav { - margin-left: -15px; - } -} - -.dfe-vertical-nav__section { - margin: 0 0 20px; - padding: 0; - list-style-type: none; -} - -.dfe-vertical-nav__link { - display: block; - padding: 7px 30px 8px 10px; - text-decoration: none; - margin-bottom: 5px; - color: #003a69; -} - -.dfe-vertical-nav__section-item { - border-left: 4px solid #b1b4b6; - font-size: 16px; - font-size: 1rem; - line-height: 1.25; -} - - .dfe-vertical-nav__section-item:hover { - border-left: 4px solid #347ca9; - } - -.dfe-vertical-nav__link:focus { - background: inherit; -} - -.dfe-vertical-nav__section-item--current { - border-left: 4px solid #003a69; - font-weight: 700; - background: #f3f2f1; -} - -.dfe-vertical-nav__link:active, .dfe-vertical-nav__link:hover { - color: #1d70b8; - border-left-color: #347ca9; - text-decoration: none; - box-shadow: none; - outline: 0; -} - -.dfe-vertical-nav__link:focus { - background: #fd0; - color: #0b0c0c; - text-decoration: none; - box-shadow: none; - outline: 0; -} - -.dfe-vertical-nav__section-item--current .dfe-vertical-nav__link { - border-left-color: #003a69; - font-weight: 700; - color: #003a69; -} - - .dfe-vertical-nav__section-item--current .dfe-vertical-nav__link:hover { - text-decoration: none; - } - -.dfe-vertical-nav__section--nested { - margin-bottom: 5px; -} - - .dfe-vertical-nav__section--nested .dfe-vertical-nav__link { - padding-left: 20px; - font-weight: 400; - margin-bottom: 0; - margin-top: -5px; - } - - .dfe-vertical-nav__section--nested .dfe-vertical-nav__section-item::before { - content: "�"; - margin-left: -20px; - color: #505a5f; - } - .dfe-vertical-nav--count { float: right; background: #b1b4b6; @@ -757,19 +430,19 @@ dl.gem-c-metadata__list { margin-bottom: 0; } - .dfe-vertical-nav__section .dfe-vertical-nav__section .dfe-vertical-nav__section-item { - border-left: none; - } +.dfe-vertical-nav__section .dfe-vertical-nav__section .dfe-vertical-nav__section-item { + border-left: none; +} - .dfe-vertical-nav__section .dfe-vertical-nav__section.dfe-vertical-nav__section-item--current { - border-left: none; - background: #347ca9; - } +.dfe-vertical-nav__section .dfe-vertical-nav__section.dfe-vertical-nav__section-item--current { + border-left: none; + background: #347ca9; +} - .dfe-vertical-nav__section .dfe-vertical-nav__section.dfe-vertical-nav__section-item--current .dfe-vertical-nav__link { - font-weight: 700; - } +.dfe-vertical-nav__section .dfe-vertical-nav__section.dfe-vertical-nav__section-item--current .dfe-vertical-nav__link { + font-weight: 700; +} .print-link-button { background: url(/assets/icon-print.png) no-repeat 10px 50%; @@ -792,4 +465,4 @@ dl.gem-c-metadata__list { .govuk-list.govuk-list--bullet li .govuk-body { margin-bottom: 0; -} +}