mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10055 from owncloud/notification-fix 

Fix notification preventing top bar clickability
This commit is contained in:
Sander 2014-07-30 21:16:30 +02:00
parent 8389ff5875 b177f9b063
commit fd1bb688f9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/css/styles.css
View File

@ -680,19 +680,33 @@ label.infield {
.center { text-align:center; } .center { text-align:center; }
.inlineblock { display: inline-block; } .inlineblock { display: inline-block; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;} #notification-container {
position: absolute;
top: 0;
width: 100%;
text-align: center;
}
#notification, #update-notification { #notification, #update-notification {
margin: 0 auto;
max-width: 60%;
z-index: 101; z-index: 101;
background-color: #fc4; background-color: #fc4;
border: 0; border: 0;
padding: 0 .7em .3em; padding: 1px 8px;
display: none; display: none;
position: relative; position: relative;
top: 0; top: 0;
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
filter:alpha(opacity=90);
opacity: .9;
}
#notification span, #update-notification span {
cursor: pointer;
font-weight: bold;
margin-left: 1em;
} }
#notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; } tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; } tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }

4
core/js/js.js
View File

@ -696,7 +696,7 @@ OC.Notification={
var notification = $('#notification'); var notification = $('#notification');
if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){ if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){
notification.html(html); notification.html(html);
notification.fadeIn().css("display","inline"); notification.fadeIn().css('display','inline-block');
}else{ }else{
OC.Notification.queuedNotifications.push(html); OC.Notification.queuedNotifications.push(html);
} }
@ -710,7 +710,7 @@ OC.Notification={
var notification = $('#notification'); var notification = $('#notification');
if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){ if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){
notification.text(text); notification.text(text);
notification.fadeIn().css("display","inline"); notification.fadeIn().css('display','inline-block');
}else{ }else{
OC.Notification.queuedNotifications.push($('<div/>').text(text).html()); OC.Notification.queuedNotifications.push($('<div/>').text(text).html());
} }