pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] web: optimize scss variables declaration

Browse Source 
Mirror web_enterprise variables declaration to ease enterprise's
overrides. Reorganize variables in order to keep a consistent assignment
structure across versions.

This commit will also add '!default' flags in boostrap_overidden.scss,
allowing enterprise to reuse customization already defined in community.
This commit is contained in:
stefanorigano (SRI)
2021-06-18 21:31:27 +02:00
committed by Aaron Bohy
parent 14bffd983e
commit b389d38a36
3 changed files with 86 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/legacy/scss/bootstrap_overridden.scss
Vendored
+13 -9
View File
@@ -10,14 +10,15 @@
// All of those are BS default
$white: #fff !default;
$gray-100: $o-gray-100 !default;
$gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
$gray-400: #ced4da !default;
$gray-500: #adb5bd !default;
$gray-600: #6c757d !default;
$gray-700: #495057 !default;
$gray-800: #343a40 !default;
$gray-900: #212529 !default;
$gray-200: $o-gray-200 !default;
$gray-300: $o-gray-300 !default;
$gray-400: $o-gray-400 !default;
$gray-500: $o-gray-500 !default;
$gray-600: $o-gray-600 !default;
$gray-700: $o-gray-700 !default;
$gray-800: $o-gray-800 !default;
$gray-900: $o-gray-900 !default;
$black: #000 !default;
$primary: $o-brand-primary !default;
@@ -34,13 +35,14 @@ $body-color: $o-main-text-color !default;
//
// Style anchor elements.
$link-color: $o-main-link-color !default;
$link-hover-decoration: none !default;
// Muted
//
// Style .text-muted elements
$text-muted: $gray-500 !default;
$text-muted: $o-main-color-muted !default;
// Grid columns
//
@@ -53,6 +55,7 @@ $grid-gutter-width: $o-horizontal-padding * 2 !default;
// Define common padding and border radius sizes and more.
$border-radius: 3px !default;
$border-color: $o-gray-300 !default;
$component-active-color: $o-brand-primary !default;
$component-active-bg: $gray-200 !default;
@@ -73,6 +76,7 @@ $h4-font-size: $font-size-base * 1.2 !default;
$h5-font-size: $font-size-base * 1.1 !default;
$headings-font-weight: bold !default;
$headings-color: $o-main-headings-color !default;
// Tables
//
addons/web/static/src/legacy/scss/primary_variables.scss
+72 -61
View File
@@ -4,39 +4,51 @@
///
// Font sizes
$o-root-font-size: 12px;
$o-font-size-base: 13rem * (1px / $o-root-font-size);
$o-line-height-base: 1.5; // This is BS default
$o-root-font-size: 12px !default;
$o-font-size-base: 13rem * (1px / $o-root-font-size) !default;
$o-line-height-base: 1.5 !default; // This is BS default
// Colors
$o-community-color: #7C7BAD;
$o-enterprise-color: #875A7B;
$o-enterprise-primary-color: #00A09D;
$o-community-color: #7C7BAD !default;
$o-enterprise-color: #875A7B !default;
$o-enterprise-primary-color: #00A09D !default;
$o-brand-odoo: $o-community-color;
$o-brand-primary: $o-community-color;
$o-brand-odoo: $o-community-color !default;
$o-brand-primary: $o-community-color !default;
$o-brand-secondary: #f0eeee;
$o-brand-lightsecondary: #e2e2e0;
$o-gray-100: #f8f9fa; // This is BS default
$o-brand-secondary: #f0eeee !default;
$o-brand-lightsecondary: #e2e2e0 !default;
$o-main-color-muted: #a8a8a8;
$o-main-text-color: #4c4c4c;
// This is BS default
$o-gray-100: #f8f9fa !default;
$o-gray-200: #e9ecef !default;
$o-gray-300: #dee2e6 !default;
$o-gray-400: #ced4da !default;
$o-gray-500: #adb5bd !default;
$o-gray-600: #6c757d !default;
$o-gray-700: #495057 !default;
$o-gray-800: #343a40 !default;
$o-gray-900: #212529 !default;
$o-view-background-color: white;
$o-shadow-color: #303030;
$o-main-text-color: $o-gray-700 !default;
$o-main-color-muted: rgba($o-main-text-color, .7) !default;
$o-main-headings-color: $o-gray-900 !default;
$o-main-link-color: darken($o-brand-primary, 5%) !default;
$o-form-lightsecondary: #ccc;
$o-view-background-color: white !default;
$o-shadow-color: #303030 !default;
$o-list-footer-bg-color: #eee;
$o-list-footer-font-weight: bold;
$o-form-lightsecondary: #ccc !default;
$o-tooltip-background-color: white;
$o-tooltip-color: #666666;
$o-tooltip-arrow-color: white;
$o-tooltip-text-color: #777777;
$o-tooltip-title-text-color: black;
$o-tooltip-title-background-color: #F7F7F7;
$o-list-footer-bg-color: #eee !default;
$o-list-footer-font-weight: bold !default;
$o-tooltip-background-color: white !default;
$o-tooltip-color: #666666 !default;
$o-tooltip-arrow-color: white !default;
$o-tooltip-text-color: #777777 !default;
$o-tooltip-title-text-color: black !default;
$o-tooltip-title-background-color: #F7F7F7 !default;
// Layout
//
@@ -53,66 +65,65 @@ $o-extra-grid-breakpoints: (
lg: 992px,
xl: 1200px,
xxl: 1534px,
);
) !default;
$o-form-group-cols: 12 !default;
$o-form-spacing-unit: 5px !default;
$o-horizontal-padding: 16px !default;
$o-innergroup-rpadding: 45px !default;
$o-dropdown-hpadding: 20px !default;
$o-form-group-cols: 12;
$o-form-spacing-unit: 5px;
$o-horizontal-padding: 16px;
$o-innergroup-rpadding: 45px;
$o-dropdown-hpadding: 20px;
$o-sheet-vpadding: 24px !default;
$o-sheet-vpadding: 24px;
$o-statbutton-height: 44px !default;
$o-statbutton-vpadding: 0px !default;
$o-statbutton-spacing: 6px !default;
$o-statbutton-height: 44px;
$o-statbutton-vpadding: 0px;
$o-statbutton-spacing: 6px;
$o-modal-lg: 980px;
$o-modal-md: 650px;
$o-modal-lg: 980px !default;
$o-modal-md: 650px !default;
// Needed for having no spacing between sheet and mail body in mass_mailing:
// Different required cancel paddings between web and web_enterprise
$o-sheet-cancel-tpadding: 0px;
$o-sheet-cancel-tpadding: 0px !default;
$o-avatar-size: 90px;
$o-avatar-size: 90px !default;
$o-statusbar-height: 33px;
$o-statusbar-height: 33px !default;
$o-label-font-size-factor: 0.8;
$o-navbar-height: 46px;
$o-label-font-size-factor: 0.8 !default;
$o-navbar-height: 46px !default;
$o-nb-calendar-colors: 24;
$o-nb-calendar-colors: 24 !default;
$o-base-settings-mobile-tabs-height: 40px;
$o-base-settings-mobile-tabs-overflow-gap: 3%;
$o-base-settings-mobile-tabs-height: 40px !default;
$o-base-settings-mobile-tabs-overflow-gap: 3% !default;
$o-cp-breadcrumb-height: 30px;
$o-cp-breadcrumb-height: 30px !default;
$o-datepicker-week-color: #8f8f8f;
$o-datepicker-week-color: #8f8f8f !default;
$o-card-body-bg-opacity: 0.9;
$o-card-body-bg-opacity: 0.9 !default;
// Kanban
$o-kanban-default-record-width: 300px;
$o-kanban-small-record-width: 240px;
$o-kanban-default-record-width: 300px !default;
$o-kanban-small-record-width: 240px !default;
$o-kanban-header-title-height: 50px;
$o-kanban-header-title-height: 50px !default;
$o-kanban-image-width: 64px;
$o-kanban-image-fill-width: 95px;
$o-kanban-inside-vgutter: 8px;
$o-kanban-inside-hgutter: 8px;
$o-kanban-color-border-width: 3px;
$o-kanban-inner-hmargin: 5px;
$o-kanban-progressbar-height: 20px;
$o-kanban-image-width: 64px !default;
$o-kanban-image-fill-width: 95px !default;
$o-kanban-inside-vgutter: 8px !default;
$o-kanban-inside-hgutter: 8px !default;
$o-kanban-color-border-width: 3px !default;
$o-kanban-inner-hmargin: 5px !default;
$o-kanban-progressbar-height: 20px !default;
$o-kanban-mobile-tabs-height: 40px;
$o-kanban-mobile-empty-height: $o-kanban-image-width;
$o-kanban-mobile-tabs-height: 40px !default;
$o-kanban-mobile-empty-height: $o-kanban-image-width !default;
// ------- Kanban dashboard variables -------
// Used to manage spacing in complex dropdown menu
$o-kanban-dashboard-dropdown-complex-gap: 5px;
$o-kanban-dashboard-dropdown-complex-gap: 5px !default;
// Form view
addons/web/static/src/legacy/scss/secondary_variables.scss
+1 -1
View File
@@ -1,4 +1,4 @@
$o-webclient-background-color: desaturate($o-gray-100, 100%) !default;
$o-webclient-background-color: $o-gray-100 !default;
$o-control-panel-background-color: $o-view-background-color !default;
$o-list-footer-color: $o-main-text-color !default;