diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 9ee524688..d71571cd4 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -30,7 +30,7 @@
- +
- +
- + diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox index 4a22bab43..09f396095 100644 --- a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox +++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox @@ -52,12 +52,12 @@
-
-
+
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox index ca99febd0..0aa3f8033 100644 --- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox +++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox @@ -324,8 +324,8 @@ layout="column" layout-align="start center" ng-class="{ 'sg-close': !mailbox.service.selectedFolder.selectedMessage }" ui-view="message"> - +
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index 52d162282..9bf3623d1 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -37,7 +37,7 @@
- +
- +
- +
- +
+ class="md-default-theme md-fg md-hue-1">
@@ -62,7 +62,7 @@ var:class="dayCellClasses" var:id="currentDayId" > - @@ -71,12 +71,11 @@ - +
- + v1.1.0-rc2-master", "lodash": "latest", "Sortable": "latest", "breakpoint-sass": ">=2.4.2" diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss index ded2d1577..a3a6fe8c1 100644 --- a/UI/WebServerResources/scss/components/button/button.scss +++ b/UI/WebServerResources/scss/components/button/button.scss @@ -12,11 +12,6 @@ md-sidenav md-list .md-button { } } -.view-list md-list .md-button { - // Gain some space in lists - padding-right: 0; -} - // Expandable button for a collapsable list .sg-expandable { width: 100%; diff --git a/UI/WebServerResources/scss/components/list/list.scss b/UI/WebServerResources/scss/components/list/list.scss index 64b5781cf..0d0908552 100644 --- a/UI/WebServerResources/scss/components/list/list.scss +++ b/UI/WebServerResources/scss/components/list/list.scss @@ -18,18 +18,7 @@ $sg-avatar-width: 40px; $sg-color-chip-width: 16px; md-list-item { - &.md-with-secondary { - &.md-accent.md-bg { - .md-button { - // List items with a secondary button must have a transparent background when highlighted - // in order to honor the contrast color - background-color: transparent; - } - } - } - ._md-list-item-inner { - flex-grow: 1; // use all column space overflow: hidden; // Gain some space since we want small list items @@ -261,10 +250,10 @@ sg-avatar-image { .md-avatar:before, .md-avatar md-icon, sg-avatar-image md-icon, -.sg-avatar-list { +sg-avatar-image md-icon.material-icons { + color: rgba(0, 0, 0, 0.26); font-family: 'Material Icons'; font-size: $sg-avatar-width; - color: rgba(0, 0, 0, 0.26); } .sg-avatar-list { &:before { diff --git a/UI/WebServerResources/scss/components/subheader/subheader.scss b/UI/WebServerResources/scss/components/subheader/subheader.scss index 483aaccb5..c600a86d1 100644 --- a/UI/WebServerResources/scss/components/subheader/subheader.scss +++ b/UI/WebServerResources/scss/components/subheader/subheader.scss @@ -1,24 +1,11 @@ /// subheader.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- @import 'extends'; -.md-subheader { - margin-right: 0; -} - -.md-subheader { - .md-subheader-inner { - padding: 0 0 0 $layout-gutter-width; - } -} -md-tab-content { - .md-subheader { - .md-subheader-inner { - padding-left: $layout-gutter-width/2; - } - } -} - .sg-md-subheader { + &--icon-button ._md-subheader-inner { + padding: ($subheader-padding - ($icon-button-height - $subheader-font-size)/2) $baseline-grid; + padding-left: $subheader-padding; + } &--fixed { position: fixed; z-index: auto; diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss index 89f80fbb6..a40330732 100644 --- a/UI/WebServerResources/scss/views/_view.scss +++ b/UI/WebServerResources/scss/views/_view.scss @@ -52,17 +52,18 @@ $listView-width: grid-step(6) !global; z-index: ($z-index-view - 1); min-width: ($listView-width - ($pitch * 2)); - // With Material, when a button inside a md-list uses the class md-secondary, it has an absolute position on the - // right side of the list item. Since we define the avatar as the secondary button, we must move it to the left - // side of the list item and add some padding to the main button (.md-no-style). + // With Material, when a button inside a md-list uses the class md-secondary, it is moved inside a container + // on the right side of the list item. Since we define the avatar as the secondary button, we must move it to + // the left side of the list item. .md-with-secondary { - ._md-no-style { - min-height: $baseline-grid * 7; // 56px - padding-left: 40 + $baseline-grid * 2 !important; // 56px + ._md-list-item-inner { + padding-left: $baseline-grid; } ._md-secondary-container { - left: $baseline-grid * 2; - right: initial; + order: -1; // move secondary container to the left + } + .md-secondary { + margin: 0; padding: 0; } }