NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP][CSS]Change order of imported scss files

Browse Source 
The aim of this cleanup is to use as many bootstrap classes, functions
and utilities as possible to reduce the amount of extra code.
Instead of redefining variables, BS variables are overridden in the
bootstrap_overridden file.

In order to be able to reuse these overridden variables within our own
custom variable file — and after consultation with SRI — it was
determined that the variables.scss file should come after the bootstrap
files in the order of importation, unlike the order of odoo website's
scss files.

Changes to variables in bootstrap_overridden have been made to adapt to
the new structure.
This commit is contained in:
Elisabeth Dickinson 2022-12-29 11:13:17 +01:00 committed by Antoine Vandevenne (anv)
parent 3d73e4c5b4
commit 1638484a82
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/odoo_theme/static/scss/_variables.scss
View File

@ -118,15 +118,6 @@ $o-gray-border: $gray-400;
$o-gray-bg: $gray-200;
$o-gray-color: $gray-900;
$o-violet : #7A436B; //Odoo's #875a7b Doesn't give AAA contrast on white background
$o-blue : #77b5d1;
$o-cyan: #0dcaf0;
$o-teal : #017e84;
$o-green : #519161;
$o-orange: #f39c1e;
$o-red: #D9534F;
$o-red-light: #FF5722;
$o-literals-bg: $gray-200;
$o-literals-border: $o-literals-bg;

38
extensions/odoo_theme/static/scss/bootstrap_overridden.scss vendored
View File

@ -4,18 +4,6 @@
/* $enable-responsive-font-sizes: true; */
// Colors
$blue: $o-blue;
$purple: $o-violet;
$cyan: $o-cyan;
$red: $o-red;
$orange: $o-orange;
$green: $o-green;
$teal: $o-teal;
$primary: $o-teal;
$secondary: $o-violet;
$light: $o-light;
$dark: $o-dark;
$white: #FFFFFF;
$gray-100: #F8F8F8 !default;
$gray-200: #F2F2F2 !default;
@ -26,6 +14,19 @@ $gray-600: #888888 !default;
$gray-700: #707070 !default;
$gray-800: #343A40 !default;
$gray-900: #282F33 !default;
$blue: #77b5d1;
$purple: #714B67;
$cyan: #0dcaf0;
$red: #D9534F;
$orange: #f39c1e;
$green: #519161;
$teal: #017e84;
$primary: $teal;
$secondary: $purple;
$light: $gray-100;
$dark: $gray-600;
$success: $green;
$info: $blue;
$warning: $orange;
@ -44,6 +45,13 @@ $h4-font-size: $font-size-base * 1.266 !default;
$h5-font-size: $font-size-base * 1.125 !default;
$h6-font-size: $font-size-base !default;
$font-weight-lighter: 200;
$font-weight-light: 300;
$font-weight-normal: 400;
$font-weight-bold: 600;
$font-weight-bolder: 800;
// Images
$thumbnail-padding: .5rem;
@ -52,7 +60,7 @@ $thumbnail-padding: .5rem;
// For each of Bootstrap's buttons, define text, background, and border color.
$btn-font-size: .875rem;
$btn-font-weight: $fw_semibold;
$btn-font-weight: $font-weight-medium;
$btn-close-focus-shadow: 0 0 0 0 transparent;
$btn-close-bg: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" fill="#000000"><path d="M15,16c-.27,0-.54-.11-.73-.31l-4.21-4.44c-.38-.4-.36-1.03,.04-1.41s1.03-.36,1.41,.04l3.48,3.67,3.42-3.67c.38-.4,1.01-.42,1.41-.05,.4,.38,.42,1.01,.05,1.41l-4.15,4.44c-.19,.2-.45,.32-.73,.32h0Z"/><path d="M10.79,20.44c-.25,0-.49-.09-.69-.27-.4-.38-.42-1.01-.04-1.41l4.21-4.45c.19-.2,.45-.31,.73-.31h0c.28,0,.54,.12,.73,.32l4.15,4.45c.38,.4,.35,1.04-.05,1.41-.41,.38-1.04,.35-1.41-.05l-3.42-3.67-3.48,3.67c-.2,.21-.46,.31-.73,.31Z"/><path d="M15,28.37c-7.37,0-13.37-6-13.37-13.37S7.63,1.63,15,1.63s13.37,6,13.37,13.37-6,13.37-13.37,13.37Zm0-24.74C8.73,3.63,3.63,8.73,3.63,15s5.1,11.37,11.37,11.37,11.37-5.1,11.37-11.37S21.27,3.63,15,3.63Z"/></svg>');
$btn-close-width: 2rem;
@ -77,8 +85,8 @@ $modal-xl: fit-content;
// Accordion
$accordion-body-padding-y: 0 !default;
$accordion-body-padding-x: 0 !default;
$accordion-color: shade-color($o-accordion-bg, 60%) !default;
$accordion-bg: $o-accordion-bg;
$accordion-color: shade-color($gray-200, 60%) !default;
$accordion-bg: $gray-200;
$accordion-button-color: $accordion-color !default;
$accordion-button-active-color: $accordion-button-color !default;

2
extensions/odoo_theme/static/style.scss
View File

@ -1,8 +1,8 @@
@import "scss/bootstrap_scss/_functions.scss";
@import "scss/_sphinx_basic";
@import "scss/_variables";
@import "scss/bootstrap_overridden";
@import "scss/bootstrap_scss/bootstrap";
@import "scss/_variables";
@import "scss/_mixins";
@import "scss/_typography";
@import "scss/_iconfont";