This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI-2017 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 56f6617d635f7b4c09f400070e8ddeac9640fb76 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 15:41:42 2020 +0100 Changement de police principale pour Fira Sans --- bow-ui/src/main/less/common/_button.less | 1 + bow-ui/src/main/less/common/_font.less | 14 +++++++------- bow-ui/src/main/less/variables/_globals.less | 5 +++-- bow-ui/src/main/webapp/font/FiraSans-Light.otf | Bin 0 -> 359048 bytes bow-ui/src/main/webapp/font/FiraSans-Medium.otf | Bin 0 -> 366052 bytes bow-ui/src/main/webapp/font/FiraSans-Regular.otf | Bin 0 -> 357996 bytes bow-ui/src/main/webapp/font/Titillium-Bold.otf | Bin 55568 -> 0 bytes bow-ui/src/main/webapp/font/Titillium-Light.otf | Bin 57068 -> 0 bytes bow-ui/src/main/webapp/font/Titillium-Regular.otf | Bin 57460 -> 0 bytes 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bow-ui/src/main/less/common/_button.less b/bow-ui/src/main/less/common/_button.less index b84d228..e999537 100644 --- a/bow-ui/src/main/less/common/_button.less +++ b/bow-ui/src/main/less/common/_button.less @@ -41,6 +41,7 @@ button, border-radius: 2px; color: @color-main; cursor: pointer; + font-family: @default-font; // font-size: 110%; outline: none; diff --git a/bow-ui/src/main/less/common/_font.less b/bow-ui/src/main/less/common/_font.less index 47edd76..d719a82 100644 --- a/bow-ui/src/main/less/common/_font.less +++ b/bow-ui/src/main/less/common/_font.less @@ -1,20 +1,20 @@ @font-face { - font-family: 'Titillium'; - src: url('../font/Titillium-Regular.otf'); + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Regular.otf'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Titillium'; - src: url('../font/Titillium-Bold.otf'); - font-weight: bold; + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Medium.otf'); + font-weight: 600; font-style: normal; } @font-face { - font-family: 'Titillium'; - src: url('../font/Titillium-Light.otf'); + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Light.otf'); font-weight: lighter; font-style: normal; } \ No newline at end of file diff --git a/bow-ui/src/main/less/variables/_globals.less b/bow-ui/src/main/less/variables/_globals.less index 1a30234..b5f8767 100644 --- a/bow-ui/src/main/less/variables/_globals.less +++ b/bow-ui/src/main/less/variables/_globals.less @@ -1,12 +1,13 @@ -@default-footer-height: 100px; @default-sidebar-width: 75px; +@default-header-height: @default-sidebar-width; +@default-footer-height: 100px; @default-marge--tiny: 5px; @default-marge--small: 10px; @default-marge--medium: 30px; @default-marge--large: 50px; -@default-font: Titillium; +@default-font: 'Fira Sans'; @defaut-font-size: 16px; @default-bookmark-radius: 3px; diff --git a/bow-ui/src/main/webapp/font/FiraSans-Light.otf b/bow-ui/src/main/webapp/font/FiraSans-Light.otf new file mode 100644 index 0000000..1445a4a Binary files /dev/null and b/bow-ui/src/main/webapp/font/FiraSans-Light.otf differ diff --git a/bow-ui/src/main/webapp/font/FiraSans-Medium.otf b/bow-ui/src/main/webapp/font/FiraSans-Medium.otf new file mode 100644 index 0000000..557eded Binary files /dev/null and b/bow-ui/src/main/webapp/font/FiraSans-Medium.otf differ diff --git a/bow-ui/src/main/webapp/font/FiraSans-Regular.otf b/bow-ui/src/main/webapp/font/FiraSans-Regular.otf new file mode 100644 index 0000000..98ef98c Binary files /dev/null and b/bow-ui/src/main/webapp/font/FiraSans-Regular.otf differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Bold.otf b/bow-ui/src/main/webapp/font/Titillium-Bold.otf deleted file mode 100755 index a92497b..0000000 Binary files a/bow-ui/src/main/webapp/font/Titillium-Bold.otf and /dev/null differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Light.otf b/bow-ui/src/main/webapp/font/Titillium-Light.otf deleted file mode 100755 index 79f6929..0000000 Binary files a/bow-ui/src/main/webapp/font/Titillium-Light.otf and /dev/null differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Regular.otf b/bow-ui/src/main/webapp/font/Titillium-Regular.otf deleted file mode 100755 index 3243bc1..0000000 Binary files a/bow-ui/src/main/webapp/font/Titillium-Regular.otf and /dev/null differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.