From: Stas Vilchik Date: Tue, 27 May 2014 08:52:31 +0000 (+0600) Subject: SONAR-5333 Change font X-Git-Tag: 4.4-RC1~818 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=57745b3abb937519b574632fcdd13261b4ffc75a;p=sonarqube.git SONAR-5333 Change font --- diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less index 73ab6b55bfa..bac0f968c9a 100644 --- a/sonar-server/src/main/less/ui.less +++ b/sonar-server/src/main/less/ui.less @@ -2,32 +2,26 @@ @import "mixins"; @font-face { - font-family: 'Roboto'; + font-family: 'Titillium Web'; font-style: normal; font-weight: 300; - src: url('../fonts/roboto-light.woff') format('woff'); + src: url('../fonts/tw-300.woff') format('woff'); } @font-face { - font-family: 'Roboto'; + font-family: 'Titillium Web'; font-style: normal; font-weight: 400; - src: url('../fonts/roboto-normal.woff') format('woff'); + src: url('../fonts/tw-400.woff') format('woff'); } @font-face { - font-family: 'Roboto'; + font-family: 'Titillium Web'; font-style: normal; - font-weight: 500; - src: url('../fonts/roboto-medium.woff') format('woff'); -} -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 700; - src: url('../fonts/roboto-bold.woff') format('woff'); + font-weight: 600; + src: url('../fonts/tw-600.woff') format('woff'); } body { - font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: 'Titillium Web', 'Helvetica Neue', Helvetica, Arial, sans-serif; } diff --git a/sonar-server/src/main/webapp/fonts/roboto-bold.woff b/sonar-server/src/main/webapp/fonts/roboto-bold.woff deleted file mode 100644 index 1621ba170ea..00000000000 Binary files a/sonar-server/src/main/webapp/fonts/roboto-bold.woff and /dev/null differ diff --git a/sonar-server/src/main/webapp/fonts/roboto-light.woff b/sonar-server/src/main/webapp/fonts/roboto-light.woff deleted file mode 100644 index 797f14d0beb..00000000000 Binary files a/sonar-server/src/main/webapp/fonts/roboto-light.woff and /dev/null differ diff --git a/sonar-server/src/main/webapp/fonts/roboto-medium.woff b/sonar-server/src/main/webapp/fonts/roboto-medium.woff deleted file mode 100644 index 9f6caee9529..00000000000 Binary files a/sonar-server/src/main/webapp/fonts/roboto-medium.woff and /dev/null differ diff --git a/sonar-server/src/main/webapp/fonts/roboto-normal.woff b/sonar-server/src/main/webapp/fonts/roboto-normal.woff deleted file mode 100644 index 3be8671f927..00000000000 Binary files a/sonar-server/src/main/webapp/fonts/roboto-normal.woff and /dev/null differ diff --git a/sonar-server/src/main/webapp/fonts/tw-300.woff b/sonar-server/src/main/webapp/fonts/tw-300.woff new file mode 100644 index 00000000000..1057950a6ed Binary files /dev/null and b/sonar-server/src/main/webapp/fonts/tw-300.woff differ diff --git a/sonar-server/src/main/webapp/fonts/tw-400.woff b/sonar-server/src/main/webapp/fonts/tw-400.woff new file mode 100644 index 00000000000..5d2527aeac5 Binary files /dev/null and b/sonar-server/src/main/webapp/fonts/tw-400.woff differ diff --git a/sonar-server/src/main/webapp/fonts/tw-600.woff b/sonar-server/src/main/webapp/fonts/tw-600.woff new file mode 100644 index 00000000000..52c66548a02 Binary files /dev/null and b/sonar-server/src/main/webapp/fonts/tw-600.woff differ