diff --git a/UI/WebServerResources/js/Common/sgCheckmark.directive.js b/UI/WebServerResources/js/Common/sgCheckmark.directive.js index be61901c7..a12ee0399 100644 --- a/UI/WebServerResources/js/Common/sgCheckmark.directive.js +++ b/UI/WebServerResources/js/Common/sgCheckmark.directive.js @@ -16,7 +16,7 @@ + ng-click="$mdMenu.open()"> sort diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js index 4d4f23298..3da2eb0ec 100644 --- a/UI/WebServerResources/js/Contacts/AddressBookController.js +++ b/UI/WebServerResources/js/Contacts/AddressBookController.js @@ -260,7 +260,7 @@ if (cards.length != allCards.length) $mdToast.show( $mdToast.simple() - .content(l("Lists can't be moved or copied.")) + .textContent(l("Lists can't be moved or copied.")) .position('top right') .hideDelay(2000)); @@ -283,7 +283,7 @@ $state.go('app.addressbook'); $mdToast.show( $mdToast.simple() - .content(success) + .textContent(success) .position('top right') .hideDelay(2000)); }); diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js index dd8fe182f..fbc04fcce 100644 --- a/UI/WebServerResources/js/Contacts/AddressBooksController.js +++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js @@ -187,7 +187,7 @@ $mdToast.show( $mdToast.simple() - .content(msg) + .textContent(msg) .position('top right') .hideDelay(3000)); }, @@ -335,7 +335,7 @@ AddressBook.$subscribe(addressbookData.owner, addressbookData.name).then(function(data) { $mdToast.show( $mdToast.simple() - .content(l('Successfully subscribed to address book')) + .textContent(l('Successfully subscribed to address book')) .position('top right') .hideDelay(3000)); }); @@ -363,7 +363,7 @@ if (cards.length != allCards.length) $mdToast.show( $mdToast.simple() - .content(l("Lists can't be moved or copied.")) + .textContent(l("Lists can't be moved or copied.")) .position('top right') .hideDelay(2000)); @@ -386,7 +386,7 @@ $state.go('app.addressbook'); $mdToast.show( $mdToast.simple() - .content(success) + .textContent(success) .position('top right') .hideDelay(2000)); }); diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js index 8d5410ee2..705f644f8 100644 --- a/UI/WebServerResources/js/Mailer/MailboxController.js +++ b/UI/WebServerResources/js/Mailer/MailboxController.js @@ -486,7 +486,7 @@ vm.selectedFolder.$copyMessages(selectedMessages, '/' + dstFolder).then(function() { $mdToast.show( $mdToast.simple() - .content(l('%{0} message(s) copied', vm.selectedFolder.$selectedCount())) + .textContent(l('%{0} message(s) copied', vm.selectedFolder.$selectedCount())) .position('top right') .hideDelay(2000)); }); @@ -500,7 +500,7 @@ vm.selectedFolder.$moveMessages(selectedMessages, '/' + dstFolder).then(function(index) { $mdToast.show( $mdToast.simple() - .content(l('%{0} message(s) moved', count)) + .textContent(l('%{0} message(s) moved', count)) .position('top right') .hideDelay(2000)); if (Mailbox.$virtualMode) { diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js index 543dffaf1..430144a8d 100644 --- a/UI/WebServerResources/js/Mailer/MessageController.js +++ b/UI/WebServerResources/js/Mailer/MessageController.js @@ -285,7 +285,7 @@ // Show success toast when action succeeds $mdToast.show( $mdToast.simple() - .content(l('Successfully created card')) + .textContent(l('Successfully created card')) .position('top right') .hideDelay(2000)); }); diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js index be23c6f44..c6ffcc903 100644 --- a/UI/WebServerResources/js/Mailer/MessageEditorController.js +++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js @@ -150,7 +150,7 @@ onErrorItem: function(item, response, status, headers) { $mdToast.show( $mdToast.simple() - .content(l('Error while uploading the file \"%{0}\":', item.file.name) + + .textContent(l('Error while uploading the file \"%{0}\":', item.file.name) + ' ' + (response.message? l(response.message) : '')) .position('top right') .action(l('OK')) @@ -224,7 +224,7 @@ } $mdToast.show( $mdToast.simple() - .content(l('Your email has been saved')) + .textContent(l('Your email has been saved')) .position('top right') .hideDelay(3000)); }); @@ -255,7 +255,7 @@ } $mdToast.show( $mdToast.simple() - .content(l('Your email has been sent')) + .textContent(l('Your email has been sent')) .position('top right') .hideDelay(3000)); diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js index 6f3dff3dc..c41089041 100644 --- a/UI/WebServerResources/js/Preferences/PreferencesController.js +++ b/UI/WebServerResources/js/Preferences/PreferencesController.js @@ -457,7 +457,7 @@ if (!options || !options.quick) { $mdToast.show( $mdToast.simple() - .content(l('Preferences saved')) + .textContent(l('Preferences saved')) .position('bottom right') .hideDelay(2000)); form.$setPristine(); @@ -489,7 +489,7 @@ Authentication.changePassword(this.passwords.newPassword, this.passwords.oldPassword).then(function() { var alert = $mdDialog.alert({ title: l('Password'), - content: l('The password was changed successfully.'), + textContent: l('The password was changed successfully.'), ok: l('OK') }); $mdDialog.show( alert ) diff --git a/UI/WebServerResources/js/Scheduler/CalendarsController.js b/UI/WebServerResources/js/Scheduler/CalendarsController.js index 887177b00..a1aa14932 100644 --- a/UI/WebServerResources/js/Scheduler/CalendarsController.js +++ b/UI/WebServerResources/js/Scheduler/CalendarsController.js @@ -162,7 +162,7 @@ Calendar.$subscribe(calendarData.owner, calendarData.name).then(function(data) { $mdToast.show( $mdToast.simple() - .content(l('Successfully subscribed to calendar')) + .textContent(l('Successfully subscribed to calendar')) .position('top right') .hideDelay(3000)); }); diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js index ed977ffec..914325516 100644 --- a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js +++ b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js @@ -339,7 +339,7 @@ $mdToast.show( $mdToast.simple() - .content(msg) + .textContent(msg) .position('top right') .hideDelay(3000)); }, diff --git a/UI/WebServerResources/scss/components/input/_extends.scss b/UI/WebServerResources/scss/components/input/_extends.scss index 0518ae4bd..2b8c61a6d 100644 --- a/UI/WebServerResources/scss/components/input/_extends.scss +++ b/UI/WebServerResources/scss/components/input/_extends.scss @@ -1,3 +1,2 @@ /*! input/_extends.scss - */ -@import '../../../angular-material/src/components/input/input-variables.scss'; @import '../../../angular-material/src/components/input/input.scss'; diff --git a/UI/WebServerResources/scss/components/input/input-variables.scss b/UI/WebServerResources/scss/components/input/input-variables.scss new file mode 100644 index 000000000..55be2d632 --- /dev/null +++ b/UI/WebServerResources/scss/components/input/input-variables.scss @@ -0,0 +1,3 @@ +/// input-variables.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- + +@import '../../../angular-material/src/components/input/input-variables.scss'; diff --git a/UI/WebServerResources/scss/components/subheader/subheader.scss b/UI/WebServerResources/scss/components/subheader/subheader.scss index c820d2137..773a74e4e 100644 --- a/UI/WebServerResources/scss/components/subheader/subheader.scss +++ b/UI/WebServerResources/scss/components/subheader/subheader.scss @@ -16,7 +16,6 @@ $sg-subheader-padding-left-right: $baseline-grid; &--with-icon .md-subheader-inner, &--with-secondary-icon .md-subheader-inner { line-height: $sg-avatar-width + ($sg-subheader-padding-top-bottom)*2; - padding: ($subheader-padding - ($icon-button-height - $subheader-font-size)/2) $baseline-grid; padding: 0; padding-left: $subheader-padding; } diff --git a/UI/WebServerResources/scss/core/variables.scss b/UI/WebServerResources/scss/core/variables.scss index bd433f1d0..0c3cbba83 100644 --- a/UI/WebServerResources/scss/core/variables.scss +++ b/UI/WebServerResources/scss/core/variables.scss @@ -112,9 +112,6 @@ $slicer-breakpoint-names: 'xs' 'sm' 'md' 'lg' 'xl'; $media-pointer: (pointer fine); -// Button -$button-left-right-padding: rem(0.600); - // Icon $icon-size: rem(2.400) !default; @@ -206,15 +203,22 @@ $material-leave-duration: 0.3s; $material-leave-timing-function: cubic-bezier(0.4, 0.0, 1, 1); $material-leave: all $material-leave-duration $material-leave-timing-function; +// Button +$button-left-right-padding: rem(0.800); +$icon-button-height: rem(4.000) !default; +$icon-button-width: rem(4.000) !default; + // Fab Buttons (shared between buttons.scss and fab*.scss) -// ------------------------------------------- $button-fab-width: rem(5.600) !default; $button-fab-height: rem(5.600) !default; $button-fab-padding: rem(1.60) !default; // Shared Checkbox variables -$checkbox-width: 20px !default; +$checkbox-width: 18px !default; $checkbox-height: $checkbox-width !default; $checkbox-border-radius: 2px !default; $checkbox-border-width: 2px !default; + +// Shared Horizontal Margin Variables +$default-horizontal-margin: 16px !default; diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index 2efadecbf..5129855d1 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -25,6 +25,7 @@ // Original angular-material components // ------------------------------------------------------------------------------ +@import 'components/input/input-variables'; @import 'components/autocomplete/autocomplete'; @import 'components/backdrop/backdrop'; //@import 'components/bottomSheet/bottom-sheet';