From 5b90b4968efb6b78540ed2a057fdfdf084da7323 Mon Sep 17 00:00:00 2001 From: stefanorigano Date: Wed, 14 Oct 2015 15:43:56 +0200 Subject: [PATCH] [FIX] Headings, restore bootstrap default + minor --- _extensions/odoo/static/style.css | 84 ++----------------------- _extensions/odoo/static/typography.less | 64 +------------------ 2 files changed, 7 insertions(+), 141 deletions(-) diff --git a/_extensions/odoo/static/style.css b/_extensions/odoo/static/style.css index 3609ab192..564468d94 100644 --- a/_extensions/odoo/static/style.css +++ b/_extensions/odoo/static/style.css @@ -373,7 +373,7 @@ h6, .h5, .h6 { font-family: Lato, sans-serif; - font-weight: 300; + font-weight: 400; line-height: 1.1; color: #393f4f; } @@ -8295,61 +8295,14 @@ a { -o-transition: color 0.1s linear; transition: color 0.1s linear; } -main, -#navClone { +#navClone, +.navbar-aside { font-size: 0.875em; line-height: 1.642857143em; } main article { /* Sanitation */ } -main article h1, -main article .h1 { - font-size: 4.214285714em; - line-height: 1.169491527em; - margin-top: 0.77966102em; - margin-bottom: 0.38983051em; -} -main article h2, -main article .h2 { - font-size: 2.642857143em; - line-height: 1.243243244em; - margin-top: 1.24324324em; - margin-bottom: 0.62162162em; -} -main article h2 code, -main article .h2 code { - font-size: .5em; -} -main article h3, -main article .h3 { - font-size: 1.642857143em; - line-height: 1em; - margin-top: 1em; - margin-bottom: 1em; -} -main article h3 code, -main article .h3 code { - font-size: .5em; -} -main article h4, -main article .h4 { - font-size: 1em; - line-height: 1.642857143em; - margin-top: 1.64285714em; - margin-bottom: 1.64285714em; -} -main article p, -main article ul, -main article ol, -main article table, -main article blockquote, -main article .alert, -main article .doc-code, -main article .admonition { - margin-top: 1.64285714em; - margin-bottom: 1.64285714em; -} main article a { font-weight: bold; } @@ -8414,37 +8367,8 @@ main article sub { } @media screen and (min-width: 992px) { .doc-body { - font-size: 1em; - line-height: 1.5em; /* Sanitation */ } - .doc-body h2 { - font-size: 3.565em; - line-height: 1.058823528em; - margin-top: 1.3em; - margin-bottom: 0.505882em; - padding-bottom: .2em; - border-bottom: 1px solid #EAEAEA; - } - .doc-body h3 { - font-size: 2.625em; - line-height: 1.142857142em; - margin-top: 1.14285714em; - margin-bottom: 10px; - } - .doc-body h4 { - font-size: 1.625em; - line-height: 1.846153846em; - margin-top: 0.92307692em; - margin-bottom: 10px; - font-weight: 400; - } - .doc-body h5 { - font-size: 1.5em; - line-height: 1.7em; - margin-top: 1.5em; - margin-bottom: 10px; - } .doc-body p, .doc-body ul, .doc-body ol, @@ -9156,7 +9080,7 @@ main.index.animating .card { } .toctree-wrapper > ul > li.toctree-l1 > span { font-family: Lato, sans-serif; - font-weight: 300; + font-weight: 400; line-height: 1.1; color: #393f4f; margin-top: 22px; diff --git a/_extensions/odoo/static/typography.less b/_extensions/odoo/static/typography.less index aa5b588b9..f63be6ff8 100644 --- a/_extensions/odoo/static/typography.less +++ b/_extensions/odoo/static/typography.less @@ -8,7 +8,7 @@ @headings-font-family : Lato, sans-serif; @headings-color : @doc_heading; -@headings-font-weight : 300; +@headings-font-weight : 400; //** Global textual link color. a {.transition(color 0.1s linear); } @@ -17,41 +17,11 @@ a {.transition(color 0.1s linear); } @link-hover-decoration: underline; -main, #navClone { +#navClone, .navbar-aside { font-size: 0.875em; line-height: 1.642857143em; } main article { - h1, .h1 { - font-size: 4.214285714em; - line-height: 1.169491527em; - margin-top: 0.77966102em; - margin-bottom: 0.38983051em; - } - h2, .h2 { - font-size: 2.642857143em; - line-height: 1.243243244em; - margin-top: 1.24324324em; - margin-bottom: 0.62162162em; - code{font-size: .5em;} - } - h3, .h3 { - font-size: 1.642857143em; - line-height: 1em; - margin-top: 1em; - margin-bottom: 1em; - code{font-size: .5em;} - } - h4, .h4 { - font-size: 1em; - line-height: 1.642857143em; - margin-top: 1.64285714em; - margin-bottom: 1.64285714em; - } - p, ul, ol, table, blockquote, .alert, .doc-code, .admonition { - margin-top: 1.64285714em; - margin-bottom: 1.64285714em; - } a{ font-weight: bold; @@ -104,35 +74,7 @@ main article { @media screen and (min-width: 992px) { .doc-body { - font-size: 1em; - line-height: 1.5em; - h2 { - font-size: 3.565em; - line-height: 1.058823528em; - margin-top: 1.3em; - margin-bottom: 0.505882em; - padding-bottom: .2em; - border-bottom: 1px solid #EAEAEA; - } - h3 { - font-size: 2.625em; - line-height: 1.142857142em; - margin-top: 1.14285714em; - margin-bottom: 10px; - } - h4 { - font-size: 1.625em; - line-height: 1.846153846em; - margin-top: 0.92307692em; - margin-bottom: 10px; - font-weight: 400; - } - h5 { - font-size: 1.5em; - line-height: 1.7em; - margin-top: 1.5em; - margin-bottom: 10px; - } + p, ul, ol, table, blockquote { margin-top: 1em; margin-bottom: 1em;