Rework the way we include CSS & JS #571
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevindew
reviewed
Oct 9, 2018
app/views/govuk_publishing_components/components/_layout_for_admin.html.erb
Show resolved
Hide resolved
tijmenb
force-pushed
the
rework-includes
branch
from
7eaa4d7
to
3c25655
Compare
tijmenb
force-pushed
the
rework-includes
branch
from
3c25655
to
1929d4d
Compare
We're using the tag component, but we've previously relied on the `govuk-frontend/all` import to import the CSS.
This is no longer needed, because all components are renderable in all contexts.
This imports the CSS that we need for the layout into the layout-for-admin component. This means that the `govuk-grid-*`, `govuk-link` and `govuk-heading` classes are available inside this component, but not outside. This means we can stop including all of govuk-frontend using `@import "govuk-frontend/all"`.
This removes the separate "admin_styles.css" file for the components. From now on the applications will have to have an `application.css` file with the correct component includes.
This component now has a class.
This removes the separate "admin_styles.js" file for the components. From now on the applications will have to have an `application.js` file with the correct component includes. Updated the installation instructions as well.
These files don't need to be available separately.
This was relying previously on the `govuk-frontend/all` import.
This is needed by content publisher to hide certain content.
The component guide already includes these.
tijmenb
force-pushed
the
rework-includes
branch
from
1929d4d
to
03d7c66
Compare
This file is already required by `govuk_publishing_components/dependencies`.
alex-ju
added a commit
that referenced
this pull request
Oct 12, 2018
* Add option to send the `user_organisation` in admin analytics component (PR #577) * Add a bottom margin to the error-alert component (PR #578) * Update the way we include Javascript and Stylesheets in the admin layout component. Make sure to follow the [installation instructions](docs/install-and-use.md) (PR #571) if your using the admin layout component. * Fix background colour for focused buttons (PR #579)
Merged
tijmenb
pushed a commit
that referenced
this pull request
Oct 15, 2018
* Add option to send the `user_organisation` in admin analytics component (PR #577) * Add a bottom margin to the error-alert component (PR #578) * Update the way we include Javascript and Stylesheets in the admin layout component. Make sure to follow the [installation instructions](docs/install-and-use.md) (PR #571) if your using the admin layout component. * Fix background colour for focused buttons (PR #579)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is another attempt at unfuzzing the way we include CSS & Javascript. This PR reduces it down to the following:
application.cssby convention). This means public and admin apps use the exact same mechanism to load the CSS.See this pull request on how to convert the application.