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

[REF] web, mail: get rid of the btn-icon class

Browse Source 
That was pretty useless, better use the btn-secondary class and add
particular rules to `.btn.fa` if necessary.
This commit is contained in:
qsm-odoo
2018-07-27 12:36:54 +02:00
parent c59380bac5
commit 220e49f9d6
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/scss/composer.scss
+1 -1
View File
@@ -60,7 +60,7 @@
textarea {
resize: none;
}
.btn-icon {
.btn.fa {
@include o-hover-opacity($default-opacity: 0.8, $hover-opacity: 1);
border: none;
}
addons/mail/static/src/scss/thread_window.scss
+1 -1
View File
@@ -47,7 +47,7 @@
@include media-breakpoint-down(sm) {
padding: 13px;
}
&.btn-icon {
&.btn.fa {
font-size: 1.3em;
}
}
addons/mail/static/src/xml/chatter.xml
+1 -1
View File
@@ -44,7 +44,7 @@
<!-- Add a button to open the full composer dialog -->
<t t-jquery=".o_composer_button_add_attachment" t-operation="after">
<button tabindex="6" class="btn btn-icon fa fa-expand o_composer_button_full_composer" type="button" title="Full composer" aria-label="Full composer"/>
<button tabindex="6" class="btn btn-secondary fa fa-expand o_composer_button_full_composer" type="button" title="Full composer" aria-label="Full composer"/>
</t>
</t>
addons/mail/static/src/xml/composer.xml
+3 -3
View File
@@ -11,9 +11,9 @@
<div class="o_composer_input">
<textarea class="o_input o_composer_text_field" tabindex="2" placeholder="Write something..."/>
<div class="o_chatter_composer_tools">
<button tabindex="4" class="btn btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover" title="Emojis" aria-label="Emojis"/>
<button tabindex="5" class="btn btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button" aria-label="Add attachment" title="Add attachment"/>
<button t-if="widget.options.isMobile" tabindex="3" class="btn btn-icon fa fa-paper-plane-o o_composer_button_send" type="button" title="Send" aria-label="Send"/>
<button tabindex="4" class="btn btn-secondary fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover" title="Emojis" aria-label="Emojis"/>
<button tabindex="5" class="btn btn-secondary fa fa-paperclip o_composer_button_add_attachment" type="button" aria-label="Add attachment" title="Add attachment"/>
<button t-if="widget.options.isMobile" tabindex="3" class="btn btn-secondary fa fa-paper-plane-o o_composer_button_send" type="button" title="Send" aria-label="Send"/>
</div>
</div>
</div>
addons/web/static/src/scss/webclient_extra.scss
-5
View File
@@ -44,8 +44,3 @@ select {
@include o-text-overflow;
max-width: 150px;
}
// Button
.btn-icon {
@include button-variant($btn-secondary-color, $btn-secondary-bg, $btn-secondary-border);
}
addons/web/static/src/xml/base.xml
+3 -3
View File
@@ -204,7 +204,7 @@
<t t-name="ControlPanel.SwitchButton">
<button type="button" t-att-accesskey="view.accessKey"
t-attf-class="btn btn-icon fa fa-lg #{view.icon} o_cp_switch_#{view.type}"
t-attf-class="btn btn-secondary fa fa-lg #{view.icon} o_cp_switch_#{view.type}"
t-attf-aria-label="View #{view.type}"
t-att-data-view-type="view.type" t-attf-title="View #{view.type}" tabindex="-1"/>
</t>
@@ -1426,8 +1426,8 @@
<t t-set="att_prev" t-value="{'accesskey': 'p'}" />
<t t-set="att_next" t-value="{'accesskey': 'n'}" />
</t>
<button type="button" class="fa fa-chevron-left btn btn-icon o_pager_previous" t-att="att_prev" aria-label="Previous" title="Next" tabindex="-1"/>
<button type="button" class="fa fa-chevron-right btn btn-icon o_pager_next" t-att="att_next" aria-label="Next" title="Next" tabindex="-1"/>
<button type="button" class="fa fa-chevron-left btn btn-secondary o_pager_previous" t-att="att_prev" aria-label="Previous" title="Next" tabindex="-1"/>
<button type="button" class="fa fa-chevron-right btn btn-secondary o_pager_next" t-att="att_next" aria-label="Next" title="Next" tabindex="-1"/>
</span>
</div>