Merge pull request #18522 from owncloud/lighter-fonts

move fonts from Regular+Bold to Light+Semibold for lighter feel
This commit is contained in:
Morris Jobke 2015-08-25 22:38:55 +02:00
commit b45ae1b32e
6 changed files with 13 additions and 12 deletions

View File

@ -1,13 +1,13 @@
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: normal; font-weight: 300;
src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.woff) format('woff'); src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/OpenSans-Light.woff) format('woff');
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: bold; font-weight: 600;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/OpenSans-Bold.woff) format('woff'); src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/OpenSans-Semibold.woff) format('woff');
} }

View File

@ -16,7 +16,7 @@ ul { list-style:none; }
body { body {
background-color: #ffffff; background-color: #ffffff;
font-weight: normal; font-weight: 300;
font-size: .8em; font-size: .8em;
line-height: 1.6em; line-height: 1.6em;
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
@ -198,7 +198,7 @@ button, .button,
min-width: 25px; min-width: 25px;
padding: 5px; padding: 5px;
background-color: rgba(240,240,240,.9); background-color: rgba(240,240,240,.9);
font-weight: bold; font-weight: 600;
color: #555; color: #555;
border: 1px solid rgba(240,240,240,.9); border: 1px solid rgba(240,240,240,.9);
cursor: pointer; cursor: pointer;
@ -370,6 +370,7 @@ input[type="submit"].enabled {
} }
#emptycontent h2, #emptycontent h2,
.emptycontent h2 { .emptycontent h2 {
font-weight: 600;
font-size: 22px; font-size: 22px;
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -444,7 +445,7 @@ input[type="submit"].enabled {
padding-top: 20px; padding-top: 20px;
} }
#body-login p.info a { #body-login p.info a {
font-weight: bold; font-weight: 600;
padding: 13px; padding: 13px;
margin: -13px; margin: -13px;
} }
@ -708,7 +709,7 @@ label.infield {
.warning a, .warning a,
.error a { .error a {
color: #fff !important; color: #fff !important;
font-weight: bold !important; font-weight: 600 !important;
} }
.error pre { .error pre {
white-space: pre-wrap; white-space: pre-wrap;
@ -803,7 +804,7 @@ label.infield {
overflow: hidden; overflow: hidden;
} }
.bold { font-weight:bold; } .bold { font-weight:600; }
.center { text-align:center; } .center { text-align:center; }
.inlineblock { display: inline-block; } .inlineblock { display: inline-block; }
@ -1035,7 +1036,7 @@ div.crumb:first-child a {
top: 13px; top: 13px;
} }
div.crumb.last { div.crumb.last {
font-weight: bold; font-weight: 600;
margin-right: 10px; margin-right: 10px;
} }
div.crumb a.ellipsislink { div.crumb a.ellipsislink {
@ -1081,7 +1082,7 @@ div.crumb:active {
#body-public footer .info a { #body-public footer .info a {
color: #777; color: #777;
font-weight: bold; font-weight: 600;
padding: 13px; padding: 13px;
margin: -13px; margin: -13px;
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.