From 68685d434324b990a868e6f9944747fc36f0d6b8 Mon Sep 17 00:00:00 2001 From: MuK IT GmbH Date: Tue, 2 Jul 2019 17:11:29 +0000 Subject: [PATCH] publish muk_web_theme - 12.0 --- muk_web_theme/__manifest__.py | 2 +- muk_web_theme/static/src/scss/colors.scss | 4 --- muk_web_theme/static/src/scss/fonts.scss | 36 +++++++++++------------ 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/muk_web_theme/__manifest__.py b/muk_web_theme/__manifest__.py index eac1e42..b5605c9 100644 --- a/muk_web_theme/__manifest__.py +++ b/muk_web_theme/__manifest__.py @@ -19,7 +19,7 @@ { "name": "MuK Backend Theme", "summary": "Odoo Community Backend Theme", - "version": "12.0.1.6.1", + "version": "12.0.1.6.2", "category": "Themes/Backend", "license": "AGPL-3", "author": "MuK IT", diff --git a/muk_web_theme/static/src/scss/colors.scss b/muk_web_theme/static/src/scss/colors.scss index 2e63adc..16fe7cb 100644 --- a/muk_web_theme/static/src/scss/colors.scss +++ b/muk_web_theme/static/src/scss/colors.scss @@ -17,10 +17,6 @@ * **********************************************************************************/ -//---------------------------------------------------------- -// Colors -//---------------------------------------------------------- - $o-brand-odoo: #243742; $o-brand-primary: #5D8DA8; diff --git a/muk_web_theme/static/src/scss/fonts.scss b/muk_web_theme/static/src/scss/fonts.scss index 60aa4fc..4f658c9 100644 --- a/muk_web_theme/static/src/scss/fonts.scss +++ b/muk_web_theme/static/src/scss/fonts.scss @@ -20,15 +20,15 @@ $font-path-noto: '../fonts/Noto'; $font-path-roboto: '../fonts/Roboto'; -@mixin mk-font-face($name, $weight, $style) { +@mixin mk-roboto-font-face($name, $weight, $style) { @font-face { font-family: 'Noto'; - src: url('#{$font-path-noto}/Roboto-#{$name}.eot'); + src: url('#{$font-path-noto}/Noto-#{$name}.eot'); src: local('Noto #{$name}'), local('Noto-#{$name}'), - url('#{$font-path-noto}/Roboto-#{$name}.eot?#iefix') format('embedded-opentype'), - url('#{$font-path-noto}/Roboto-#{$name}.woff') format('woff'), - url('#{$font-path-noto}/Roboto-#{$name}.ttf') format('truetype'), - url('#{$font-path-noto}/Roboto-#{$name}.svg#Roboto') format('svg'); + url('#{$font-path-noto}/Noto-#{$name}.eot?#iefix') format('embedded-opentype'), + url('#{$font-path-noto}/Noto-#{$name}.woff') format('woff'), + url('#{$font-path-noto}/Noto-#{$name}.ttf') format('truetype'), + url('#{$font-path-noto}/Noto-#{$name}.svg#Noto') format('svg'); font-weight: $weight; font-style: $style; } @@ -45,15 +45,15 @@ $font-path-roboto: '../fonts/Roboto'; } } -@include mk-font-face('Thin', 100, normal); -@include mk-font-face('ThinItalic', 100, italic); -@include mk-font-face('Light', 300, normal); -@include mk-font-face('LightItalic', 300, italic); -@include mk-font-face('Regular', 400, normal); -@include mk-font-face('Italic', 400, italic); -@include mk-font-face('Medium', 500, normal); -@include mk-font-face('MediumItalic', 500, italic); -@include mk-font-face('Bold', 700, normal); -@include mk-font-face('BoldItalic', 700, italic); -@include mk-font-face('Black', 900, normal); -@include mk-font-face('BlackItalic', 900, italic); +@include mk-roboto-font-face('Thin', 100, normal); +@include mk-roboto-font-face('ThinItalic', 100, italic); +@include mk-roboto-font-face('Light', 300, normal); +@include mk-roboto-font-face('LightItalic', 300, italic); +@include mk-roboto-font-face('Regular', 400, normal); +@include mk-roboto-font-face('Italic', 400, italic); +@include mk-roboto-font-face('Medium', 500, normal); +@include mk-roboto-font-face('MediumItalic', 500, italic); +@include mk-roboto-font-face('Bold', 700, normal); +@include mk-roboto-font-face('BoldItalic', 700, italic); +@include mk-roboto-font-face('Black', 900, normal); +@include mk-roboto-font-face('BlackItalic', 900, italic);