diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-07 14:30:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-07 14:30:30 +0200 |
| commit | bf51fe55a149fb642a410f579dc4b6dcbd794eac (patch) | |
| tree | f4f208f06094bcef6541fd1fc034e0265de4ad21 /addons/web/static/src/less | |
| parent | bf32940142beb879211b7034bb77a7845c9d0555 (diff) | |
| parent | 0f2b2c4e2b99df8d68456016a4bea86e26c1c80e (diff) | |
[MERGE] forward port branch saas-16 up to 0f2b2c4e2b9
Diffstat (limited to 'addons/web/static/src/less')
| -rw-r--r-- | addons/web/static/src/less/control_panel.less | 11 | ||||
| -rw-r--r-- | addons/web/static/src/less/web_calendar.less | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/static/src/less/control_panel.less b/addons/web/static/src/less/control_panel.less index 83048112815..4a022112e09 100644 --- a/addons/web/static/src/less/control_panel.less +++ b/addons/web/static/src/less/control_panel.less @@ -99,13 +99,16 @@ .o-flex-display(); .o-flex-flow(row, wrap); - .o_cp_buttons, .o_cp_pager { + .o_cp_buttons { .o-flex-display(); margin-right: auto; + > div { + margin-top: 5px; + } } - - .o_cp_buttons > div { - margin-top: 5px; + .o_cp_pager { + .o-flex-display(); + margin-left: auto; } } diff --git a/addons/web/static/src/less/web_calendar.less b/addons/web/static/src/less/web_calendar.less index ed25f8f8dd0..d6aab5e0e38 100644 --- a/addons/web/static/src/less/web_calendar.less +++ b/addons/web/static/src/less/web_calendar.less @@ -64,9 +64,6 @@ .o_field_type_char:first-child { font-weight: bold; } - .o_field_type_many2many:last-child img { - float: right; - } .fc-view { overflow-x: auto; > table { |