diff options
author | Maxime Quandalle <maxime@quandalle.com> | 2015-08-20 15:54:50 +0200 |
---|---|---|
committer | Maxime Quandalle <maxime@quandalle.com> | 2015-08-20 15:59:00 +0200 |
commit | 8ae6abe603571839b74f3106ba53922a849d1125 (patch) | |
tree | d0ad47dffe81e10adde8752478c6ad8bca440b03 /client/components/main | |
parent | a79599d76c808520d36aa7c19e366906cb89982c (diff) | |
download | wekan-8ae6abe603571839b74f3106ba53922a849d1125.tar.gz wekan-8ae6abe603571839b74f3106ba53922a849d1125.tar.bz2 wekan-8ae6abe603571839b74f3106ba53922a849d1125.zip |
Switch the font to roboto
Diffstat (limited to 'client/components/main')
-rw-r--r-- | client/components/main/fonts.styl | 17 | ||||
-rw-r--r-- | client/components/main/header.styl | 4 | ||||
-rw-r--r-- | client/components/main/layouts.styl | 8 |
3 files changed, 23 insertions, 6 deletions
diff --git a/client/components/main/fonts.styl b/client/components/main/fonts.styl new file mode 100644 index 00000000..fc8c8f00 --- /dev/null +++ b/client/components/main/fonts.styl @@ -0,0 +1,17 @@ +@font-face + font-family: 'Roboto' + font-style: normal + font-weight: 400 + src: local('Roboto'), + local('Roboto-Regular'), + url('/fonts/roboto-regular.woff2') format('woff2'), + url('/fonts/roboto-regular.woff') format('woff') + +@font-face + font-family: 'Roboto' + font-style: normal + font-weight: 700 + src: local('Roboto Bold'), + local('Roboto-Bold'), + url('/fonts/roboto-bold.woff2') format('woff2'), + url('/fonts/roboto-bold.woff') format('woff') diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 76a1bc8c..1840becb 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -3,7 +3,7 @@ #header color: white transition: background-color 0.4s - background: #27AE60 + background: #2980B9 #header-quick-access background-color: rgba(0, 0, 0, 0.2) @@ -117,7 +117,7 @@ .board-header-btn, h1.is-clickable &.is-active, - &:hover + &:hover:not(.is-disabled) background: rgba(0, 0, 0, .15) .separator diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index e998b389..a6512574 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -3,13 +3,14 @@ global-reset() html, body, input, select, textarea, button - font: 14px "Helvetica Neue", Arial, Helvetica, sans-serif + font: 14px Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif line-height: 18px color: #4d4d4d html font-size: 100% max-height: 100% + user-select: none -webkit-text-size-adjust: 100% body @@ -29,9 +30,6 @@ body position: relative flex: 1 -div::selection - background: transparent - h1 font-size: 22px line-height: 1.2em @@ -81,6 +79,8 @@ strong font-weight: bold p + user-select: text + a text-decoration: underline word-wrap: break-word |