diff --git a/css/font-open-sans/OpenSans-Bold-cyrillic-ext.woff2 b/css/font-open-sans/OpenSans-Bold-cyrillic-ext.woff2 new file mode 100644 index 000000000..79ff21332 Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-cyrillic-ext.woff2 differ diff --git a/css/font-open-sans/OpenSans-Bold-cyrillic.woff2 b/css/font-open-sans/OpenSans-Bold-cyrillic.woff2 new file mode 100644 index 000000000..263805ec0 Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-cyrillic.woff2 differ diff --git a/css/font-open-sans/OpenSans-Bold-greek-ext.woff2 b/css/font-open-sans/OpenSans-Bold-greek-ext.woff2 new file mode 100644 index 000000000..d58ebada7 Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-greek-ext.woff2 differ diff --git a/css/font-open-sans/OpenSans-Bold-greek.woff2 b/css/font-open-sans/OpenSans-Bold-greek.woff2 new file mode 100644 index 000000000..33b5dea47 Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-greek.woff2 differ diff --git a/css/font-open-sans/OpenSans-Bold-latin-ext.woff2 b/css/font-open-sans/OpenSans-Bold-latin-ext.woff2 new file mode 100644 index 000000000..a0fa0de77 Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-latin-ext.woff2 differ diff --git a/css/font-open-sans/OpenSans-Bold-latin.woff2 b/css/font-open-sans/OpenSans-Bold-latin.woff2 new file mode 100644 index 000000000..9e451410d Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-latin.woff2 differ diff --git a/css/font-open-sans/OpenSans-Bold-vietnamese.woff2 b/css/font-open-sans/OpenSans-Bold-vietnamese.woff2 new file mode 100644 index 000000000..a0dbe4506 Binary files /dev/null and b/css/font-open-sans/OpenSans-Bold-vietnamese.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-cyrillic-ext.woff2 b/css/font-open-sans/OpenSans-Regular-cyrillic-ext.woff2 new file mode 100644 index 000000000..6bd46848e Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-cyrillic-ext.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-cyrillic.woff2 b/css/font-open-sans/OpenSans-Regular-cyrillic.woff2 new file mode 100644 index 000000000..6eb58dc21 Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-cyrillic.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-greek-ext.woff2 b/css/font-open-sans/OpenSans-Regular-greek-ext.woff2 new file mode 100644 index 000000000..fb2208775 Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-greek-ext.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-greek.woff2 b/css/font-open-sans/OpenSans-Regular-greek.woff2 new file mode 100644 index 000000000..e55e07667 Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-greek.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-latin-ext.woff2 b/css/font-open-sans/OpenSans-Regular-latin-ext.woff2 new file mode 100644 index 000000000..e28edc0d0 Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-latin-ext.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-latin.woff2 b/css/font-open-sans/OpenSans-Regular-latin.woff2 new file mode 100644 index 000000000..e07a1700d Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-latin.woff2 differ diff --git a/css/font-open-sans/OpenSans-Regular-vietnamese.woff2 b/css/font-open-sans/OpenSans-Regular-vietnamese.woff2 new file mode 100644 index 000000000..e4ee21ab0 Binary files /dev/null and b/css/font-open-sans/OpenSans-Regular-vietnamese.woff2 differ diff --git a/css/font-open-sans/font-open-sans.css b/css/font-open-sans/font-open-sans.css new file mode 100644 index 000000000..3182a31ef --- /dev/null +++ b/css/font-open-sans/font-open-sans.css @@ -0,0 +1,112 @@ +/* cyrillic-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-cyrillic-ext.woff2') format('woff2'); + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; +} +/* cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-cyrillic.woff2') format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-greek-ext.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-greek.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-vietnamese.woff2') format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-latin-ext.woff2') format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Regular'), local('OpenSans-Regular'), url('./OpenSans-Regular-latin.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-cyrillic-ext.woff2') format('woff2'); + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; +} +/* cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-cyrillic.woff2') format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-greek-ext.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-greek.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-vietnamese.woff2') format('woff2'); + unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-latin-ext.woff2') format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./OpenSans-Bold-latin.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; +} diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig index 261cb8d4e..6359694ca 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig @@ -37,9 +37,11 @@ - {# - Font Combodo #} + {# - Font OpenSans #} + + {# - Font Combodo #} - {# - Font awesome #} + {# - Font awesome #} {# - Misc libs #} diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css index 447bdb1f7..854d9c26b 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css @@ -1,4 +1,3 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); /*! * Combodo portal theme v1.0.0 * Based on Bootswatch Simplex diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss index 935aa1617..d57a3ee67 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss @@ -1,5 +1,4 @@ @import 'variables.scss'; -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); /*! * Combodo portal theme v1.0.0 diff --git a/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.otf b/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.otf deleted file mode 100644 index 3692b12ae..000000000 Binary files a/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.otf and /dev/null differ diff --git a/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.ttf b/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.ttf deleted file mode 100644 index fbf700971..000000000 Binary files a/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.ttf and /dev/null differ diff --git a/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.woff b/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.woff deleted file mode 100644 index 7d1754240..000000000 Binary files a/datamodels/2.x/itop-portal-base/portal/web/fonts/Combodo.woff and /dev/null differ