diff options
| author | Kevin Baptiste <kba@odoo.com> | 2019-08-12 07:18:23 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-11-28 10:05:12 +0000 |
| commit | ff1c35513aecef5fbc30f7c2f3834450e719714e (patch) | |
| tree | 8149f14df17095845e735d6cccaf9317a1f97af6 /addons/web/static/src/scss | |
| parent | 4c030311ada2ad19a2ee81b15544b7aed35b642b (diff) | |
[IMP] web: update to fontawesome 4.7.0 to 5.11.2
FontAwesome 5 introduced new names for some icons as described on
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes
This commit replaces the old names to the new ones.
closes odoo/odoo#35826
Taskid: 2050241
Related: odoo/enterprise#5180
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/web/static/src/scss')
| -rw-r--r-- | addons/web/static/src/scss/dropdown_menu.scss | 3 | ||||
| -rw-r--r-- | addons/web/static/src/scss/fields.scss | 26 | ||||
| -rw-r--r-- | addons/web/static/src/scss/fontawesome_overridden.scss | 41 | ||||
| -rw-r--r-- | addons/web/static/src/scss/kanban_view.scss | 6 | ||||
| -rw-r--r-- | addons/web/static/src/scss/list_view.scss | 5 | ||||
| -rw-r--r-- | addons/web/static/src/scss/pivot_view.scss | 10 | ||||
| -rw-r--r-- | addons/web/static/src/scss/search_view.scss | 6 | ||||
| -rw-r--r-- | addons/web/static/src/scss/web_calendar.scss | 10 |
8 files changed, 73 insertions, 34 deletions
diff --git a/addons/web/static/src/scss/dropdown_menu.scss b/addons/web/static/src/scss/dropdown_menu.scss index 7ce7412b6d0..6537b5b2569 100644 --- a/addons/web/static/src/scss/dropdown_menu.scss +++ b/addons/web/static/src/scss/dropdown_menu.scss @@ -36,10 +36,11 @@ font-weight: bold; &:before { - font-family: FontAwesome; + font-family: 'Font Awesome 5 Free'; position: absolute; left: 4px; content: "\f00c"; + font-weight: 900; } } .o_trash_button { diff --git a/addons/web/static/src/scss/fields.scss b/addons/web/static/src/scss/fields.scss index 05862d3746f..aa726c4c08f 100644 --- a/addons/web/static/src/scss/fields.scss +++ b/addons/web/static/src/scss/fields.scss @@ -228,10 +228,10 @@ padding-left: 5px; } - &.fa-star-o { + &.far.fa-star { color: $o-main-color-muted; } - &.fa-star { + &.fas.fa-star { color: gold; } } @@ -239,16 +239,18 @@ // Favorite &.o_favorite { - i.fa { + i.fa, + i.far, + i.fas { font-size: 16px; } - i.fa-star-o { + i.far.fa-star { color: $o-main-color-muted; &:hover { color: gold; } } - i.fa-star { + i.fas.fa-star { color: gold; } } @@ -375,22 +377,26 @@ opacity: 0; transition: opacity ease 400ms; - > button.fa { + > button.fa, + > button.far, + > button.fas { border: none; background-color: transparent; } - > .fa { + > .fa, + > .far, + > .fas { padding: 4px; - margin: 5px; - cursor: pointer; } } @include media-breakpoint-down(xs, $o-extra-grid-breakpoints) { .o_form_image_controls{ position: initial; opacity: 1; - > .fa{ + > .fa, + > .far, + > .fas{ width: 50%; padding: 6px; margin: 0px; diff --git a/addons/web/static/src/scss/fontawesome_overridden.scss b/addons/web/static/src/scss/fontawesome_overridden.scss index a234dbc9f81..61e88be3fc3 100644 --- a/addons/web/static/src/scss/fontawesome_overridden.scss +++ b/addons/web/static/src/scss/fontawesome_overridden.scss @@ -1,15 +1,15 @@ // This is rtl language specific fix // It will override the font awesome symbols and flip them 180 degree .o_rtl { - .fa { + .fa, .far, .fas, .fab { &.fa-align-right, &.fa-align-left, &.fa-chevron-right, &.fa-chevron-left, &.fa-arrow-right, &.fa-arrow-left, - &.fa-hand-o-right, - &.fa-hand-o-left, + &.fa-hand-point-right, + &.fa-hand-point-left, &.fa-arrow-circle-right, &.fa-arrow-circle-left, &.fa-caret-right, @@ -24,15 +24,32 @@ &.fa-quote-left, &.fa-chevron-circle-right, &.fa-chevron-circle-left, - &.fa-long-arrow-right, - &.fa-long-arrow-left, - &.fa-toggle-right, - &.fa-toggle-left, - &.fa-caret-square-o-right, - &.fa-arrow-circle-o-left, - &.fa-arrow-circle-o-right, - &.fa-caret-square-o-left { + &.fa-long-arrow-alt-right, + &.fa-long-arrow-alt-left, + &.fa-caret-square-right, + &.fa-caret-square-left, + &.fa-arrow-alt-circle-left, + &.fa-arrow-alt-circle-right { transform: rotate(180deg); } } -}
\ No newline at end of file +} + +.fa, .fas { + font-weight: 900 !important; +} + +.far { + font-weight: 400 !important; +} + +.fa-phone { + transform: rotate(90deg); +} + +.fa-clock { + transform: rotateY(180deg); + + * { + transform: rotate(0deg); + } +} diff --git a/addons/web/static/src/scss/kanban_view.scss b/addons/web/static/src/scss/kanban_view.scss index d65a8d4fa1c..e04431eab6e 100644 --- a/addons/web/static/src/scss/kanban_view.scss +++ b/addons/web/static/src/scss/kanban_view.scss @@ -97,6 +97,10 @@ } .o_kanban_record_bottom { + .fa, .far, .fas, .fab { + font-size: 15px; + } + .oe_kanban_bottom_left, .oe_kanban_bottom_right { display: flex; align-items: center; @@ -112,7 +116,7 @@ .o_priority_star { margin-top: 1px; - font-size: 18px; + font-size: 15px; } } .oe_kanban_bottom_right{ diff --git a/addons/web/static/src/scss/list_view.scss b/addons/web/static/src/scss/list_view.scss index c9562df798b..86e4eefc0b0 100644 --- a/addons/web/static/src/scss/list_view.scss +++ b/addons/web/static/src/scss/list_view.scss @@ -65,8 +65,9 @@ user-select: none; // Prevent unwanted selection while sorting &::after { - font-family: FontAwesome; + font-family: 'Font Awesome 5 Free'; content: "\f0d7"; + font-weight: 900; opacity: 0; } &:not(:empty)::after { @@ -76,12 +77,14 @@ cursor: n-resize; &::after { content: "\f0d7"; + font-weight: 900; } } &.o-sort-down { cursor: s-resize; &::after { content: "\f0d8"; + font-weight: 900; } } &:hover::after { diff --git a/addons/web/static/src/scss/pivot_view.scss b/addons/web/static/src/scss/pivot_view.scss index d67607fe558..8ec49cb0455 100644 --- a/addons/web/static/src/scss/pivot_view.scss +++ b/addons/web/static/src/scss/pivot_view.scss @@ -61,18 +61,20 @@ .o_pivot_header_cell_closed { @include o-pivot-header-cell; &::before { - font-family: FontAwesome; - content: ""; + font-family: 'Font Awesome 5 Free'; + content: "\f067"; margin-right: 8px; + font-weight: 900; } } .o_pivot_header_cell_opened { @include o-pivot-header-cell; &::before { - font-family: FontAwesome; - content: ""; + font-family: 'Font Awesome 5 Free'; + content: "\f068"; margin-right: 8px; + font-weight: 900; } } diff --git a/addons/web/static/src/scss/search_view.scss b/addons/web/static/src/scss/search_view.scss index 3a4aaae28dc..4aafbc74afb 100644 --- a/addons/web/static/src/scss/search_view.scss +++ b/addons/web/static/src/scss/search_view.scss @@ -8,6 +8,10 @@ position: relative; padding: 0 20px 1px 0; + .fa, .fas, .far { + font-size: 10px; + } + .o_searchview_more { font-size: 16px; cursor: pointer; @@ -202,7 +206,7 @@ } } .o-searchview-custom-public a:after { - font-family: FontAwesome; + font-family: 'Font Awesome 5 Free'; content: "\f0c0"; margin-left: 5px; font-weight: normal; diff --git a/addons/web/static/src/scss/web_calendar.scss b/addons/web/static/src/scss/web_calendar.scss index 759dfa94ad0..55fc4c1d9ab 100644 --- a/addons/web/static/src/scss/web_calendar.scss +++ b/addons/web/static/src/scss/web_calendar.scss @@ -421,12 +421,14 @@ $o-cw-filter-avatar-size: 20px; color: transparent; &:before { - font: normal normal normal 13px/1 FontAwesome; + font: normal normal normal 13px/1 'Font Awesome 5 Free'; content: "\f053"; color: gray('400'); + font-weight: 900; } &.ui-icon-circle-triangle-e:before { - content: "\f054" + content: "\f054"; + font-weight: 900; } } @@ -487,7 +489,7 @@ $o-cw-filter-avatar-size: 20px; input:not(:checked) + label .o_cw_filter_input_bg { background: transparent!important; - i.fa { + i.fa, i.far, i.fas { visibility: hidden; } } @@ -497,7 +499,7 @@ $o-cw-filter-avatar-size: 20px; @include size($o-cw-filter-avatar-size); border-radius: 2px; - &.fa { + &.fa, &.far, &.fas { padding: 4px 3px; } } |
