Skip to content

[FIX][18.0] viin_brand: bad UI 2 #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TuyenTran12345 wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[FIX][18.0] viin_brand: bad UI 2 #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions viin_brand_common/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
# common branding
'viin_brand_common/static/src/legacy/scss/navbar.scss',
'viin_brand_common/static/src/legacy/scss/systray.scss',
('after', 'web/static/src/core/emoji_picker/emoji_picker.scss', 'viin_brand_common/static/src/core/emoji_picker/emoji_picker.scss'),
('after', 'web/static/src/webclient/webclient.scss', 'viin_brand_common/static/src/webclient/webclient.scss'),
('after', 'web/static/src/search/search_panel/search_view.scss', 'viin_brand_common/static/src/search/search_panel/search_view.scss'),
('after', 'web/static/src/search/search_bar/search_bar.scss', 'viin_brand_common/static/src/search/search_bar/search_bar.scss'),
Expand Down
3 changes: 3 additions & 0 deletions viin_brand_common/static/src/core/emoji_picker/emoji_picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.o-EmojiPicker .o-EmojiPicker-navbar .o-Emoji > span {
filter: none;
}
5 changes: 5 additions & 0 deletions viin_brand_im_livechat/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
'demo': [
'data/im_livechat_channel_demo.xml'
],
'assets': {
'im_livechat.assets_embed_core': [
'viin_brand_im_livechat/static/src/embed/common/livechat_button.xml',
],
},
'data': [
'data/digest_data.xml',
'data/im_livechat_chatbot_data.xml',
Expand Down
10 changes: 10 additions & 0 deletions viin_brand_im_livechat/static/src/embed/common/livechat_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="im_livechat.LivechatButton" t-inherit-mode="extension">
<xpath expr="//button" position="attributes">
<attribute name="t-attf-style">
color: {{livechatService.options.button_text_color}}; background-color: #00bbce; width: {{size}}px; height: {{size}}px; min-width: 56px; top: {{ position.top }}; left: {{ position.left }};
</attribute>
</xpath>
</t>
</templates>
1 change: 1 addition & 0 deletions viin_brand_mail/static/src/core/common/chat_window.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.o-mail-ChatWindow-header {
background-color: $brand-primary-dark !important;
color: white;
}