Skip to content

Commit

Permalink
nicer css paths
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickpatrickpatrick committed Nov 6, 2023
1 parent bddff61 commit c7e2bcf
Show file tree
Hide file tree
Showing 36 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $govuk-new-link-styles: true;
@import "govuk_publishing_components/component_support";

// Include all govuk frontend components
@import "dist/govuk/components/all";
@import "govuk/components/all";

// components
@import "components/accordion";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// This file should be included in an application prior to specific components
// It provides supporting gem component helpers and mixins
// and everything else from govuk-frontend not included in govuk_frontend_support
@import "dist/govuk/core/all";
@import "dist/govuk/objects/all";
@import "dist/govuk/utilities/all";
@import "dist/govuk/overrides/all";
@import "govuk/core/all";
@import "govuk/objects/all";
@import "govuk/utilities/all";
@import "govuk/overrides/all";

@import "govuk_publishing_components/components/helpers/brand-colours";
@import "govuk_publishing_components/components/helpers/link";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "govuk_publishing_components/individual_component_support";
@import "mixins/prefixed-transform";
@import "dist/govuk/components/accordion/accordion";
@import "govuk/components/accordion/accordion";

// Prevent elements inside the button from receiving click events
.gem-c-accordion__show-all > * {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/back-link/back-link";
@import "govuk/components/back-link/back-link";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/breadcrumbs/breadcrumbs";
@import "govuk/components/breadcrumbs/breadcrumbs";

.gem-c-breadcrumbs--inverse .govuk-breadcrumbs__list-item .govuk-breadcrumbs__link {
&:link,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/button/button";
@import "govuk/components/button/button";

// Because govuk-frontend adds a responsive bottom margin by default for each component
// we reset it to zero so we can set it separately using `gem-c-button--bottom-margin`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/character-count/character-count";
@import "govuk/components/character-count/character-count";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/checkboxes/checkboxes";
@import "govuk/components/checkboxes/checkboxes";

.govuk-checkboxes--nested {
margin-left: -(govuk-spacing(4) + 2px); // 22px
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/cookie-banner/cookie-banner";
@import "govuk/components/cookie-banner/cookie-banner";

.gem-c-cookie-banner .govuk-button-group[hidden] {
display: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/date-input/date-input";
@import "govuk/components/date-input/date-input";

// Add spacing between input items on narrow containers when they collapse under each other
.govuk-date-input {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/details/details";
@import "govuk/components/details/details";
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/error-message/error-message";
@import "govuk/components/error-message/error-message";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/error-summary/error-summary";
@import "govuk/components/error-summary/error-summary";

.gem-c-error-summary__list-item {
@include govuk-font($size: 19, $weight: bold);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/fieldset/fieldset";
@import "govuk/components/fieldset/fieldset";
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/file-upload/file-upload";
@import "govuk/components/file-upload/file-upload";
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/hint/hint";
@import "govuk/components/hint/hint";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/input/input";
@import "govuk/components/input/input";

$search-icon-size: 40px;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/inset-text/inset-text";
@import "govuk/components/inset-text/inset-text";
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/label/label";
@import "govuk/components/label/label";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/footer/footer";
@import "govuk/components/footer/footer";

.gem-c-layout-footer--border {
border-top: govuk-spacing(2) solid govuk-colour("blue");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "govuk_publishing_components/components/search";
@import "govuk_publishing_components/components/skip-link";
@import "dist/govuk/components/header/header";
@import "dist/govuk/components/tag/tag";
@import "govuk/components/header/header";
@import "govuk/components/tag/tag";

.gem-c-layout-header--production .govuk-header__container {
border-bottom-color: govuk-colour("red", $legacy: "bright-red");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/notification-banner/notification-banner";
@import "govuk/components/notification-banner/notification-banner";

.gem-c-notice {
@include govuk-responsive-margin(8, "bottom");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/panel/panel";
@import "govuk/components/panel/panel";

.gem-c-panel__prepend {
@include govuk-font($size: 24, $weight: bold);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/phase-banner/phase-banner";
@import "govuk/components/phase-banner/phase-banner";

.gem-c-phase-banner {
.govuk-phase-banner__content__app-name {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/pagination/pagination";
@import "govuk/components/pagination/pagination";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/radios/radios";
@import "govuk/components/radios/radios";

.gem-c-radio__heading-text {
margin: 0 0 govuk-spacing(4) 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/select/select";
@import "govuk/components/select/select";

.gem-c-select__select--full-width {
min-width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/skip-link/skip-link";
@import "govuk/components/skip-link/skip-link";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/notification-banner/notification-banner";
@import "govuk/components/notification-banner/notification-banner";

.gem-c-success-alert__message {
@include govuk-font(19, $weight: bold);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/summary-list/summary-list";
@import "govuk/components/summary-list/summary-list";

.gem-c-summary-list {
border-bottom: 1px solid $govuk-border-colour;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/table/table";
@import "govuk/components/table/table";

$table-border-width: 1px;
$table-border-colour: govuk-colour("mid-grey", $legacy: "grey-2");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/tabs/tabs";
@import "govuk/components/tabs/tabs";

.js-enabled {
.gem-c-tabs__panel--no-border {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/textarea/textarea";
@import "govuk/components/textarea/textarea";

.gem-c-textarea {
.govuk-textarea {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "govuk_publishing_components/individual_component_support";
@import "dist/govuk/components/warning-text/warning-text";
@import "govuk/components/warning-text/warning-text";

.gem-c-warning-text .govuk-warning-text__text {
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// stylelint-disable scss/at-extend-no-missing-placeholder
.govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
.gem-c-govspeak {
@import "dist/govuk/components/button/button";
@import "govuk/components/button/button";

// Some links in Govspeak should look like buttons[1] when using:
// ```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file should be included in an application prior to specific components
// It provides govuk-frontend but adds no weight to the compiled CSS
@import "components/helpers/govuk-frontend-settings";
@import "dist/govuk/base";
@import "govuk/base";

@import "components/mixins/margins";
// TODO: remove this focus override when govuk_template is no longer used
Expand Down

0 comments on commit c7e2bcf

Please sign in to comment.