diff options
| -rw-r--r-- | core/css/apps.css | 4 | ||||
| -rw-r--r-- | core/css/fonts.css | 10 | ||||
| -rw-r--r-- | core/css/header.css | 9 | ||||
| -rw-r--r-- | core/css/mobile.css | 8 | ||||
| -rw-r--r-- | core/css/styles.css | 6 | ||||
| -rw-r--r-- | core/fonts/OpenSans-Regular.woff | bin | 0 -> 20544 bytes | |||
| -rw-r--r-- | settings/css/settings.css | 3 |
7 files changed, 28 insertions, 12 deletions
diff --git a/core/css/apps.css b/core/css/apps.css index ee68c45b1f2..8fcd30cd8f2 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -561,11 +561,11 @@ button.loading { .section h2 { font-size: 20px; margin-bottom: 12px; - font-weight: normal; + font-weight: 300; } .section h3 { font-size: 15px; - font-weight: normal; + font-weight: 300; margin: 12px 0; } /* slight position correction of checkboxes and radio buttons */ diff --git a/core/css/fonts.css b/core/css/fonts.css index de2742c6368..2a894031e54 100644 --- a/core/css/fonts.css +++ b/core/css/fonts.css @@ -1,3 +1,13 @@ +/* for low-res screens, use Regular font-weight instead of Light */ +@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) { + @font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: normal; + src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.woff) format('woff'); + } +} + @font-face { font-family: 'Open Sans'; font-style: normal; diff --git a/core/css/header.css b/core/css/header.css index 369750251c4..37f06ef0632 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -119,6 +119,7 @@ position: relative; color: #fff; font-size: 16px; + font-weight: 300; margin: 0; margin-top: -24px; padding: 7px 0 7px 5px; @@ -352,3 +353,11 @@ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; opacity: 1; } + +/* do not show display name when profile picture is present */ +#header .avatardiv.avatardiv-shown + #expandDisplayName { + display: none; +} +#header #expand { + display: block; +} diff --git a/core/css/mobile.css b/core/css/mobile.css index 26f7b8520b9..288ae2979de 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -26,14 +26,6 @@ display: none; } -/* do not show display name on mobile when profile picture is present */ -#header .avatardiv.avatardiv-shown + #expandDisplayName { - display: none; -} -#header #expand { - display: block; -} - /* do not show update notification on mobile */ #update-notification { display: none !important; diff --git a/core/css/styles.css b/core/css/styles.css index 15325eada33..0a48c60f939 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -27,7 +27,7 @@ select:hover { body { background-color: #ffffff; - font-weight: 300; + font-weight: 400; font-size: .8em; line-height: 1.6em; font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; @@ -258,6 +258,9 @@ button, .button, border: 1px solid rgba(240,240,240,.9); cursor: pointer; } +select, .button.multiselect { + font-weight: 400; +} input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, input[type="button"]:focus, button:hover, button:focus, @@ -591,6 +594,7 @@ input[type="submit"].enabled { #body-login input[type="password"], #body-login input[type="email"] { border: none; + font-weight: 300; } /* Nicely grouping input field sets */ diff --git a/core/fonts/OpenSans-Regular.woff b/core/fonts/OpenSans-Regular.woff Binary files differnew file mode 100644 index 00000000000..2abc3ed69fd --- /dev/null +++ b/core/fonts/OpenSans-Regular.woff diff --git a/settings/css/settings.css b/settings/css/settings.css index 5fa9b30a647..60ba805d3ca 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -19,6 +19,7 @@ input#openid, input#webdav { width:20em; } margin-top: -30px; } .clientsbox h2 { + font-weight: 300; font-size: 20px; margin: 35px 0 10px; } @@ -26,7 +27,7 @@ input#openid, input#webdav { width:20em; } margin-top: 10px; } .clientsbox a { - font-weight: bold; + font-weight: 600; } #displaynameerror { |