diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-04-27 16:01:09 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 81f359c81c69af2a5ec0645602e2bb43b2e16721 (patch) | |
| tree | dc3ebb2391acf9c3e51def6dc1407586c8d9e2cb /addons/mail/static/src/xml | |
| parent | 7f10b55a5035bd3cab48ba58a519510a25b94f60 (diff) | |
[REF] *: BS4, remove the use of btn-sm
Odoo made the bad choice of using the 'btn-sm' class for every button
instead of configuring the padding for default 'btn' to be smaller.
In BS4, the style of btn-sm is actually more complex, lowering the
font-size too. Also, btn-xs was removed so we would not have the
possibility to display smaller button than our default ones.
This commit removes btn-sm wherever it was used. Unfortunately, this
might remove it at some places where it made sense but this can be
restored in a second time.
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 6 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/chatter.xml | 8 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 8 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/discuss.xml | 24 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/followers.xml | 8 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/systray.xml | 10 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 2 |
7 files changed, 33 insertions, 33 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index ca07f810101..1ca80f46fcd 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -62,13 +62,13 @@ <t t-raw="activity.note"/> </div> <div class="o_thread_message_tools btn-group"> - <a role="button" href="#" class="btn btn-link btn-success text-muted btn-sm o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover"> + <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover"> <i class="fa fa-check"/> Mark Done </a> - <a role="button" href="#" class="btn btn-link btn-default text-muted btn-sm o_activity_edit o_activity_link" t-att-data-activity-id="activity.id"> + <a role="button" href="#" class="btn btn-link btn-default text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id"> <i class="fa fa-pencil"/> Edit </a> - <a role="button" href="#" class="btn btn-link btn-sm btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id"> + <a role="button" href="#" class="btn btn-link btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id"> <i class="fa fa-times"/> Cancel </a> </div> diff --git a/addons/mail/static/src/xml/chatter.xml b/addons/mail/static/src/xml/chatter.xml index 9b6d0586bdc..63bf85adde4 100644 --- a/addons/mail/static/src/xml/chatter.xml +++ b/addons/mail/static/src/xml/chatter.xml @@ -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-sm 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-icon fa fa-expand o_composer_button_full_composer" type="button" title="Full composer" aria-label="Full composer"/> </t> </t> @@ -57,13 +57,13 @@ @param {boolean} [scheduleActivityButton] --> <t t-name="mail.chatter.Buttons"> - <button t-if="newMessageButton" type="button" class="btn btn-sm btn-link o_chatter_button_new_message" title="Send a message" disabled="disabled"> + <button t-if="newMessageButton" type="button" class="btn btn-link o_chatter_button_new_message" title="Send a message" disabled="disabled"> Send message </button> - <button t-if="logNoteButton" class="btn btn-sm btn-link o_chatter_button_log_note" title="Log a note. Followers will not be notified." disabled="disabled"> + <button t-if="logNoteButton" class="btn btn-link o_chatter_button_log_note" title="Log a note. Followers will not be notified." disabled="disabled"> Log note </button> - <button t-if="scheduleActivityButton" class="btn btn-sm btn-link o_chatter_button_schedule_activity" title="Log or schedule an activity" disabled="disabled"> + <button t-if="scheduleActivityButton" class="btn btn-link o_chatter_button_schedule_activity" title="Log or schedule an activity" disabled="disabled"> <i class="fa fa-clock-o" role="img" aria-label="Dates" title="Dates"/> <t t-if="isMobile">Activity</t><t t-else="">Schedule activity</t> </button> </t> diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 849a37ae3d1..93061c3e4fd 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -11,16 +11,16 @@ <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-sm 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-sm 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-sm btn-icon fa fa-paper-plane-o o_composer_button_send" type="button" title="Send" aria-label="Send"/> + <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"/> </div> </div> </div> <div class="o_composer_attachments_list"/> </div> <div class="o_composer_send"> - <button tabindex="3" class="btn btn-sm btn-primary o_composer_button_send d-none d-md-inline-block" type="button"><t t-esc="widget.options.sendText"/></button> + <button tabindex="3" class="btn btn-primary o_composer_button_send d-none d-md-inline-block" type="button"><t t-esc="widget.options.sendText"/></button> </div> <span class="d-none"> <t t-call="HiddenInputFile"> diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml index bb62bed5cca..f46c5a12300 100644 --- a/addons/mail/static/src/xml/discuss.xml +++ b/addons/mail/static/src/xml/discuss.xml @@ -181,16 +181,16 @@ --> <t t-name="mail.discuss.ControlButtons"> <div> - <button type="button" class="btn btn-primary btn-sm o_mail_discuss_button_invite d-none d-md-inline-block" title="Invite people">Invite</button> - <button type="button" class="btn btn-default btn-sm o_mail_discuss_button_mark_all_read d-none d-md-inline-block" title="Mark all as read">Mark all read</button> - <button type="button" class="btn btn-default btn-sm o_mail_discuss_button_unstar_all" title="Unstar all messages">Unstar all</button> - <button type="button" class="btn btn-default btn-sm o_mail_discuss_button_dm d-block d-md-none" title="New Message">New Message</button> - <button t-if="!disableAddThread" type="button" class="btn btn-default btn-sm o_mail_discuss_button_public o_mail_discuss_button_private d-block d-md-none" title="New Channel">New Channel</button> - <button type="button" class="btn btn-default btn-sm o_hidden o_mail_discuss_button_select_all" title="Select all messages to moderate">Select All</button> - <button type="button" class="btn btn-default btn-sm o_hidden o_mail_discuss_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button> - <button type="button" data-decision="accept" class="btn btn-default btn-sm o_mail_discuss_button_moderate_all" title="Accept selected messages">Accept</button> - <button type="button" data-decision="reject" class="btn btn-default btn-sm o_mail_discuss_button_moderate_all" title="Reject selected messages">Reject</button> - <button type="button" data-decision="discard" class="btn btn-default btn-sm o_mail_discuss_button_moderate_all" title="Discard selected messages">Discard</button> + <button type="button" class="btn btn-primary o_mail_discuss_button_invite d-none d-md-inline-block" title="Invite people">Invite</button> + <button type="button" class="btn btn-default o_mail_discuss_button_mark_all_read d-none d-md-inline-block" title="Mark all as read">Mark all read</button> + <button type="button" class="btn btn-default o_mail_discuss_button_unstar_all" title="Unstar all messages">Unstar all</button> + <button type="button" class="btn btn-default o_mail_discuss_button_dm d-block d-md-none" title="New Message">New Message</button> + <button t-if="!disableAddThread" type="button" class="btn btn-default o_mail_discuss_button_public o_mail_discuss_button_private d-block d-md-none" title="New Channel">New Channel</button> + <button type="button" class="btn btn-default o_hidden o_mail_discuss_button_select_all" title="Select all messages to moderate">Select All</button> + <button type="button" class="btn btn-default o_hidden o_mail_discuss_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button> + <button type="button" data-decision="accept" class="btn btn-default o_mail_discuss_button_moderate_all" title="Accept selected messages">Accept</button> + <button type="button" data-decision="reject" class="btn btn-default o_mail_discuss_button_moderate_all" title="Reject selected messages">Reject</button> + <button type="button" data-decision="discard" class="btn btn-default o_mail_discuss_button_moderate_all" title="Discard selected messages">Discard</button> </div> </t> @@ -208,10 +208,10 @@ <t t-name="mail.discuss_mobile"> <div class="o_mail_discuss"> <div class="o_mail_discuss_mobile_mailboxes_buttons"> - <button type="button" class="btn btn-primary btn-sm d-inline d-md-none o_mailbox_inbox_item" title="Inbox" data-type="mailbox_inbox"> + <button type="button" class="btn btn-primary d-inline d-md-none o_mailbox_inbox_item" title="Inbox" data-type="mailbox_inbox"> Inbox </button> - <button type="button" class="btn btn-default btn-sm d-inline d-md-none o_mailbox_inbox_item" title="Starred" data-type="mailbox_starred"> + <button type="button" class="btn btn-default d-inline d-md-none o_mailbox_inbox_item" title="Starred" data-type="mailbox_starred"> Starred </button> </div> diff --git a/addons/mail/static/src/xml/followers.xml b/addons/mail/static/src/xml/followers.xml index add787b7e03..a19831308a6 100644 --- a/addons/mail/static/src/xml/followers.xml +++ b/addons/mail/static/src/xml/followers.xml @@ -7,7 +7,7 @@ <t t-name="mail.Followers"> <div class="o_followers"> <div class="o_followers_title_box"> - <button class="btn btn-sm btn-link dropdown-toggle" title="Dropdown menu - Followers" + <button class="btn btn-link dropdown-toggle" title="Dropdown menu - Followers" data-toggle="dropdown" aria-expanded="false"> <i class="fa fa-user" role="img" aria-label="Dropdown menu - Followers"></i> <span class="o_followers_count"/> @@ -15,14 +15,14 @@ <ul class="dropdown-menu o_followers_list" role="menu"></ul> </div> <div class="o_followers_actions"> - <div class="btn-group btn-group-sm o_subtypes_list"> - <button class="btn btn-sm btn-link o_followers_follow_button o_followers_notfollow"> + <div class="btn-group o_subtypes_list"> + <button class="btn btn-link o_followers_follow_button o_followers_notfollow"> <span class="o_follow">Follow</span> <span class="fa fa-times o_followers_unfollow"/> <span class="o_followers_unfollow"> Unfollow</span> <span class="fa fa-check o_followers_following"/> <span class="o_followers_following"> Following</span> - </button><button class="btn btn-sm btn-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + </button><button class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <span class="fa fa-bell" role="img" aria-label="Alarm menu" title="Alarm menu"/> </button> <ul class="dropdown-menu" role="menu"/> diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index 7f3d56d955d..2f506b926df 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -12,16 +12,16 @@ <ul class="o_mail_systray_dropdown dropdown-menu" role="menu"> <li role="menuitem" t-if="widget.isMobile()"> <div class="o_mail_systray_mobile_header"> - <button type="button" class="btn btn-default btn-sm o_new_message"> New message </button> + <button type="button" class="btn btn-default o_new_message"> New message </button> </div> </li> <li role="menuitem" t-if="!widget.isMobile()" class="o_mail_systray_dropdown_top"> <div> - <button type="button" class="btn btn-sm btn-link o_filter_button active"> All </button> - <button type="button" class="btn btn-sm btn-link o_filter_button" data-filter='chat'> Chat </button> - <button type="button" class="btn btn-sm btn-link o_filter_button" data-filter='channels'> Channels </button> + <button type="button" class="btn btn-link o_filter_button active"> All </button> + <button type="button" class="btn btn-link o_filter_button" data-filter='chat'> Chat </button> + <button type="button" class="btn btn-link o_filter_button" data-filter='channels'> Channels </button> </div> - <button type="button" class="btn btn-sm btn-link o_new_message"> New message </button> + <button type="button" class="btn btn-link o_new_message"> New message </button> </li> <li role="menuitem" class="o_mail_systray_dropdown_items"/> <li role="menuitem" t-if="widget.isMobile()"> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 2d877068694..41335c3f5f3 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -438,7 +438,7 @@ <span><i class="fa fa-spinner fa-spin" role="img" aria-label="Please wait" title="Please wait"/> Loading older messages... </span> </t> <t t-else=""> - <button class="btn btn-sm btn-link">-------- Show older messages --------</button> + <button class="btn btn-link">-------- Show older messages --------</button> </t> </div> </t> |
