This commit is contained in:
life
2014-05-07 16:44:44 +08:00
parent 84c15377ff
commit 7a1a0921f5
8 changed files with 431 additions and 653 deletions

View File

@ -7,31 +7,6 @@
*/
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('../fonts/OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url('../fonts/OpenSans-Bold.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../fonts/OpenSans-Italic.woff') format('woff');
}
article,
aside,
details,
@ -329,7 +304,7 @@ html {
}
body {
font-family: 'Open Sans', Arial, Tahoma, sans-serif, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: Arial, Tahoma, sans-serif, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 1.428571429;
color: #333333;
@ -505,7 +480,7 @@ h6,
.h4,
.h5,
.h6 {
font-family: 'Open Sans', Arial, Tahoma, sans-serif, "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Arial,sans-serif;
font-family: Arial, Tahoma, sans-serif, "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Arial,sans-serif;
font-weight: 500;
line-height: 1.1;
color: inherit;