diff options
| author | Olivier Dony <odo@openerp.com> | 2017-05-16 18:23:03 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-05-16 18:23:15 +0200 |
| commit | 5f4db9df6640100302ab7967344e12ab877089cb (patch) | |
| tree | 934f0ceb590fb72846c12cb046d96ff609554951 /addons/web/static/src/less/fields.less | |
| parent | cbca7e13132fe807ac918d9b3c2fcbbb3a12a103 (diff) | |
| parent | 5afe894f440eff3b58134d14fa7c9b43b19fe88b (diff) | |
[MERGE] Forward-port saas-16 up to 5afe894f440eff3b58134d14fa7c9b43b19fe88b
Diffstat (limited to 'addons/web/static/src/less/fields.less')
| -rw-r--r-- | addons/web/static/src/less/fields.less | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/addons/web/static/src/less/fields.less b/addons/web/static/src/less/fields.less index 329b4f62fbd..b070a8f4cc8 100644 --- a/addons/web/static/src/less/fields.less +++ b/addons/web/static/src/less/fields.less @@ -26,7 +26,11 @@ //------------------------------------------------------------------------------ .o_field_widget { - display: inline-block; + // Default display and alignment of widget and internal <input/> + &, input.o_input { + display: inline-block; + text-align: inherit; + } // Block fields &.note-editor, &.oe_form_field_html, &.oe_form_field_html_text, &.oe_form_field_text, &.o_view_manager_content, &.o_field_domain { @@ -64,11 +68,6 @@ } } - // Input in field - input[type="text"] { - display: inline-block; - } - // Text &.o_field_text, &.oe_form_field_text .oe_form_text_content { width: 100%; @@ -92,6 +91,18 @@ .o-flex-flow(row, wrap); .o-align-items(baseline); + .o_tag_color_0 { background-color: #4D4D4D; } + .o_tag_color_1 { background-color: #61BD4F; } + .o_tag_color_2 { background-color: #F2D600; } + .o_tag_color_3 { background-color: #FFAB4A; } + .o_tag_color_4 { background-color: #EB5A46; } + .o_tag_color_5 { background-color: #875A7B; } + .o_tag_color_6 { background-color: #0079BF; } + .o_tag_color_7 { background-color: #00C2E0; } + .o_tag_color_8 { background-color: #4CD98E; } + .o_tag_color_9 { background-color: #FF80CE; } + .o_tag_color_10 { background-color: #B6BBBF; } + > .o_field_widget { .o-flex(1, 0, 100px); position: initial; @@ -105,18 +116,6 @@ color: white; cursor: pointer; - &.o_tag_color_0 { background-color: #4D4D4D; } - &.o_tag_color_1 { background-color: #61BD4F; } - &.o_tag_color_2 { background-color: #F2D600; } - &.o_tag_color_3 { background-color: #FFAB4A; } - &.o_tag_color_4 { background-color: #EB5A46; } - &.o_tag_color_5 { background-color: #875A7B; } - &.o_tag_color_6 { background-color: #0079BF; } - &.o_tag_color_7 { background-color: #00C2E0; } - &.o_tag_color_8 { background-color: #4CD98E; } - &.o_tag_color_9 { background-color: #FF80CE; } - &.o_tag_color_10 { background-color: #B6BBBF; } - > .o_badge_text { .o-text-overflow(inline-block); max-width: 200px; |