[IMP] odoo_theme: general cleanup
A general reorganization of the code was needed for more clarity.
The different markup styles have been grouped together under a common
"chapter", comments have been rewritten and example pages have been
added for context.
Some levels have been removed Where there were too many for no reason.
By removing one level of styles (e.g.: `#wrap`) we avoid needing to
force overrides or adding `!important` to our code.
⌙ e.g.: before commit 9ef86cd93d8c6fc0fd96b437f629237e7a562c6e,
`.o_spoilers .accordion-body >:first-child` was being involuntarily
overridden.
task-3046383
X-original-commit: 620e3c33ef
Part-of: odoo/documentation#4112
This commit is contained in:
Elisabeth Dickinson
Antoine Vandevenne (anv)
parent
dce318e2f1
commit
768d48ce15
@ -588,15 +588,15 @@ ol.upperroman {
|
||||
list-style: upper-roman;
|
||||
}
|
||||
|
||||
:not(li) > ol > li:first-child > :first-child,
|
||||
:not(li) > ul > li:first-child > :first-child {
|
||||
margin-top: 0px;
|
||||
}
|
||||
// :not(li) > ol > li:first-child > :first-child,
|
||||
// :not(li) > ul > li:first-child > :first-child {
|
||||
// margin-top: 0px;
|
||||
// }
|
||||
|
||||
:not(li) > ol > li:last-child > :last-child,
|
||||
:not(li) > ul > li:last-child > :last-child {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
// :not(li) > ol > li:last-child > :last-child,
|
||||
// :not(li) > ul > li:last-child > :last-child {
|
||||
// margin-bottom: 0px;
|
||||
// }
|
||||
|
||||
ol.simple ol p,
|
||||
ol.simple ul p,
|
||||
|
||||
@ -1,9 +1,3 @@
|
||||
$o-grid-breakpoint-xxl: 1400px;
|
||||
$o-grid-breakpoint-xxxl: 1680px;
|
||||
|
||||
$o-container-max-width-xxl:1380px;
|
||||
$o-container-max-width-xxxl: 1560px;
|
||||
|
||||
// Typography
|
||||
// ===============================================
|
||||
$o-font-family-serif: 'Roboto Slab', Georgia, "Times New Roman", Times, serif;
|
||||
|
||||
@ -21,6 +21,7 @@ body {
|
||||
text-underline-position: from-font;
|
||||
|
||||
&.external:not(.image-reference):after {
|
||||
//see https://www.odoo.com/documentation/master/contributing/documentation/rst_cheat_sheet.html#external-hyperlinks
|
||||
content: '#{$i-external-link}';
|
||||
margin: 0 $o-icon-margin;
|
||||
font-family: icomoon, sans-serif !important;
|
||||
@ -37,13 +38,6 @@ body {
|
||||
@include o-scroll-padding()
|
||||
}
|
||||
|
||||
abbr {
|
||||
text-underline-offset: 2px;
|
||||
|
||||
&[title="Pull Request"] {
|
||||
@include o-easter-egg();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.hidden {
|
||||
@ -52,11 +46,6 @@ body {
|
||||
visibility: hidden !important;
|
||||
}
|
||||
|
||||
span.viewcode-link {
|
||||
float: none;
|
||||
margin-left: .3rem;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Header with logo, searchbar and switchers
|
||||
//------------------------------------------------------------------------------
|
||||
@ -200,7 +189,7 @@ header {
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Left side nav toctree
|
||||
// Navigation - Left side-nav toctree
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
.o_side_nav {
|
||||
@ -371,8 +360,9 @@ header {
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// On this page local toctree
|
||||
// Navigation - "On This Page" local toctree
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
aside.o_page_toc {
|
||||
@ -426,7 +416,7 @@ header {
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Main page content
|
||||
// Layout
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#wrap {
|
||||
@ -440,97 +430,9 @@ header {
|
||||
grid-template-columns: minmax(0,$o-side-nav-width) minmax(0,auto) minmax(0,$o-on-page-width);
|
||||
margin-top: $o-headers-height;
|
||||
}
|
||||
|
||||
// Literals Styles (ex: https://www.odoo.com/documentation/master/developer/reference/backend/orm.html#fields)
|
||||
.o_code, .sig [class^="sig-"] {
|
||||
@include o-code;
|
||||
}
|
||||
|
||||
.o_code {
|
||||
padding: 0 .3rem;
|
||||
|
||||
&.file {
|
||||
padding-right: .4rem;
|
||||
background-color: $blue-100;
|
||||
font-family: $font-family-base;
|
||||
font-weight: $o-font-weight-medium;
|
||||
font-style: italic;
|
||||
color: $blue-700;
|
||||
}
|
||||
}
|
||||
|
||||
.sig {
|
||||
.sig-prename {
|
||||
padding-left: .3rem;
|
||||
|
||||
&+ .sig-name {
|
||||
padding-right: .3rem;
|
||||
}
|
||||
}
|
||||
|
||||
em.property + .sig-name {
|
||||
padding-left: .3rem;
|
||||
}
|
||||
|
||||
.sig-paren:last-of-type {
|
||||
padding-right: .3rem;
|
||||
}
|
||||
}
|
||||
|
||||
dl.py, dl.js, dl.o-definition-list {
|
||||
> dd {
|
||||
margin-top: -0.075rem;
|
||||
padding-left: $o-padding-s;
|
||||
padding-top: $o-padding-xs;
|
||||
border-left: 3px solid $o-literals-border;
|
||||
}
|
||||
|
||||
&.class em.property {
|
||||
font-size: $font-size-sm;
|
||||
|
||||
&:first-child {
|
||||
border-bottom: 3px solid $o-literals-border;
|
||||
}
|
||||
|
||||
&:not(:first-child) {
|
||||
@include o-code;
|
||||
padding: 0 .3rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dl:not([class]) dd {
|
||||
margin-left: $o-margin-s;
|
||||
}
|
||||
|
||||
dl.field-list {
|
||||
padding: .5rem;
|
||||
border: 1px solid $o-gray-border;
|
||||
@include font-size($font-size-sm);
|
||||
|
||||
@include media-breakpoint-down(lg) {
|
||||
display: block;
|
||||
}
|
||||
|
||||
> dt {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
padding-left: 0;
|
||||
|
||||
li:not(:last-child) {
|
||||
padding-bottom: $o-padding-xs;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
iframe {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
main {
|
||||
main.container-fluid {
|
||||
position: relative;
|
||||
grid-area: main;
|
||||
padding-bottom: $o-padding-l;
|
||||
@ -548,10 +450,16 @@ header {
|
||||
&.o_index, &.o_fullwidth_page, &.o_has_code_column {
|
||||
grid-column-end: toc;
|
||||
}
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Content
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// Homepage
|
||||
// https://www.odoo.com/documentation/master/index.html
|
||||
|
||||
&.o_index {
|
||||
.o_index {
|
||||
.o_content_fw_banner {
|
||||
align-items: center;
|
||||
margin: 0 -0.75rem $o-margin-m;
|
||||
@ -592,8 +500,9 @@ header {
|
||||
}
|
||||
}
|
||||
|
||||
// First level legal page and pages with toctrees (i.e.: User Docs, Install & Maintain, Developer, Contributing)
|
||||
&.o_fullwidth_page div.toctree-wrapper > ul {
|
||||
// First level legal page and pages with toctrees
|
||||
// (ex: https://www.odoo.com/documentation/master/developer.html)
|
||||
.o_fullwidth_page div.toctree-wrapper > ul {
|
||||
flex-wrap: wrap;
|
||||
display: flex;
|
||||
|
||||
@ -613,8 +522,10 @@ header {
|
||||
}
|
||||
}
|
||||
|
||||
// pages with column for code on the right
|
||||
&.o_has_code_column {
|
||||
// Pages with a column for code on the right
|
||||
// (ex: https://www.odoo.com/documentation/master/applications/finance/accounting/getting_started/memento.html)
|
||||
|
||||
.o_has_code_column {
|
||||
article.doc-body {
|
||||
@include media-breakpoint-up(xl) {
|
||||
.o_git_link {
|
||||
@ -662,7 +573,7 @@ header {
|
||||
}
|
||||
}
|
||||
|
||||
&.o_hide_toc .toctree-wrapper {
|
||||
.o_hide_toc .toctree-wrapper {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@ -844,10 +755,52 @@ header {
|
||||
}
|
||||
}
|
||||
|
||||
.guilabel, .menuselection {
|
||||
font-weight: $font-weight-bold;
|
||||
iframe {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.container .container:not([class^="col"]) {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
ul, ol {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
ol ol {
|
||||
list-style: lower-alpha;
|
||||
|
||||
> li:before {
|
||||
content: none;
|
||||
}
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Markups
|
||||
// (see https://www.odoo.com/documentation/master/contributing/documentation/rst_cheat_sheet.html#markups)
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// Technical Terms (Literals)
|
||||
.o_code, .sig [class^="sig-"] {
|
||||
@include o-code;
|
||||
}
|
||||
|
||||
.o_code {
|
||||
padding: 0 .3rem;
|
||||
|
||||
//File
|
||||
&.file {
|
||||
padding-right: .4rem;
|
||||
background-color: $blue-100;
|
||||
font-family: $font-family-base;
|
||||
font-weight: $o-font-weight-medium;
|
||||
font-style: italic;
|
||||
color: $blue-700;
|
||||
}
|
||||
}
|
||||
|
||||
// Definitions
|
||||
.dfn{
|
||||
@include font-size($font-size-sm);
|
||||
line-height: 1;
|
||||
@ -870,24 +823,99 @@ header {
|
||||
}
|
||||
}
|
||||
|
||||
//Abbreviations
|
||||
abbr {
|
||||
text-underline-offset: 2px;
|
||||
|
||||
.container .container:not([class^="col"]) {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
&[title="Pull Request"] {
|
||||
@include o-easter-egg();
|
||||
}
|
||||
}
|
||||
|
||||
ul, ol {
|
||||
text-align: left;
|
||||
//GUI Element & Menu Selection
|
||||
.guilabel, .menuselection {
|
||||
font-weight: $font-weight-bold;
|
||||
}
|
||||
|
||||
ol ol {
|
||||
list-style: lower-alpha;
|
||||
// API and Reference Styles
|
||||
//(ex: https://www.odoo.com/documentation/master/developer/reference/backend/orm.html#fields)
|
||||
|
||||
> li:before {
|
||||
content: none;
|
||||
.sig {
|
||||
.sig-prename {
|
||||
padding-left: .3rem;
|
||||
|
||||
&+ .sig-name {
|
||||
padding-right: .3rem;
|
||||
}
|
||||
}
|
||||
|
||||
em.property + .sig-name {
|
||||
padding-left: .3rem;
|
||||
}
|
||||
|
||||
.sig-paren:last-of-type {
|
||||
padding-right: .3rem;
|
||||
}
|
||||
}
|
||||
|
||||
dl.py, dl.js, dl.o-definition-list {
|
||||
> dd {
|
||||
margin-top: -0.075rem;
|
||||
padding-left: $o-padding-s;
|
||||
padding-top: $o-padding-xs;
|
||||
border-left: 3px solid $o-literals-border;
|
||||
}
|
||||
|
||||
&.class em.property {
|
||||
font-size: $font-size-sm;
|
||||
|
||||
&:first-child {
|
||||
border-bottom: 3px solid $o-literals-border;
|
||||
}
|
||||
|
||||
&:not(:first-child) {
|
||||
@include o-code;
|
||||
padding: 0 .3rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The field-lists are generated Parameters and Arguments
|
||||
// within the References (ex: https://www.odoo.com/documentation/master/developer/reference/backend/orm.html#odoo.fields.Field)
|
||||
dl.field-list {
|
||||
padding: .5rem;
|
||||
border: 1px solid $o-gray-border;
|
||||
@include font-size($font-size-sm);
|
||||
|
||||
@include media-breakpoint-down(lg) {
|
||||
display: block;
|
||||
}
|
||||
|
||||
> dt {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
padding-left: 0;
|
||||
|
||||
li:not(:last-child) {
|
||||
padding-bottom: $o-padding-xs;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dl:not([class]) dd {
|
||||
margin-left: $o-margin-s;
|
||||
}
|
||||
|
||||
// Child of source-code URL
|
||||
// ex: https://www.odoo.com/documentation/16.0/developer/reference/backend/orm.html#odoo.models.AbstractModel
|
||||
span.viewcode-link {
|
||||
float: none;
|
||||
margin-left: .3rem;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Alerts
|
||||
//------------------------------------------------------------------------------
|
||||
@ -923,6 +951,13 @@ header {
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
.graphviz {
|
||||
overflow-x: auto;
|
||||
white-space: nowrap;
|
||||
img {
|
||||
max-width: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Custom Admonitions
|
||||
@ -999,15 +1034,6 @@ header {
|
||||
background: $gray-200;
|
||||
}
|
||||
}
|
||||
.graphviz {
|
||||
overflow-x: auto;
|
||||
white-space: nowrap;
|
||||
img {
|
||||
max-width: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Spoilers
|
||||
@ -1174,6 +1200,7 @@ header {
|
||||
//------------------------------------------------------------------------------
|
||||
// Footer
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
footer {
|
||||
.o_get_help {
|
||||
padding-top: $o-padding-l;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user