mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-24 11:10:12 +01:00
closing #1148 by removing the transparent background from the spinner. Does not solve the margin of the spinner on the buttons, but that is low prio for now
This commit is contained in:
Reinier Balt
parent
31118d8c8c
commit
57ad48d7d7
2 changed files with 26 additions and 20 deletions
|
|
@ -1,10 +1,10 @@
|
|||
/*!
|
||||
/*!
|
||||
* jQuery blockUI plugin
|
||||
* Version 2.36 (16-NOV-2010)
|
||||
* Version 2.38 (29-MAR-2011)
|
||||
* @requires jQuery v1.2.3 or later
|
||||
*
|
||||
* Examples at: http://malsup.com/jquery/block/
|
||||
* Copyright (c) 2007-2008 M. Alsup
|
||||
* Copyright (c) 2007-2010 M. Alsup
|
||||
* Dual licensed under the MIT and GPL licenses:
|
||||
* http://www.opensource.org/licenses/mit-license.php
|
||||
* http://www.gnu.org/licenses/gpl.html
|
||||
|
|
@ -42,7 +42,7 @@ $.growlUI = function(title, message, timeout, onClose) {
|
|||
$.blockUI({
|
||||
message: $m, fadeIn: 700, fadeOut: 1000, centerY: false,
|
||||
timeout: timeout, showOverlay: false,
|
||||
onUnblock: onClose,
|
||||
onUnblock: onClose,
|
||||
css: $.blockUI.defaults.growlCSS
|
||||
});
|
||||
};
|
||||
|
|
@ -65,7 +65,7 @@ $.fn.unblock = function(opts) {
|
|||
});
|
||||
};
|
||||
|
||||
$.blockUI.version = 2.35; // 2nd generation blocking at no extra cost!
|
||||
$.blockUI.version = 2.38; // 2nd generation blocking at no extra cost!
|
||||
|
||||
// override these in your code to change the default behavior and style
|
||||
$.blockUI.defaults = {
|
||||
|
|
@ -74,9 +74,9 @@ $.blockUI.defaults = {
|
|||
|
||||
title: null, // title string; only used when theme == true
|
||||
draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded)
|
||||
|
||||
|
||||
theme: false, // set to true to use with jQuery UI themes
|
||||
|
||||
|
||||
// styles for the message when blocking; if you wish to disable
|
||||
// these and use an external stylesheet then do this in your code:
|
||||
// $.blockUI.defaults.css = {};
|
||||
|
|
@ -92,7 +92,7 @@ $.blockUI.defaults = {
|
|||
backgroundColor:'#fff',
|
||||
cursor: 'wait'
|
||||
},
|
||||
|
||||
|
||||
// minimal style set used when themes are used
|
||||
themedCSS: {
|
||||
width: '30%',
|
||||
|
|
@ -123,7 +123,7 @@ $.blockUI.defaults = {
|
|||
'-moz-border-radius': '10px',
|
||||
'border-radius': '10px'
|
||||
},
|
||||
|
||||
|
||||
// IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w
|
||||
// (hat tip to Jorge H. N. de Vasconcelos)
|
||||
iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank',
|
||||
|
|
@ -167,7 +167,7 @@ $.blockUI.defaults = {
|
|||
|
||||
// suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
|
||||
applyPlatformOpacityRules: true,
|
||||
|
||||
|
||||
// callback method invoked when fadeIn has completed and blocking message is visible
|
||||
onBlock: null,
|
||||
|
||||
|
|
@ -224,11 +224,14 @@ function install(el, opts) {
|
|||
// layer2 is the overlay layer which has opacity and a wait cursor (by default)
|
||||
// layer3 is the message content that is displayed while blocking
|
||||
|
||||
var lyr1 = ($.browser.msie || opts.forceIframe)
|
||||
var lyr1 = ($.browser.msie || opts.forceIframe)
|
||||
? $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>')
|
||||
: $('<div class="blockUI" style="display:none"></div>');
|
||||
var lyr2 = $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
|
||||
|
||||
|
||||
var lyr2 = opts.theme
|
||||
? $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>')
|
||||
: $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
|
||||
|
||||
var lyr3, s;
|
||||
if (opts.theme && full) {
|
||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+z+';display:none;position:fixed">' +
|
||||
|
|
@ -244,7 +247,7 @@ function install(el, opts) {
|
|||
}
|
||||
else if (full) {
|
||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+z+';display:none;position:fixed"></div>';
|
||||
}
|
||||
}
|
||||
else {
|
||||
s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+z+';display:none;position:absolute"></div>';
|
||||
}
|
||||
|
|
@ -256,12 +259,12 @@ function install(el, opts) {
|
|||
lyr3.css(themedCSS);
|
||||
lyr3.addClass('ui-widget-content');
|
||||
}
|
||||
else
|
||||
else
|
||||
lyr3.css(css);
|
||||
}
|
||||
|
||||
// style the overlay
|
||||
if (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))
|
||||
if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
|
||||
lyr2.css(opts.overlayCSS);
|
||||
lyr2.css('position', full ? 'fixed' : 'absolute');
|
||||
|
||||
|
|
@ -274,7 +277,7 @@ function install(el, opts) {
|
|||
$.each(layers, function() {
|
||||
this.appendTo($par);
|
||||
});
|
||||
|
||||
|
||||
if (opts.theme && opts.draggable && $.fn.draggable) {
|
||||
lyr3.draggable({
|
||||
handle: '.ui-dialog-titlebar',
|
||||
|
|
@ -383,7 +386,7 @@ function remove(el, opts) {
|
|||
}
|
||||
opts = $.extend({}, $.blockUI.defaults, opts || {});
|
||||
bind(0, el, opts); // unbind events
|
||||
|
||||
|
||||
var els;
|
||||
if (full) // crazy selector to handle odd field errors in ie6/7
|
||||
els = $('body').children().filter('.blockUI').add('body > .blockUI');
|
||||
|
|
@ -432,7 +435,7 @@ function bind(b, el, opts) {
|
|||
$el.data('blockUI.isBlocked', b);
|
||||
|
||||
// don't bind events when overlay is not in use or if bindEvents is false
|
||||
if (!opts.bindEvents || (b && !opts.showOverlay))
|
||||
if (!opts.bindEvents || (b && !opts.showOverlay))
|
||||
return;
|
||||
|
||||
// bind anchors and inputs for mouse and key events
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ div#input_box {
|
|||
|
||||
#input_box ul#predecessor_ul {
|
||||
list-style-type: none;
|
||||
color: 0;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.show_from_input, .due_input, .project_input, .context_input,
|
||||
|
|
@ -1245,16 +1245,19 @@ button.positive, .widgets a.positive{
|
|||
border:1px solid #fbc2c4;
|
||||
color:#d12f19;
|
||||
}
|
||||
|
||||
.widgets a.negative:active{
|
||||
background-color:#d12f19;
|
||||
border:1px solid #d12f19;
|
||||
color:#fff;
|
||||
}
|
||||
|
||||
.blockUI.blockOverlay {
|
||||
background-image:url('../images/waiting.gif');
|
||||
background-repeat:no-repeat;
|
||||
background-position:center center;
|
||||
background-color:white;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.bigWaiting {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue