From eeb6be1f0871130b9d12b90a7771135e3ea6c780 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 25 Aug 2015 10:24:34 -0400 Subject: [PATCH] (css) Match new ng-material files names --- .../scss/components/bottomSheet/_extends.scss | 2 +- .../{bottomSheet.scss => bottom-sheet.scss} | 0 .../scss/components/gridList/_extends.scss | 2 +- .../gridList/{gridList.scss => grid-list.scss} | 0 ...rogressCircular.scss => progress-circular.scss} | 0 .../scss/components/progressLinear/_extends.scss | 2 +- .../{progressLinear.scss => progress-linear.scss} | 0 .../scss/components/virtualRepeat/_extends.scss | 2 +- .../{virtualRepeat.scss => virtual-repeat.scss} | 0 UI/WebServerResources/scss/styles.scss | 14 +++++++------- UI/WebServerResources/scss/views/_view.scss | 3 ++- 11 files changed, 13 insertions(+), 12 deletions(-) rename UI/WebServerResources/scss/components/bottomSheet/{bottomSheet.scss => bottom-sheet.scss} (100%) rename UI/WebServerResources/scss/components/gridList/{gridList.scss => grid-list.scss} (100%) rename UI/WebServerResources/scss/components/progressCircular/{progressCircular.scss => progress-circular.scss} (100%) rename UI/WebServerResources/scss/components/progressLinear/{progressLinear.scss => progress-linear.scss} (100%) rename UI/WebServerResources/scss/components/virtualRepeat/{virtualRepeat.scss => virtual-repeat.scss} (100%) diff --git a/UI/WebServerResources/scss/components/bottomSheet/_extends.scss b/UI/WebServerResources/scss/components/bottomSheet/_extends.scss index d1049036f..0ccec5e00 100644 --- a/UI/WebServerResources/scss/components/bottomSheet/_extends.scss +++ b/UI/WebServerResources/scss/components/bottomSheet/_extends.scss @@ -1,2 +1,2 @@ /*! bottomSheet/_extends.scss - */ -@import '../../../angular-material/src/components/bottomSheet/bottomSheet.scss'; \ No newline at end of file +@import '../../../angular-material/src/components/bottomSheet/bottom-sheet.scss'; diff --git a/UI/WebServerResources/scss/components/bottomSheet/bottomSheet.scss b/UI/WebServerResources/scss/components/bottomSheet/bottom-sheet.scss similarity index 100% rename from UI/WebServerResources/scss/components/bottomSheet/bottomSheet.scss rename to UI/WebServerResources/scss/components/bottomSheet/bottom-sheet.scss diff --git a/UI/WebServerResources/scss/components/gridList/_extends.scss b/UI/WebServerResources/scss/components/gridList/_extends.scss index b6c2bca0a..9c4c25307 100644 --- a/UI/WebServerResources/scss/components/gridList/_extends.scss +++ b/UI/WebServerResources/scss/components/gridList/_extends.scss @@ -1 +1 @@ -@import '../../../angular-material/src/components/gridList/gridList.scss'; +@import '../../../angular-material/src/components/gridList/grid-list.scss'; diff --git a/UI/WebServerResources/scss/components/gridList/gridList.scss b/UI/WebServerResources/scss/components/gridList/grid-list.scss similarity index 100% rename from UI/WebServerResources/scss/components/gridList/gridList.scss rename to UI/WebServerResources/scss/components/gridList/grid-list.scss diff --git a/UI/WebServerResources/scss/components/progressCircular/progressCircular.scss b/UI/WebServerResources/scss/components/progressCircular/progress-circular.scss similarity index 100% rename from UI/WebServerResources/scss/components/progressCircular/progressCircular.scss rename to UI/WebServerResources/scss/components/progressCircular/progress-circular.scss diff --git a/UI/WebServerResources/scss/components/progressLinear/_extends.scss b/UI/WebServerResources/scss/components/progressLinear/_extends.scss index 6355e0ccd..c82b7546c 100644 --- a/UI/WebServerResources/scss/components/progressLinear/_extends.scss +++ b/UI/WebServerResources/scss/components/progressLinear/_extends.scss @@ -1,2 +1,2 @@ /*! progressLinear/_extends.scss - */ -@import '../../../angular-material/src/components/progressLinear/progressLinear.scss'; \ No newline at end of file +@import '../../../angular-material/src/components/progressLinear/progress-linear.scss'; diff --git a/UI/WebServerResources/scss/components/progressLinear/progressLinear.scss b/UI/WebServerResources/scss/components/progressLinear/progress-linear.scss similarity index 100% rename from UI/WebServerResources/scss/components/progressLinear/progressLinear.scss rename to UI/WebServerResources/scss/components/progressLinear/progress-linear.scss diff --git a/UI/WebServerResources/scss/components/virtualRepeat/_extends.scss b/UI/WebServerResources/scss/components/virtualRepeat/_extends.scss index cf7fe997f..f4350b02b 100644 --- a/UI/WebServerResources/scss/components/virtualRepeat/_extends.scss +++ b/UI/WebServerResources/scss/components/virtualRepeat/_extends.scss @@ -1,2 +1,2 @@ /*! virtualRepeat/_extends.scss - */ -@import '../../../angular-material/src/components/virtualRepeat/virtualRepeater.scss'; \ No newline at end of file +@import '../../../angular-material/src/components/virtualRepeat/virtual-repeater.scss'; diff --git a/UI/WebServerResources/scss/components/virtualRepeat/virtualRepeat.scss b/UI/WebServerResources/scss/components/virtualRepeat/virtual-repeat.scss similarity index 100% rename from UI/WebServerResources/scss/components/virtualRepeat/virtualRepeat.scss rename to UI/WebServerResources/scss/components/virtualRepeat/virtual-repeat.scss diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index 6ee0a4ed6..41d7ec800 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -27,7 +27,7 @@ // ------------------------------------------------------------------------------ @import 'components/autocomplete/autocomplete'; @import 'components/backdrop/backdrop'; -@import 'components/bottomSheet/bottomSheet'; +//@import 'components/bottomSheet/bottom-sheet'; @import 'components/button/button'; @import 'components/card/card'; @import 'components/checkbox/checkbox'; @@ -41,13 +41,13 @@ @import 'components/fabSpeedDial/fabSpeedDial'; //@import 'components/fabToolbar/fabToolbar'; //@import 'components/fabTrigger/fabTrigger'; -@import 'components/gridList/gridList'; +@import 'components/gridList/grid-list'; @import 'components/icon/icon'; @import 'components/input/input'; @import 'components/list/list'; @import 'components/menu/menu'; -//@import 'components/progressCircular/progressCircular'; -@import 'components/progressLinear/progressLinear'; +//@import 'components/progressCircular/progress-circular'; +@import 'components/progressLinear/progress-linear'; @import 'components/radioButton/radio-button'; @import 'components/select/select'; @import 'components/sidenav/sidenav'; @@ -60,7 +60,7 @@ @import 'components/toast/toast'; @import 'components/toolbar/toolbar'; @import 'components/tooltip/tooltip'; -@import 'components/virtualRepeat/virtualRepeat'; +@import 'components/virtualRepeat/virtual-repeat'; @import 'components/whiteframe/whiteframe'; // Theme @@ -97,8 +97,8 @@ @import 'core/base_styles/base_style'; // Make sure this is last to override anything else -@import 'shame'; +//@import 'shame'; // dev-tools - NOT FOR PRODUCTION // ------------------------------------------------------------------------------ -@import 'devtools'; +//@import 'devtools'; diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss index 3c3c8e0fb..f4d54e5d4 100644 --- a/UI/WebServerResources/scss/views/_view.scss +++ b/UI/WebServerResources/scss/views/_view.scss @@ -6,7 +6,8 @@ @import 'MessageEditorUI'; @import 'SchedulerUI'; -.view[layout=row] { +.view[layout=row], +.view.layout-row { max-height: 100%; }