Merge branch 'master' into ci/commit-lint

uPortal-Attic · Oct 18, 2017 · 4cea64d · 4cea64d
2 parents 92f7c1d + a0076b2
commit 4cea64d
Show file tree

Hide file tree

Showing 26 changed files with 551 additions and 469 deletions.
diff --git a/LICENSE b/LICENSE
@@ -209,8 +209,6 @@ This product may include Contributions intentionally submitted for inclusion in
 This product bundles Glyphicon Halflings ( http://glyphicons.com/
  ) via Bootstrap 3's distributing these under The MIT License.
 
-This product bundles angular-ui / ui-sortable / sortable.js ( https://github.com/angular-ui/ui-sortable/blob/master/src/sortable.js ) under The MIT License.
-
 
 The MIT License (MIT)
 

diff --git a/components/config.js b/components/config.js
@@ -50,7 +50,7 @@ define(['./my-app/app-config.js'], function(myAppConfig) {
       'app-config': 'js/app-config',
       'frame-config': 'js/frame-config',
       'override': 'js/override',
-      'sortable': 'js/sortable',
+      'sortable': 'https://cdnjs.cloudflare.com/ajax/libs/angular-ui-sortable/0.17.2/sortable.min',
   };
 
   var frameShims = {
@@ -69,6 +69,10 @@ define(['./my-app/app-config.js'], function(myAppConfig) {
       },
       'ui-bootstrap': {deps: ['angular']},
       'ui-gravatar': {deps: ['angular']},
+      'sortable': {
+        deps: ['angular', 'jquery-ui'],
+        exports: 'sortable',
+      },
   };
 
   var allPaths;

diff --git a/components/css/buckyless/header.less b/components/css/buckyless/header.less
@@ -58,14 +58,17 @@ portal-header {
       }
 
       .md-menu {
-        margin: 0;
-
         > .md-button {
           min-width: 48px;
           margin: 0;
         }
       }
 
+      .menu-toggle.md-button {
+        min-width: 48px;
+        margin: 0;
+      }
+
       .top-bar-controls-xs {
         .avatar__default {
           margin-right: 12px;

diff --git a/components/css/buckyless/md-generated.less b/components/css/buckyless/md-generated.less
@@ -243,3 +243,96 @@ md-tooltip {
     }
   }
 }
+
+// Main menu
+main-menu {
+  .main-menu__mobile-bar {
+    background: @grayscale2;
+    min-height: 56px;
+
+    .md-button {
+      min-width: 48px;
+      margin: 0 8px 0 0;
+
+      .main-menu__high-priority {
+        position: absolute;
+        top: 0;
+        left: 4px;
+
+        .material-icons {
+          font-size: 16px;
+        }
+      }
+    }
+
+    .username-menu {
+      .md-button.avatar__default {
+        display: inline-block;
+        outline: none;
+        border-radius: 50%;
+        height: 40px;
+        width: 40px;
+        min-width: initial;
+        padding: 4px;
+        text-transform: uppercase;
+
+        > span {
+          color: @grayscale2;
+          background-color: @color1;
+          border-radius: 50%;
+          display: block;
+          margin: 0;
+          overflow: hidden;
+          position: relative;
+          height: 32px;
+          width: 32px;
+          z-index: 0;
+          line-height: 32px;
+          font-size: 18px;
+          font-weight: 400;
+        }
+      }
+    }
+  }
+
+  md-sidenav.main-menu__sidenav {
+    .links-separated {
+      display: block;
+      padding: 12px 15px 12px 24px;
+      bottom: 0;
+      position: absolute;
+      width: 320px;
+
+      a {
+        color: @grayscale6;
+        cursor: pointer;
+        font-size: 12px;
+        padding: 2px 5px;
+        text-decoration: none;
+        white-space: nowrap;
+
+        &:hover {
+          color: @black;
+        }
+      }
+
+      @media (max-width: @xs) {
+        width: calc(100% - 56px);
+        min-width: calc(100% - 56px);
+        max-width: calc(100% - 56px);
+      }
+    }
+
+    @media (max-width: @xs) {
+      z-index: 80;
+    }
+
+    @media (min-width: @xs) {
+      padding-top: 56px;
+
+      &.has-priority-notifications {
+        padding-top: 102px;
+      }
+    }
+  }
+}
diff --git a/components/css/buckyless/notifications.less b/components/css/buckyless/notifications.less
@@ -22,6 +22,10 @@
   padding-left: 0;
   padding-right: 0;
 
+  .notifications__empty {
+    padding: 24px 18px;
+  }
+
   .notifications-list {
     padding: 0;
 

diff --git a/components/js/app-config.js b/components/js/app-config.js
@@ -30,6 +30,8 @@ define(['angular'], function(angular) {
         })
         .value('APP_OPTIONS', {
             'optionsTemplateURL': null,
+            'appMenuTemplateURL': null,
+            'appMenuItems': [],
         })
         .value('SERVICE_LOC', {
             'aboutURL': null,
@@ -81,7 +83,7 @@ define(['angular'], function(angular) {
         ])
         .value('APP_BETA_FEATURES', [
           {
-            'id': 'toogleSomething',
+            'id': 'toggleSomething',
             'title': 'Sample Toggle',
             'description':
               'This is just an example of a toggle. ' +

diff --git a/components/js/override.js b/components/js/override.js
@@ -22,6 +22,14 @@ define(['angular'], function(angular) {
     .constant('OVERRIDE', {
       'APP_OPTIONS': {
         'optionsTemplateURL': 'portal/misc/partials/example-options.html',
+        'appMenuTemplateURL': 'portal/misc/partials/example-menu.html',
+        'appMenuItems': [
+          {
+            'label': 'MyUW home',
+            'icon': 'home',
+            'url': '/web',
+          },
+        ],
       },
     });
 });