From 2a132b4e8f2917507219aba5273bce6b74593c76 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 6 Aug 2015 11:48:42 -0400 Subject: [PATCH] (css) Cleanup directives already in material --- .../scss/components/divider/divider.scss | 10 ---------- UI/WebServerResources/scss/core/layout.scss | 1 + UI/WebServerResources/scss/core/mixins.scss | 19 ------------------- .../scss/core/typography.scss | 8 ++++---- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/UI/WebServerResources/scss/components/divider/divider.scss b/UI/WebServerResources/scss/components/divider/divider.scss index 58a005bfc..5ada17538 100644 --- a/UI/WebServerResources/scss/components/divider/divider.scss +++ b/UI/WebServerResources/scss/components/divider/divider.scss @@ -1,12 +1,2 @@ /// divider.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- @import 'extends'; - -md-divider { - display: block; - border-top: 1px solid; - margin: 0; - - &.md-inset { - margin-left: $baseline-grid * 9; - } -} diff --git a/UI/WebServerResources/scss/core/layout.scss b/UI/WebServerResources/scss/core/layout.scss index 9d7bed548..4a09c409e 100644 --- a/UI/WebServerResources/scss/core/layout.scss +++ b/UI/WebServerResources/scss/core/layout.scss @@ -176,6 +176,7 @@ flex, hide, show, show-sm; margin-right: 0; margin-left: 0; } + // App container for responsive .sg-app-content { @include to(sm) { diff --git a/UI/WebServerResources/scss/core/mixins.scss b/UI/WebServerResources/scss/core/mixins.scss index 0e8e6161a..908fc223b 100644 --- a/UI/WebServerResources/scss/core/mixins.scss +++ b/UI/WebServerResources/scss/core/mixins.scss @@ -1,25 +1,6 @@ /// mixins.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- @import '../../angular-material/src/core/style/mixins.scss'; -@mixin margin-selectors($before:1em, $after:1em, $start:0px, $end:0px) { - -webkit-margin-before: $before; - -webkit-margin-after: $after; - -webkit-margin-start: $start; - -webkit-margin-end: $end; -} - -@mixin not-selectable($value:none) { - user-select: $value; -} - -@mixin input-placeholder-color($color) { - &::-webkit-input-placeholder, - &::-moz-placeholder, /* Firefox 19+ */ - &:-moz-placeholder, /* Firefox 18- */ - &:-ms-input-placeholder { - color: $color; - } -} // Utility to compensate for the the xml mandatory attribute values // Creates classes extending layout attributes with no values // ---------------------------------------------------------------- diff --git a/UI/WebServerResources/scss/core/typography.scss b/UI/WebServerResources/scss/core/typography.scss index f6a047780..d0944f495 100644 --- a/UI/WebServerResources/scss/core/typography.scss +++ b/UI/WebServerResources/scss/core/typography.scss @@ -343,10 +343,10 @@ html p { white-space: nowrap; } .#{$md}-display-2--light { - $lineHeight: $sg-line-height-7; - font-size: $sg-font-size-7; - line-height: $lineHeight; - font-weight: $sg-font-light; + $lineHeight: $sg-line-height-7; + font-size: $sg-font-size-7; + line-height: $lineHeight; + font-weight: $sg-font-light; } .#{$md}-display-3 { $lineHeight : $sg-line-height-8;