darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get SASS compilation working

Browse Source 
Main thing that was missing was including the main CSS file in the template.

There are a few hacky bits here, like moving the whole of toolkit inside the
stylesheets directory.

Would arguably be cleaner using something that isn’t Flask Assets, but that’s
something for later.
This commit is contained in:
Chris Hill-Scott
2015-12-10 15:57:32 +00:00
parent 2f980ab622
commit a5f4580a7f
8 changed files with 431 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/govuk_frontend_toolkit

Submodule app/assets/govuk_frontend_toolkit deleted from 26b6a60d07

4
app/assets/stylesheets/govuk_elements/main.scss
View File

@@ -3,8 +3,8 @@
// https://github.com/alphagov/govuk_frontend_toolkit/tree/master/stylesheets
@import "../../govuk_frontend_toolkit/stylesheets/design-patterns/alpha-beta";
@import "../../govuk_frontend_toolkit/stylesheets/design-patterns/buttons";
@import "../govuk_frontend_toolkit/stylesheets/design-patterns/alpha-beta";
@import "../govuk_frontend_toolkit/stylesheets/design-patterns/buttons";
// GOV.UK elements
@import "elements/helpers";

16
app/assets/stylesheets/govuk_template/govuk-template.scss
View File

@@ -1,11 +1,11 @@
/* govuk_frontend_toolkit includes */
@import "../../govuk_frontend_toolkit/stylesheets/colours";
@import "../../govuk_frontend_toolkit/stylesheets/conditionals";
@import "../../govuk_frontend_toolkit/stylesheets/css3";
@import "../../govuk_frontend_toolkit/stylesheets/device-pixels";
@import "../../govuk_frontend_toolkit/stylesheets/typography";
@import "../../govuk_frontend_toolkit/stylesheets/grid_layout";
@import "../../govuk_frontend_toolkit/stylesheets/design-patterns/_buttons";
@import "../govuk_frontend_toolkit/stylesheets/colours";
@import "../govuk_frontend_toolkit/stylesheets/conditionals";
@import "../govuk_frontend_toolkit/stylesheets/css3";
@import "../govuk_frontend_toolkit/stylesheets/device-pixels";
@import "../govuk_frontend_toolkit/stylesheets/typography";
@import "../govuk_frontend_toolkit/stylesheets/grid_layout";
@import "../govuk_frontend_toolkit/stylesheets/design-patterns/_buttons";
// Edited version of govuk_elements repo
// https://github.com/alphagov/govuk_elements
@@ -23,5 +23,3 @@
// Extra CSS for this application
@import "../app";

14
app/assets/stylesheets/main.scss
View File

@@ -1,6 +1,6 @@
// Edited version of govuk_frontend_toolkit
// https://github.com/alphagov/govuk_frontend_toolkit/
@import "govuk_frontend_toolkit/stylesheets/conditionals";
@import "govuk_frontend_toolkit/stylesheets/_conditionals.scss";
@import "govuk_frontend_toolkit/stylesheets/shims";
@import "govuk_frontend_toolkit/stylesheets/measurements";
@import "govuk_frontend_toolkit/stylesheets/css3";
@@ -11,14 +11,6 @@
@import "govuk_frontend_toolkit/stylesheets/design-patterns/buttons";
@import "govuk_frontend_toolkit/stylesheets/design-patterns/alpha-beta";
// Edited version of govuk_template repo
// https://github.com/alphagov/govuk_template
@import "govuk_template/govuk-template";
@import "govuk_template/govuk-template-ie6";
@import "govuk_template/govuk-template-ie7";
@import "govuk_template/govuk-template-ie8";
@import "govuk_template/govuk-template-print";
// Edited version of govuk_elements repo
// https://github.com/alphagov/govuk_elements
@import "govuk_elements/elements/reset";
@@ -33,5 +25,9 @@
@import "govuk_elements/elements/panels";
@import "govuk_elements/elements/tables";
// ////---xxsd----k/
// Extra CSS for this application
@import "components/sms-message";
// Break this up
@import "app";