pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] portal, website: BS4, lower <body/> font size

Browse Source 
With BS4, the website's font size was set to 16px instead of 14px as
before. We finally decided to force the 14px back. This commit also
moves some bootstrap variables extensions to portal as it should have
been done and reformat the files to match the bootstrap _variables.scss
file.
This commit is contained in:
qsm-odoo
2018-09-10 17:54:42 +02:00
parent b356b9468e
commit 903ff171ac
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/portal/static/src/scss/bootstrap_overridden.scss
Vendored
+13
View File
@@ -0,0 +1,13 @@
// Fonts
//
// Font, line-height, and color for body text, headings, and more.
$font-size-base: $o-theme-font-size-base;
$font-size-sm: (12 / 16) * 1rem;
// Buttons
//
// For each of Bootstrap's buttons, define text, background, and border color.
$btn-padding-y-sm: (1 / 16) * 1rem;
$btn-padding-x-sm: (5 / 16) * 1rem;
addons/portal/static/src/scss/primary_variables.scss
+2
View File
@@ -0,0 +1,2 @@
$o-theme-font-size-base: (14 / 16) * 1rem;
addons/portal/views/assets.xml
+11
View File
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/primary_variables.scss"/>
</xpath>
</template>
<template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/bootstrap_overridden.scss"/>
</xpath>
</template>
<template id="assets_frontend" inherit_id="web.assets_frontend" name="Portal Assets" priority="15">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/bootstrap.extend.scss"/>
addons/web_editor/static/src/js/tours/rte.js
+1 -1
View File
@@ -314,7 +314,7 @@ tour.register('rte_inline', {
trigger: '#wrapwrap img:first[width][height][style*="-radius"][style*="1px"][style*="padding"]',
}, {
content: "check the font image src",
trigger: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(0,160,157)/32"]',
trigger: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(0,160,157)/28"]',
}, {
content: "check the font class to css",
trigger: '#wrapwrap img:eq(1)[height]:not([class*="fa"])',
addons/website/static/src/scss/bootstrap_overridden.scss
Vendored
+15 -7
View File
@@ -1,13 +1,21 @@
//
// Color system
//
$yiq-text-dark: color('text');
// Body
//
// Settings for the `<body>` element.
$body-bg: color('body');
$body-color: color('text');
$yiq-text-dark: color('text');
$headings-color: color('h1');
// Fonts
//
// Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: nth($o-theme-fonts, $o-theme-font-number);
$headings-font-family: nth($o-theme-fonts, $o-theme-headings-font-number);
$font-size-sm: 0.75rem;
$btn-padding-y-sm: 0.0625rem;
$btn-padding-x-sm: 0.3125rem;
$headings-font-family: nth($o-theme-fonts, $o-theme-headings-font-number);
$headings-color: color('h1');