Commit 73bb8352 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

UX improvements

parent 43bffebe
......@@ -89,8 +89,8 @@
"warning_text": $white,
"disabled_background": $btn_inactive,
"disabled_text": $mercury_approx,
"shuffled_background": black,
"shuffled_text": $white,
"shuffled_background": brown,
"shuffled_text": white,
"bonus_background": $thm_red,
"bonus_text": $white,
"card_type_background": $thm_blue,
......
......@@ -131,7 +131,7 @@
"work": " Ansehen | Präsentieren: <span class=\"pomodoroHighlight\">__minutes__</span>",
"break": " Pause: <span class=\"pomodoroHighlight\">__minutes__</span>",
"button": {
"start": "\uD83C\uDF45Timer starten",
"start": "Timer starten",
"cancel": "Abbrechen"
}
}
......
......@@ -137,13 +137,13 @@ Template.filterIndexItemCardset.events({
'click .collapseCardsetInfoButton': function (event) {
if ($(event.target).hasClass('glyphicon-collapse-up')) {
$(event.target).addClass('glyphicon-collapse-down').removeClass('glyphicon-collapse-up');
$($(event.target).data('id')).hide('slide', {direction: "up"}, 'fast');
$($(event.target).data('id')).hide('slide', {direction: "up"}, 'slow');
} else {
$("[id^=collapseCardsetInfo]").hide('slide', {direction: "up"}, 'fast');
$(".collapseCardsetInfoIcon").addClass('glyphicon-collapse-down').removeClass('glyphicon-collapse-up');
$(event.target).addClass('glyphicon-collapse-up').removeClass('glyphicon-collapse-down');
$($(event.target).data('id')).show('slide', {direction: "up"}, 'fast', function () {
$('body, html').animate({scrollTop: ($(event.target).offset().top - ($('.resultItemHeaderWrapper').height() + $('.thm-header').height() - 25))}, 'fast');
$($(event.target).data('id')).show('slide', {direction: "up"}, 'slow', function () {
$('body, html').animate({scrollTop: ($(event.target).offset().top - ($('.resultItemHeaderWrapper').height() + $('.thm-header').height() - 25))}, 'slow');
});
}
},
......
......@@ -76,7 +76,7 @@
{{_ "pomodoro.form.user.button.settings"}}
</button>
{{/if}}
<button type="button" id="startPom" class="btn btn-success btn-raised" data-dismiss="modal">
<button type="button" id="startPom" class="btn btn-success btn-raised fa fa-rocket" data-dismiss="modal">
{{#if isActiveRoute regex='presentation|demo'}}
{{_ "pomodoro.form.presentation.button.start"}}
{{else}}
......
......@@ -129,7 +129,7 @@ Template.welcome.helpers({
loginButtons += '<button id="guest" class="btn btn-large btn-raised btn-block" data-toggle="modal" data-target="#underDevelopmentModal" title="' + TAPi18n.__("landingPage.login.tooltip.guest") + '"><span class="flex-content"><i class="fa fa-user"></i>&nbsp;' + TAPi18n.__("landingPage.login.guest") + '</span></button>';
}
if (Meteor.settings.public.login.pro) {
loginButtons += '<button id="pro" class="btn btn-large btn-raised btn-block" data-toggle="modal" data-target="#underDevelopmentModal" title="' + TAPi18n.__("landingPage.login.tooltip.pro") + '"><span class="flex-content"><i class="fa fa-credit-card"></i>&nbsp;' + TAPi18n.__("landingPage.login.pro") + '</span></button>';
loginButtons += '<button id="pro" class="btn btn-large btn-raised btn-block" data-toggle="modal" data-target="#underDevelopmentModal" title="' + TAPi18n.__("landingPage.login.tooltip.pro") + '"><span class="flex-content"><i class="fa fa-paypal"></i>&nbsp;' + TAPi18n.__("landingPage.login.pro") + '</span></button>';
}
}
// Backdoor for login in acceptance tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment