From 6d12c2a2c8c19435713e6b24d16512c6b6cec4f1 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 11 Jun 2015 14:09:07 -0400 Subject: [PATCH] (feat) enabled menu and fabdial support --- .../scss/components/fabSpeedDial/_extends.scss | 2 ++ .../scss/components/fabSpeedDial/fabSpeedDial.scss | 2 ++ UI/WebServerResources/scss/components/menu/_extends.scss | 2 ++ UI/WebServerResources/scss/components/menu/menu.scss | 2 ++ UI/WebServerResources/scss/core/variables.scss | 3 ++- UI/WebServerResources/scss/styles.scss | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 UI/WebServerResources/scss/components/fabSpeedDial/_extends.scss create mode 100644 UI/WebServerResources/scss/components/fabSpeedDial/fabSpeedDial.scss create mode 100644 UI/WebServerResources/scss/components/menu/_extends.scss create mode 100644 UI/WebServerResources/scss/components/menu/menu.scss diff --git a/UI/WebServerResources/scss/components/fabSpeedDial/_extends.scss b/UI/WebServerResources/scss/components/fabSpeedDial/_extends.scss new file mode 100644 index 000000000..a30622886 --- /dev/null +++ b/UI/WebServerResources/scss/components/fabSpeedDial/_extends.scss @@ -0,0 +1,2 @@ +/*! fabSpeedDial/_extends.scss - */ +@import '../../../angular-material/src/components/fabSpeedDial/fabSpeedDial.scss'; diff --git a/UI/WebServerResources/scss/components/fabSpeedDial/fabSpeedDial.scss b/UI/WebServerResources/scss/components/fabSpeedDial/fabSpeedDial.scss new file mode 100644 index 000000000..a942e8acc --- /dev/null +++ b/UI/WebServerResources/scss/components/fabSpeedDial/fabSpeedDial.scss @@ -0,0 +1,2 @@ +/// fabSpeedDial.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- +@import 'extends'; diff --git a/UI/WebServerResources/scss/components/menu/_extends.scss b/UI/WebServerResources/scss/components/menu/_extends.scss new file mode 100644 index 000000000..8a550ac89 --- /dev/null +++ b/UI/WebServerResources/scss/components/menu/_extends.scss @@ -0,0 +1,2 @@ +/*! menu/_extends.scss - */ +@import '../../../angular-material/src/components/menu/menu.scss'; diff --git a/UI/WebServerResources/scss/components/menu/menu.scss b/UI/WebServerResources/scss/components/menu/menu.scss new file mode 100644 index 000000000..f3304506f --- /dev/null +++ b/UI/WebServerResources/scss/components/menu/menu.scss @@ -0,0 +1,2 @@ +/// menu..scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- +@import 'extends'; diff --git a/UI/WebServerResources/scss/core/variables.scss b/UI/WebServerResources/scss/core/variables.scss index 9eb88f01d..38a7fafe9 100644 --- a/UI/WebServerResources/scss/core/variables.scss +++ b/UI/WebServerResources/scss/core/variables.scss @@ -139,7 +139,8 @@ $z-index-scroll-mask: 65 !default; $z-index-sidenav: 60 !default; $z-index-backdrop: 50 !default; $z-index-toolbar: 10 !default; -$z-index-fab: 20; +$z-index-menu: 99 !default; +$z-index-fab: 20 !default; $z-index-view: 9; // Easing Curves diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index 2c5d27d35..00ba68419 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -35,10 +35,12 @@ @import 'components/content/content'; @import 'components/dialog/dialog'; @import 'components/divider/divider'; +@import 'components/fabSpeedDial/fabSpeedDial'; @import 'components/gridList/gridList'; @import 'components/icon/icon'; @import 'components/input/input'; @import 'components/list/list'; +@import 'components/menu/menu'; @import 'components/autoScrollList/autoScrollList'; //@import 'components/progressCircular/progressCircular'; @import 'components/progressLinear/progressLinear';