diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index 7072f2df5..6a707fa17 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -28,8 +28,8 @@ integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"> {# TODO EDI boostrap beta cdn ??? Isn't there a stable CDN ? It looks like this cdn won't exist forever :D #} - {% endblock %} @@ -95,7 +95,7 @@ {# Do not show the edition link for pages without content #} {% if github_link and not 'has_only_toc' in meta %} - Edit on GitHub + Edit on GitHub {% endif %} diff --git a/extensions/odoo_theme/layout_templates/footer.html b/extensions/odoo_theme/layout_templates/footer.html index c46008c74..f1de71938 100644 --- a/extensions/odoo_theme/layout_templates/footer.html +++ b/extensions/odoo_theme/layout_templates/footer.html @@ -1,5 +1,5 @@
-
Get Help
+
Get Help
Contact Support Ask the Odoo Community diff --git a/extensions/odoo_theme/layout_templates/header.html b/extensions/odoo_theme/layout_templates/header.html index ffd3da28d..a43d51d08 100644 --- a/extensions/odoo_theme/layout_templates/header.html +++ b/extensions/odoo_theme/layout_templates/header.html @@ -2,7 +2,7 @@
diff --git a/extensions/odoo_theme/layout_templates/language_switcher.html b/extensions/odoo_theme/layout_templates/language_switcher.html index dd0faf199..ee9f67b9a 100644 --- a/extensions/odoo_theme/layout_templates/language_switcher.html +++ b/extensions/odoo_theme/layout_templates/language_switcher.html @@ -1,22 +1,10 @@
- {# #} -
- {{ language }} {# The current language #} - {% for alternate_language, language_code, url in alternate_languages %} - {{ alternate_language }} - {% endfor %} +
+ +
-
+
\ No newline at end of file diff --git a/extensions/odoo_theme/layout_templates/searchbox.html b/extensions/odoo_theme/layout_templates/searchbox.html index febb1898f..27f0f459b 100644 --- a/extensions/odoo_theme/layout_templates/searchbox.html +++ b/extensions/odoo_theme/layout_templates/searchbox.html @@ -3,7 +3,7 @@ - +
diff --git a/extensions/odoo_theme/layout_templates/version_switcher.html b/extensions/odoo_theme/layout_templates/version_switcher.html index b2cc70616..a1e64bd10 100644 --- a/extensions/odoo_theme/layout_templates/version_switcher.html +++ b/extensions/odoo_theme/layout_templates/version_switcher.html @@ -3,18 +3,13 @@
- {# #} -
- {{ version }} {# The current version #} - {% for alternate_version, url in alternate_versions %} - {{ alternate_version }} - {% endfor %} +
+ +
diff --git a/extensions/odoo_theme/static/fonts/icomoon.eot b/extensions/odoo_theme/static/fonts/icomoon.eot index 7c60c721a..0f830ea74 100644 Binary files a/extensions/odoo_theme/static/fonts/icomoon.eot and b/extensions/odoo_theme/static/fonts/icomoon.eot differ diff --git a/extensions/odoo_theme/static/fonts/icomoon.svg b/extensions/odoo_theme/static/fonts/icomoon.svg index 998251b66..9ae126b59 100644 --- a/extensions/odoo_theme/static/fonts/icomoon.svg +++ b/extensions/odoo_theme/static/fonts/icomoon.svg @@ -7,73 +7,86 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extensions/odoo_theme/static/fonts/icomoon.ttf b/extensions/odoo_theme/static/fonts/icomoon.ttf index 45c51e5c5..7734fd524 100644 Binary files a/extensions/odoo_theme/static/fonts/icomoon.ttf and b/extensions/odoo_theme/static/fonts/icomoon.ttf differ diff --git a/extensions/odoo_theme/static/fonts/icomoon.woff b/extensions/odoo_theme/static/fonts/icomoon.woff index f267997d9..c69e2012d 100644 Binary files a/extensions/odoo_theme/static/fonts/icomoon.woff and b/extensions/odoo_theme/static/fonts/icomoon.woff differ diff --git a/extensions/odoo_theme/static/img/icons/basic.svg b/extensions/odoo_theme/static/img/icons/basic.svg deleted file mode 100644 index 2f6c268ce..000000000 --- a/extensions/odoo_theme/static/img/icons/basic.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/doc-admin.svg b/extensions/odoo_theme/static/img/icons/doc-admin.svg deleted file mode 100644 index 51d9ad851..000000000 --- a/extensions/odoo_theme/static/img/icons/doc-admin.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/doc-apps.svg b/extensions/odoo_theme/static/img/icons/doc-apps.svg deleted file mode 100644 index 51bd1006b..000000000 --- a/extensions/odoo_theme/static/img/icons/doc-apps.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/doc-contribute.svg b/extensions/odoo_theme/static/img/icons/doc-contribute.svg deleted file mode 100644 index cf52ed375..000000000 --- a/extensions/odoo_theme/static/img/icons/doc-contribute.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/doc-dev.svg b/extensions/odoo_theme/static/img/icons/doc-dev.svg deleted file mode 100644 index 85ccb91bf..000000000 --- a/extensions/odoo_theme/static/img/icons/doc-dev.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/doc-services.svg b/extensions/odoo_theme/static/img/icons/doc-services.svg deleted file mode 100644 index 1a537af68..000000000 --- a/extensions/odoo_theme/static/img/icons/doc-services.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/edit.svg b/extensions/odoo_theme/static/img/icons/edit.svg deleted file mode 100644 index c1750b489..000000000 --- a/extensions/odoo_theme/static/img/icons/edit.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/full-control.svg b/extensions/odoo_theme/static/img/icons/full-control.svg deleted file mode 100644 index 5272b662a..000000000 --- a/extensions/odoo_theme/static/img/icons/full-control.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/help.svg b/extensions/odoo_theme/static/img/icons/help.svg deleted file mode 100644 index 8e0c6a24e..000000000 --- a/extensions/odoo_theme/static/img/icons/help.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/install.svg b/extensions/odoo_theme/static/img/icons/install.svg deleted file mode 100644 index 673320c49..000000000 --- a/extensions/odoo_theme/static/img/icons/install.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/link.svg b/extensions/odoo_theme/static/img/icons/link.svg deleted file mode 100644 index 839f89b56..000000000 --- a/extensions/odoo_theme/static/img/icons/link.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/search.svg b/extensions/odoo_theme/static/img/icons/search.svg deleted file mode 100644 index 5769223a8..000000000 --- a/extensions/odoo_theme/static/img/icons/search.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/tech-knowledge.svg b/extensions/odoo_theme/static/img/icons/tech-knowledge.svg deleted file mode 100644 index 5f2d19ed7..000000000 --- a/extensions/odoo_theme/static/img/icons/tech-knowledge.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/img/icons/tutorials.svg b/extensions/odoo_theme/static/img/icons/tutorials.svg deleted file mode 100644 index d2adbb142..000000000 --- a/extensions/odoo_theme/static/img/icons/tutorials.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - diff --git a/extensions/odoo_theme/static/js/page_toc.js b/extensions/odoo_theme/static/js/page_toc.js index e3729e528..1f7f83ca0 100644 --- a/extensions/odoo_theme/static/js/page_toc.js +++ b/extensions/odoo_theme/static/js/page_toc.js @@ -128,6 +128,10 @@ relatedHeadingRef.setAttribute('data-bs-target', `#${tocEntryList.id}`); relatedHeadingRef.setAttribute('data-bs-toggle', 'collapse'); }); + // TODO [ANV] + // current output: + // desired output: Text + }; })(); diff --git a/extensions/odoo_theme/static/scss/_iconfont.scss b/extensions/odoo_theme/static/scss/_iconfont.scss new file mode 100644 index 000000000..f19d915a1 --- /dev/null +++ b/extensions/odoo_theme/static/scss/_iconfont.scss @@ -0,0 +1,425 @@ +//------------------------------------------------------------------------------ +// icomoon icons +//------------------------------------------------------------------------------ + +[class^="i-"], [class*=" i-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: '#{$icomoon-font-family}' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; +} + + +.i-arrow-up { + &:before { + content: $i-arrow-up; + } +} +.i-arrow-down { + &:before { + content: $i-arrow-down; + } +} +.i-arrow-left { + &:before { + content: $i-arrow-left; + } +} +.i-arrow-right { + &:before { + content: $i-arrow-right; + } +} +.i-chevron-up { + &:before { + content: $i-chevron-up; + } +} +.i-chevron-down { + &:before { + content: $i-chevron-down; + } +} +.i-chevron-left { + &:before { + content: $i-chevron-left; + } +} +.i-chevron-right { + &:before { + content: $i-chevron-right; + } +} +.i-link { + &:before { + content: $i-link; + } +} +.i-websites { + &:before { + content: $i-websites; + } +} +.i-sales { + &:before { + content: $i-sales; + } +} +.i-sales_2 { + &:before { + content: $i-sales_2; + } +} +.i-marketing { + &:before { + content: $i-marketing; + } +} +.i-apps_1 { + &:before { + content: $i-apps_1; + } +} +.i-apps_2 { + &:before { + content: $i-apps_2; + } +} +.i-app_features { + &:before { + content: $i-app_features; + } +} +.i-app-favorites { + &:before { + content: $i-app-favorites; + } +} +.i-basics { + &:before { + content: $i-basics; + } +} +.i-cart { + &:before { + content: $i-cart; + } +} +.i-shop { + &:before { + content: $i-shop; + } +} +.i-accountant { + &:before { + content: $i-accountant; + } +} +.i-customer-reviews { + &:before { + content: $i-customer-reviews; + } +} +.i-hr { + &:before { + content: $i-hr; + } +} +.i-developer { + &:before { + content: $i-developer; + } +} +.i-users { + &:before { + content: $i-users; + } +} +.i-doc-admin { + &:before { + content: $i-doc-admin; + } +} +.i-doc-apps { + &:before { + content: $i-doc-apps; + } +} +.i-doc-contribute { + &:before { + content: $i-doc-contribute; + } +} +.i-doc-dev { + &:before { + content: $i-doc-dev; + } +} +.i-doc-services { + &:before { + content: $i-doc-services; + } +} +.i-documentation { + &:before { + content: $i-documentation; + } +} +.i-scaleup { + &:before { + content: $i-scaleup; + } +} +.i-knowledge { + &:before { + content: $i-knowledge; + } +} +.i-tutorial { + &:before { + content: $i-tutorial; + } +} +.i-elearning_1 { + &:before { + content: $i-elearning_1; + } +} +.i-elearning_2 { + &:before { + content: $i-elearning_2; + } +} +.i-install { + &:before { + content: $i-install; + } +} +.i-o-edu { + &:before { + content: $i-o-edu; + } +} +.i-certifications { + &:before { + content: $i-certifications; + } +} +.i-events { + &:before { + content: $i-events; + } +} +.i-showcase { + &:before { + content: $i-showcase; + } +} +.i-jobs { + &:before { + content: $i-jobs; + } +} +.i-finances { + &:before { + content: $i-finances; + } +} +.i-money-bag { + &:before { + content: $i-money-bag; + } +} +.i-money-plant { + &:before { + content: $i-money-plant; + } +} +.i-o-help { + &:before { + content: $i-o-help; + } +} +.i-o-logo { + &:before { + content: $i-o-logo; + } +} +.i-o-services { + &:before { + content: $i-o-services; + } +} +.i-o-tour { + &:before { + content: $i-o-tour; + } +} +.i-services { + &:before { + content: $i-services; + } +} +.i-operations_1 { + &:before { + content: $i-operations_1; + } +} +.i-operations_2 { + &:before { + content: $i-operations_2; + } +} +.i-performance { + &:before { + content: $i-performance; + } +} +.i-time-management_2 { + &:before { + content: $i-time-management_2; + } +} +.i-time-management { + &:before { + content: $i-time-management; + } +} +.i-advanced { + &:before { + content: $i-advanced; + } +} +.i-search { + &:before { + content: $i-search; + } +} +.i-overview { + &:before { + content: $i-overview; + } +} +.i-view { + &:before { + content: $i-view; + } +} +.i-view-more { + &:before { + content: $i-view-more; + } +} +.i-view-next { + &:before { + content: $i-view-next; + } +} +.i-partners { + &:before { + content: $i-partners; + } +} +.i-contact { + &:before { + content: $i-contact; + } +} +.i-forums { + &:before { + content: $i-forums; + } +} +.i-github { + &:before { + content: $i-github; + } +} +.i-support { + &:before { + content: $i-support; + } +} +.i-collaborating { + &:before { + content: $i-collaborating; + } +} +.i-compare { + &:before { + content: $i-compare; + } +} +.i-themes { + &:before { + content: $i-themes; + } +} +.i-translate { + &:before { + content: $i-translate; + } +} +.i-release { + &:before { + content: $i-release; + } +} +.i-v12 { + &:before { + content: $i-v12; + } +} +.i-v13 { + &:before { + content: $i-v13; + } +} +.i-v14 { + &:before { + content: $i-v14; + } +} +.i-info { + &:before { + content: $i-info; + } +} +.i-warning { + &:before { + content: $i-warning; + } +} +.i-danger { + &:before { + content: $i-danger; + } +} +.i-note { + &:before { + content: $i-note; + } +} +.i-exercise { + &:before { + content: $i-exercise; + } +} +.i-lightbulb { + &:before { + content: $i-lightbulb; + } +} +.i-check { + &:before { + content: $i-check; + } +} +.i-edit { + &:before { + content: $i-edit; + } +} \ No newline at end of file diff --git a/extensions/odoo_theme/static/scss/_mixins.scss b/extensions/odoo_theme/static/scss/_mixins.scss index 1ea6b86fd..473287eaa 100644 --- a/extensions/odoo_theme/static/scss/_mixins.scss +++ b/extensions/odoo_theme/static/scss/_mixins.scss @@ -112,8 +112,7 @@ @mixin inline-icomoon($icon-content, $margin) { content: '#{$icon-content}'; font-family: '#{$icomoon-font-family}' !important; - font-size: 1.8rem; - line-height: 1rem; + font-size: 1.5rem; font-weight: $fw_regular; vertical-align: middle; margin: $margin; diff --git a/extensions/odoo_theme/static/scss/_typography.scss b/extensions/odoo_theme/static/scss/_typography.scss index 0fd351630..feb5bb882 100644 --- a/extensions/odoo_theme/static/scss/_typography.scss +++ b/extensions/odoo_theme/static/scss/_typography.scss @@ -2,6 +2,10 @@ // Typography // ============================================================================= +//------------------------------------------------------------------------------ +// Fonts +//------------------------------------------------------------------------------ + @font-face { font-family: '#{$icomoon-font-family}'; src: url('#{$icomoon-font-path}/#{$icomoon-font-family}.eot?6i2y1w'); diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss index 25295118c..f16f98e97 100644 --- a/extensions/odoo_theme/static/scss/_variables.scss +++ b/extensions/odoo_theme/static/scss/_variables.scss @@ -161,24 +161,9 @@ $fw_black: 900; // Colors //------------------------------------------------------------------------------ -$o-color-palettes: ( - ( - 'o-color-1': #00a09d, - 'o-color-2': #875a7b, - 'o-color-3': #9ba6b0, - 'o-color-4': #ffffff, - 'o-color-5': #000000, - - 'o-cc1-text': '800', - 'o-cc1-headings': '900', - 'o-cc1-link': 'o-color-2', - - 'footer': '900', - ), -); - -$o-violet-dark: #875a7b; -$o-violet-darker: #603c5e; +$o-violet: #875a7b; +$o-violet-dark: #7A436B; +$o-violet-darkest: #64305E; $o-inverse-lightest: #98a6b0; $o-inverse-light: #8b979f; @@ -187,7 +172,7 @@ $o-inverse-dark: #5b7687; $o-inverse-darker: #485761; $color-alpha: #00A19B; -$color-alpha-dark: #00615F; +$color-alpha-dark: #00807D; $color-alpha-light: #26d1af; $color-alpha-lightest: #2aebc4; @@ -222,10 +207,10 @@ $gray-darker: #282F33; $gray-darkest: shade-color($gray-darker, 30%); -$primary: #00A19B; -$secondary: #603c5e; +$primary: $color-alpha-dark; +$secondary: $o-violet-dark; -$brand-primary : $o-violet-dark; +$brand-primary : $o-violet; $brand-success : #50AF51; $brand-info: #4B9EB6; $brand-warning : #F0AD4E; @@ -237,47 +222,7 @@ $doc_exercise: #938E94; $doc_code-bg: $gray-darker; $doc_lime: #CDDC39; $doc_orange: #FF5722; -$doc_cyan: #00A19B; - -$o-theme-color-palettes: ( - ( - 'default': #adb5bd, // 500 - - 'violet-dark': $o-violet-dark, - 'violet-darker': $o-violet-darker, - - 'inverse-lightest': $o-inverse-lightest, - 'inverse-light': $o-inverse-light, - 'inverse': $o-inverse, - 'inverse-dark': $o-inverse-dark, - 'inverse-darker': $o-inverse-darker, - - 'alpha': $color-alpha, - 'alpha-dark': $color-alpha-dark, - 'alpha-light': $color-alpha-light, - 'alpha-lightest': $color-alpha-lightest, - - 'beta': $color-beta, - 'beta-dark': $color-beta-dark, - 'beta-light': $color-beta-light, - 'beta-lightest': $color-beta-lightest, - - 'gamma': $color-gamma, - 'gamma-dark': $color-gamma-dark, - 'gamma-light': $color-gamma-light, - 'gamma-lightest': $color-gamma-lightest, - - 'delta': $color-delta, - 'delta-dark': $color-delta-dark, - 'delta-light': $color-delta-light, - 'delta-lightest': $color-delta-lightest, - - 'epsilon': $color-epsilon, - 'epsilon-dark': $color-epsilon-dark, - 'epsilon-light': $color-epsilon-light, - 'epsilon-lightest': $color-epsilon-lightest, - ), -); +$doc_cyan: $color-alpha; //------------------------------------------------------------------------------ // Misc @@ -303,73 +248,86 @@ $o-ease: cubic-bezier(.55,0,.1,1); $icomoon-font-family: "icomoon" !default; $icomoon-font-path: "fonts" !default; -$i-accountant: "\e900"; -$i-advanced: "\e901"; -$i-app_features: "\e902"; -$i-app-favorites: "\e903"; +$i-arrow-up: "\e948"; +$i-arrow-down: "\e945"; +$i-arrow-left: "\e946"; +$i-arrow-right: "\e947"; +$i-chevron-up: "\e94c"; +$i-chevron-down: "\e949"; +$i-chevron-left: "\e94a"; +$i-chevron-right: "\e94b"; +$i-link: "\e94f"; +$i-websites: "\e944"; +$i-sales: "\e953"; +$i-sales_2: "\e931"; +$i-marketing: "\e922"; $i-apps_1: "\e904"; $i-apps_2: "\e905"; +$i-app_features: "\e902"; +$i-app-favorites: "\e903"; $i-basics: "\e906"; $i-cart: "\e907"; -$i-certifications: "\e908"; -$i-check: "\e909"; -$i-collaborating: "\e90a"; -$i-compare: "\e90b"; -$i-contact: "\e90c"; +$i-shop: "\e937"; +$i-accountant: "\e900"; $i-customer-reviews: "\e90d"; +$i-hr: "\e91c"; $i-developer: "\e90e"; +$i-users: "\e93f"; $i-doc-admin: "\e90f"; $i-doc-apps: "\e910"; $i-doc-contribute: "\e911"; $i-doc-dev: "\e912"; $i-doc-services: "\e913"; $i-documentation: "\e914"; +$i-scaleup: "\e934"; +$i-knowledge: "\e920"; +$i-tutorial: "\e93e"; $i-elearning_1: "\e915"; $i-elearning_2: "\e916"; -$i-events: "\e917"; -$i-exercise: "\e918"; -$i-finances: "\e919"; -$i-forums: "\e91a"; -$i-github: "\e91b"; -$i-hr: "\e91c"; -$i-info: "\e91d"; $i-install: "\e91e"; +$i-o-edu: "\e926"; +$i-certifications: "\e908"; +$i-events: "\e917"; +$i-showcase: "\e938"; $i-jobs: "\e91f"; -$i-knowledge: "\e920"; -$i-lightbulb: "\e921"; -$i-marketing: "\e922"; +$i-finances: "\e919"; $i-money-bag: "\e923"; $i-money-plant: "\e924"; -$i-note: "\e925"; -$i-o-edu: "\e926"; $i-o-help: "\e927"; $i-o-logo: "\e928"; $i-o-services: "\e929"; $i-o-tour: "\e92a"; +$i-services: "\e936"; $i-operations_1: "\e92b"; $i-operations_2: "\e92c"; -$i-overview: "\e92d"; -$i-partners: "\e92e"; $i-performance: "\e92f"; -$i-release: "\e930"; -$i-sales_2: "\e931"; -$i-sales_3: "\e932"; -$i-sales_1: "\e933"; -$i-scaleup: "\e934"; -$i-search: "\e935"; -$i-services: "\e936"; -$i-shop: "\e937"; -$i-showcase: "\e938"; -$i-support: "\e939"; -$i-themes: "\e93a"; $i-time-management_2: "\e93b"; $i-time-management: "\e93c"; +$i-advanced: "\e901"; +$i-search: "\e935"; +$i-overview: "\e92d"; +$i-view: "\e952"; +$i-view-more: "\e950"; +$i-view-next: "\e951"; +$i-partners: "\e92e"; +$i-contact: "\e90c"; +$i-forums: "\e91a"; +$i-github: "\e91b"; +$i-support: "\e939"; +$i-collaborating: "\e90a"; +$i-compare: "\e90b"; +$i-themes: "\e93a"; $i-translate: "\e93d"; -$i-tutorial: "\e93e"; -$i-users: "\e93f"; +$i-release: "\e930"; $i-v12: "\e940"; $i-v13: "\e941"; $i-v14: "\e942"; +$i-info: "\e91d"; $i-warning: "\e943"; -$i-websites: "\e944"; +$i-danger: "\e94d"; +$i-note: "\e925"; +$i-exercise: "\e918"; +$i-lightbulb: "\e921"; +$i-check: "\e909"; +$i-edit: "\e932"; diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss index fdbd68abe..8428cdc27 100644 --- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss +++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss @@ -3,7 +3,7 @@ // // The contrast ratio value that determines when the lightness of color changes from "dark" to "light". Acceptable values are 3 , 4.5 and 7. -$min-contrast-ratio: 3; +$min-contrast-ratio: 4.5; // Components // $enable-shadows : true; @@ -21,8 +21,6 @@ $border-radius-sm: 1rem / 16 !default; // Font, line-height, and color for body text, headings, and more. $font-size-base: 0.875rem; -$body-color: $gray-dark; - $line-height-base: 1.45 !default; $h1-font-size: $font-size-base * (39 / 15) !default; diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 8893e7a2f..cbd82a336 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -3,374 +3,7 @@ @import "scss/bootstrap_scss/bootstrap"; @import "scss/_mixins"; @import "scss/_typography"; - -// TODO EDI remove -aside#o_page_toc .active > a{ - background-color: red; -} - -//------------------------------------------------------------------------------ -// icomoon icons -//------------------------------------------------------------------------------ - -[class^="i-"], [class*=" i-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: '#{$icomoon-font-family}' !important; - speak: never; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; -} - -.i-accountant { - &:before { - content: $i-accountant; - } -} -.i-advanced { - &:before { - content: $i-advanced; - } -} -.i-app_features { - &:before { - content: $i-app_features; - } -} -.i-app-favorites { - &:before { - content: $i-app-favorites; - } -} -.i-apps_1 { - &:before { - content: $i-apps_1; - } -} -.i-apps_2 { - &:before { - content: $i-apps_2; - } -} -.i-basics { - &:before { - content: $i-basics; - } -} -.i-cart { - &:before { - content: $i-cart; - } -} -.i-certifications { - &:before { - content: $i-certifications; - } -} -.i-check { - &:before { - content: $i-check; - } -} -.i-collaborating { - &:before { - content: $i-collaborating; - } -} -.i-compare { - &:before { - content: $i-compare; - } -} -.i-contact { - &:before { - content: $i-contact; - } -} -.i-customer-reviews { - &:before { - content: $i-customer-reviews; - } -} -.i-developer { - &:before { - content: $i-developer; - } -} -.i-doc-admin { - &:before { - content: $i-doc-admin; - } -} -.i-doc-apps { - &:before { - content: $i-doc-apps; - } -} -.i-doc-contribute { - &:before { - content: $i-doc-contribute; - } -} -.i-doc-dev { - &:before { - content: $i-doc-dev; - } -} -.i-doc-services { - &:before { - content: $i-doc-services; - } -} -.i-documentation { - &:before { - content: $i-documentation; - } -} -.i-elearning_1 { - &:before { - content: $i-elearning_1; - } -} -.i-elearning_2 { - &:before { - content: $i-elearning_2; - } -} -.i-events { - &:before { - content: $i-events; - } -} -.i-exercise { - &:before { - content: $i-exercise; - } -} -.i-finances { - &:before { - content: $i-finances; - } -} -.i-forums { - &:before { - content: $i-forums; - } -} -.i-github { - &:before { - content: $i-github; - } -} -.i-hr { - &:before { - content: $i-hr; - } -} -.i-info { - &:before { - content: $i-info; - } -} -.i-install { - &:before { - content: $i-install; - } -} -.i-jobs { - &:before { - content: $i-jobs; - } -} -.i-knowledge { - &:before { - content: $i-knowledge; - } -} -.i-lightbulb { - &:before { - content: $i-lightbulb; - } -} -.i-marketing { - &:before { - content: $i-marketing; - } -} -.i-money-bag { - &:before { - content: $i-money-bag; - } -} -.i-money-plant { - &:before { - content: $i-money-plant; - } -} -.i-note { - &:before { - content: $i-note; - } -} -.i-o-edu { - &:before { - content: $i-o-edu; - } -} -.i-o-help { - &:before { - content: $i-o-help; - } -} -.i-o-logo { - &:before { - content: $i-o-logo; - } -} -.i-o-services { - &:before { - content: $i-o-services; - } -} -.i-o-tour { - &:before { - content: $i-o-tour; - } -} -.i-operations_1 { - &:before { - content: $i-operations_1; - } -} -.i-operations_2 { - &:before { - content: $i-operations_2; - } -} -.i-overview { - &:before { - content: $i-overview; - } -} -.i-partners { - &:before { - content: $i-partners; - } -} -.i-performance { - &:before { - content: $i-performance; - } -} -.i-release { - &:before { - content: $i-release; - } -} -.i-sales_2 { - &:before { - content: $i-sales_2; - } -} -.i-sales_3 { - &:before { - content: $i-sales_3; - } -} -.i-sales_1 { - &:before { - content: $i-sales_1; - } -} -.i-scaleup { - &:before { - content: $i-scaleup; - } -} -.i-search { - &:before { - content: $i-search; - } -} -.i-services { - &:before { - content: $i-services; - } -} -.i-shop { - &:before { - content: $i-shop; - } -} -.i-showcase { - &:before { - content: $i-showcase; - } -} -.i-support { - &:before { - content: $i-support; - } -} -.i-themes { - &:before { - content: $i-themes; - } -} -.i-time-management_2 { - &:before { - content: $i-time-management_2; - } -} -.i-time-management { - &:before { - content: $i-time-management; - } -} -.i-translate { - &:before { - content: $i-translate; - } -} -.i-tutorial { - &:before { - content: $i-tutorial; - } -} -.i-users { - &:before { - content: $i-users; - } -} -.i-v12 { - &:before { - content: $i-v12; - } -} -.i-v13 { - &:before { - content: $i-v13; - } -} -.i-v14 { - &:before { - content: $i-v14; - } -} -.i-warning { - &:before { - content: $i-warning; - } -} -.i-websites { - &:before { - content: $i-websites; - } -} - - +@import "scss/_iconfont"; div[aria-label="related navigation"] { display: none; @@ -406,12 +39,9 @@ header.o_main_header{ padding-left: 3rem; margin-right: 3rem; > .o_logo { - height: $o-header-height; - display: flex; - align-items: center; img { - margin-top: -12px; - margin-right: 1rem; + margin-right: 0.2rem; + vertical-align: text-bottom; } span { font-size: 2rem; @@ -424,12 +54,11 @@ header.o_main_header{ width: 90%; max-width: 500px; .btn{ - @include o-position-absolute($top: 50%, $right: .5rem); + @include o-position-absolute($top: 50%, $right: 1rem); @include transform (translateY(-50%)) ; - &:before{ - @include inline-icon('img/icons/search.svg' , 20px, 0); - opacity: .3; - } + padding: 0; + font-size: 1.2rem; + color: $gray; } } .o_languages { @@ -471,9 +100,9 @@ header.o_main_header{ a{ display: block; padding: .5rem 0; - color: $o-violet-darker; + color: $o-violet-dark; text-decoration: none; - opacity: .5; + opacity: .75; &.current, &:hover { opacity: 1; } @@ -486,8 +115,7 @@ header.o_main_header{ > .toctree-l1 { > a:before { - @include inline-icomoon($i-doc-apps, 0 1rem 0 0); - margin-left: -30px; + @include inline-icomoon($i-doc-apps, 0 1rem 0 -30px); } &.o_menu_applications > a:before{ content:'#{$i-doc-apps}'; @@ -540,19 +168,20 @@ dt { a.headerlink { visibility: hidden; + &:after { + @include inline-icomoon($i-link, 0 1rem 0 0); + visibility: hidden; + color: $gray-light; + opacity: 0; + transition: .1s + } } -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink, -caption:hover > a.headerlink, -p.caption:hover > a.headerlink, -div.code-block-caption:hover > a.headerlink { - visibility: visible; +h1, h2, h3, h4, h5, h6, dt, caption, p.caption, div.code-block-caption { + &:hover > a.headerlink:after{ + visibility: visible; + opacity: 1; + } } #wrap { @@ -586,28 +215,29 @@ div.code-block-caption:hover > a.headerlink { &.index{ h2[class*="o_title_"] { - color: $o-violet-darker; + color: $o-violet-dark; font-weight: $fw_bold; margin-bottom: 1rem; &:before { - @include inline-icon('img/icons/full-control.svg' , 50px, 0 1rem 0 0); + @include inline-icomoon($i-o-services , 0 1rem 0 0); display: block; + font-size: 50px; margin: 0 auto 20px; } &.o_title_start:before { - background-image: url('img/icons/full-control.svg'); + content: '#{$i-o-services}'; } &.o_title_install:before { - background-image: url('img/icons/install.svg'); + content: '#{$i-install}'; } &.o_title_basic:before { - background-image: url('img/icons/basic.svg'); + content: '#{$i-basics}'; } &.o_title_tutorial:before { - background-image: url('img/icons/tutorials.svg'); + content: '#{$i-elearning_1}'; } &.o_title_advanced:before { - background-image: url('img/icons/tech-knowledge.svg'); + content: '#{$i-advanced}'; } } ul { @@ -617,16 +247,9 @@ div.code-block-caption:hover > a.headerlink { padding-bottom: 1rem; a { display: block; - color: $gray-700; font-weight: $fw_bold; padding-bottom: .5rem; } - p { - color: $gray-500; - } - &:hover a, &:hover p { - color: $primary; - } } } } @@ -747,16 +370,17 @@ div.code-block-caption:hover > a.headerlink { position: relative; .o_git_link { - color: $gray-light; + color: $gray; @include o-position-absolute($top: 0, $right: 1rem); - - &:before{ - @include inline-icon('img/icons/edit.svg' , 18px, 0 .5rem 0 0); + i { + font-size: 1.2rem; + margin-right: .2rem; } } h1 { margin-bottom: 2rem; + max-width: calc(100% - 120px); } h2 { @@ -765,15 +389,11 @@ div.code-block-caption:hover > a.headerlink { border-bottom: 1px solid $gray-light; margin-bottom: 2rem; margin-top: 2rem; - - &::after{ - @include inline-icon('img/icons/link.svg' , 24px, 0 0 0 1rem); - } } h3 { font-size: 20px; - font-weight: regular; + font-weight: $fw_regular; color: $gray-darker; } @@ -808,7 +428,7 @@ div.code-block-caption:hover > a.headerlink { font-weight: $fw_bold; &:before { - @include inline-icomoon($i-info, 0 .5rem 0 0); + @include inline-icomoon($i-info, 0 .2rem 0 0); @include media-breakpoint-down(md) { display:none; } @@ -963,7 +583,9 @@ div.code-block-caption:hover > a.headerlink { // } } */ } - + .o_page_toc_nav > ul { + padding-left: 0; + } h3 { text-transform: uppercase; font-weight: $fw_bold; @@ -971,14 +593,6 @@ div.code-block-caption:hover > a.headerlink { color: $gray-darker; } - > ul { - padding-left: 0; - - > li > .o_page_toc_title { - display:none; - } - } - ul { list-style: none; @@ -990,9 +604,15 @@ div.code-block-caption:hover > a.headerlink { &.o_page_toc_title { display:none; + + ul { + padding-left: 0; + } } } } + .active > a{ + font-weight: $fw_bold; + } } } @@ -1001,7 +621,7 @@ div.code-block-caption:hover > a.headerlink { color: $gray-light; border-radius: $border-radius; padding: 1rem; - margin-bottom: ($line-height-base/2)rem; + margin-bottom: ($line-height-base/2)*1rem; pre { margin-bottom: 0; @@ -1043,10 +663,6 @@ footer{ font-size: 20px; font-weight: $fw_bold; margin-bottom: 1.5rem; - - &::before { - @include inline-icon('img/icons/help.svg' , 30px, 0 1rem 0 0); - } } } @@ -1067,8 +683,7 @@ footer{ } .accordion-body { - background: $gray-lightest; - border-bottom: 1px solid tint-color($primary, 50%); + background: $gray-100; > li > a { font-weight: $fw-regular; }