diff options
| author | Yannick Tivisse <yti@odoo.com> | 2015-01-20 14:13:19 +0100 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2015-01-21 16:11:26 +0100 |
| commit | 9207c4645a639bcd67ac3aa27ac1bda22d063638 (patch) | |
| tree | 05bd77b27c03d34dcae14e342126fc5d8ad6abae /addons/web/static/src/css | |
| parent | b96087496022b9ffaf6cf95eaac4752d389182b5 (diff) | |
[IMP] Replace all oe_e class by fontawesome + remove entyporegular library
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 49 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 48 |
2 files changed, 27 insertions, 70 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a72ff1cffb2..a6a0a308607 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -8,16 +8,6 @@ font-weight: normal; font-style: normal; } -@font-face { - font-family: "EntypoRegular"; - src: url("/web/static/src/font/entypo-webfont.eot") format("eot"); - src: url("/web/static/src/font/entypo-webfont.eot?#iefix") format("embedded-opentype"); - src: url("/web/static/src/font/entypo-webfont.woff") format("woff"); - src: url("/web/static/src/font/entypo-webfont.ttf") format("truetype"); - src: url("/web/static/src/font/entypo-webfont.svg") format("svg") active; - font-weight: normal; - font-style: normal; -} #oe_main_menu_navbar { min-height: 34px; z-index: 1001; @@ -282,12 +272,6 @@ font-size: 21px; font-weight: 300 !important; } -.openerp .oe_e { - font-family: "entypoRegular" !important; - font-size: 34px; - font-weight: 300 !important; - line-height: 100%; -} .openerp .oe_left { float: left; margin-right: 8px; @@ -508,7 +492,8 @@ text-shadow: 0 0 2px black; vertical-align: top; position: relative; - top: -8px; + top: 4px; + font-size: 22px; } .openerp .oe_star_on:hover, .openerp .oe_star_off:hover { text-decoration: none; @@ -2100,10 +2085,9 @@ border: none; text-shadow: none; } -.openerp .oe_fileupload .oe_add button.oe_attach .oe_e { +.openerp .oe_fileupload .oe_add button.oe_attach .fa { position: relative; - top: -10px; - left: -9px; + font-size: 18px; } .openerp .oe_fileupload .oe_add input.oe_form_binary_file { display: inline-block; @@ -2129,11 +2113,11 @@ padding-left: 4px; padding-right: 4px; } -.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e { +.openerp .oe_fileupload .oe_attachments .oe_attachment .fa { font-size: 23px; margin-top: -5px; } -.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e:hover { +.openerp .oe_fileupload .oe_attachments .oe_attachment .fa:hover { text-decoration: none; } .openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(odd) { @@ -2154,9 +2138,12 @@ right: 0px; } .openerp .oe_form_field_many2one .oe_m2o_cm_button { - line-height: 14px; + line-height: 27px; float: right; padding-left: 2px; + font-size: 19px; + color: #7C7BAD; + cursor: pointer; } .openerp .oe_form_field_many2one input { padding-right: 13px; @@ -2613,17 +2600,9 @@ cursor: ns-resize; } .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle { - font-size: 1px; - letter-spacing: -1px; - color: transparent; - text-shadow: none; - font-weight: normal; - margin-right: 7px; -} -.openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before { - font: 18px "entypoRegular"; - content: "}"; + font-size: 18px; color: #E0E0E0; + margin-right: 7px; } .openerp .oe_list_content .oe_list_field_progressbar progress { width: 100%; @@ -3072,7 +3051,7 @@ body.oe_single_form .oe_single_form_container { .openerp .tree_header button, .openerp .oe_mail .oe_mail_thread_msg .oe_mail_unread, .openerp .oe_mail_fetch_more, .openerp .oe_m2o_drop_down_button img, .openerp .oe_form_field_one2many_list_row_add { visibility: hidden; } - .openerp a.oe_m2o_cm_button, .openerp a.oe_e { + .openerp a.oe_m2o_cm_button, .openerp a.fa { visibility: hidden; } .openerp .oe_form .oe_form_field_date img, .openerp .oe_form .oe_form_field_datetime img { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 94054c6aa7f..b7dfddeabdd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -23,16 +23,6 @@ $sheet-padding: 16px font-weight: normal font-style: normal -@font-face - font-family: 'EntypoRegular' - src: url('/web/static/src/font/entypo-webfont.eot') format('eot') - src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype') - src: url('/web/static/src/font/entypo-webfont.woff') format('woff') - src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype') - src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active - font-weight: normal - font-style: normal - @mixin reset() border: none padding: 0 @@ -130,17 +120,6 @@ $sheet-padding: 16px content: $icon-name color: $color -@mixin text-to-entypo-icon($icon-name, $color: #404040, $size: 21px) - font-size: 1px - letter-spacing: -1px - color: transparent - text-shadow: none - font-weight: normal - &:before - font: $size "entypoRegular" - content: $icon-name - color: $color - // }}} #oe_main_menu_navbar @@ -336,11 +315,6 @@ $sheet-padding: 16px font-family: "mnmliconsRegular" !important font-size: 21px font-weight: 300 !important - .oe_e - font-family: "entypoRegular" !important - font-size: 34px - font-weight: 300 !important - line-height: 100% .oe_left float: left margin-right: 8px @@ -475,7 +449,8 @@ $sheet-padding: 16px text-shadow: 0 0 2px black vertical-align: top position: relative - top: -8px + top: 4px + font-size: 22px .oe_star_on:hover, .oe_star_off:hover text-decoration: none .oe_star_on @@ -1763,10 +1738,9 @@ $sheet-padding: 16px box-shadow: none border: none text-shadow: none - .oe_e + .fa position: relative - top: -10px - left: -9px + font-size: 18px input.oe_form_binary_file display: inline-block margin-left: -85px @@ -1787,10 +1761,10 @@ $sheet-padding: 16px padding: 2px padding-left: 4px padding-right: 4px - .oe_e + .fa font-size: 23px margin-top: -5px - .oe_e:hover + .fa:hover text-decoration: none .oe_attachment:nth-child(odd) background: white @@ -1807,9 +1781,12 @@ $sheet-padding: 16px top: 2px right: 0px .oe_m2o_cm_button - line-height: 14px + line-height: 27px float: right padding-left: 2px + font-size: 19px + color: #7C7BAD + cursor: pointer input padding-right: 13px &.ui-autocomplete @@ -2147,7 +2124,8 @@ $sheet-padding: 16px padding: 0 !important cursor: ns-resize .oe_list_handle - @include text-to-entypo-icon("}",#E0E0E0,18px) + font-size: 18px + color: #E0E0E0 margin-right: 7px .oe_list_field_progressbar progress width: 100% @@ -2533,7 +2511,7 @@ body.oe_single_form .tree_header button, .oe_mail .oe_mail_thread_msg .oe_mail_unread, .oe_mail_fetch_more, .oe_m2o_drop_down_button img, .oe_form_field_one2many_list_row_add visibility: hidden a - &.oe_m2o_cm_button, &.oe_e + &.oe_m2o_cm_button, &.fa visibility: hidden .oe_form .oe_form_field_date img, .oe_form_field_datetime img |
