diff options
Diffstat (limited to 'addons/web/static/src')
3 files changed, 56 insertions, 66 deletions
diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss index 09dd5ddbfd4..edff888acbf 100644 --- a/addons/web/static/src/scss/bootstrap_overridden.scss +++ b/addons/web/static/src/scss/bootstrap_overridden.scss @@ -20,21 +20,21 @@ $gray-800: #343a40 !default; $gray-900: #212529 !default; $black: #000 !default; -$primary: $o-brand-primary; -$secondary: $white; +$primary: $o-brand-primary !default; +$secondary: $white !default; // Body // // Settings for the `<body>` element. -$body-bg: $o-brand-secondary; -$body-color: $o-main-text-color; +$body-bg: $o-brand-secondary !default; +$body-color: $o-main-text-color !default; // Links // // Style anchor elements. -$link-hover-decoration: none; +$link-hover-decoration: none !default; // Muted // @@ -46,53 +46,53 @@ $text-muted: $gray-500 !default; // // Set the number of columns and specify the width of the gutters. -$grid-gutter-width: $o-horizontal-padding * 2; +$grid-gutter-width: $o-horizontal-padding * 2 !default; // Components // // Define common padding and border radius sizes and more. -$border-radius: 3px; +$border-radius: 3px !default; -$component-active-color: $o-brand-primary; -$component-active-bg: $gray-200; +$component-active-color: $o-brand-primary !default; +$component-active-bg: $gray-200 !default; // Fonts // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; +$font-family-sans-serif: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif !default; -$font-size-base: $o-font-size-base; -$line-height-base: $o-line-height-base; +$font-size-base: $o-font-size-base !default; +$line-height-base: $o-line-height-base !default; -$h1-font-size: $o-font-size-base * 2.0; -$h2-font-size: $o-font-size-base * 1.5; -$h3-font-size: $o-font-size-base * 1.3; -$h4-font-size: $o-font-size-base * 1.2; -$h5-font-size: $o-font-size-base * 1.1; +$h1-font-size: $o-font-size-base * 2.0 !default; +$h2-font-size: $o-font-size-base * 1.5 !default; +$h3-font-size: $o-font-size-base * 1.3 !default; +$h4-font-size: $o-font-size-base * 1.2 !default; +$h5-font-size: $o-font-size-base * 1.1 !default; -$headings-font-weight: bold; +$headings-font-weight: bold !default; // Tables // // Customizes the `.table` component with basic values, each used across all table variations. -$table-accent-bg: rgba($black, .01); -$table-hover-bg: rgba($black, .04); +$table-accent-bg: rgba($black, .01) !default; +$table-hover-bg: rgba($black, .04) !default; // Dropdowns // // Dropdown menu container and contents. -$dropdown-border-color: $gray-300; +$dropdown-border-color: $gray-300 !default; -$dropdown-link-color: $o-main-text-color; -$dropdown-link-hover-color: $gray-900; -$dropdown-link-hover-bg: $gray-200; +$dropdown-link-color: $o-main-text-color !default; +$dropdown-link-hover-color: $gray-900 !default; +$dropdown-link-hover-bg: $gray-200 !default; -$dropdown-link-active-color: $gray-900; -$dropdown-link-active-bg: $gray-300; +$dropdown-link-active-color: $gray-900 !default; +$dropdown-link-active-bg: $gray-300 !default; // Z-index master list @@ -111,39 +111,29 @@ $dropdown-link-active-bg: $gray-300; // Navs -$nav-tabs-link-active-bg: $white; +$nav-tabs-link-active-bg: $white !default; -$nav-pills-border-radius: 0; -$nav-pills-link-active-color: $white; -$nav-pills-link-active-bg: $o-brand-primary; - -// Navbar - -// FIXME $navbar-height ? $navbar-margin-bottom ? $navbar-inverse-* ? $navbar-border-radius ? +$nav-pills-border-radius: 0 !default; +$nav-pills-link-active-color: $white !default; +$nav-pills-link-active-bg: $o-brand-primary !default; // Badges -// FIXME $badge-bg, $badge-color, $badge-line-height ? -$badge-font-weight: normal; +$badge-font-weight: normal !default; // Modals // Padding applied to the modal body -$modal-inner-padding: $o-horizontal-padding; +$modal-inner-padding: $o-horizontal-padding !default; -// FIXME $modal-title-padding ? - -$modal-lg: 980px; -$modal-md: 650px; +$modal-lg: 980px !default; +$modal-md: 650px !default; // Breadcrumbs -$breadcrumb-padding-y: 0; -$breadcrumb-padding-x: 0; -$breadcrumb-margin-bottom: 0; - -$breadcrumb-bg: $o-control-panel-background-color; -// FIXME $breadcrumb-color ? -$breadcrumb-active-color: #777777; +$breadcrumb-padding-y: 0 !default; +$breadcrumb-padding-x: 0 !default; +$breadcrumb-margin-bottom: 0 !default; -// FIXME $icon-font-path ? +$breadcrumb-bg: $o-control-panel-background-color !default; +$breadcrumb-active-color: #777777 !default; diff --git a/addons/web/static/src/scss/bootstrap_overridden_frontend.scss b/addons/web/static/src/scss/bootstrap_overridden_frontend.scss index f803cf3e72d..b36ccc0ae24 100644 --- a/addons/web/static/src/scss/bootstrap_overridden_frontend.scss +++ b/addons/web/static/src/scss/bootstrap_overridden_frontend.scss @@ -2,4 +2,4 @@ // // Font, line-height, and color for body text, headings, and more. -$font-size-base: $o-theme-font-size-base; +$font-size-base: $o-theme-font-size-base !default; diff --git a/addons/web/static/src/scss/secondary_variables.scss b/addons/web/static/src/scss/secondary_variables.scss index c612c17dcb1..5b9d6ab239d 100644 --- a/addons/web/static/src/scss/secondary_variables.scss +++ b/addons/web/static/src/scss/secondary_variables.scss @@ -1,34 +1,34 @@ -$o-webclient-background-color: desaturate($o-gray-100, 100%); -$o-control-panel-background-color: $o-view-background-color; +$o-webclient-background-color: desaturate($o-gray-100, 100%) !default; +$o-control-panel-background-color: $o-view-background-color !default; -$o-list-footer-color: $o-main-text-color; -$o-list-group-header-color: lighten($o-brand-lightsecondary, 10%); +$o-list-footer-color: $o-main-text-color !default; +$o-list-group-header-color: lighten($o-brand-lightsecondary, 10%) !default; // UI custom colors for tags, kanban records' colors, ...) // Note: the first value is the old BS3 gray-light value $o-colors: lighten(#000, 46.7%), #F06050, #F4A460, #F7CD1F, #6CC1ED, #814968, - #EB7E7F, #2C8397, #475577, #D6145F, #30C381, #9365B8; + #EB7E7F, #2C8397, #475577, #D6145F, #30C381, #9365B8 !default; -$o-sheet-cancel-hpadding: $o-horizontal-padding; -$o-sheet-cancel-bpadding: $o-horizontal-padding; +$o-sheet-cancel-hpadding: $o-horizontal-padding !default; +$o-sheet-cancel-bpadding: $o-horizontal-padding !default; -$o-statusbar-arrow-width: $o-statusbar-height / 3; -$o-statusbar-disabled-bg: lighten($o-brand-lightsecondary, 7%); +$o-statusbar-arrow-width: $o-statusbar-height / 3 !default; +$o-statusbar-disabled-bg: lighten($o-brand-lightsecondary, 7%) !default; -$o-navbar-inverse-link-hover-bg: darken($o-brand-odoo, 10%); +$o-navbar-inverse-link-hover-bg: darken($o-brand-odoo, 10%) !default; -$o-datepicker-week-bg-color: lighten($o-datepicker-week-color, 30%); +$o-datepicker-week-bg-color: lighten($o-datepicker-week-color, 30%) !default; // Kanban -$o-kanban-record-margin: $o-horizontal-padding / 2; -$o-kanban-group-padding: $o-horizontal-padding; // Cannot be higher than this +$o-kanban-record-margin: $o-horizontal-padding / 2 !default; +$o-kanban-group-padding: $o-horizontal-padding !default; // Cannot be higher than this -$o-kanban-inside-hgutter-mobile: $o-horizontal-padding; +$o-kanban-inside-hgutter-mobile: $o-horizontal-padding !default; // ------- Kanban dashboard variables ------- // Since rows and containers are used inside cards, we're // forced to set the padding relative to the grid system. -$o-kanban-dashboard-hpadding: $o-horizontal-padding; -$o-kanban-dashboard-vpadding: $o-horizontal-padding / 2; +$o-kanban-dashboard-hpadding: $o-horizontal-padding !default; +$o-kanban-dashboard-vpadding: $o-horizontal-padding / 2 !default; |