diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-07-27 00:56:18 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-07-27 00:56:18 +0100 |
| commit | f9cfa8acb622a680d09b4d06f7ea8e038168e1f6 (patch) | |
| tree | 904fc6e4828cfae852f3ce7e1941e22276f5b29d | |
| parent | 0c4032f6cdb42db906a20b8631b327102431e566 (diff) | |
Factor CSS so that all SCSS is under cobrand, and non-SCSS is in css/ under that.
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | templates/web/emptyhomes/header.html | 2 | ||||
| -rw-r--r-- | templates/web/reading/header.html | 2 | ||||
| -rw-r--r-- | templates/web/southampton/header.html | 2 | ||||
| -rw-r--r-- | web/cobrands/emptyhomes/css/css.css (renamed from web/cobrands/emptyhomes/css.css) | 0 | ||||
| -rw-r--r-- | web/cobrands/reading/css.scss (renamed from web/cobrands/reading/css/css.scss) | 0 | ||||
| -rw-r--r-- | web/cobrands/southampton/css/style.css (renamed from web/cobrands/southampton/style.css) | 0 |
7 files changed, 4 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index 862e1b7b3..709210437 100644 --- a/.gitignore +++ b/.gitignore @@ -19,19 +19,9 @@ tags FixMyStreet-EmptyHomes.po FixMyBarangay.po -/web/cobrands/fiksgatami/css.css -/web/cobrands/southampton/css.css -/web/cobrands/reading/css/css.css /web/css/core.css /web/css/main.css -/web/cobrands/default/*.css -/web/cobrands/fixmystreet/*.css -/web/cobrands/bromley/*.css -/web/cobrands/fixmybarangay/*.css -/web/cobrands/oxfordshire/*.css -/web/cobrands/stevenage/*.css -/web/cobrands/barnet/*.css -/web/cobrands/zurich/*.css +/web/cobrands/*/*.css /web/cobrands/seesomething /web/photo /local diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index d3f93b5ad..fea973468 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -8,7 +8,7 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin %] <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css.css') %]"> + <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css/css.css') %]"> [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] </head> diff --git a/templates/web/reading/header.html b/templates/web/reading/header.html index 85117b57e..23bafd726 100644 --- a/templates/web/reading/header.html +++ b/templates/web/reading/header.html @@ -12,7 +12,7 @@ <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/reading.css') %]" /> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/print3rdParty.css') %]" media="print"/> - <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/css.css') %]" /> + <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css.css') %]" /> [% INCLUDE 'common_header_tags.html', site_title = 'Reading City Council FixMyStreet' %] diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html index e02083a99..430b8027c 100644 --- a/templates/web/southampton/header.html +++ b/templates/web/southampton/header.html @@ -5,7 +5,7 @@ <!--[if gt IE 8]><!--><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><!--<![endif]--> <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" /> + <link rel="stylesheet" type="text/css" href="/cobrands/southampton/css/style.css" /> <link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css.css') %]" /> [% INCLUDE 'common_header_tags.html', site_title = 'Southampton City Council FixMyStreet' %] diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css/css.css index 829986f59..829986f59 100644 --- a/web/cobrands/emptyhomes/css.css +++ b/web/cobrands/emptyhomes/css/css.css diff --git a/web/cobrands/reading/css/css.scss b/web/cobrands/reading/css.scss index d25d73156..d25d73156 100644 --- a/web/cobrands/reading/css/css.scss +++ b/web/cobrands/reading/css.scss diff --git a/web/cobrands/southampton/style.css b/web/cobrands/southampton/css/style.css index cd4c0f490..cd4c0f490 100644 --- a/web/cobrands/southampton/style.css +++ b/web/cobrands/southampton/css/style.css |