Skip to content

Commit

Permalink
Merge pull request #3 from westbywest/master
Browse files Browse the repository at this point in the history
Remove Asap fonts and jquery
  • Loading branch information
areynold committed May 10, 2013
2 parents 80efc2a + e2fac1e commit 29b8731
Show file tree
Hide file tree
Showing 21 changed files with 10 additions and 783 deletions.
103 changes: 8 additions & 95 deletions files/htdocs/cascade.css
Original file line number Diff line number Diff line change
@@ -1,91 +1,4 @@
@font-face {
font-family: 'AsapRegular';
src: url('./fonts/asap/Asap-Regular-webfont.eot');
src: url('./fonts/asap/Asap-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-Regular-webfont.woff') format('woff'),
url('./fonts/asap/Asap-Regular-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-Regular-webfont.svg#AsapRegular') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'AsapItalic';
src: url('./fonts/asap/Asap-Italic-webfont.eot');
src: url('./fonts/asap/Asap-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-Italic-webfont.woff') format('woff'),
url('./fonts/asap/Asap-Italic-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-Italic-webfont.svg#AsapItalic') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'AsapBold';
src: url('./fonts/asap/Asap-Bold-webfont.eot');
src: url('./fonts/asap/Asap-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-Bold-webfont.woff') format('woff'),
url('./fonts/asap/Asap-Bold-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-Bold-webfont.svg#AsapBold') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'AsapBoldItalic';
src: url('./fonts/asap/Asap-BoldItalic-webfont.eot');
src: url('./fonts/asap/Asap-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-BoldItalic-webfont.woff') format('woff'),
url('./fonts/asap/Asap-BoldItalic-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-BoldItalic-webfont.svg#AsapBoldItalic') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Asap';
src: url('./fonts/asap/Asap-Regular-webfont.eot');
src: url('./fonts/asap/Asap-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-Regular-webfont.woff') format('woff'),
url('./fonts/asap/Asap-Regular-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-Regular-webfont.svg#AsapRegular') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Asap';
src: url('./fonts/asap/Asap-Italic-webfont.eot');
src: url('./fonts/asap/Asap-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-Italic-webfont.woff') format('woff'),
url('./fonts/asap/Asap-Italic-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-Italic-webfont.svg#AsapItalic') format('svg');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'Asap';
src: url('./fonts/asap/Asap-Bold-webfont.eot');
src: url('./fonts/asap/Asap-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-Bold-webfont.woff') format('woff'),
url('./fonts/asap/Asap-Bold-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-Bold-webfont.svg#AsapBold') format('svg');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'Asap';
src: url('./fonts/asap/Asap-BoldItalic-webfont.eot');
src: url('./fonts/asap/Asap-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('./fonts/asap/Asap-BoldItalic-webfont.woff') format('woff'),
url('./fonts/asap/Asap-BoldItalic-webfont.ttf') format('truetype'),
url('./fonts/asap/Asap-BoldItalic-webfont.svg#AsapBoldItalic') format('svg');
font-weight: bold;
font-style: italic;
}

/* If needed cleancss.com could strip ~7Kbytes from this file */
html, body {
margin: 0;
padding: 0;
Expand Down Expand Up @@ -185,7 +98,7 @@ textarea {
body {
background-color: #FFFFFF;
color: #4d4d4d;
font: 15px/18px "Asap", Helvetica, Arial, sans-serif;
font: 15px/18px Helvetica, Arial, sans-serif;
margin: 0;
padding: 0;
}
Expand Down Expand Up @@ -424,7 +337,7 @@ form .cbi-value label.cbi-value-title.tippable {
position: relative;
background: #E6E6E6;
color: black;
font: italic 14px/16px Asap;
font: italic 14px/16px Helvetica, Arial, sans-serif;
padding: 5px;
margin: 10px 0 0 0;
display: none;
Expand Down Expand Up @@ -597,7 +510,7 @@ table {
width: 100%;
}
table th, table td {
font: normal 13px/16px Asap;
font: normal 13px/16px Helvetica, Arial, sans-serif;
padding: 15px 5px;
text-align: left;
background-color: whitesmoke;
Expand Down Expand Up @@ -640,7 +553,7 @@ header h1 {
}
header h1 a {
color: #4d4d4d;
font: 15px/17px Asap;
font: 15px/17px Helvetica, Arial, sans-serif;
}
header nav {
background: black;
Expand All @@ -662,7 +575,7 @@ header nav > ul a, header nav > ul a {
margin: 4px;
text-decoration: none;
text-transform: uppercase;
font: 13px/18px AsapRegular;
font: 13px/18px Helvetica, Arial, sans-serif;
border-bottom: 2px solid transparent;
color: #ffffff;
}
Expand Down Expand Up @@ -789,7 +702,7 @@ header .dropdown-menu a:hover, .dropdown-menu a:hover, header .dropdown-menu a.h
}
.tabs > li > a, .cbi-tabmenu > li > a {
border: 3px solid transparent;
font: normal 15px/23px Asap;
font: normal 15px/23px Helvetica, Arial, sans-serif;
color: #6e6e6e;
margin-right: 2px;
padding: 0 9px;
Expand Down Expand Up @@ -1122,7 +1035,7 @@ table.cbi-section-table td.cbi-section-table-cell {
}
.cbi-value-description {
display: inline;
font: normal 12px/14px Asap;
font: normal 12px/14px Helvetica, Arial, sans-serif;
color: black;
}
.cbi-value-description img {
Expand Down
94 changes: 0 additions & 94 deletions files/htdocs/fonts/asap/Asap SIL OFL Font License 1.1.txt

This file was deleted.

Binary file removed files/htdocs/fonts/asap/Asap-Bold-webfont.eot
Binary file not shown.

0 comments on commit 29b8731

Please sign in to comment.