From 72278a1210c6f9f7fd60e90df9f5dc26c8fa7a61 Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Mon, 22 Feb 2021 17:12:48 +0100 Subject: [PATCH 01/13] add 'master' to doc versions --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c0f780b3a..97f7bf1d1 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ clean: $(RM_CMD) extensions/odoo_theme/static/style.css @echo "Cleaning finished." -#edi: SPHINXOPTS += -A collapse_menu=True # If needed, comment rather than setting False -edi: VERSIONS += 12.0,13.0,14.0 +# edi: SPHINXOPTS += -A collapse_menu=True # If needed, comment rather than setting False +edi: VERSIONS += 12.0,13.0,14.0,master edi: CANONICAL_VERSION += 14.0 edi: LANGUAGES += en,fr,es edi: CURRENT_LANG += fr From bd4a43312405394ed61ff222d4215c7e924e843b Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Fri, 26 Feb 2021 11:06:05 +0100 Subject: [PATCH 02/13] add o_deepest_active_toc_entry class on deepest active
  • --- extensions/odoo_theme/static/js/menu.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/odoo_theme/static/js/menu.js b/extensions/odoo_theme/static/js/menu.js index 516bd655a..fff83bd34 100644 --- a/extensions/odoo_theme/static/js/menu.js +++ b/extensions/odoo_theme/static/js/menu.js @@ -16,8 +16,9 @@ * * TOC entries (
  • elements) that are on the path of the displayed page receive the * `o_active_toc_entry` class, and their related (parent) TOC entry list (
      elements) receive - * the `show` (Bootstrap) class. The child TOC entry list of the deepest TOC entry also - * receives the `show` class. + * the `show` (Bootstrap) class. + * Also, the deepest TOC entry receives the `o_deepest_active_toc_entry` class, and its child + * TOC entry list receives the `show` class. */ const _flagActiveTocEntriesAndLists = () => { let deepestTocEntry = undefined; @@ -32,6 +33,7 @@ } }) if (deepestTocEntry) { + deepestTocEntry.classList.add('o_deepest_active_toc_entry'); const childTocEntryList = deepestTocEntry.querySelector('ul'); if (childTocEntryList) { childTocEntryList.classList.add('show'); From 352477bbac933734d2688b4d49d23a6c15eee0e7 Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Fri, 26 Feb 2021 11:19:52 +0100 Subject: [PATCH 03/13] add o_deepest_active_toc_entry class on deepest active
    • 2 --- extensions/odoo_theme/static/js/menu.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/odoo_theme/static/js/menu.js b/extensions/odoo_theme/static/js/menu.js index fff83bd34..47b23f92e 100644 --- a/extensions/odoo_theme/static/js/menu.js +++ b/extensions/odoo_theme/static/js/menu.js @@ -33,11 +33,13 @@ } }) if (deepestTocEntry) { - deepestTocEntry.classList.add('o_deepest_active_toc_entry'); const childTocEntryList = deepestTocEntry.querySelector('ul'); if (childTocEntryList) { childTocEntryList.classList.add('show'); + } else { // If the toc entry is not a TOC, add the class to its closest ancestor entry + deepestTocEntry = deepestTocEntry.parentElement.parentElement; } + deepestTocEntry.classList.add('o_deepest_active_toc_entry'); } }; From 6bb05c41feafd0f8dd9be2aededa7291c7f1e56e Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 16:43:12 +0100 Subject: [PATCH 04/13] Makefile fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 97f7bf1d1..5b6bf304e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ edi: LANGUAGES += en,fr,es edi: CURRENT_LANG += fr edi: clean html -static: extensions/odoo_theme/static extensions/odoo_theme/static/style.css +static: extensions/odoo_theme/static/style.css cp -r extensions/odoo_theme/static/* _build/html/_static/ html: extensions/odoo_theme/static/style.css @@ -48,7 +48,7 @@ html: extensions/odoo_theme/static/style.css fast: SPHINXOPTS += -A collapse_menu=True fast: html -extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/*.scss +extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss @echo "Compiling stylesheets..." pysassc $(subst .css,.scss,$@) $@ @echo "Compilation finished." From 9026a86ee9b59e09321aee224cd7dacda38e0f16 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 16:28:52 +0100 Subject: [PATCH 05/13] [DESIGN] link icon updated --- .../odoo_theme/static/fonts/icomoon.eot | Bin 59140 -> 58612 bytes .../odoo_theme/static/fonts/icomoon.svg | 2 +- .../odoo_theme/static/fonts/icomoon.ttf | Bin 58976 -> 58448 bytes .../odoo_theme/static/fonts/icomoon.woff | Bin 59052 -> 58524 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/odoo_theme/static/fonts/icomoon.eot b/extensions/odoo_theme/static/fonts/icomoon.eot index 0f830ea7484b844dc8d50a2d06001034f1134dcb..46b76f911b3b11dfda343f7e203ccefd960c4c84 100644 GIT binary patch delta 662 zcmXw$KWGzi6vyAYe@VQ%CYQ_QlD3KQQgbDc;x)ZklF-z}K_TfVL6J}^fi_LfWauEq zK}0$=I29Zegcb*v6jvR(C@5V75h+?Ch^}=~s_)YFxBTAweLwH}{r&ho_`n{%Wrf25 zz`~#>ztSR>(o!w8=bW> z<84!apJuMDG#6{XdOLRjzI`J7Wuvy%f;zJaa6o>LSgkddHm~^pP`^$5!&bB10hSaP zTyS+@+5RHl{@A6nf3G=U-@sMafENJjELtAI%~g*DE`nvu9Gnd6Q7PTO@24l|4nYkY@xv zf*a+=m^Mq-Ic9V`&LIhD*a9OKuVgZnxT7a{42a006l6F(;AnQdR1K?+k{Lxw3CYM{ zYCh`34BQWnNGhi*j+Qq{)$W+y3Zx^FpAAaHBnuH@6s0g}4sD|e{yooglHd_}+~asv zrsBxrdFDr^9K)Dl#GFXMKpK^TtY5@PI^d|`YAJ4Oj-s=u%CgFxi?m~v3?7MyvZ~0V znV_SORZB)*bMk>O$51qjVgQA+y5qjboGd5`IY%#@M|>(s98ZffPX4?e{@IM^NZZ*Q}I zu>Kb3-#a>d^9G^VArCispHO;o9bW$_mB!=ocOua5NuPWL40hlUJ|V4vxwx0kA39bX85 z`?wfQ7AJGK7PjJ2+K5W$6f3X_%>u{fOy`K4k)!4jb%vF1xT}zbDb@;vEttwdwiy#& z;KEVH|HOImJb2ar45SfyjAtUb%ch5YF5w(G4rl!qx8K=-sWsf>xG^_96~hyW+LHmU zA&=vaaH1|wb9+-?sC*h!+6^DU$#^+In6cqK5>7TS6Mo`${{)C?wN1ya1nI)H2*7_b zFEGt9s7xUj*nm&C?hW&Pf2*|SL*mUT3J9Pw98hzjs+EIbz!w49&$y|TTJ@sgIELY| zR8dt1%;V=oRsn3oa0EA(SoJv^|J=Xmf@(O1sL<@9RbKapezE^ldBaP*q98zqB9CLJ zrbuN$pp_sAdQnt+VkWkSoK!bWT|oFDLn>rS`B_nsNw)>p;!N>2xLnnRzP{)oP=-T-(>&*k)sXCskG8C9gBNa1CwW;7E-5m`2CwJ7QZ$wGxOYN}aB07)(u5^t@v z)%Wv5ZzFUoCh#CkijgRVC@nU67-Z#OJD#f}z3UiRTU8Rp=OM_9DUc|xZdi^X_>Y^Z z>B5?-P)oyL1WB4h>l@{*e$hklGIJOxIT@%#4M$_lRYAL8MAw2es5tf|uI_mZzcLVP z-LR2AQFbOg3S$g;JOgyg(ox9Ja-VL)RM7)&`fQ{xSWB_4VFr^_o;w?H|Du|ammtl>V9)@`QW3& Mw~l%z%lGfVzqSC$q5uE@ diff --git a/extensions/odoo_theme/static/fonts/icomoon.svg b/extensions/odoo_theme/static/fonts/icomoon.svg index 9ae126b59..e9ba92415 100644 --- a/extensions/odoo_theme/static/fonts/icomoon.svg +++ b/extensions/odoo_theme/static/fonts/icomoon.svg @@ -84,7 +84,7 @@ - + diff --git a/extensions/odoo_theme/static/fonts/icomoon.ttf b/extensions/odoo_theme/static/fonts/icomoon.ttf index 7734fd524a490b0dea75d4e74bc13e48c4b70db9..15fff3aaff0d32406ea70eac474ebf5824ceec26 100644 GIT binary patch delta 645 zcmXw$KWGzi6vyAYKS}D{HMv|amo&XIUTUrcu6Ru^mLxQFaZqR+OHd?eCD5kHnGBtb zlSrqEAQT*QvN#Bm;#vm>5rr&51u3<55OsADs_)YFxBTAweLwH}{r&jue`E*m*^T+$ zo2}?&0DK6r_q4H8znywMJ_oQr0RV*t9R%085cSuopJ+6@YYR-ML;Zc4SzKw|s{eYl zeHY-{F6pnD^|dxMm`#8K@`Lnhy}7h`W#ljQTf{$Tw>n*5NrA%)z78z=dgspP9v%JL z;edS$S78HQ0w}ZS%oHxVbC{owYmR21rp9AxED&^Zm@%`KJB5~GO;H_CV<$x3Kq4{( zI47z*i>`xZ--~=yhirVW{B*&c$qwf&Lfu}OuwhjG6j5WrQ49wBC_lz>S-Q?Kqv3H5 zNl3#En7UE5?W*BvX&xg2vM5FwPK$V|YgB4+#gpwZ6y=zN3})w(o^Ik^bW~J0P4?8H zS*i6>T04?Uh+#G=5|b$_*eq&2inruk1i&xwJcz~g}96^V)?hv%6e_JWSOY3g30 zWFn10us#%sr@rp9A?okWU~w3n2$3YAa|QY%mdMmfYu z1U>YCcO?!L;#5%~(G!;lsR$uZ5aI^hD%1lP#HEL{REP_`aYBlDV>`r`^~`(k`+eV& zc7J_Hj~~&y>*>YD=hp~gM2(V?!&RD z9hYx3dHD>n1k2DW3T;6;Qxrs@T0qsQR-x%FLl!1lOAxhTVh3qcQv2S)7sWK51;6&c zUyh05sU?xA-BZlsfOv?bq)}`T#%UIT2!Tw3mw2;wCWEF zL4TvX5vS*qze1LlkWiK+uQmgP!b zF0mUk*!^X2!2{iLEm@=4dAqV241-eta%Ig={E{R=h9bwc^t?<}Nut#-345H^Uz(cj zA(EQ;G;d0%KV-<7poW@`B-4>RTae;S7`r;xH|Je<-aI)p%x=}0wE%9Kxtw|7W<1kCyyse3N7oW95KB-Q(;(42)3RMl3SLC>9<1mZwGCX1q$o2OeXX+5 zFZn25VJ-tLrvg=|V7!&rP7XzWS vt^7j_S-jrl@zpKy#TY-2E*~c#jYjt#KKV}HZ4EB%eX{?-LGS3!(_i2}p4r3K diff --git a/extensions/odoo_theme/static/fonts/icomoon.woff b/extensions/odoo_theme/static/fonts/icomoon.woff index c69e2012de167b50f275395db860f6c664faa295..73f450283928a5efc27e3be4814b1b616773fd22 100644 GIT binary patch delta 685 zcmXw$PiWIn9LL`;e>;<`Nz)|ly4IS`W)wTfy42E^RWCg#v^z>cr0Afqb!}|L9mL)| z>}1(#(1U{D5D}!qs~)^44tCIsNRcu`^r|Oi`b)Px`0{@5_ddVx_k}#)rw8w7{cg2f zCO~i<4u~+>R|stPzv=x8<=$vO$Y}6tH&AY@)^8E=wT(p9Q{?gNas!*#+r{&oCw`0Z zHJaT`?0p~vu6e3ZzRr5djT`{ld8io_2&Q zQ-9j6P8T0{@8#b+pL#SQ|6VhMenYO3hvXR{Y7XqB>_ul8GK;!l8!<36J*Wja-cCWn zOj^zYShlr*HKzqnh)fKSNFZRJ+&VdMY$$qO=%d+a<9THkv(8d-GH)U3^ood0qB5t5 z7UZXa=e#H{#&T$U&M{-aaSmPq4%@_x#;WObHRc*|7Gwcv5Carr$gbwZN;O?|mGlgV zN>Bm{l9$46)PzxBT2vWBakaczs`Vm9TTX>UKOGQ}NfbiJC`w`8n%IWp>^{pfBF76X z95AdZVR2-$EcHEIi9*ygqi(2R0*;CS+AlyTCA+F#E5#hmRSX(bNm7|}p-!}#h9dz$ zQWa??9dM0Etz_mkH!tf9h0!z!GH_=N*ZUr8zMv@R9KL)W;1MS>EG|qHcu8d$IKTpb z@G$pz#W(v_eL8i+U;Ir32782jxxV(}bRRw$-v^42?YYCfGi#~!d~<7~+o}x5hwtG( DGNFj# delta 1217 zcmYjQPi)&%829Jr*na+#_+MhLL9H7n&9rPGPU57Ms&?C~nzn)= zb|5xz;DETm;4le^OD{te0u>>Sa0H3VBqRtk#MA*4EA&*mvBAKB3x!9~vVf)wKB?lDU)&-elXU+1GH}s1A=gP}& z>=t<*G6Z>ST`>eA@jR*cvEK{B+Qo_39&!@RFf<K_<=O9g{IdYv3?d z=la^LZO>{ad#cu{SkpSdD_Sn6T{_tlsF+a%A_xRtB}zs$KoF4Sa;+AIJwKkQP)ZCX zYx5vV#X{^ZmR9>-e&{X-PQ?Hggh4P8xezABMh}CmY_COAb)g)EPE^jiBcJ2 z+0k^<)_L!|kr)mvDl#!u42BoQDYU*^UhNlM1TRyYf}E3ph(xzlN*x8%b9#8oPyC8) zU1928#PBNv-qLgn`D1xK<&i0+$m8munWlz9hNg3^4P!;e%=F2gHe=33nu-~usoXr- zWBvstBT@lgCK*G`P~qVGA2;M@?t71}zm{8k%&GX}<9hhQ`qt@w@cCg3{AhI7Ir?7N TY7VY$f41}9Ztvj1(Xa3nmhR1) From eeebf93eb3709ec6195436c7e20deb9e958de548 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 16:34:58 +0100 Subject: [PATCH 06/13] [DESIGN] update font-sizes : now base size is 16px and secondary font size is 14px --- .../odoo_theme/static/scss/_mixins.scss | 2 +- .../odoo_theme/static/scss/_variables.scss | 1 + .../static/scss/bootstrap_overridden.scss | 23 +++++-------------- extensions/odoo_theme/static/style.scss | 7 +++--- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/extensions/odoo_theme/static/scss/_mixins.scss b/extensions/odoo_theme/static/scss/_mixins.scss index 918b5e2ac..ec05f79bd 100644 --- a/extensions/odoo_theme/static/scss/_mixins.scss +++ b/extensions/odoo_theme/static/scss/_mixins.scss @@ -112,7 +112,7 @@ @mixin inline-icomoon($icon-content, $margin) { content: '#{$icon-content}'; font-family: '#{$icomoon-font-family}' !important; - font-size: 1.5rem; + @include font-size(1.5rem); font-weight: $fw_regular; vertical-align: middle; margin: $margin; diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss index a6b795129..1484789f6 100644 --- a/extensions/odoo_theme/static/scss/_variables.scss +++ b/extensions/odoo_theme/static/scss/_variables.scss @@ -241,6 +241,7 @@ $website-2x-prefix: "2x_"; // Animations and Transitions $o-ease: cubic-bezier(.55,0,.1,1); +$font-size-secondary: .875rem; //------------------------------------------------------------------------------ // icomoon icons //------------------------------------------------------------------------------ diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss index 6ddb6c608..0f6a79ddb 100644 --- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss +++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss @@ -20,23 +20,12 @@ $border-radius-sm: 1rem / 16 !default; // // Font, line-height, and color for body text, headings, and more. -$font-size-base: 0.875rem; -$line-height-base: 1.45 !default; - - -$h1-font-size: $font-size-base * 2.5 !default; -$h2-font-size: $font-size-base * 2 !default; -$h3-font-size: $font-size-base * 1.75 !default; -$h4-font-size: $font-size-base * 1.5 !default; -$h5-font-size: $font-size-base * 1.25 !default; -$h6-font-size: $font-size-base !default; - -/* $h1-font-size: $font-size-base * (39 / 15) !default; -$h2-font-size: $font-size-base * (32 / 15) !default; -$h3-font-size: $font-size-base * (26 / 15) !default; -$h4-font-size: $font-size-base * (19 / 15) !default; -$h5-font-size: $font-size-base * (15 / 15) !default; -$h6-font-size: $font-size-base * (13 / 15) !default; */ +$h1-font-size: 1.875rem; +$h2-font-size: 1.5rem; +$h3-font-size: 1.125rem; +$h4-font-size: 1rem; +$h5-font-size: 1rem; +$h6-font-size: $font-size-secondary; /* $headings-font-weight: $fw_semibold !default; */ diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index dacb370f0..9ce963c19 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -11,7 +11,6 @@ div[aria-label="related navigation"] { } body { - font-size: $font-size-base; a { text-decoration: none !important; } @@ -86,6 +85,7 @@ header.o_main_header{ padding-left: 3rem; background-color: lighten($o-violet-dark, 70%) ; z-index: 10; + @include font-size($font-size-secondary); > ul { padding-left: 30px !important; @@ -205,7 +205,7 @@ header.o_main_header{ &:before { @include inline-icomoon($i-o-services , 0 1rem 0 0); display: block; - font-size: 50px; + @include font-size(50px); margin: 0 auto 20px; } &.o_title_start:before { @@ -359,6 +359,7 @@ header.o_main_header{ .o_git_link { color: $gray; @include o-position-absolute($top: 0, $right: 1rem); + @include font-size($font-size-secondary); i { font-size: 1.2rem; margin-right: .2rem; @@ -391,6 +392,7 @@ header.o_main_header{ visibility: hidden !important; &:after { @include inline-icomoon($i-link, 0 1rem 0 0); + @include font-size($font-size-base); visibility: hidden; font-size: 1rem; color: $gray-light; @@ -460,7 +462,6 @@ header.o_main_header{ } > h3, > .alert-title { - font-size: 1.642857143em; line-height: 1em; margin: 0 0 10px 0; font-size: 1rem; From 713c8269c12359098bafd2698aae5e8f4499b12b Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 17:43:59 +0100 Subject: [PATCH 07/13] [DESIGN] redesigned code blocks on has_code_col pages --- .../odoo_theme/static/scss/_mixins.scss | 2 +- .../odoo_theme/static/scss/_sphinx_basic.scss | 8 +-- extensions/odoo_theme/static/style.scss | 60 ++++++++++++------- 3 files changed, 43 insertions(+), 27 deletions(-) diff --git a/extensions/odoo_theme/static/scss/_mixins.scss b/extensions/odoo_theme/static/scss/_mixins.scss index ec05f79bd..3ea75789a 100644 --- a/extensions/odoo_theme/static/scss/_mixins.scss +++ b/extensions/odoo_theme/static/scss/_mixins.scss @@ -130,7 +130,7 @@ } @mixin code-col(){ - content: ""; + /* content: ""; Deactivating has_code_col background */ background: $doc_code-bg; /* @include box-shadow(inset 40px 0 40px -18px rgba(22, 24, 29, 0.3)); */ @include o-position-absolute($top: 3rem, $right:0); diff --git a/extensions/odoo_theme/static/scss/_sphinx_basic.scss b/extensions/odoo_theme/static/scss/_sphinx_basic.scss index 56253baab..b17ef4eac 100644 --- a/extensions/odoo_theme/static/scss/_sphinx_basic.scss +++ b/extensions/odoo_theme/static/scss/_sphinx_basic.scss @@ -625,9 +625,9 @@ pre { overflow-y: hidden; /* fixes display issues on Chrome browsers */ } -pre, div[class*="highlight-"] { +/* pre, div[class*="highlight-"] { clear: both; -} +} */ span.pre { -moz-hyphens: none; @@ -636,9 +636,9 @@ span.pre { hyphens: none; } -div[class*="highlight-"] { +/* div[class*="highlight-"] { margin: 1em 0; -} +} */ td.linenos pre { border: 0; diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 9ce963c19..7e4e9dc48 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -331,16 +331,24 @@ header.o_main_header{ pre { font-size: 12px; } + } - .content-switcher { - margin-top:0; + .content-switcher { - > ul { - margin-bottom: 0; - } + .nav-tabs .nav-link.active { + background-color: #f8f8f8; + border-color: #dee2e6 #dee2e6 #f8f8f8; + font-weight: $fw_semibold; + } - > ul > li { - color: $gray-lightest; + .tab-content { + display:flex; + background: $doc_code-bg; + border: 1px $gray-300 solid; + border-top: 0; + + div[class^="highlight"] { + margin: 0; } } } @@ -357,28 +365,41 @@ header.o_main_header{ position: relative; .o_git_link { - color: $gray; - @include o-position-absolute($top: 0, $right: 1rem); @include font-size($font-size-secondary); + @include o-position-absolute($top: 1rem, $right: 1rem); i { - font-size: 1.2rem; margin-right: .2rem; } } dt { - padding-top: $o-header-height; - margin-top: -$o-header-height; + &:before { + content: ''; + display: block; + width: 0; + height: 0; + padding-top: $o-header-height + 10px; + margin-top: -$o-header-height - 10px; + } } section { - // This fixes the scroll position - padding-top: $o-header-height; - margin-top: -$o-header-height; + // This fixes the scroll position // BUT creates issues when buttons or links from the previous section are behind it + /* padding-top: $o-header-height; + margin-top: -$o-header-height; */ + // adding a :before works better; + &:before { + content: ''; + display: block; + width: 0; + height: 0; + padding-top: $o-header-height + 10px; + margin-top: -$o-header-height - 10px; + } > h1 { color: $o-violet-dark; - font-weight: $fw_semibold; + font-weight: $fw_bold; max-width: calc(100% - 120px); } @@ -416,15 +437,10 @@ header.o_main_header{ } - &:not(.has_code_col) { - div[class^="highlight"] { - border: 1px solid $gray-light; - } - } - div[class^="highlight"] { // This styles the consoles like read-the-doc's consoles overflow-x: auto; + border: 1px solid $gray-light; margin: 1px 0 24px 0; div[class^="highlight"] { From 51d08f3c36fd5c33cad2ebaed1cb7beeafbf37ac Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 16:44:43 +0100 Subject: [PATCH 08/13] add hidden class --- extensions/odoo_theme/static/style.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 7e4e9dc48..679a3d370 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -18,6 +18,12 @@ body { margin-left: 1rem; } } + +.hidden { + visibility: hidden !important; + display: none !important; + opacity: 0 !important; +} //------------------------------------------------------------------------------ // Header with logo, searchbar and switchers //------------------------------------------------------------------------------ From 9a019b40dd030d74c8bbb1dd9090e71e535d299f Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 17:38:14 +0100 Subject: [PATCH 09/13] css cleanup --- .../odoo_theme/static/scss/_mixins.scss | 24 +- .../odoo_theme/static/scss/_variables.scss | 258 ++++++------------ .../static/scss/bootstrap_overridden.scss | 19 -- extensions/odoo_theme/static/style.scss | 142 ++++------ 4 files changed, 138 insertions(+), 305 deletions(-) diff --git a/extensions/odoo_theme/static/scss/_mixins.scss b/extensions/odoo_theme/static/scss/_mixins.scss index 3ea75789a..dff9fd41e 100644 --- a/extensions/odoo_theme/static/scss/_mixins.scss +++ b/extensions/odoo_theme/static/scss/_mixins.scss @@ -85,29 +85,7 @@ transform : $args; } -//-- Material Design Icons -@mixin mdi-icon($content){ - font-family: 'Material-Design-Icons'; - content: $content; - display: inline-block; - text-rendering: geometricPrecision; - font-size: 1em; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -@mixin inline-icon($img-url, $size, $margin){ - content: ''; - display: inline-block; - width: $size; - height: $size; - vertical-align: middle; - background-size: contain; - background-repeat: no-repeat; - background-image: url($img-url); - margin: $margin; - -} +//-- add icon @mixin inline-icomoon($icon-content, $margin) { content: '#{$icon-content}'; diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss index 1484789f6..798eb5869 100644 --- a/extensions/odoo_theme/static/scss/_variables.scss +++ b/extensions/odoo_theme/static/scss/_variables.scss @@ -59,93 +59,6 @@ $color-epsilon-lightest : #FF8D63; // Typography // =============================================== -$fw_extralight : 200; -$fw_light : 300; -$fw_regular : 400; -$fw_medium : 500; -$fw_semibold : 600; -$fw_bold : 800; -$fw_extrabold : 900; - -// Fonts -// =============================================== -// As a base font, we use bts4 native font stack: -// website/static/src/scss/primary_variables.scss - -$font-family-serif: Georgia, "Times New Roman", Times, serif; - -$o-website-values-palettes: ( - ( - "font-number": 1, - "headings-font-number": 2, - "navbar-font-number": 1, - "buttons-font-number": 1, - ), -); - -//------------------------------------------------------------------------------ -// Website customizations -//------------------------------------------------------------------------------ - -$o-website-values-palettes: ( - ( - // Font - 'font': 'Inter', - 'headings-font': 'Inter', - 'navbar-font': 'Inter', - 'buttons-font': 'Inter', - - 'font-size-base': 0.875rem, - - 'link-underline': 'never', - - 'btn-ripple': true, - - // Buttons - 'btn-padding-y': 0.375rem, - 'btn-padding-x': 0.75rem, - 'btn-font-size': 0.875rem, - 'btn-padding-y-sm': 0.25rem, - 'btn-padding-x-sm': 0.375rem, - 'btn-font-size-sm': .75rem, - 'btn-padding-y-lg': 0.625rem, - 'btn-padding-x-lg': 1rem, - 'btn-font-size-lg': 1rem, - - 'btn-border-radius': 0.125rem, - 'btn-border-radius-sm': 0.125rem, - 'btn-border-radius-lg': 0.125rem, - - // Inputs - 'input-padding-y': 0.375rem, - 'input-padding-x': 0.75rem, - 'input-font-size': 0.875rem, - 'input-padding-y-sm': 0.25rem, - 'input-padding-x-sm': 0.375rem, - 'input-font-size-sm': 0.75rem, - 'input-padding-y-lg': 0.625rem, - 'input-padding-x-lg': 1rem, - 'input-font-size-lg': 1rem, - - 'input-border-radius': 0.125rem, - 'input-border-radius-sm': 0.125rem, - 'input-border-radius-lg': 0.125rem, - - // Footer - 'footer-effect': 'slideout_slide_hover', - ), -); - -//------------------------------------------------------------------------------ -// Fonts -//------------------------------------------------------------------------------ - -$o-theme-font-configs: ( - 'Inter': ( - 'family': ('Inter', sans-serif), - 'url': 'Inter:200,300,400,500,600,700,800,900', - ) -); $fw_extralight: 200; $fw_light: 300; @@ -156,91 +69,6 @@ $fw_bold: 700; $fw_extrabold: 800; $fw_black: 900; - -//------------------------------------------------------------------------------ -// Colors -//------------------------------------------------------------------------------ - -$o-violet: #875a7b; -$o-violet-dark: #7A436B; -$o-violet-darkest: #64305E; - -$o-inverse-lightest: #98a6b0; -$o-inverse-light: #8b979f; -$o-inverse: #47738f; -$o-inverse-dark: #5b7687; -$o-inverse-darker: #485761; - -$color-alpha: #00A19B; -$color-alpha-dark: #00807D; -$color-alpha-light: #26d1af; -$color-alpha-lightest: #2aebc4; - -$color-beta: #5b899e; -$color-beta-dark: #3d5d6b; -$color-beta-light: #699fb8; -$color-beta-lightest: #77b5d1; - -$color-gamma: #e46f78; -$color-gamma-dark: #b0565c; -$color-gamma-light: #fc7c84; -$color-gamma-lightest: #fc959c; - -$color-delta: #5c5b80; -$color-delta-dark: #37364d; -$color-delta-light: #6e6d99; -$color-delta-lightest: #807fb3; - -$color-epsilon: #d5653e; -$color-epsilon-dark: #a34e2f; -$color-epsilon-light: #f07346; -$color-epsilon-lightest: #ff8d63; - -$header-link-normal: #343a40; - -$gray-lightest: #F9F9F9; -$gray-lighter: #F2F2F2; -$gray-light: #d5d5d5; -$gray: #888888; -$gray-dark: #707070; -$gray-darker: #282F33; -$gray-darkest: shade-color($gray-darker, 30%); - - -$primary: $color-alpha-dark; -$secondary: $o-violet-dark; - -$brand-primary : $o-violet; -$brand-success : #50AF51; -$brand-info: #4B9EB6; -$brand-warning : #f39c1e; -$brand-danger : #D9534F; - -$doc_paper_dark: $gray-lighter; -$doc_paper: #ffffff; -$doc_exercise: #938E94; -$doc_code-bg: #F8F8F8; -$doc_lime: #CDDC39; -$doc_orange: #FF5722; -$doc_cyan: $color-alpha; - -//------------------------------------------------------------------------------ -// Misc -//------------------------------------------------------------------------------ - -// Header -$o-header-height: 90px; -$o-side-nav-width: 350px; -$o-on-page-width: 25%; -$o-header-white: #ffffff; - -// Paths and Prefixes -$website-img-base-url: "../img/"; -$website-2x-prefix: "2x_"; - -// Animations and Transitions -$o-ease: cubic-bezier(.55,0,.1,1); - $font-size-secondary: .875rem; //------------------------------------------------------------------------------ // icomoon icons @@ -332,3 +160,89 @@ $i-lightbulb: "\e921"; $i-check: "\e909"; $i-edit: "\e932"; + +//------------------------------------------------------------------------------ +// Colors +//------------------------------------------------------------------------------ + +$o-violet: #875a7b; +$o-violet-dark: #7A436B; +$o-violet-darkest: #64305E; + +$o-inverse-lightest: #98a6b0; +$o-inverse-light: #8b979f; +$o-inverse: #47738f; +$o-inverse-dark: #5b7687; +$o-inverse-darker: #485761; + +$color-alpha: #00A19B; +$color-alpha-dark: #00807D; +$color-alpha-light: #26d1af; +$color-alpha-lightest: #2aebc4; + +$color-beta: #5b899e; +$color-beta-dark: #3d5d6b; +$color-beta-light: #699fb8; +$color-beta-lightest: #77b5d1; + +$color-gamma: #e46f78; +$color-gamma-dark: #b0565c; +$color-gamma-light: #fc7c84; +$color-gamma-lightest: #fc959c; + +$color-delta: #5c5b80; +$color-delta-dark: #37364d; +$color-delta-light: #6e6d99; +$color-delta-lightest: #807fb3; + +$color-epsilon: #d5653e; +$color-epsilon-dark: #a34e2f; +$color-epsilon-light: #f07346; +$color-epsilon-lightest: #ff8d63; + +$header-link-normal: #343a40; + +$gray-lightest: #F9F9F9; +$gray-lighter: #F2F2F2; +$gray-light: #d5d5d5; +$gray: #888888; +$gray-dark: #707070; +$gray-darker: #282F33; +$gray-darkest: shade-color($gray-darker, 30%); + + +$primary: $color-alpha-dark; +$secondary: $o-violet-dark; + +$brand-primary : $o-violet; +$brand-success : #50AF51; +$brand-info: #4B9EB6; +$brand-warning : #f39c1e; +$brand-danger : #D9534F; + +$doc_paper_dark: $gray-lighter; +$doc_paper: #ffffff; +$doc_exercise: #938E94; +$doc_code-bg: #F8F8F8; +$doc_lime: #CDDC39; +$doc_orange: #FF5722; +$doc_cyan: $color-alpha; + +//------------------------------------------------------------------------------ +// Misc +//------------------------------------------------------------------------------ + +// Header +$o-header-height: 90px; +$o-side-nav-width: 350px; +$o-on-page-width: 25%; +$o-header-white: #ffffff; + +// Paths and Prefixes +$website-img-base-url: "../img/"; +$website-2x-prefix: "2x_"; + +// Animations and Transitions +$o-ease: cubic-bezier(.55,0,.1,1); + + diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss index 0f6a79ddb..ff4743552 100644 --- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss +++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss @@ -9,13 +9,6 @@ $enable-shadows : true; // Define common padding and border radius sizes and more. -$line-height-lg: 1.3333333 !default; // extra decimals for Win 8.1 Chrome -$line-height-sm: 1.3 !default; - -$border-radius: 2rem / 16 !default; -$border-radius-lg: 2rem / 16 !default; -$border-radius-sm: 1rem / 16 !default; - // Fonts // // Font, line-height, and color for body text, headings, and more. @@ -27,18 +20,6 @@ $h4-font-size: 1rem; $h5-font-size: 1rem; $h6-font-size: $font-size-secondary; -/* $headings-font-weight: $fw_semibold !default; */ - -/* $display1-size: 5.5rem * 10 / 16 !default; -$display2-size: 4.5rem * 10 / 16 !default; -$display3-size: 3.5rem * 10 / 16 !default; -$display4-size: 3rem * 10 / 16 !default; - -$display1-weight: $fw_semibold !default; -$display2-weight: $fw_semibold !default; -$display3-weight: $fw_semibold !default; -$display4-weight: $fw_semibold !default; */ - $display-line-height: 1; /* $blockquote-font-size: $font-size-base !default; */ diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 679a3d370..c72ccc129 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -174,6 +174,49 @@ header.o_main_header{ } } +//------------------------------------------------------------------------------ +// On this page local toctree +//------------------------------------------------------------------------------ + + aside.o_page_toc { + display: none; + @include font-size($font-size-secondary); + @include media-breakpoint-up(lg) { + display: block; + position: -webkit-sticky; + position: sticky; + top: $o-header-height; + right: 0; + width: $o-on-page-width; + height: calc(100% - #{$o-header-height}); + padding: 3rem 3rem 3rem 0; + } + + h3 { + text-transform: uppercase; + font-weight: $fw_bold; + color: $gray-darker; + padding-left: .5rem; + margin-bottom: 0; + } + + a { + font-weight: $fw_regular; + color: $gray-darkest; + } + + .o_page_toc_title { + display:none; + + ul { + padding-left: 0; + } + } + + .o_active_toc_entry > a { + font-weight: $fw_bold; + } + } + //------------------------------------------------------------------------------ // Main page content //------------------------------------------------------------------------------ @@ -268,7 +311,7 @@ header.o_main_header{ .toctree-l1 > a { display: block; color: $gray-darker; - font-size: 1.2rem; + @include font-size($h2-font-size); padding-bottom: .5rem; border-bottom: 1px solid $gray-light; margin-bottom: 1rem; @@ -418,13 +461,15 @@ header.o_main_header{ a.headerlink { visibility: hidden !important; &:after { - @include inline-icomoon($i-link, 0 1rem 0 0); + content: '#{$i-link}'; + font-family: $icomoon-font-family !important; @include font-size($font-size-base); + vertical-align: middle; + margin: 0 1rem 0 0; visibility: hidden; - font-size: 1rem; color: $gray-light; opacity: 0; - transition: .1s + @include o-transition(all, .1s) } } // This makes permalinks only visible on hover. @@ -612,70 +657,16 @@ header.o_main_header{ } } } - -//------------------------------------------------------------------------------ -// On this page toc -//------------------------------------------------------------------------------ - - aside.o_page_toc { - display: none; - - @include media-breakpoint-up(lg) { - display: block; - position: -webkit-sticky; - position: sticky; - top: $o-header-height; - right: 0; - width: $o-on-page-width; - height: calc(100% - #{$o-header-height}); - padding: 3rem 3rem 3rem 1rem; - font-size: .9rem; - } - - .o_page_toc_nav > ul { - padding-left: 0; - } - - h3 { - text-transform: uppercase; - font-weight: $fw_bold; - font-size: 1rem; - color: $gray-darker; - } - - ul { - list-style: none; - - a { - display: block; - padding: .5rem 0; - font-weight: $fw_regular; - color: $gray-darker; - - &.o_page_toc_title { - display:none; - + ul { - padding-left: 0; - } - } - } - } - .o_active_toc_entry > a { - font-weight: $fw_bold; - } - } } - //------------------------------------------------------------------------------ // Footer //------------------------------------------------------------------------------ -footer{ +footer { > div { padding: 3rem; @include media-breakpoint-up(lg) { - padding-left: calc(#{$o-side-nav-width} + 3rem) } } @@ -691,35 +682,4 @@ footer{ } } - - .o_footer_nav { - display: flex; - - .o_footer_nav_title { - font-weight: $fw_regular; - text-transform: uppercase; - padding: 0 1rem; - } - - .accordion { - - .accordion-collapse { - border: none; - } - - .accordion-body { - background: $gray-100; - > li > a { - font-weight: $fw-regular; - } - - } - - .accordion-button::after { - background-size: .8rem; - width: .8rem; - height: .8rem; - } - } - } -} +} \ No newline at end of file From eb6574df7be18622dd21c977b40ded7f2b08addc Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 17:38:58 +0100 Subject: [PATCH 10/13] [DESIGN] Added font for testing on h3 in main content --- extensions/odoo_theme/static/scss/_typography.scss | 1 + extensions/odoo_theme/static/scss/_variables.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/extensions/odoo_theme/static/scss/_typography.scss b/extensions/odoo_theme/static/scss/_typography.scss index aebcce169..5cabb7d44 100644 --- a/extensions/odoo_theme/static/scss/_typography.scss +++ b/extensions/odoo_theme/static/scss/_typography.scss @@ -5,6 +5,7 @@ //------------------------------------------------------------------------------ // Fonts //------------------------------------------------------------------------------ +@import url('https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@500&display=swap'); @font-face { font-family: '#{$icomoon-font-family}'; diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss index 798eb5869..37093a440 100644 --- a/extensions/odoo_theme/static/scss/_variables.scss +++ b/extensions/odoo_theme/static/scss/_variables.scss @@ -59,6 +59,7 @@ $color-epsilon-lightest : #FF8D63; // Typography // =============================================== +$font-family-serif: 'Roboto Slab', Georgia, "Times New Roman", Times, serif; $fw_extralight: 200; $fw_light: 300; From 780301ed2d29db90c2b312110ce31226435c37a1 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 17:07:32 +0100 Subject: [PATCH 11/13] [DESIGN] fix toctrees folding and margins --- extensions/odoo_theme/static/style.scss | 118 ++++++++++++++++-------- 1 file changed, 79 insertions(+), 39 deletions(-) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index c72ccc129..e1b2d3b4c 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -87,42 +87,52 @@ header.o_main_header{ left:0; } @include o-transition($duration:.3s); - padding-top: 3rem; + padding-top: 2rem; padding-left: 3rem; background-color: lighten($o-violet-dark, 70%) ; z-index: 10; @include font-size($font-size-secondary); - > ul { - padding-left: 30px !important; - > li { - padding: .5rem 0; - } + color: $o-violet-dark; + + .toctree-l1 { + padding-top: .5rem; + padding-bottom: .5rem; + } + + .toctree-l1 > ul { + padding-left: 1.5rem; } ul { - padding-left: 1rem; - list-style: none; - li { - a{ - display: block; - padding: .5rem 0; - color: $o-violet-dark; - text-decoration: none; - opacity: .75; - &.current, &:hover { + + li.o_active_toc_entry{ + &:not(.toctree-l1) > .o_toc_entry_wrapper { + i[class^="i-"]:not(.collapsed) { + @include transform(rotate(90deg)); + } + } + > .o_toc_entry_wrapper { + i[class^="i-"]:not(.collapsed), a.reference { + font-weight: $fw_bold; opacity: 1; } } } - li.current > a { - font-weight: $fw_bold; - opacity: 1; + + .o_deepest_active_toc_entry { + background-color: $gray-lightest; } > .toctree-l1 { - &[class^="o_menu_"] > .o_toc_entry_wrapper > i:before { - @include inline-icomoon($i-doc-apps, 0 1rem 0 -30px); + + &[class*="o_menu_"] > .o_toc_entry_wrapper > i { + opacity: .75; + &:before { + @include inline-icomoon($i-doc-apps, 0 1rem 0 0); + color: $o-violet-dark; + margin-right: 0.5rem; + } } &.o_menu_applications > .o_toc_entry_wrapper > i:before{ content:'#{$i-doc-apps}'; @@ -140,25 +150,7 @@ header.o_main_header{ content:'#{$i-doc-contribute}'; } - .o_toc_entry_wrapper { - display: flex; - align-items: center; - } - } - > .toctree-l2 { - .o_toc_entry_wrapper { - > i[class^="i-"] { - transition: rotate .3s; - - &[aria-expanded="true"]{ - transform: rotate(90deg); - } - - } - } - } - } scrollbar-width: thin; scrollbar-color: $o-violet-darker transparent; @@ -174,6 +166,54 @@ header.o_main_header{ } } +.o_side_nav, .o_page_toc_nav { + ul { // all uls in toc + list-style: none; + padding-left: 1rem; + + li { + padding-left: .2rem; + > a.reference { + padding-left: 1.2rem; + } + + a { + display: inline-block; + padding: .5rem 0; + color: inherit; + opacity: .75; + &.current, &:hover { + opacity: 1; + } + } + + &:not(.toctree-l1) { + .o_toc_entry_wrapper { + > i[class^="i-"] { + display: inline-block; + margin-right: .2rem; + @include o-transition(rotate, .3s); + font-weight: $fw_bold; + color: inherit; + + &[aria-expanded="true"] { + @include transform(rotate(90deg)); + } + } + } + } + .o_active_toc_entry { + > a , > .o_toc_entry_wrapper a{ + font-weight: $fw_bold; + opacity: 1; + } + } + } + } + > ul { //is first ul in toc + padding-left: 0; + } +} //------------------------------------------------------------------------------ // On this page local toctree //------------------------------------------------------------------------------ From ff3455692372306c86d5b1d65565b062a47f4ac2 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 17:19:44 +0100 Subject: [PATCH 12/13] fix for scroll padding --- extensions/odoo_theme/static/scss/_mixins.scss | 12 ++++++++++++ extensions/odoo_theme/static/style.scss | 18 ++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/extensions/odoo_theme/static/scss/_mixins.scss b/extensions/odoo_theme/static/scss/_mixins.scss index dff9fd41e..79221bfbf 100644 --- a/extensions/odoo_theme/static/scss/_mixins.scss +++ b/extensions/odoo_theme/static/scss/_mixins.scss @@ -96,6 +96,18 @@ margin: $margin; } +//-- fix scroll issue + +@mixin scroll-padding() { + content: ''; + display: block; + width: 0; + height: 0; + padding-top: $o-header-height + 10px; + margin-top: -$o-header-height - 10px; +} + + //-- has_col @mixin pseudo-col(){ diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index e1b2d3b4c..776b111ab 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -463,27 +463,17 @@ header.o_main_header{ dt { &:before { - content: ''; - display: block; - width: 0; - height: 0; - padding-top: $o-header-height + 10px; - margin-top: -$o-header-height - 10px; + @include scroll-padding() } } section { // This fixes the scroll position // BUT creates issues when buttons or links from the previous section are behind it - /* padding-top: $o-header-height; - margin-top: -$o-header-height; */ + // padding-top: $o-header-height; + // margin-top: -$o-header-height; */ // adding a :before works better; &:before { - content: ''; - display: block; - width: 0; - height: 0; - padding-top: $o-header-height + 10px; - margin-top: -$o-header-height - 10px; + @include scroll-padding() } > h1 { From fa9c4948a05a02547b5af35bcd557c6c2b1775fc Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 26 Feb 2021 17:40:27 +0100 Subject: [PATCH 13/13] [DESIGN] main content tweaks --- .../odoo_theme/static/scss/_typography.scss | 4 +--- extensions/odoo_theme/static/style.scss | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extensions/odoo_theme/static/scss/_typography.scss b/extensions/odoo_theme/static/scss/_typography.scss index 5cabb7d44..0c3e389dc 100644 --- a/extensions/odoo_theme/static/scss/_typography.scss +++ b/extensions/odoo_theme/static/scss/_typography.scss @@ -48,10 +48,8 @@ html body{ //------------------------------------------------------------------------------ // Font weight //------------------------------------------------------------------------------ -// "fw_extralight and fw_medium" classes -// are kept for backward compatibility b, strong{ - font-weight: $fw_extrabold; + font-weight: $fw_bold; } a { diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 776b111ab..77fea187e 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -328,8 +328,11 @@ header.o_main_header{ } } + // "in between" pages (Applications / Contributing) + &.doc-toc { .toctree-wrapper { + margin-top: 1.5rem; > ul { display: flex; flex-wrap: wrap; @@ -385,7 +388,7 @@ header.o_main_header{ > * { width: 54.633333%; - max-width: 600px; + /* max-width: 600px; */ float: left; clear: left; } @@ -402,12 +405,7 @@ header.o_main_header{ margin-left: 57%; padding: 1rem; - p, blockquote, tr, th, li { - color: $gray-light; - } - blockquote { - color: $gray-light; font-family: $font-family-serif; font-weight: $fw_semibold; font-style: italic; @@ -488,6 +486,11 @@ header.o_main_header{ border-bottom: 1px solid $gray-light; } + > h3 { + color: $gray-darkest; + font-weight: $fw_extrabold; + } + a.headerlink { visibility: hidden !important; &:after { @@ -512,8 +515,7 @@ header.o_main_header{ } .img-fluid { - @include box-shadow(0 3px 6px rgba(0, 0, 0, .16)); - margin-bottom: 2rem; + margin-bottom: 1rem; } }