From: Jakub Steiner <jimmac(a)gmail.com>
- compass sends weird stuff by default. local(☺)???
- ignore browser quirks, do it the proper CSS way, one family, different weights and styles.
(applies cleanly on 930509883ee219e7f3c4e1e0a9cd9e7040a1949a)
---
src/app/stylesheets/_liberation.scss | 67 +++++++++++++++++++---------------
src/app/stylesheets/_overpass.scss | 36 +++++++++++--------
src/app/stylesheets/_text.scss | 12 +++---
src/app/stylesheets/kalpana.scss | 5 ++-
src/app/stylesheets/screen.scss | 4 +-
5 files changed, 69 insertions(+), 55 deletions(-)
diff --git a/src/app/stylesheets/_liberation.scss b/src/app/stylesheets/_liberation.scss
index 03558a8..a4461cd 100644
--- a/src/app/stylesheets/_liberation.scss
+++ b/src/app/stylesheets/_liberation.scss
@@ -1,35 +1,42 @@
-@import "compass/css3";
-@include font-face("LiberationSansRegular",
- font-files( "/fonts/LiberationSans-Regular-webfont.eot", eot,
- "/fonts/LiberationSans-Regular-webfont.eot?#iefix", eot,
- "/fonts/LiberationSans-Regular-webfont.woff", woff,
- "/fonts/LiberationSans-Regular-webfont.ttf", truetype,
- "/fonts/LiberationSans-Regular-webfont.svg#webfontLfr8h6FA", svg)
+@font-face {
+ font-family: 'Liberation Sans';
+ src: local('Liberation Sans'), local('LiberationSans'), local('Liberation Sans Regular'), local('LiberationSansRegular'),
+ url('/fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
+ url('/fonts/LiberationSans-Regular-webfont.woff') format('woff'),
+ url('/fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
+ url('/fonts/LiberationSans-Regular-webfont.svg#webfontLfr8h6FA') format('svg');
+ font-weight: normal;
+ font-style: normal;
-);
+}
-@include font-face("LiberationSansItalic",
- font-files( "/fonts/LiberationSans-Italic-webfont.eot", eot,
- "/fonts/LiberationSans-Italic-webfont.eot?#iefix", eot,
- "/fonts/LiberationSans-Italic-webfont.woff", woff,
- "/fonts/LiberationSans-Italic-webfont.ttf", truetype,
- "/fonts/LiberationSans-Italic-webfont.svg#webfont8TmwkzPJ", svg)
+@font-face {
+ font-family: 'Liberation Sans';
+ src: local('Liberation Sans Italic'), local('LiberationSansItalic'),
+ url('/fonts/LiberationSans-Italic-webfont.woff') format('woff'),
+ url('/fonts/LiberationSans-Italic-webfont.ttf') format('truetype'),
+ url('/fonts/LiberationSans-Italic-webfont.svg#webfont8TmwkzPJ') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
-);
+@font-face {
+ font-family: 'Liberation Sans';
+ src: local('Liberation Sans Bold'), local('LiberationSansBold'),
+ url('/fonts/LiberationSans-Bold-webfont.woff') format('woff'),
+ url('/fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
+ url('/fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
-@include font-face("LiberationSansBold",
- font-files( "/fonts/LiberationSans-Bold-webfont.eot", eot,
- "/fonts/LiberationSans-Bold-webfont.eot?#iefix", eot,
- "/fonts/LiberationSans-Bold-webfont.woff", woff,
- "/fonts/LiberationSans-Bold-webfont.ttf", truetype,
- "/fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07", svg)
+@font-face {
+ font-family: 'Liberation Sans';
+ src: local('Liberation Sans Bold Italic'), local('LiberationSansBoldItalic'),
+ url('/fonts/LiberationSans-BoldItalic-webfont.woff') format('woff'),
+ url('/fonts/LiberationSans-BoldItalic-webfont.ttf') format('truetype'),
+ url('/fonts/LiberationSans-BoldItalic-webfont.svg#webfont8uGO27Bu') format('svg');
+ font-weight: bold;
+ font-style: italic;
-);
-
-@include font-face("LiberationSansBoldItalic",
- font-files( "/fonts/LiberationSans-BoldItalic-webfont.eot", eot,
- "/fonts/LiberationSans-BoldItalic-webfont.eot?#iefix", eot,
- "/fonts/LiberationSans-BoldItalic-webfont.woff", woff,
- "/fonts/LiberationSans-BoldItalic-webfont.ttf", truetype,
- "/fonts/LiberationSans-BoldItalic-webfont.svg#webfont8uGO27Bu", svg)
-);
\ No newline at end of file
+}
diff --git a/src/app/stylesheets/_overpass.scss b/src/app/stylesheets/_overpass.scss
index d84fcef..5f8e89d 100755
--- a/src/app/stylesheets/_overpass.scss
+++ b/src/app/stylesheets/_overpass.scss
@@ -1,15 +1,21 @@
-@import "compass/css3";
-@include font-face("Overpass",
- font-files( "/fonts/overpass_regular-web.eot", eot,
- "/fonts/overpass_regular-web.eot?#iefix", eot,
- "/fonts/overpass_regular-web.woff", woff,
- "/fonts/overpass_regular-web.ttf", truetype,
- "/fonts/overpass_regular-web.svg#webfontLTZe4IYH", svg)
- );
-@include font-face("Overpass",
- font-files( "/fonts/overpass_bold-web.eot", eot,
- "/fonts/overpass_bold-web.eot?#iefix", eot,
- "/fonts/overpass_bold-web.woff", woff,
- "/fonts/overpass_bold-web.ttf", truetype,
- "/fonts/overpass_bold-web.svg#webfontzAU82Ltw", svg)
- );
\ No newline at end of file
+@font-face {
+ font-family: 'Overpass';
+ src: local("Overpass"),
+ url('/fonts/overpass_regular-web.eot?#iefix') format('eot'),
+ url('/fonts/overpass_regular-web.woff') format('woff'),
+ url('/fonts/overpass_regular-web.ttf') format('truetype'),
+ url('/fonts/overpass_regular-web.svg#webfontLTZe4IYH') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Overpass';
+ src: local("Overpass Bold"), local("OverpassBold"),
+ url('/fonts/overpass_bold-web.eot?#iefix') format('eot'),
+ url('/fonts/overpass_bold-web.woff') format('woff'),
+ url('/fonts/overpass_bold-web.ttf') format('truetype'),
+ url('/fonts/overpass_bold-web.svg#webfontzAU82Ltw') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
diff --git a/src/app/stylesheets/_text.scss b/src/app/stylesheets/_text.scss
index ed6c59f..dbcfd04 100644
--- a/src/app/stylesheets/_text.scss
+++ b/src/app/stylesheets/_text.scss
@@ -7,19 +7,18 @@
@import "overpass";
@import "liberation";
-$screenfont: "LiberationSansRegular", sans-serif;
-$headlinefont: "Overpass", sans-serif;
+$screenfont: "Liberation Sans", sans-serif;
+$headlinefont: "Overpass", Interstate, sans-serif;
body {
- font-size: 11px;
- font-family: $screenfont;
- line-height: 1.4em;
+ font: 12px/1.5 $screenfont;
}
+
h1 { font-size: 180%;
text-transform: uppercase;
font-weight: bold;
}
-h2 { font-size: 170%; }
+h2 { font-size: 170%; text-transform: uppercase; }
h3 { font-size: 160%; }
h4 { font-size: 150%; }
h5 { font-size: 140%; }
@@ -27,6 +26,7 @@ h1,h2,h3,h4,h5 {
color: #939292;
font-family: $headlinefont;
margin-top: 1em;
+ font-weight: bold;
}
li {
margin-left: 0;
diff --git a/src/app/stylesheets/kalpana.scss b/src/app/stylesheets/kalpana.scss
index 38869fc..17719ed 100644
--- a/src/app/stylesheets/kalpana.scss
+++ b/src/app/stylesheets/kalpana.scss
@@ -606,7 +606,7 @@ ul.block {
nav.tab_nav{
display: block;
- font-weight: normal;
+ font-weight: bold;
font-family: $headlinefont;
font-size: 14px;
&>ul {
@@ -965,7 +965,7 @@ ul.tiles {
}
/*footer*/
footer {
- font-size: 90%;
+ font-size: 95%;
margin: 20px 0 0;
padding: 20px 10px 10px 10px;
display: block;
@@ -977,6 +977,7 @@ footer {
li {
display: block;
float: right;
+ margin-left: 1em;
}
}
diff --git a/src/app/stylesheets/screen.scss b/src/app/stylesheets/screen.scss
index 9c90d69..75f8fb7 100644
--- a/src/app/stylesheets/screen.scss
+++ b/src/app/stylesheets/screen.scss
@@ -619,7 +619,7 @@ $errata_color: #700;
padding: 0.2em 0.7em;
width: auto;
color: #FFF;
- @include box-shadow(0, 1px 1px #000);
+ @include box-shadow(0, 1px, 1px, #000);
}
.product-icon {
@@ -638,4 +638,4 @@ $errata_color: #700;
.product_arch {
font-size: 11px;
display: inline;
-}
\ No newline at end of file
+}
--
1.7.4.4
