diff options
| author | Kevin Baptiste <kba@odoo.com> | 2019-12-05 07:18:28 +0000 |
|---|---|---|
| committer | Kevin Baptiste <kba@odoo.com> | 2019-12-09 10:33:36 +0000 |
| commit | 6cbe824871da51af27ac5b2feb7ecc9fcd6b18d0 (patch) | |
| tree | 5e3300c274fdedb5f8a13e0dc964f89941e17538 /addons/website/static/src/scss | |
| parent | 78ae3da90213261071fdadb06cbb0507182303e2 (diff) | |
[REV] web: reverts update to fontawesome 5.11.2
This reverts commit ff1c35513aecef5fbc30f7c2f3834450e719714e.
closes odoo/odoo#41480
X-original-commit: 116057b26e71db4692280463669f3e80d813ddcc
Related: odoo/enterprise#7110
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/website/static/src/scss')
4 files changed, 26 insertions, 28 deletions
diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss index 90326d9e837..fd42d78a8bd 100644 --- a/addons/website/static/src/scss/website.edit_mode.scss +++ b/addons/website/static/src/scss/website.edit_mode.scss @@ -109,10 +109,8 @@ table.editorbar-panel { } } -// 'Font Awesome 5 Free' -.note-editable .fa, -.note-editable .far, -.note-editable .fas { +// fontawesome +.note-editable .fa { cursor: pointer; } diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 472bb5b7ae3..874ff081f04 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -167,7 +167,8 @@ font[class*='bg-'] { } // Icons -.fa, .far, .fas, .fab { +.fa { + font-family: "FontAwesome" !important; $size: 3rem; &.rounded-circle, @@ -491,16 +492,14 @@ table.table_desc tr td { outline: none; &:before { content:'\f056'; - font-family: 'Font Awesome 5 Free'; + font-family: 'FontAwesome'; display: inline-block; margin: 0 .5em 0 .75em; color: $gray-600; - font-weight: 900; } &.collapsed:before { content:'\f055'; - font-family: 'Font Awesome 5 Free'; - font-weight: 900; + font-family: 'FontAwesome'; } &:hover, &:focus { @@ -542,7 +541,7 @@ table.table_desc tr td { background-image: none; color: $body-color; &:before { - font-family: "Font Awesome 5 Free"; + font-family: "FontAwesome"; display: inline-block; background-color: #fff; } @@ -571,7 +570,6 @@ table.table_desc tr td { font-size: 2rem; color: #fff; text-shadow: $box-shadow-sm; - font-weight: 900; } // Indicators .carousel-indicators li { @@ -1024,27 +1022,28 @@ table.table_desc tr td { // Rating .s_rating { $star: "\f005"; + $star-o: "\f006"; $circle: "\f111"; + $circle-o: "\f10c"; $heart: "\f004"; - @mixin s_rating_generate_icons($icon) { + $heart-o: "\f08a"; + @mixin s_rating_generate_icons($off, $on) { .fa:before { - content: $icon; - font-weight: 400; + content: $off; } @for $counter from 5 to 0 { &.s_rating_#{$counter} { .fa:nth-of-type(-n+#{$counter}):before { - content: $icon; - font-weight: 900; + content: $on; } } } } - > .s_rating_stars { @include s_rating_generate_icons($star); } - > .s_rating_squares { @include s_rating_generate_icons($circle); } - > .s_rating_hearts { @include s_rating_generate_icons($heart); } + > .s_rating_stars { @include s_rating_generate_icons($star-o, $star); } + > .s_rating_squares { @include s_rating_generate_icons($circle-o, $circle); } + > .s_rating_hearts { @include s_rating_generate_icons($heart-o, $heart); } > .s_rating_bar { - .fa, .far, .fas, .fab { + .fa { display: none; } .s_rating_bar { @@ -1071,9 +1070,9 @@ table.table_desc tr td { } } } - > .s_rating_1x { .fa, .far, .fas, .fab { font-size: 1em; }; } - > .s_rating_2x { .fa, .far, .fas, .fab { font-size: 2em; }; } - > .s_rating_3x { .fa, .far, .fas, .fab { font-size: 3em; }; } + > .s_rating_1x { .fa { font-size: 1em; }; } + > .s_rating_2x { .fa { font-size: 2em; }; } + > .s_rating_3x { .fa { font-size: 3em; }; } } // diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss index 22f18fd9adc..0027d792093 100644 --- a/addons/website/static/src/scss/website.ui.scss +++ b/addons/website/static/src/scss/website.ui.scss @@ -34,6 +34,7 @@ body.o_connected_user { .o_menu_sections { .o_mobile_preview a { text-align: center; + font-size: 20px; } } .o_menu_systray { @@ -51,6 +52,7 @@ body.o_connected_user { .o_mobile_preview a { text-align: center; + font-size: 20px; } } @include media-breakpoint-down(sm) { @@ -133,7 +135,7 @@ body .modal { font-weight: normal; color: inherit; - .fa, .far, .fas { + .fa { margin-left: $grid-gutter-width/2; } } @@ -228,8 +230,7 @@ body .modal { @include o-position-absolute(2px, 3px); display: inline-block; content: "\f00c"; - font-family: 'Font Awesome 5 Free'; - font-weight: 900; + font-family: FontAwesome; color: white; font-size: 12px; } @@ -419,7 +420,7 @@ body .modal { padding: 0.45rem; } td { - > a.fa, > a.far, > a.fas { + > a.fa { margin-left: 5px; color: $o-brand-odoo; } diff --git a/addons/website/static/src/scss/website.wysiwyg.scss b/addons/website/static/src/scss/website.wysiwyg.scss index 2d81ceebc32..4e6fa2bc0c9 100644 --- a/addons/website/static/src/scss/website.wysiwyg.scss +++ b/addons/website/static/src/scss/website.wysiwyg.scss @@ -41,7 +41,7 @@ border: none; border-radius: 0; - .fa, .far, .fas { + .fa { margin-right: $grid-gutter-width/4; &.fa-times { |
