pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website, hr_*: fix some squished buttons

Browse Source 
=== ISSUE ===

With the new Milk design, we introduced `.border-radius` on buttons.
Most of the time the render looks great, but in some cases, it would break
the layout.

This is due to the fact that old design sometimes used two buttons
next to each other.

This worked fine because they did not have any radius but now it looks
like they are compressed and squished.

=== AFTER ===

This commit tracks some of these cases to improve the global render
of these buttons.

task-3329612
part of task-332626

closes odoo/odoo#122705

X-original-commit: 90c2ba3eb0bf74d675c574b13cedb90235398773
Related: odoo/enterprise#41590
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
This commit is contained in:
Chrysanthe (chgo)
2023-05-26 18:41:40 +02:00
parent 86eb916bf2
commit f062b8239e
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<button class="btn btn-secondary" t-if="canDelete" t-on-click="deleteRecord" data-hotkey="x">Delete</button>
</xpath>
<xpath expr="//div[contains(@class, 'o_cp_buttons')]" position="after">
<div class="flex-grow-1 d-flex flex-row-reverse">
<div class="flex-grow-1 d-flex flex-row-reverse gap-1">
<button class="btn btn-secondary" t-if="canRefuse" t-on-click="() => this.onClick('action_refuse')" data-hotkey="z">Refuse</button>
<button class="btn btn-secondary" t-if="canApprove" t-on-click="() => this.onClick('action_approve')" data-hotkey="g">Approve</button>
<button class="btn btn-secondary" t-if="canValidate" t-on-click="() => this.onClick('action_validate')" data-hotkey="v">Validate</button>
addons/hr_presence/views/hr_employee_views.xml
+8 -8
View File
@@ -37,16 +37,16 @@
<attribute name="create">0</attribute>
</xpath>
<xpath expr="//div[hasclass('oe_kanban_details')]" position="inside">
<div class="oe_kanban_content">
<div class="oe_kanban_row">
<div class="oe_kanban_content d-flex flex-column gap-1">
<div class="oe_kanban_row d-flex gap-1">
<field name="hr_presence_state" invisible="1"/>
<button name="action_set_present" type="object" class="btn btn-primary btn-sm mt8 fa fa-check" title="Set as present" attrs="{'invisible': [('hr_presence_state', '=', 'present')]}"> </button>
<button name="action_set_absent" type="object" class="btn btn-primary btn-sm mt8 fa fa-times" title="Set as absent" attrs="{'invisible': [('hr_presence_state', '!=', 'present')]}"> </button>
<button name="action_open_leave_request" type="object" class="btn btn-primary btn-sm mt8">Time Off</button>
<button name="action_set_present" type="object" class="btn btn-success btn-sm fa fa-check" title="Set as present" attrs="{'invisible': [('hr_presence_state', '=', 'present')]}"> </button>
<button name="action_set_absent" type="object" class="btn btn-warning btn-sm fa fa-times" title="Set as absent" attrs="{'invisible': [('hr_presence_state', '!=', 'present')]}"> </button>
<button name="action_open_leave_request" type="object" class="btn btn-secondary btn-sm">Time Off</button>
</div>
<div class="oe_kanban_row">
<button name="action_send_sms" type="object" class="btn btn-primary btn-sm mt8">SMS</button>
<button name="action_send_mail" type="object" class="btn btn-primary btn-sm mt8">Log</button>
<div class="oe_kanban_row d-flex gap-1">
<button name="action_send_sms" type="object" class="btn btn-secondary btn-sm">SMS</button>
<button name="action_send_mail" type="object" class="btn btn-secondary btn-sm">Log</button>
</div>
</div>
</xpath>
addons/website/static/src/components/dialog/edit_menu.xml
+5 -9
View File
@@ -24,21 +24,17 @@
<t t-name="website.MenuRow" owl="1">
<li t-att-data-menu-id="props.menu.fields['id']" t-att-data-is-mega-menu="props.menu.fields['is_mega_menu'] ? 'true' : undefined">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text fa fa-bars" role="img" aria-label="Dropdown menu" title="Dropdown menu"/>
</div>
<span class="form-control d-flex align-items-center">
<div class="input-group mb-1">
<span class="input-group-text bg-view fa fa-bars" role="img" aria-label="Dropdown menu" title="Dropdown menu"/>
<span class="form-control d-flex align-items-center bg-view">
<span class="js_menu_label o_text_overflow flex-grow-1">
<t t-esc="props.menu.fields['name']"/>
</span>
<span t-if="props.menu.fields['is_mega_menu']" class="badge text-bg-primary">Mega Menu</span>
<i t-if="props.menu.is_homepage" class="fa fa-home ms-3" role="img" aria-label="Home" title="Home"/>
</span>
<span class="input-group-append">
<button t-on-click="edit" type="button" class="btn btn-primary js_edit_menu fa fa-pencil-square-o" aria-label="Edit Menu Item" title="Edit Menu Item"/>
<button t-on-click="delete" type="button" class="btn btn-danger js_delete_menu fa fa-trash-o" aria-label="Delete Menu Item" title="Delete Menu Item"/>
</span>
<button t-on-click="edit" type="button" class="btn btn-secondary js_edit_menu fa fa-pencil-square-o" aria-label="Edit Menu Item" title="Edit Menu Item"/>
<button t-on-click="delete" type="button" class="btn btn-secondary js_delete_menu fa fa-trash-o rounded-start-0" aria-label="Delete Menu Item" title="Delete Menu Item"/>
</div>
<ul t-if="props.menu.children">
<t t-foreach="props.menu.children" t-as="submenu" t-key="submenu.fields['id']">