Fixes #3473 - Macros are not displayed within the Mobile View

- hides avatars for now (using bootstrap utility class .hidden-xs)
- for a future mobile placement of the avatars in for example the sidebar, use .visible-xs to only show them on mobile)
- reference: https://getbootstrap.com/docs/3.3/css/#responsive-utilities
This commit is contained in:
Felix Niklas 2021-03-29 16:39:24 +02:00 committed by Thorsten Eckel
parent 6e17591f27
commit 76bb7f920e
2 changed files with 20 additions and 15 deletions

View file

@ -1,5 +1,5 @@
<div class="attributeBar-avatars flex horizontal js-avatars"></div> <div class="attributeBar-avatars flex horizontal js-avatars hidden-xs"></div>
<div class="buttonDropdown btn js-reset <% if !@resetButtonShown: %>hide<% end %>"><%- @T('Discard your unsaved changes.') %></div> <div class="attributeBar-reset buttonDropdown btn js-reset <% if !@resetButtonShown: %>hide<% end %>"><span><%- @T('Discard your unsaved changes.') %></span></div>
<div class="buttonDropdown dropdown dropdown--actions dropup"> <div class="buttonDropdown dropdown dropdown--actions dropup">
<div class="btn btn--text btn--icon--last" data-toggle="dropdown"> <div class="btn btn--text btn--icon--last" data-toggle="dropdown">
<span class="js-secondaryActionButtonLabel"></span> <%- @Icon('arrow-up') %> <span class="js-secondaryActionButtonLabel"></span> <%- @Icon('arrow-up') %>
@ -26,10 +26,10 @@
</div> </div>
<form class="buttonDropdown"> <form class="buttonDropdown">
<% if @macroDisabled: %> <% if @macroDisabled: %>
<button class="btn btn--primary js-submit"><%- @T('Update') %></button> <button class="btn btn--primary js-submit"><span><%- @T('Update') %></span></button>
<% else: %> <% else: %>
<div class="buttonDropdown dropdown dropup js-submitDropdown"> <div class="buttonDropdown dropdown dropup js-submitDropdown">
<button class="btn btn--primary btn--split--first js-submit"><%- @T('Update') %></button> <button class="btn btn--primary btn--split--first js-submit"><span><%- @T('Update') %></span></button>
<button class="btn btn--primary btn--slim btn--only-icon btn--split--last js-openDropdownMacro"><%- @Icon('arrow-up') %></button> <button class="btn btn--primary btn--slim btn--only-icon btn--split--last js-openDropdownMacro"><%- @Icon('arrow-up') %></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="userAction"> <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="userAction">
<% for macro in @macros: %> <% for macro in @macros: %>

View file

@ -437,6 +437,7 @@ pre code.hljs {
min-width: 0; min-width: 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: block;
} }
&--only-icon .icon, &--only-icon .icon,
@ -7624,27 +7625,31 @@ footer {
transition: margin 250ms; transition: margin 250ms;
flex-shrink: 0; flex-shrink: 0;
@include phone {
overflow: auto;
-webkit-overflow-scrolling: touch;
direction: rtl;
}
&.is-closed { &.is-closed {
margin-bottom: -60px; margin-bottom: -60px;
} }
@include phone {
&-reset {
flex-shrink: 5;
}
.btn,
.buttonDropdown {
min-width: 20px;
&--only-icon {
min-width: 36px;
}
}
}
&-inner { &-inner {
height: 60px; height: 60px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding: 10px; padding: 10px;
@include phone {
width: fit-content;
direction: initial;
}
} }
&-avatars { &-avatars {