From cad2ca8c7aa1fd18e9a2ffc69da3e11c5cd9e58a Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 10:21:27 -0500 Subject: [PATCH 1/9] Sentence-case username --- uw-frame-components/css/buckyless/directives/username-menu.less | 1 + uw-frame-components/css/buckyless/md-generated.less | 1 + uw-frame-components/portal/main/controllers.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/uw-frame-components/css/buckyless/directives/username-menu.less b/uw-frame-components/css/buckyless/directives/username-menu.less index c7519ac3d..7ad88cd87 100644 --- a/uw-frame-components/css/buckyless/directives/username-menu.less +++ b/uw-frame-components/css/buckyless/directives/username-menu.less @@ -11,6 +11,7 @@ portal-header { min-width: initial; margin-left: 8px; padding: 4px; + text-transform: uppercase; > span { color: @username-menu-color; diff --git a/uw-frame-components/css/buckyless/md-generated.less b/uw-frame-components/css/buckyless/md-generated.less index f66a61735..8a098dda5 100644 --- a/uw-frame-components/css/buckyless/md-generated.less +++ b/uw-frame-components/css/buckyless/md-generated.less @@ -90,6 +90,7 @@ md-menu-content.top-bar-menu-content { .display-name { font-weight: 600; margin: 0; + text-transform: capitalize; } .campus-id { diff --git a/uw-frame-components/portal/main/controllers.js b/uw-frame-components/portal/main/controllers.js index 2bb84feb2..354d264fc 100644 --- a/uw-frame-components/portal/main/controllers.js +++ b/uw-frame-components/portal/main/controllers.js @@ -109,7 +109,7 @@ define(['angular', 'require'], function(angular, require) { if (vm.user.firstName || vm.user.displayName) { vm.username = vm.user.firstName ? - vm.user.firstName : vm.user.displayName; + vm.user.firstName.toLowerCase() : vm.user.displayName.toLowerCase(); } vm.firstLetter = vm.username.substring(0, 1); From 75090fd54da11f800eadb9bf42bae40f748ca980 Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 11:02:01 -0500 Subject: [PATCH 2/9] Remodel priority notifications --- uw-frame-components/css/buckyless/header.less | 8 ++----- .../css/buckyless/notifications.less | 23 ++++++++++++------- .../css/themes/common-variables.less | 8 ++++++- .../messages/partials/notifications-bell.html | 2 +- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/uw-frame-components/css/buckyless/header.less b/uw-frame-components/css/buckyless/header.less index 7d3adec83..5c882300e 100644 --- a/uw-frame-components/css/buckyless/header.less +++ b/uw-frame-components/css/buckyless/header.less @@ -15,7 +15,7 @@ portal-header { min-height: 56px; position: fixed; box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 2px 1px -1px rgba(0, 0, 0, 0.12); - z-index: 98; + z-index: 80; top: 0; overflow-y: hidden; @@ -65,10 +65,6 @@ portal-header { &.has-priority-nots { @media (min-width: @xs) { padding-top: 46px; - - md-toolbar { - top: 46px; - } } } @@ -77,7 +73,7 @@ portal-header { width: 100%; position: absolute; top: 56px; - z-index: 98; + z-index: 80; overflow: hidden; transition: @search-transition; background: rgba(0, 0, 0, 0.4); diff --git a/uw-frame-components/css/buckyless/notifications.less b/uw-frame-components/css/buckyless/notifications.less index 5f3d6cbfe..2b53e016e 100644 --- a/uw-frame-components/css/buckyless/notifications.less +++ b/uw-frame-components/css/buckyless/notifications.less @@ -101,7 +101,7 @@ border-radius: 50%; padding: 0; color: @color1; - z-index: 98; + z-index: 80; top: 0; right: 26px; @@ -123,7 +123,7 @@ color: @color1; font-weight: 400; font-size: 20px; - z-index: 98; + z-index: 80; position: absolute; line-height: 40px; left: 14px; @@ -160,17 +160,23 @@ .priority-gt-xs .priority-notifications { height: 46px; width: 100%; - background-color: @grayscale2; - z-index: 98; - position: fixed; + z-index: 80; + padding: 4px; display: flex; justify-content: center; align-items: center; - border: 1px solid @black; top: 0; + .priority-bubble { + box-shadow: @box-shadow-4; + background-color: @grayscale2; + border-radius: 6px; + } + .notification-message { - font-size: 15px; + padding: 4px 26px; + font-size: 14px; + line-height: 1; } p { @@ -229,8 +235,9 @@ width: 30px; padding: 0; - .md-icon { + .material-icons { font-size: 22px; + color: @grayscale10; } } } diff --git a/uw-frame-components/css/themes/common-variables.less b/uw-frame-components/css/themes/common-variables.less index 953fe11b0..70b649850 100644 --- a/uw-frame-components/css/themes/common-variables.less +++ b/uw-frame-components/css/themes/common-variables.less @@ -25,7 +25,12 @@ @md: 1280px; @lg: 1920px; -@border: 1px solid @grayscale3; +/* Shadow depths */ +@box-shadow-1: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +@box-shadow-2: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); +@box-shadow-3: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); +@box-shadow-4: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); +@box-shadow-5: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22); /* Footer */ @footer-background-color: #404040; @@ -44,3 +49,4 @@ .border (@color: @grayscale3, @size: 1px) { border: @size solid @color; } +@border: 1px solid @grayscale3; diff --git a/uw-frame-components/portal/messages/partials/notifications-bell.html b/uw-frame-components/portal/messages/partials/notifications-bell.html index f52130dd4..3d4790dbe 100644 --- a/uw-frame-components/portal/messages/partials/notifications-bell.html +++ b/uw-frame-components/portal/messages/partials/notifications-bell.html @@ -87,7 +87,7 @@
-
+
{{ priority.title }}
Date: Tue, 22 Aug 2017 12:48:24 -0500 Subject: [PATCH 3/9] Add animations, rename transitions --- .../css/buckyless/features.less | 2 +- uw-frame-components/css/buckyless/frame.less | 5 +-- uw-frame-components/css/buckyless/header.less | 21 ++++++---- .../css/buckyless/notifications.less | 41 ++++++------------- uw-frame-components/css/buckyless/widget.less | 4 +- .../css/themes/common-variables.less | 6 +-- .../messages/partials/notifications-bell.html | 17 +++++--- .../portal/misc/partials/app-header.html | 4 +- .../portal/misc/partials/frame-page.html | 1 - .../staticFeeds/sample-messages.json | 26 ------------ 10 files changed, 45 insertions(+), 82 deletions(-) diff --git a/uw-frame-components/css/buckyless/features.less b/uw-frame-components/css/buckyless/features.less index 00551dcd3..95b6aae38 100644 --- a/uw-frame-components/css/buckyless/features.less +++ b/uw-frame-components/css/buckyless/features.less @@ -64,7 +64,7 @@ portal-header md-toolbar .md-toolbar-tools mascot-announcement { position: relative; img { - transition: @mascot-transition; + transition: @transition-all; position: relative; top: 26px; } diff --git a/uw-frame-components/css/buckyless/frame.less b/uw-frame-components/css/buckyless/frame.less index 871834b2c..281588d75 100644 --- a/uw-frame-components/css/buckyless/frame.less +++ b/uw-frame-components/css/buckyless/frame.less @@ -5,12 +5,9 @@ min-height: 90vh; .page-content { + transition: @transition-all; padding: 56px 0 48px; - &.has-priority-nots { - padding: 102px 0 48px; - } - .white-page { background-color: @white; margin-left: 1%; diff --git a/uw-frame-components/css/buckyless/header.less b/uw-frame-components/css/buckyless/header.less index 5c882300e..56a54fafa 100644 --- a/uw-frame-components/css/buckyless/header.less +++ b/uw-frame-components/css/buckyless/header.less @@ -1,5 +1,11 @@ portal-header { display: block; + position: fixed; + width: 100%; + z-index: 80; + top: 0; + overflow-y: hidden; + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 2px 1px -1px rgba(0, 0, 0, 0.12); a { &:not(.md-button):not(.btn):not(.launch-app-button):not(.full-width) { @@ -13,16 +19,12 @@ portal-header { md-toolbar { min-height: 56px; - position: fixed; - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 2px 1px -1px rgba(0, 0, 0, 0.12); - z-index: 80; - top: 0; - overflow-y: hidden; .md-toolbar-tools { padding-left: 0; height: 56px; max-height: 56px; + overflow-y: hidden; .title-link { h1 { @@ -62,9 +64,10 @@ portal-header { } } - &.has-priority-nots { - @media (min-width: @xs) { - padding-top: 46px; + @media (min-width: @xs) { + &.has-priority-nots + + .page-content { + padding-top: 102px; } } @@ -75,7 +78,7 @@ portal-header { top: 56px; z-index: 80; overflow: hidden; - transition: @search-transition; + transition: @transition-height; background: rgba(0, 0, 0, 0.4); &:not(.search-expanded) { diff --git a/uw-frame-components/css/buckyless/notifications.less b/uw-frame-components/css/buckyless/notifications.less index 2b53e016e..84d030196 100644 --- a/uw-frame-components/css/buckyless/notifications.less +++ b/uw-frame-components/css/buckyless/notifications.less @@ -161,11 +161,17 @@ height: 46px; width: 100%; z-index: 80; - padding: 4px; + padding: 4px 4px 0 4px; display: flex; justify-content: center; align-items: center; top: 0; + transition: @transition-all; + + &.animate-hide { + opacity: 0; + height: 0; + } .priority-bubble { box-shadow: @box-shadow-4; @@ -174,46 +180,23 @@ } .notification-message { + color: @black; padding: 4px 26px; font-size: 14px; line-height: 1; - } - - p { - margin-bottom: 0; - } -} - -.priority-xs .priority-notifications { - min-height: 40px; - position: relative; - top: 0; - margin: 0 -15px; - padding: 12px 20px; - background-color: @grayscale2; - - .notification-message { - font-size: 13px; - } -} - -.priority-gt-xs .priority-notifications, -.priority-xs .priority-notifications { - .notification-message { - color: @black; text-align: center; display: block; margin-bottom: 0; - - a { - color: @link-color; - } } a.notification-message { color: @link-color; } + p { + margin-bottom: 0; + } + .notification-buttons { margin-left: 26px; diff --git a/uw-frame-components/css/buckyless/widget.less b/uw-frame-components/css/buckyless/widget.less index b614e8375..c2f114838 100644 --- a/uw-frame-components/css/buckyless/widget.less +++ b/uw-frame-components/css/buckyless/widget.less @@ -52,7 +52,7 @@ color: @grayscale8; border-radius: 0 0 4px 4px; box-shadow: none; - transition: @mascot-transition; + transition: @transition-all; &:hover { background-color: @color1; @@ -441,7 +441,7 @@ opacity: 0; top: 0; margin: 0; - transition: @opacity-transition; + transition: @transition-opacity; &.widget-info { left: 0; diff --git a/uw-frame-components/css/themes/common-variables.less b/uw-frame-components/css/themes/common-variables.less index 70b649850..77faf5fee 100644 --- a/uw-frame-components/css/themes/common-variables.less +++ b/uw-frame-components/css/themes/common-variables.less @@ -40,10 +40,10 @@ Transitions */ @background-transition: background-color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); +@transition-height: height 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); +@transition-opacity: opacity 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); +@transition-all: all 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); @link-hover-transition: color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); -@search-transition: height 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); -@mascot-transition: all 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); -@opacity-transition: opacity 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); /* Custom mix-ins */ .border (@color: @grayscale3, @size: 1px) { diff --git a/uw-frame-components/portal/messages/partials/notifications-bell.html b/uw-frame-components/portal/messages/partials/notifications-bell.html index 3d4790dbe..b84e44d93 100644 --- a/uw-frame-components/portal/messages/partials/notifications-bell.html +++ b/uw-frame-components/portal/messages/partials/notifications-bell.html @@ -86,8 +86,13 @@ -
-
+
+
{{ priority.title }}
-

- You have {{ vm.priorityNotifications.length }} important notifications. View your notifications. -

+
+

+ You have {{ vm.priorityNotifications.length }} important notifications. View your notifications. +

+
diff --git a/uw-frame-components/portal/misc/partials/app-header.html b/uw-frame-components/portal/misc/partials/app-header.html index aa6b115f3..36485ac36 100644 --- a/uw-frame-components/portal/misc/partials/app-header.html +++ b/uw-frame-components/portal/misc/partials/app-header.html @@ -1,11 +1,11 @@ -

+

{{ ::icon }} {{::title}}

-
+
diff --git a/uw-frame-components/portal/misc/partials/frame-page.html b/uw-frame-components/portal/misc/partials/frame-page.html index c7bee8568..9757803ce 100644 --- a/uw-frame-components/portal/misc/partials/frame-page.html +++ b/uw-frame-components/portal/misc/partials/frame-page.html @@ -1,5 +1,4 @@
- Date: Tue, 22 Aug 2017 12:49:56 -0500 Subject: [PATCH 4/9] Revert changes to sample messages --- .../staticFeeds/sample-messages.json | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/uw-frame-components/staticFeeds/sample-messages.json b/uw-frame-components/staticFeeds/sample-messages.json index 65fff2fdf..0ce4e30a3 100644 --- a/uw-frame-components/staticFeeds/sample-messages.json +++ b/uw-frame-components/staticFeeds/sample-messages.json @@ -71,6 +71,32 @@ "url": "/features" }, "confirmButton": null + }, + { + "id": "sample-uw-frame-filtered-popup-announcement", + "title": "This is a filtered popup", + "titleShort": "Filtered popup", + "description": "This popup message should not appear to anyone unless group filtering is disabled (via beta settings).", + "descriptionShort": "You must have disabled group filtering!", + "messageType": "announcement", + "goLiveDate": "2017-08-01T09:30", + "expireDate": "2017-08-15", + "featureImageUrl": "img/the-cow.png", + "priority": "high", + "audienceFilter": { + "groups": ["Nonexistent-Group"], + "dataUrl": "", + "dataObject": "", + "dataArrayFilter": {} + }, + "actionButton": null, + "moreInfoButton": { + "label": "Read more", + "url": "/features" + }, + "confirmButton": { + "label": "Got it!" + } } ] } From b40eb81d76b4726016407601436cf02a9403ea07 Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 12:55:11 -0500 Subject: [PATCH 5/9] Rename color transition --- uw-frame-components/css/buckyless/general.less | 2 +- uw-frame-components/css/buckyless/md-generated.less | 2 +- uw-frame-components/css/buckyless/notifications.less | 4 ++-- uw-frame-components/css/themes/common-variables.less | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uw-frame-components/css/buckyless/general.less b/uw-frame-components/css/buckyless/general.less index dd803f528..bcab3a7b6 100644 --- a/uw-frame-components/css/buckyless/general.less +++ b/uw-frame-components/css/buckyless/general.less @@ -1,7 +1,7 @@ /* General MyUW Styles */ a { - transition: @link-hover-transition; + transition: @transition-color; &:not(.md-button):not(.btn):not(.launch-app-button):not(.full-width) { text-decoration: none; diff --git a/uw-frame-components/css/buckyless/md-generated.less b/uw-frame-components/css/buckyless/md-generated.less index 8a098dda5..72031a841 100644 --- a/uw-frame-components/css/buckyless/md-generated.less +++ b/uw-frame-components/css/buckyless/md-generated.less @@ -123,7 +123,7 @@ md-menu-content.top-bar-menu-content { text-align: right; md-icon { - transition: @link-hover-transition; + transition: @transition-color; } &:hover { diff --git a/uw-frame-components/css/buckyless/notifications.less b/uw-frame-components/css/buckyless/notifications.less index 84d030196..7b0d44cd7 100644 --- a/uw-frame-components/css/buckyless/notifications.less +++ b/uw-frame-components/css/buckyless/notifications.less @@ -57,7 +57,7 @@ .md-secondary { color: @grayscale7; - transition: @link-hover-transition; + transition: @transition-color; &:hover { color: @grayscale9; @@ -139,7 +139,7 @@ .notification-desktop { .notification-badge { position: relative; - transition: @link-hover-transition; + transition: @transition-color; .material-icons { width: 40px; diff --git a/uw-frame-components/css/themes/common-variables.less b/uw-frame-components/css/themes/common-variables.less index 77faf5fee..0e39e1b18 100644 --- a/uw-frame-components/css/themes/common-variables.less +++ b/uw-frame-components/css/themes/common-variables.less @@ -43,7 +43,7 @@ @transition-height: height 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); @transition-opacity: opacity 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); @transition-all: all 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); -@link-hover-transition: color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); +@transition-color: color 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); /* Custom mix-ins */ .border (@color: @grayscale3, @size: 1px) { From 4c25666d9cf72880ed3756979bf1c139298b68c2 Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 13:11:47 -0500 Subject: [PATCH 6/9] Fix padding discrepancy --- uw-frame-components/css/buckyless/frame.less | 4 +-- .../staticFeeds/sample-messages.json | 26 ------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/uw-frame-components/css/buckyless/frame.less b/uw-frame-components/css/buckyless/frame.less index 281588d75..c7feea78d 100644 --- a/uw-frame-components/css/buckyless/frame.less +++ b/uw-frame-components/css/buckyless/frame.less @@ -5,8 +5,8 @@ min-height: 90vh; .page-content { - transition: @transition-all; - padding: 56px 0 48px; + transition: padding 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); + padding: 60px 0 48px; .white-page { background-color: @white; diff --git a/uw-frame-components/staticFeeds/sample-messages.json b/uw-frame-components/staticFeeds/sample-messages.json index 0ce4e30a3..65fff2fdf 100644 --- a/uw-frame-components/staticFeeds/sample-messages.json +++ b/uw-frame-components/staticFeeds/sample-messages.json @@ -71,32 +71,6 @@ "url": "/features" }, "confirmButton": null - }, - { - "id": "sample-uw-frame-filtered-popup-announcement", - "title": "This is a filtered popup", - "titleShort": "Filtered popup", - "description": "This popup message should not appear to anyone unless group filtering is disabled (via beta settings).", - "descriptionShort": "You must have disabled group filtering!", - "messageType": "announcement", - "goLiveDate": "2017-08-01T09:30", - "expireDate": "2017-08-15", - "featureImageUrl": "img/the-cow.png", - "priority": "high", - "audienceFilter": { - "groups": ["Nonexistent-Group"], - "dataUrl": "", - "dataObject": "", - "dataArrayFilter": {} - }, - "actionButton": null, - "moreInfoButton": { - "label": "Read more", - "url": "/features" - }, - "confirmButton": { - "label": "Got it!" - } } ] } From 1d19e7bd854e799705693a1d644e7afcd806fdfd Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 13:16:13 -0500 Subject: [PATCH 7/9] Revert changes to sample messages --- uw-frame-components/css/buckyless/frame.less | 2 +- .../staticFeeds/sample-messages.json | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/uw-frame-components/css/buckyless/frame.less b/uw-frame-components/css/buckyless/frame.less index c7feea78d..789bd359c 100644 --- a/uw-frame-components/css/buckyless/frame.less +++ b/uw-frame-components/css/buckyless/frame.less @@ -5,7 +5,7 @@ min-height: 90vh; .page-content { - transition: padding 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); + transition: padding 0.3s cubic-bezier(0.25, 0.8, 0.25, 1); padding: 60px 0 48px; .white-page { diff --git a/uw-frame-components/staticFeeds/sample-messages.json b/uw-frame-components/staticFeeds/sample-messages.json index 65fff2fdf..0ce4e30a3 100644 --- a/uw-frame-components/staticFeeds/sample-messages.json +++ b/uw-frame-components/staticFeeds/sample-messages.json @@ -71,6 +71,32 @@ "url": "/features" }, "confirmButton": null + }, + { + "id": "sample-uw-frame-filtered-popup-announcement", + "title": "This is a filtered popup", + "titleShort": "Filtered popup", + "description": "This popup message should not appear to anyone unless group filtering is disabled (via beta settings).", + "descriptionShort": "You must have disabled group filtering!", + "messageType": "announcement", + "goLiveDate": "2017-08-01T09:30", + "expireDate": "2017-08-15", + "featureImageUrl": "img/the-cow.png", + "priority": "high", + "audienceFilter": { + "groups": ["Nonexistent-Group"], + "dataUrl": "", + "dataObject": "", + "dataArrayFilter": {} + }, + "actionButton": null, + "moreInfoButton": { + "label": "Read more", + "url": "/features" + }, + "confirmButton": { + "label": "Got it!" + } } ] } From 32ac455927f32dcc9b8af88798f46ad4c77ee6b5 Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 13:22:59 -0500 Subject: [PATCH 8/9] Resolve linting errors --- uw-frame-components/css/buckyless/header.less | 3 +-- uw-frame-components/css/buckyless/notifications.less | 2 +- uw-frame-components/css/themes/common-variables.less | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/uw-frame-components/css/buckyless/header.less b/uw-frame-components/css/buckyless/header.less index 56a54fafa..2a91b77fd 100644 --- a/uw-frame-components/css/buckyless/header.less +++ b/uw-frame-components/css/buckyless/header.less @@ -65,8 +65,7 @@ portal-header { } @media (min-width: @xs) { - &.has-priority-nots - + .page-content { + &.has-priority-nots + .page-content { padding-top: 102px; } } diff --git a/uw-frame-components/css/buckyless/notifications.less b/uw-frame-components/css/buckyless/notifications.less index 7b0d44cd7..7dce5bac0 100644 --- a/uw-frame-components/css/buckyless/notifications.less +++ b/uw-frame-components/css/buckyless/notifications.less @@ -161,7 +161,7 @@ height: 46px; width: 100%; z-index: 80; - padding: 4px 4px 0 4px; + padding: 4px 4px 0; display: flex; justify-content: center; align-items: center; diff --git a/uw-frame-components/css/themes/common-variables.less b/uw-frame-components/css/themes/common-variables.less index 0e39e1b18..7ca83c652 100644 --- a/uw-frame-components/css/themes/common-variables.less +++ b/uw-frame-components/css/themes/common-variables.less @@ -26,11 +26,11 @@ @lg: 1920px; /* Shadow depths */ -@box-shadow-1: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); -@box-shadow-2: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); -@box-shadow-3: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); -@box-shadow-4: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); -@box-shadow-5: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22); +@box-shadow-1: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); +@box-shadow-2: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); +@box-shadow-3: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); +@box-shadow-4: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22); +@box-shadow-5: 0 19px 38px rgba(0, 0, 0, 0.3), 0 15px 12px rgba(0, 0, 0, 0.22); /* Footer */ @footer-background-color: #404040; From 66070e8407a49b71f709a3e57ff62eb2b89b4406 Mon Sep 17 00:00:00 2001 From: zeke-witter Date: Tue, 22 Aug 2017 14:27:03 -0500 Subject: [PATCH 9/9] Switch to ng-show for bells that share markup --- .../portal/messages/partials/notifications-bell.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/uw-frame-components/portal/messages/partials/notifications-bell.html b/uw-frame-components/portal/messages/partials/notifications-bell.html index b84e44d93..3d0701efa 100644 --- a/uw-frame-components/portal/messages/partials/notifications-bell.html +++ b/uw-frame-components/portal/messages/partials/notifications-bell.html @@ -1,12 +1,12 @@
+ ng-show="directiveMode === 'mobile-bell' && vm.notifications.length !== 0"> notifications
- + Notifications
- {{ vm.notifications.length }} notifications
@@ -75,7 +75,7 @@ -