diff --git a/uw-frame-components/css/buckyless/notifications.less b/uw-frame-components/css/buckyless/notifications.less index 779122ad3..a9fb19ec3 100644 --- a/uw-frame-components/css/buckyless/notifications.less +++ b/uw-frame-components/css/buckyless/notifications.less @@ -138,7 +138,7 @@ > .arrow-down { border-left: 7px solid transparent; border-right: 7px solid transparent; - border-top: 7px solid lighten(@color1, 20%); + border-top: 7px solid @grayscale2; z-index:2000; position: absolute; top:-14px; @@ -166,12 +166,13 @@ .hidden-xs .priority-notifications { height: 46px; width: 100%; - background-color: lighten(@color1, 20%); + background-color: @grayscale2; z-index:100; position: fixed; display: flex; justify-content: center; align-items: center; + border: 1px solid @black; .notification-message { font-size:15px; } @@ -186,25 +187,36 @@ top: 0; margin:0px -15px; padding:15px 20px 12px; - background-color: lighten(@color1, 20%); + background-color: @grayscale2; .notification-message { font-size:13px; } } -.hidden-xs .priority-notifications .notification-message, -.visible-xs .priority-notifications .notification-message { - color:@white; - text-align:center; - display: block; - margin-bottom:0; - a { - color:#eee; - border-bottom:1px solid #eee; - } - a:hover { - color:#fff; - border-bottom:1px solid #fff; +.hidden-xs .priority-notifications, +.visible-xs .priority-notifications { + .notification-message { + color:@black; + text-align:center; + display: block; + margin-bottom:0; + a { + color:#eee; + border-bottom:1px solid #eee; + } + a:hover { + color:#fff; + border-bottom:1px solid #fff; + } + } + .notification-buttons { + margin-left: 26px; + .md-button { + text-transform: none; + min-height: 0; + max-height: 26px; + line-height: 26px; + } } } diff --git a/uw-frame-components/js/frame-config.js b/uw-frame-components/js/frame-config.js index 8c1a983e7..72a0c9008 100644 --- a/uw-frame-components/js/frame-config.js +++ b/uw-frame-components/js/frame-config.js @@ -348,7 +348,7 @@ define(['angular'], function(angular) { } }, { - "name" : "uw-oskhosh", + "name" : "uw-oshkosh", "crest" : "img/uw-oshkosh-2016.png", "title" : "MyUW", "subtitle" : null, diff --git a/uw-frame-components/js/override.js b/uw-frame-components/js/override.js index 19a7485ac..4494adfec 100644 --- a/uw-frame-components/js/override.js +++ b/uw-frame-components/js/override.js @@ -2,13 +2,13 @@ define(['angular'], function(angular) { /*Keep in sync with docs/markdown/configuration.md*/ - var config = angular.module('override', []); - config - //see configuration.md for howto - .constant('OVERRIDE', { - - }); + var config = angular.module('override', []); + config + //see configuration.md for howto + .constant('OVERRIDE', { - return config; + }); -}); + return config; + +}); \ No newline at end of file diff --git a/uw-frame-components/portal/notifications/partials/notification-bell.html b/uw-frame-components/portal/notifications/partials/notification-bell.html index 0c47464a3..e7ad24210 100644 --- a/uw-frame-components/portal/notifications/partials/notification-bell.html +++ b/uw-frame-components/portal/notifications/partials/notification-bell.html @@ -31,7 +31,19 @@