aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/cobrands/fixmystreet/_base.scss30
-rw-r--r--web/cobrands/fixmystreet/_mixins.scss2
-rw-r--r--web/cobrands/fixmystreet/base.scss65
-rw-r--r--web/cobrands/fixmystreet/layout.scss65
4 files changed, 81 insertions, 81 deletions
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 4202564f7..42b36b0cf 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -1,7 +1,7 @@
/* HEADINGS and TYPOGRAPHY */
body {
- font-family: 'MuseoSans', 'Helvetica', 'Arial', sans-serif;
+ font-family: MuseoSans, Helmet, Freesans, sans-serif;
margin:0;
font-size:1em;
line-height:1.5;
@@ -17,14 +17,14 @@ p {
}
small{
- font-family: 'helvetica', 'arial',sans-serif;
+ font-family: Helmet, Freesans, sans-serif;
font-style: italic;
font-size: 0.8125em;
line-height: 1.2307em;
}
h1 {
- font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif;
+ font-family: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif;
font-size: 2em;
line-height: 1em;
font-weight: normal;
@@ -43,7 +43,7 @@ h1#reports_heading a {
}
h2 {
- font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif;
+ font-family:'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif;
font-size: 1.5em; /*24px*/
line-height: 1.3333em; /*32px*/
font-weight: normal;
@@ -56,12 +56,12 @@ h3 {
line-height: 1.20em;
margin-top: 1.2em;
margin-bottom: 0.8em;
- font-weight: bold
+ font-weight: normal;
}
h4 {
font-size: 1em;
- font-weight: bold;
+ font-weight: normal;
margin-bottom: 1em;
}
@@ -105,7 +105,7 @@ ol.big-numbers {
color:#ccc;
line-height:1;
font: {
- family: 'helvetica', 'arial', sans-serif;
+ family: Helmet, Freesans, sans-serif;
weight:bold;
size:2.5em;
}
@@ -177,14 +177,14 @@ a:visited {
margin-bottom: 0px;
}
.meta-2{
- font-family: 'helvetica', 'arial',sans-serif;
+ font-family: Helmet, Freesans, sans-serif;
color:#666666;
font-style: italic;
font-size: 0.75em;
}
h4.static{
- font-family: 'helvetica', 'arial',sans-serif;
+ font-family: Helmet, Freesans, sans-serif;
text-transform: uppercase;
font-size: 0.875em;
line-height: 1.71428em;
@@ -256,7 +256,7 @@ textarea {
display: block;
font-size: 1em;
line-height: 1.5em;
- font-family: 'helvetica', 'arial', sans-serif;
+ font-family: Helmet, Freesans, sans-serif;
min-height:8em;
}
@@ -514,7 +514,7 @@ p.label-valid {
text-transform:uppercase;
font: {
size:0.6875em;
- family: 'helvetica', 'arial', sans-serif;
+ family: Helmet, Freesans, sans-serif;
}
&:hover, &.hover, &.active {
text-decoration:none;
@@ -1356,7 +1356,7 @@ table.nicetable {
h2 {
font: {
style:italic;
- family: 'helvetica', 'arial', sans-serif;
+ family: Helmet, Freesans, sans-serif;
size:1.1875em;
}
color:#4d4d4d;
@@ -1366,7 +1366,7 @@ table.nicetable {
padding:1em;
color: $primary_text;
background: $primary;
- font-family: 'helvetica', 'arial', sans-serif;
+ font-family: Helmet, Freesans, sans-serif;
label {
margin:0;
}
@@ -1408,7 +1408,7 @@ table.nicetable {
color:#C8C8C8;
padding:0.5em;
font: {
- family: 'helvetica', 'arial', sans-serif;
+ family: Helmet, Freesans, sans-serif;
size:0.8125em;
}
@include border-radius(0 0 0.25em 0.25em);
@@ -1425,7 +1425,7 @@ table.nicetable {
width:100%;
color: $primary_text;
background: $primary;
- font-family: 'helvetica', 'arial', sans-serif;
+ font-family: Helmet, Freesans, sans-serif;
div {
display:table-cell;
text-align:center;
diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss
index f77152dd6..4c7bc5af8 100644
--- a/web/cobrands/fixmystreet/_mixins.scss
+++ b/web/cobrands/fixmystreet/_mixins.scss
@@ -3,7 +3,7 @@
cursor:pointer;
font:{
size: 0.875em;
- family: 'Helvetica', 'Arial', sans-serif;
+ family: Helmet, Freesans, sans-serif;
weight:bold;
}
text-transform:uppercase;
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 55b006b42..21cc16cb4 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -8,70 +8,5 @@
@import "_colours";
@import "_mixins";
@import "compass";
-
-/* HEADINGS and TYPOGRAPHY */
-
-@font-face {
- font-family: 'MuseoSans';
- src: url('fonts/MuseoSans_300-webfont.eot');
- src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/MuseoSans_300-webfont.woff') format('woff'),
- url('fonts/MuseoSans_300-webfont.ttf') format('truetype'),
- url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'MuseoSans';
- src: url('fonts/MuseoSans_300_Italic-webfont.eot');
- src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
- url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
- url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
- font-weight: normal;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'MuseoSans';
- src: url('fonts/MuseoSans_500-webfont.eot');
- src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/MuseoSans_500-webfont.woff') format('woff'),
- url('fonts/MuseoSans_500-webfont.ttf') format('truetype'),
- url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
- font-weight: bold;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'MuseoSans';
- src: url('fonts/MuseoSans_500_Italic-webfont.eot');
- src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
- url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
- url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
- font-weight: bold;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Museo300-display';
- src: url('fonts/Museo300-Regular-webfont.eot');
- src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/Museo300-Regular-webfont.woff') format('woff'),
- url('fonts/Museo300-Regular-webfont.ttf') format('truetype'),
- url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-
-/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the
- * table caption *at all* if the header is set to a font-face :( */
-noindex:-o-prefocus, #site-header {
- font-family: sans-serif;
-}
-
@import "_base";
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index f9d5b3930..ff7080c11 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -1,3 +1,68 @@
+@font-face {
+ font-family: 'MuseoSans';
+ src: url('fonts/MuseoSans_300-webfont.eot');
+ src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/MuseoSans_300-webfont.woff') format('woff'),
+ url('fonts/MuseoSans_300-webfont.ttf') format('truetype'),
+ url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'MuseoSans';
+ src: url('fonts/MuseoSans_300_Italic-webfont.eot');
+ src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
+ url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
+ url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'MuseoSans';
+ src: url('fonts/MuseoSans_500-webfont.eot');
+ src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/MuseoSans_500-webfont.woff') format('woff'),
+ url('fonts/MuseoSans_500-webfont.ttf') format('truetype'),
+ url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'MuseoSans';
+ src: url('fonts/MuseoSans_500_Italic-webfont.eot');
+ src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
+ url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
+ url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
+ font-weight: bold;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Museo300-display';
+ src: url('fonts/Museo300-Regular-webfont.eot');
+ src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Museo300-Regular-webfont.woff') format('woff'),
+ url('fonts/Museo300-Regular-webfont.ttf') format('truetype'),
+ url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the
+ * table caption *at all* if the header is set to a font-face :( */
+noindex:-o-prefocus, #site-header {
+ font-family: sans-serif;
+}
+
+h3, h4 {
+ font-weight: bold;
+}
+
@import "_colours";
@import "_layout";
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 15:12:04 +0000