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

[IMP] web,mail: pivot & chatter design adaption

Browse Source 
Part-of: odoo/odoo#116641
This commit is contained in:
Brieuc-brd
2023-05-12 22:59:18 +02:00
committed by Pierre Paridans
parent 316c4dc801
commit 0f065ed8ea
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/composer/composer.scss
-4
View File
@@ -64,7 +64,3 @@
padding-top: 10px;
padding-bottom: 10px;
}
.o-mail-Composer-send {
border: 1px solid darken($primary, 5%);
}
addons/mail/static/src/composer/composer.xml
+1 -1
View File
@@ -78,7 +78,7 @@
</div>
</div>
<button t-if="!compact or store.isSmall" class="o-mail-Composer-send btn btn-secondary o-last border-start-0"
t-att-class="{'mt-2': extended, 'rounded-0 rounded-end-3': !extended and !compact, 'align-self-stretch': !extended}"
t-att-class="{'mt-2': extended, 'rounded-0 rounded-end-3': !extended and !compact, 'align-self-stretch': !extended, 'border border-start-0': env.inDiscussApp}"
t-on-click="sendMessage"
type="button"
t-att-disabled="isSendButtonDisabled"
addons/mail/static/src/core_ui/message.xml
+2 -2
View File
@@ -116,7 +116,7 @@
</t>
</t>
</div>
<div t-if="props.hasActions and !message.isTransient" class="o-mail-Message-actions bg-view"
<div t-if="props.hasActions and !message.isTransient" class="o-mail-Message-actions"
t-att-class="{
'position-absolute top-0': !env.inDiscussApp,
'start-0 ms-3': isAlignedRight,
@@ -130,7 +130,7 @@
'o-expanded': state.expandOptions
}"
>
<div class="d-flex rounded-1 shadow-sm overflow-hidden" t-att-class="{
<div class="d-flex rounded-1 bg-view shadow-sm overflow-hidden" t-att-class="{
'mt-3': env.inChatter and !(message.isDiscussion or message.isNotification),
'flex-row-reverse': env.inChatWindow and isAlignedRight,
}"
addons/mail/static/src/web/message_patch.xml
+1 -1
View File
@@ -20,7 +20,7 @@
</t>
</ul>
</t>
<div t-if="message.body" class="o-mail-Message-body text-break mb-0 bg-view w-100" t-ref="body">
<div t-if="message.body" class="o-mail-Message-body text-break mb-0 w-100" t-ref="body">
<t t-out="message.body"/>
</div>
</t>
addons/web/static/src/scss/bootstrap_overridden.scss
Vendored
+1 -1
View File
@@ -137,7 +137,7 @@ $table-bg: transparent !default;
$table-striped-color: inherit !default;
$table-striped-bg-factor: 0.01 !default;
$table-hover-bg-factor: .055 !default;
$table-border-color: $gray-200 !default;
$table-border-color: $border-color !default;
$table-group-separator-color: $gray-200 !default;
$table-cell-padding-x: .75rem !default;
$table-cell-padding-y: .75rem !default;
addons/web/static/src/views/pivot/pivot_renderer.xml
+5 -3
View File
@@ -3,7 +3,7 @@
<t t-name="web.PivotRenderer" owl="1">
<t t-call="web.PivotView.Buttons"/>
<div class="o_pivot table-responsive">
<div class="o_pivot table-responsive mx-3">
<table
class="table-hover table table-sm table-bordered table-borderless bg-view"
@@ -16,8 +16,9 @@
<t t-if="cell.measure" t-call="web.PivotMeasure"/>
<t t-elif="cell.isLeaf !== undefined" t-call="web.PivotHeader">
<t t-set="isXAxis" t-value="true"/>
<t t-set="isInHead" t-value="true"/>
</t>
<th t-else="" t-att-colspan="cell.width" t-att-rowspan="cell.height" class="fw-normal border-start-0"/>
<th t-else="" t-att-colspan="cell.width" t-att-rowspan="cell.height" class="fw-normal border-start-0" t-att-class="{ 'border-top': cell_index != 0 }"/>
</t>
</tr>
</thead>
@@ -55,12 +56,13 @@
<t t-name="web.PivotHeader" owl="1">
<th
class="text-nowrap cursor-pointer fw-normal user-select-none border-start-0"
class="text-nowrap cursor-pointer fw-normal user-select-none"
t-att-colspan="isXAxis ? cell.width : undefined"
t-att-rowspan="isXAxis ? cell.height : undefined"
t-att-class="{
o_pivot_header_cell_closed: cell.isLeaf,
o_pivot_header_cell_opened: !cell.isLeaf,
'border-top': isInHead,
}"
t-attf-style="{{
isXAxis