Skip to content

Commit

Permalink
added Roboto font and rules
Browse files Browse the repository at this point in the history
  • Loading branch information
flouc001 committed Jun 20, 2017
1 parent 8164a0c commit 2d04452
Show file tree
Hide file tree
Showing 16 changed files with 88 additions and 4 deletions.
File renamed without changes.
File renamed without changes.
Binary file added style/fonts/Roboto-Black.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-BlackItalic.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-Bold.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-BoldItalic.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-Italic.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-Light.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-LightItalic.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-Medium.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-MediumItalic.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-Regular.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-Thin.ttf
Binary file not shown.
Binary file added style/fonts/Roboto-ThinItalic.ttf
Binary file not shown.
16 changes: 14 additions & 2 deletions style/less/fonts.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
@font-face{font-family:'apl';src:url('Apl385.woff')format('woff'),url('Apl385.ttf')format('truetype')}
@font-face{font-family:'apl';src:url('./fonts/Apl385.woff')format('woff'),url('../fonts/Apl385.ttf')format('truetype')}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Thin.ttf')format('truetype'); font-weight:100;font-style:normal}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-ThinItalic.ttf')format('truetype'); font-weight:100;font-style:italic}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Light.ttf')format('truetype'); font-weight:300;font-style:normal}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-LightItalic.ttf')format('truetype'); font-weight:300;font-style:italic}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Regular.ttf')format('truetype'); font-weight:400;font-style:normal}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Italic.ttf')format('truetype'); font-weight:400;font-style:italic}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Medium.ttf')format('truetype'); font-weight:500;font-style:normal}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-MediumItalic.ttf')format('truetype'); font-weight:500;font-style:italic}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Bold.ttf')format('truetype'); font-weight:700;font-style:normal}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-BoldItalic.ttf')format('truetype'); font-weight:700;font-style:italic}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-Black.ttf')format('truetype'); font-weight:900;font-style:normal}
@font-face{font-family:'Roboto';src:url('./fonts/Roboto-BlackItalic.ttf')format('truetype'); font-weight:900;font-style:italic}
.ui-font-mixin(){
font-family:"Verdana";
font-family:"Roboto";
font-size:14px;
}
76 changes: 74 additions & 2 deletions style/new-style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,78 @@
@font-face {
font-family: 'apl';
src: url('Apl385.woff') format('woff'), url('Apl385.ttf') format('truetype');
src: url('fonts/Apl385.woff') format('woff'), url('../fonts/Apl385.ttf') format('truetype');
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Thin.ttf') format('truetype');
font-weight: 100;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-ThinItalic.ttf') format('truetype');
font-weight: 100;
font-style: italic;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Italic.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-MediumItalic.ttf') format('truetype');
font-weight: 500;
font-style: italic;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-BoldItalic.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-Black.ttf') format('truetype');
font-weight: 900;
font-style: normal;
}
@font-face {
font-family: 'Roboto';
src: url('fonts/Roboto-BlackItalic.ttf') format('truetype');
font-weight: 900;
font-style: italic;
}
.newDark {
/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) */
Expand Down Expand Up @@ -2672,6 +2744,6 @@
}
#cn *,
#cn #cn_env_add a {
font-family: "Verdana";
font-family: "Roboto";
font-size: 14px;
}

0 comments on commit 2d04452

Please sign in to comment.