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

[FIX] web, calendar: many2many avatar-tags field alignment

Browse Source 
Prior to this commit the avatar status element was touching the badge
border.

task-2579123
This commit is contained in:
stefanorigano (SRI)
2021-07-23 06:54:18 +00:00
committed by Aaron Bohy
parent b49cd9fa55
commit f7efa256fb
5 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/static/src/scss/calendar.scss
+1 -5
View File
@@ -1,9 +1,5 @@
.o_calendar_invitation {
display: inline-block;
width: 10px;
height: 10px;
border-radius: 5px;
vertical-align: middle;
@extend .o_status;
&.accepted {
background-color: theme-color('success');
addons/calendar/static/src/xml/base_calendar.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<t t-name="Many2ManyAttendeeTag" t-extend="FieldMany2ManyTagAvatar">
<t t-jquery="span:first" t-operation="prepend">
<span t-if="attendeesData[el_index] and attendeesData[el_index].status and attendeesData[el_index].status !== 'needsAction'"
t-attf-class="o_calendar_invitation #{attendeesData[el_index].status}"/>
t-attf-class="o_calendar_invitation d-inline-block align-middle #{attendeesData[el_index].status}"/>
</t>
</t>
addons/web/static/src/legacy/js/views/calendar/calendar_popover.js
+1 -1
View File
@@ -200,7 +200,7 @@ var CalendarPopover = Widget.extend(WidgetAdapterMixin, StandaloneFieldManagerMi
}
self._registerWidget(recordID, field.name, fieldWidget);
// Only display the fields whose attributes does not make them invisible
let fieldClass = "list-group-item flex-shrink-0 d-flex flex-wrap";
let fieldClass = "list-group-item flex-shrink-0 d-flex flex-wrap align-items-center";
if (fieldWidget.attrs && fieldWidget.attrs.modifiers) {
const fieldModifier = record.evalModifiers(_.pick(fieldWidget.attrs.modifiers, 'invisible'));
fieldClass += fieldModifier.invisible ? ' o_invisible_modifier' : '';
addons/web/static/src/legacy/scss/bootstrap_overridden.scss
Vendored
-4
View File
@@ -161,10 +161,6 @@ $toast-font-size: $font-size-base !default;
$toast-background-color: rgba($white, .7) !default;
$toast-header-background-color: $toast-background-color !default;
// Badges
$badge-font-weight: normal !default;
// Modals
// Padding applied to the modal body
addons/web/static/src/legacy/scss/fields.scss
+7 -13
View File
@@ -277,29 +277,23 @@
}
// Many2many tags avatar
&.avatar {
align-items: center;
.badge {
padding: 0 0.6em 0 0;
align-items: center;
img {
height: 17px;
width: 17px;
height: 1.2em;
width: 1.2em;
object-fit: cover;
margin-top: 1px;
margin-left: 1px;
}
.o_badge_text {
display: flex;
align-items:center;
.o_badge_text, .o_delete {
padding-top: 0.25em;
padding-bottom: 0.25em;
}
.o_tag_badge_text {
padding-left:2px;
}
.o_delete {
padding-top: 0.25em;
padding-bottom: 0.25em;
}
}
}
}