mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-19 13:54:25 +01:00
[bug] change group button overflow
This commit is contained in:
parent
c7c739d518
commit
8d4b354199
@ -1,5 +1,7 @@
|
||||
# Changelog Fab Manager
|
||||
|
||||
- Fix a bug: on small screens, display of button "change group" overflow
|
||||
|
||||
## v2.6.7 2018 October 4
|
||||
|
||||
- Ability to configure SMTP more precisely
|
||||
|
@ -207,7 +207,7 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
|
||||
start = moment.tz(start.toISOString(), Fablab.timezone)
|
||||
end = moment.tz(end.toISOString(), Fablab.timezone)
|
||||
# first we check that the selected slot is an N-hours multiple (ie. not decimal)
|
||||
if Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10)/SLOT_MULTIPLE)
|
||||
if Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10) / SLOT_MULTIPLE)
|
||||
today = new Date()
|
||||
if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0)
|
||||
# then we open a modal window to let the admin specify the slot type
|
||||
|
@ -77,6 +77,13 @@
|
||||
animation:spin 4s linear infinite;
|
||||
}
|
||||
|
||||
.btn-no-overflow {
|
||||
display: block;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
|
||||
@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
|
||||
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
|
||||
|
@ -95,7 +95,7 @@
|
||||
<div class="well well-warning">
|
||||
<strong>{{getUserGroup().name}}</strong>
|
||||
</div>
|
||||
<button class="btn btn-default m-t"
|
||||
<button class="btn btn-default btn-no-overflow m-t"
|
||||
ng-click="group.change = !group.change"
|
||||
ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)"
|
||||
translate
|
||||
|
Loading…
x
Reference in New Issue
Block a user