Permalink
Browse files

Added roboto artifacts and fixed up fonts.less to use it.

  • Loading branch information...
aeoth
aeoth committed Feb 8, 2012
1 parent 63f6ea2 commit 9928f1af4485b469a52c893ac5a1a9ba94ddeeb4
View
@@ -0,0 +1,18 @@
+Copyright (C) 2008 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+##########
+
+This directory contains the fonts for the platform. They are licensed
+under the Apache 2 license.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
View
@@ -1,21 +1,41 @@
-@fonts: "Segoe UI", "Segoe WP", "Helvetica Neue", Roboto, sans-serif;
+@font-face {
+ font-family: 'RobotoRegular';
+ src: url('../fonts/Roboto-Regular-webfont.eot');
+ src: url('../fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/Roboto-Regular-webfont.woff') format('woff'),
+ url('../fonts/Roboto-Regular-webfont.ttf') format('truetype'),
+ url('../fonts/Roboto-Regular-webfont.svg#RobotoRegular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'RobotoLight';
+ src: url('../fonts/Roboto-Light-webfont.eot');
+ src: url('../fonts/Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/Roboto-Light-webfont.woff') format('woff'),
+ url('../fonts/Roboto-Light-webfont.ttf') format('truetype'),
+ url('../fonts/Roboto-Light-webfont.svg#RobotoLight') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@fonts: "Segoe UI", "Segoe WP", "Helvetica Neue", 'RobotoRegular', sans-serif;
+@headingfonts: "Segoe UI Light", "Helvetica Neue", 'RobotoLight', "Segoe UI", "Segoe WP", sans-serif;
body {
font-family: @fonts;
}
h1, h2, h3, h4, h5, h6
{
+ font-family: @headingfonts;
font-weight: 100;
text-transform: lowercase;
margin-top:5px;
margin-bottom:0px;
}
-h1, h2 {
- font-family: "Segoe UI Light", @fonts;
-}
-
h1 { font-size: 3.8em; }
h2 { font-size: 2em; }

0 comments on commit 9928f1a

Please sign in to comment.