From 7a401374f2187e81c71a6ffef964c4dcbb531735 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 5 Feb 2016 11:04:28 -0500 Subject: [PATCH] (css,js) Update Angular Material to v1.0.5 --- NEWS | 1 + UI/WebServerResources/angular-material | 2 +- UI/WebServerResources/bower.json | 2 +- UI/WebServerResources/scss/components/list/list.scss | 1 - UI/WebServerResources/scss/core/layout.scss | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index cb01f729c..f919aa949 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Enhancements - [web] improved scrolling behavior when deleting a single message (#3489) - [web] added "Move To" option for selected messages (#3477) - [web] updated CKEditor to version 4.5.7 + - [web] updated Angular Material to 1.0.5 - [web/eas] add shared/public namespaces in the list or returned folders Bug fixes diff --git a/UI/WebServerResources/angular-material b/UI/WebServerResources/angular-material index 8ef798f0f..251534975 160000 --- a/UI/WebServerResources/angular-material +++ b/UI/WebServerResources/angular-material @@ -1 +1 @@ -Subproject commit 8ef798f0fe242c555ef7c11fa0abe762fb218a02 +Subproject commit 2515349755c6c829a6580005b04943e52633379d diff --git a/UI/WebServerResources/bower.json b/UI/WebServerResources/bower.json index 479214289..363f980b7 100644 --- a/UI/WebServerResources/bower.json +++ b/UI/WebServerResources/bower.json @@ -7,7 +7,7 @@ "angular-sanitize": "1.4.x", "angular-ui-router": "latest", "angular-file-upload": "latest", - "angular-material": "master", + "angular-material": "v1.0.5", "lodash": "latest", "breakpoint-sass": ">=2.4.2" }, diff --git a/UI/WebServerResources/scss/components/list/list.scss b/UI/WebServerResources/scss/components/list/list.scss index 3347191c4..8b1134a9d 100644 --- a/UI/WebServerResources/scss/components/list/list.scss +++ b/UI/WebServerResources/scss/components/list/list.scss @@ -148,7 +148,6 @@ div.md-tile-left { &-tile-content { flex: 1; overflow: hidden; // required in Firefox - margin-left: $list-item-primary-avatar-width + (2 * $baseline-grid); // Leave space for an avatar .sg-tile-date { font-size: sg-size(body); font-weight: $sg-font-light; diff --git a/UI/WebServerResources/scss/core/layout.scss b/UI/WebServerResources/scss/core/layout.scss index 0ea82bbfb..af5941f8e 100644 --- a/UI/WebServerResources/scss/core/layout.scss +++ b/UI/WebServerResources/scss/core/layout.scss @@ -2,7 +2,6 @@ // Import from sources for extends // ------------------------------- -@import "../../angular-material/src/core/style/layout"; @import "../../angular-material/src/core/services/layout/layout";