diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-07-14 14:49:52 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-07-14 14:49:52 +0100 |
| commit | 99e1a43cdba0e52d2832747d3b53aec0fbe2f4fe (patch) | |
| tree | 872e380a0ec68a4945ba5b0c3789dc957e17c42f /web | |
| parent | 6f23d7b44ddc2556897e920cb88a3c81357605bf (diff) | |
| parent | f604fb2765b2845ddf5c8ba12832348e9d59016c (diff) | |
Merge branch 'new-reports-in-core'
Diffstat (limited to 'web')
| -rw-r--r-- | web/cobrands/fixmystreet.com/base.scss | 3 | ||||
| -rw-r--r-- | web/cobrands/sass/_autocomplete.scss (renamed from web/cobrands/fixmystreet.com/_autocomplete.scss) | 0 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 2 | ||||
| -rw-r--r-- | web/cobrands/sass/_dashboard.scss (renamed from web/cobrands/fixmystreet.com/_dashboard.scss) | 0 | ||||
| -rw-r--r-- | web/js/dashboard.js (renamed from web/cobrands/fixmystreet.com/dashboard.js) | 0 |
5 files changed, 2 insertions, 3 deletions
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss index c90b65c1a..4f2a7b1de 100644 --- a/web/cobrands/fixmystreet.com/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -258,6 +258,3 @@ $grid-breakpoint-sm: $mysoc-footer-breakpoint-sm; margin-bottom: 0; } } - -@import "autocomplete"; -@import "dashboard"; diff --git a/web/cobrands/fixmystreet.com/_autocomplete.scss b/web/cobrands/sass/_autocomplete.scss index deebc1803..deebc1803 100644 --- a/web/cobrands/fixmystreet.com/_autocomplete.scss +++ b/web/cobrands/sass/_autocomplete.scss diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index a261c3b0a..87e474136 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -2429,3 +2429,5 @@ table.nicetable { @import "_fixedthead"; @import "_dropzone"; @import "_multiselect"; +@import "_autocomplete"; +@import "_dashboard"; diff --git a/web/cobrands/fixmystreet.com/_dashboard.scss b/web/cobrands/sass/_dashboard.scss index aae8aa98b..aae8aa98b 100644 --- a/web/cobrands/fixmystreet.com/_dashboard.scss +++ b/web/cobrands/sass/_dashboard.scss diff --git a/web/cobrands/fixmystreet.com/dashboard.js b/web/js/dashboard.js index f436b8d18..f436b8d18 100644 --- a/web/cobrands/fixmystreet.com/dashboard.js +++ b/web/js/dashboard.js |