Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove govuk elements sass from the app folder #208

Merged
merged 4 commits into from
Jun 6, 2016

Conversation

gemmaleigh
Copy link
Contributor

@gemmaleigh gemmaleigh commented May 31, 2016

This PR adds /govuk-modules/govuk-elements-sass to includePaths, so that the GOV.UK elements Sass files can remain in /govuk-modules/govuk-elements-sass/ without the need for an additional copy task.

As these files are overridden each time the app is run, there are probably a number of users who have tried to edit the files only to find that their changes have been lost.

This way, the govuk-elements-sass files can be viewed in the same way as the template and toolkit files -by looking in /govuk-modules/ (as there is still an extra copy step to govuk-modules) but they won't appear in /app/assets/sass/.

@gemmaleigh gemmaleigh force-pushed the remove-govuk-elements-sass-from-the-app-folder branch from 70b7316 to 2342ff5 Compare May 31, 2016 14:12
@tsmorgan
Copy link
Contributor

+1 from me. Seems more intuitive not to be copying files from a module into the app/ folder. I think it'll be easier for newer people to understand what's going on.

joelanman pushed a commit that referenced this pull request May 31, 2016
# 0.17.3

- Fix colour of H2 headings in footer

# 0.17.2

- Fix a bug with the skip-to-content link and iOS Voiceover
- Migrate @Viewport statement from govuk_frontend_toolkit

# 0.17.1

- Reduce file size of template: removes HTML comments, `type`
attributes on
  scripts, and uses HTML5 charset declaration. #208
- Switch external link media query to be mobile first #205
- Sass file cleanups
  - Replace old grid mixins with newer grid from frontend toolkit #134
  - Remove duplicate grey variables #201
feedmypixel pushed a commit to hmrc/govuk_prototype_kit that referenced this pull request May 31, 2016
# 0.17.3

- Fix colour of H2 headings in footer

# 0.17.2

- Fix a bug with the skip-to-content link and iOS Voiceover
- Migrate @Viewport statement from govuk_frontend_toolkit

# 0.17.1

- Reduce file size of template: removes HTML comments, `type`
attributes on
  scripts, and uses HTML5 charset declaration. alphagov#208
- Switch external link media query to be mobile first alphagov#205
- Sass file cleanups
  - Replace old grid mixins with newer grid from frontend toolkit alphagov#134
  - Remove duplicate grey variables alphagov#201
@joelanman
Copy link
Contributor

looks good, means it lines up with the way we're doing it elsewhere. Also fixes the weird situation where these files were bring included in the kit (in /app) but being immediately copied over by the gruntfile.

@gemmaleigh gemmaleigh changed the title For discussion: Remove govuk elements sass from the app folder Remove govuk elements sass from the app folder Jun 1, 2016
@gemmaleigh
Copy link
Contributor Author

@joelanman, can you merge this one please?

@gemmaleigh gemmaleigh mentioned this pull request Jun 6, 2016
@gemmaleigh gemmaleigh force-pushed the remove-govuk-elements-sass-from-the-app-folder branch from 2342ff5 to 8e5e5e9 Compare June 6, 2016 16:05
These already exist in govuk-modules/govuk-elements-sass, so there is
no need to also copy them to /app/
There is no need for these to be copied to app/assets/sass, as they
will be overridden if edited. Remove them to avoid confusion.
These files won’t need to be copied from govuk/modules.

In theory govuk_modules isn’t needed either and these paths could be
updated to /node_modules/govuk_repo_name but it provides a way to see
what lives in each repo.
As it might not be clear where _govuk-elements.scss is imported from,
update the comment.
@joelanman joelanman merged commit 2984f8b into master Jun 6, 2016
@timpaul
Copy link
Contributor

timpaul commented Jun 6, 2016

👍 I came a cropper with this issue just the other day.

@joelanman joelanman mentioned this pull request Jun 9, 2016
@gemmaleigh gemmaleigh deleted the remove-govuk-elements-sass-from-the-app-folder branch July 5, 2016 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants