rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

[bug] change group button overflow

Browse Source
This commit is contained in:
Sylvain 2018-10-15 16:51:44 +02:00
parent c7c739d518
commit 8d4b354199
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# Changelog Fab Manager # Changelog Fab Manager
- Fix a bug: on small screens, display of button "change group" overflow
## v2.6.7 2018 October 4 ## v2.6.7 2018 October 4
- Ability to configure SMTP more precisely - Ability to configure SMTP more precisely

2
app/assets/javascripts/controllers/admin/calendar.coffee.erb
View File

@ -207,7 +207,7 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
start = moment.tz(start.toISOString(), Fablab.timezone) start = moment.tz(start.toISOString(), Fablab.timezone)
end = moment.tz(end.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) # 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() today = new Date()
if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0) if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0)
# then we open a modal window to let the admin specify the slot type # then we open a modal window to let the admin specify the slot type

7
app/assets/stylesheets/app.buttons.scss
View File

@ -77,6 +77,13 @@
animation:spin 4s linear infinite; 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); } } @-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } } @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } } @keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }

2
app/assets/templates/plans/index.html.erb
View File

@ -95,7 +95,7 @@
<div class="well well-warning"> <div class="well well-warning">
<strong>{{getUserGroup().name}}</strong> <strong>{{getUserGroup().name}}</strong>
</div> </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-click="group.change = !group.change"
ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)" ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)"
translate translate