[FIX] hr_{recruitment,skills},mass_mailing,project,note: milk adaptations
hr_recruitment: switch smart button value and label - Switching applicant's name with "Employee" label to be consistent with the rest of smart button's format mass_mailing: adapt status bar layout - Removed excessive margin between the status bar and the content - Added no padding between status bar and the control panel - Removed a useless border before the status - Improved margin between alert and buttons project: right side panel stats buttons alignment hr_skills: fix `::before` alignment == ISSUE == Before this commit, the :before line in Employee resume is not aligned with the dots. This is due to the fact that the variable $o-hrs-timeline-entry-padding used in the mixin isn't the right value we should use. There was also an issue with responsive. == After this commit == We now use a calc, which process the half of the circle plus the padding minus the border-width. The $o-horizontal-padding is the variable used to define the padding of the line inside the form view. We adapt this in a smaller media query since the $o-horizontal-padding value is different. task-2818586 Part-of: odoo/odoo#116641
This commit is contained in:
committed by
Pierre Paridans
parent
c1080c8638
commit
fabf9e9703
@@ -78,8 +78,8 @@
|
||||
groups="hr.group_hr_user"
|
||||
attrs="{'invisible': [('emp_id', '=', False)]}">
|
||||
<div class="o_field_widget o_stat_info">
|
||||
<span class="o_stat_text"><field name="employee_name" readonly="1"/></span>
|
||||
<span class="o_stat_value">Employee</span>
|
||||
<span class="o_stat_value"><field name="employee_name" readonly="1"/></span>
|
||||
<span class="o_stat_text">Employee</span>
|
||||
</div>
|
||||
</button>
|
||||
<button name="action_applications_email"
|
||||
|
||||
@@ -16,12 +16,15 @@
|
||||
}
|
||||
|
||||
&:before {
|
||||
@include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + $o-hrs-timeline-entry-padding));
|
||||
width: 1px;
|
||||
@include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + o-to-rem($o-horizontal-padding) - o-to-rem($border-width)));
|
||||
width: $border-width;
|
||||
height: 100%;
|
||||
margin-left: 2.1rem;
|
||||
background-color: $border-color;
|
||||
content: "";
|
||||
|
||||
@include media-breakpoint-up(lg, $o-extra-grid-breakpoints) {
|
||||
left: ($o-hrs-timeline-dot-size * .5 + o-to-rem($o-horizontal-padding) * 2 - o-to-rem($border-width))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,13 +27,6 @@
|
||||
.o_statusbar_buttons {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
.o_statusbar_status {
|
||||
border-left: solid $o-gray-300 1px;
|
||||
}
|
||||
}
|
||||
.o_mass_mailing_mailing_group {
|
||||
margin-top: $o-sheet-cancel-tpadding + 33px;
|
||||
}
|
||||
.o-mail-Form-chatter {
|
||||
margin: 0;
|
||||
@@ -183,7 +176,6 @@
|
||||
}
|
||||
|
||||
.o_mass_mailing_mailing_form.o_mass_mailing_form_full_width .alert.alert-info:not(.o_invisible_modifier) {
|
||||
margin: 0 0 0 12px;
|
||||
flex: 1;
|
||||
padding: unset;
|
||||
border-left-width: 1px;
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<field name="model">mailing.mailing</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Mailing" class="o_mass_mailing_mailing_form">
|
||||
<header style="min-height:31px;">
|
||||
<header class="pt-3">
|
||||
<button name="action_launch" type="object" class="oe_highlight" string="Send"
|
||||
attrs="{'invisible': [('state', 'in', ('in_queue', 'sending', 'done'))]}" data-hotkey="v"
|
||||
confirm="This will send the email to all recipients. Are you sure you want to proceed?"
|
||||
@@ -74,7 +74,7 @@
|
||||
|
||||
<field name="state" readonly="1" widget="statusbar"/>
|
||||
</header>
|
||||
<div class="alert alert-info text-center" role="alert"
|
||||
<div class="alert alert-info mb-2 text-center" role="alert"
|
||||
attrs="{'invisible': ['&','&','&','&','&',('state', '!=', 'in_queue'),('sent', '=', 0),('canceled', '=', 0),('scheduled', '=', 0),('failed', '=', 0),('warning_message', '=', False)]}">
|
||||
<div class="o_mails_canceled" attrs="{'invisible': [('canceled', '=', 0)]}">
|
||||
<button class="btn-link py-0"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
.o_form_sheet_bg {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 0;
|
||||
.o_form_statusbar {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
@@ -163,9 +163,13 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Note" class="o_note_form_view">
|
||||
<header>
|
||||
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/>
|
||||
<div class="py-1 px-2 border rounded bg-view">
|
||||
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags" class="mb-0"/>
|
||||
</div>
|
||||
<div class="py-1 px-2 border rounded bg-view">
|
||||
<field name="company_id" groups="base.group_multi_company" class="mb-0"/>
|
||||
</div>
|
||||
<field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<field name="memo" type="html" class="oe_memo" default_focus="1" options="{'resizable': false, 'collaborative': true}"/>
|
||||
|
||||
+2
@@ -37,9 +37,11 @@ $o-rightpanel-p-tiny: $o-rightpanel-p-small*0.5;
|
||||
.o_form_view {
|
||||
.oe_button_box {
|
||||
margin: -1px (-$o-rightpanel-p) 0;
|
||||
box-shadow: inset 0 -1px 0 $border-color;
|
||||
|
||||
.oe_stat_button {
|
||||
flex-basis: 25%;
|
||||
margin: 0;
|
||||
|
||||
&:nth-child(4n):not(:last-child) {
|
||||
border-right-width: 0;
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
<ViewButton
|
||||
t-if="button.show"
|
||||
defaultRank="'oe_stat_button'"
|
||||
className="'h-auto py-2 border border-start-0 border-top-0 text-start'"
|
||||
className="'flex-grow-0 h-auto py-2 border border-start-0 border-top-0 text-start rounded-0'"
|
||||
icon="`fa-${button.icon}`"
|
||||
title="button.text"
|
||||
clickParams="_getStatButtonClickParams(button)"
|
||||
|
||||
Reference in New Issue
Block a user