diff -r 3ec2343f2b85 -r 40909e8d6855 integration/css/common.css --- a/integration/css/common.css Thu Nov 08 18:24:47 2012 +0100 +++ b/integration/css/common.css Fri Nov 09 18:56:29 2012 +0100 @@ -1,54 +1,60 @@ /* fonts */ @font-face { - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: normal; font-style: normal; - src:url("fonts/OpenSans-Regular.eot") format("eot"), + src: local('Open Sans'), local('OpenSans'), + url("fonts/OpenSans-Regular.eot") format("eot"), url("fonts/OpenSans-Regular.woff") format("woff"), url("fonts/OpenSans-Regular.ttf") format("truetype"), url("fonts/OpenSans-Regular.svg#OpenSans-Regular") format("svg"); } @font-face { - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: normal; font-style: italic; - src:url("fonts/OpenSans-Italic.eot") format("eot"), + src: local('Open Sans Italic'), local('OpenSans-Italic'), + url("fonts/OpenSans-Italic.eot") format("eot"), url("fonts/OpenSans-Italic.woff") format("woff"), url("fonts/OpenSans-Italic.ttf") format("truetype"), url("fonts/OpenSans-Italic.svg#OpenSans-Italic") format("svg"); } @font-face { - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: 300; font-style: normal; - src:url("fonts/OpenSans-Light.eot") format("eot"), + src: local('Open Sans Light'), local('OpenSans-Light'), + url("fonts/OpenSans-Light.eot") format("eot"), url("fonts/OpenSans-Light.woff") format("woff"), url("fonts/OpenSans-Light.ttf") format("truetype"), url("fonts/OpenSans-Light.svg#OpenSans-Regular") format("svg"); } @font-face { - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: 600; font-style: normal; - src:url("fonts/OpenSans-Semibold.eot") format("eot"), + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), + url("fonts/OpenSans-Semibold.eot") format("eot"), url("fonts/OpenSans-Semibold.woff") format("woff"), url("fonts/OpenSans-Semibold.ttf") format("truetype"), url("fonts/OpenSans-Semibold.svg#OpenSans-Semibold") format("svg"); } @font-face { - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: 600; font-style: italic; - src:url("fonts/OpenSans-SemiboldItalic.eot") format("eot"), + src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), + url("fonts/OpenSans-SemiboldItalic.eot") format("eot"), url("fonts/OpenSans-SemiboldItalic.woff") format("woff"), url("fonts/OpenSans-SemiboldItalic.ttf") format("truetype"), url("fonts/OpenSans-SemiboldItalic.svg#OpenSans-SemiboldItalic") format("svg"); } @font-face { - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: bold; font-style: normal; - src:url("fonts/OpenSans-Bold.eot") format("eot"), + src: local('Open Sans Bold'), local('OpenSans-Bold'), + url("fonts/OpenSans-Bold.eot") format("eot"), url("fonts/OpenSans-Bold.woff") format("woff"), url("fonts/OpenSans-Bold.ttf") format("truetype"), url("fonts/OpenSans-Bold.svg#OpenSans-Bold") format("svg"); @@ -65,13 +71,18 @@ textarea { resize: none; } + +input, textarea { + font-family: 'Open Sans'; +} + /* common */ .wrap{ min-height:100%; background-color: #FFF; width: 960px; margin: 0 auto; - font-family: 'OpenSans'; + font-family: 'Open Sans'; font-weight: 400; color:#333333; font-size: 13px; @@ -187,7 +198,6 @@ .popin-content input[type=password], .popin-content textarea{ padding: 0 4px; - font-family: 'OpenSans'; font-size: 12px; border: 1px solid #867a97; -webkit-border-radius: 4px;