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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = function(grunt){
sourcemap: true,
includePaths: [
'govuk_modules/govuk_template/assets/stylesheets',
'govuk_modules/govuk_frontend_toolkit/stylesheets'
'govuk_modules/govuk_frontend_toolkit/stylesheets',
'govuk_modules/govuk-elements-sass/'
],
outputStyle: 'expanded'
},
Expand Down Expand Up @@ -63,14 +64,7 @@ module.exports = function(grunt){
src: '**',
dest: 'lib/'
}]
},
govuk_elements: {
files: [{
cwd: 'govuk_modules/govuk-elements-sass',
src: ['**'],
dest: 'app/assets/sass/'
}]
},
}
},

// Watches assets and sass for changes
Expand Down
54 changes: 0 additions & 54 deletions app/assets/sass/_govuk-elements.scss

This file was deleted.

4 changes: 2 additions & 2 deletions app/assets/sass/application.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Import GOV.UK elements, this will import the frontend toolkit and some base styles.
// Take a look in _govuk-elements.scss to see which files are imported.
// Import GOV.UK elements from /govuk-modules/, this will import the frontend toolkit and some base styles.
// Take a look in /govuk-modules/_govuk-elements.scss to see which files are imported.
@import 'govuk-elements';

// Take a look at patterns.scss to see which files are imported.
Expand Down
126 changes: 0 additions & 126 deletions app/assets/sass/elements/_base.scss

This file was deleted.

6 changes: 0 additions & 6 deletions app/assets/sass/elements/_breadcrumbs.scss

This file was deleted.

50 changes: 0 additions & 50 deletions app/assets/sass/elements/_buttons.scss

This file was deleted.

9 changes: 0 additions & 9 deletions app/assets/sass/elements/_components.scss

This file was deleted.

34 changes: 0 additions & 34 deletions app/assets/sass/elements/_details.scss

This file was deleted.

Loading