From 4989cffdce828f2fb17ec9df0eac7c1740e42a33 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Tue, 7 May 2019 15:08:02 -0500 Subject: [PATCH] UI: Restore Open Sans as default font --- app/Resources/public/css/base.css | 26 ++++++++++++++++++++++++++ app/Resources/public/css/document.css | 25 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index a1b6848946..d16bf51285 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -11,12 +11,38 @@ */ /* Sticky footer styles -------------------------------------------------- */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url(themes/chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans-Light.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url(themes/chamilo/fonts/OpenSans.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(themes/chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans-Semibold.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(themes/chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans-Bold.woff) format('woff'); +} + html { background-color: #FFF; position: relative; min-height: 100%; } body { + font-family: 'Open Sans', sans-serif; /* Margin bottom by footer height */ margin-bottom: 60px; } diff --git a/app/Resources/public/css/document.css b/app/Resources/public/css/document.css index f51e155a9d..bff916b96e 100644 --- a/app/Resources/public/css/document.css +++ b/app/Resources/public/css/document.css @@ -5,6 +5,31 @@ This stylesheet must import editor_content.css file */ @import url(./editor_content.css); +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url(themes/chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans-Light.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url(themes/chamilo/fonts/OpenSans.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(themes/chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans-Semibold.woff) format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(themes/chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(themes/chamilo/fonts/OpenSans-Bold.woff) format('woff'); +} + body { color: #666; font-family: 'Open Sans', sans-serif;