From a5c9f41375e547a9b4dd02f14ae4f0dbfcd6f9ee Mon Sep 17 00:00:00 2001 From: Benoit Favreault Date: Thu, 2 Apr 2015 00:59:06 -0400 Subject: [PATCH] Fixed "fantom account" --- UI/Templates/MailerUI/UIxMailMainFrame.wox | 10 +-------- .../scss/components/subheader/subheader.scss | 21 +++++++++++++------ .../scss/core/typography.scss | 2 ++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index ee795807e..5646de795 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -287,15 +287,7 @@ - - -
- - {{account.name}} - -
-
-
+

{{account.name}}

diff --git a/UI/WebServerResources/scss/components/subheader/subheader.scss b/UI/WebServerResources/scss/components/subheader/subheader.scss index fa9e3e71d..f6bdd20dc 100644 --- a/UI/WebServerResources/scss/components/subheader/subheader.scss +++ b/UI/WebServerResources/scss/components/subheader/subheader.scss @@ -1,17 +1,26 @@ @import 'extends'; .sg-md-subheader { - padding: $baseline-grid $baseline-grid $baseline-grid $layout-gutter-width; - position: fixed; - background-color: transparent; + position: fixed; + z-index: auto; + padding: $baseline-grid $baseline-grid $baseline-grid $layout-gutter-width; + background-color: transparent; + &--static { + position: static; z-index: auto; + padding: $baseline-grid $baseline-grid $baseline-grid $layout-gutter-width; + background-color: transparent; + font-size: $sg-font-size-2; + font-weight: $sg-font-medium; + } } .sg-md-subheader { - font-size: $sg-font-size-2; font-weight: $sg-font-medium; + font-size: $sg-font-size-2; } + .sg-md-subheader > * { - font-size: inherit; font-weight: inherit; -}; \ No newline at end of file + font-size: inherit; +} diff --git a/UI/WebServerResources/scss/core/typography.scss b/UI/WebServerResources/scss/core/typography.scss index 05a826652..ae2918d26 100644 --- a/UI/WebServerResources/scss/core/typography.scss +++ b/UI/WebServerResources/scss/core/typography.scss @@ -423,7 +423,9 @@ html p { /// @alias .subhead-2 .#{$md}-subhead-solo { @extend .#{$md}-subhead-2; + margin: 0; } + .#{$md}-title { $lineHeight : $sg-line-height-4; font-size: $sg-font-size-4;