From 3f3f41eb08666d4be5ed71521f85bba61d3ad7af Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Tue, 27 Sep 2016 00:53:25 -0300 Subject: [PATCH] Create introduction page without images --- src/components/mdButton/mdButton.scss | 2 +- src/components/mdToolbar/mdToolbar.scss | 2 - src/core/stylesheets/core.theme | 20 ++++-- src/core/stylesheets/structure.scss | 5 +- src/core/stylesheets/type.scss | 77 ++++++++++++++++++++++ src/docs/App.vue | 28 ++++---- src/docs/components/demo-page.vue | 2 +- src/docs/components/single-page-banner.vue | 15 +++-- src/docs/components/single-page.vue | 28 ++++---- src/docs/config.js | 2 +- src/docs/index.js | 12 +++- src/docs/pages/Introduction.vue | 54 ++++++++++++++- 12 files changed, 191 insertions(+), 56 deletions(-) diff --git a/src/components/mdButton/mdButton.scss b/src/components/mdButton/mdButton.scss index 2ab3b18..2fe2f1f 100644 --- a/src/components/mdButton/mdButton.scss +++ b/src/components/mdButton/mdButton.scss @@ -15,7 +15,7 @@ $button-icon-size: 40px; min-width: $button-width; min-height: $button-height; margin: 6px 8px; - padding: 0 8px; + padding: 0 16px; display: inline-block; position: relative; align-items: center; diff --git a/src/components/mdToolbar/mdToolbar.scss b/src/components/mdToolbar/mdToolbar.scss index 03961c5..119a7d7 100644 --- a/src/components/mdToolbar/mdToolbar.scss +++ b/src/components/mdToolbar/mdToolbar.scss @@ -112,9 +112,7 @@ .md-title { margin: 0; - font-size: 20px; font-weight: 400; - line-height: 24px; &:first-child { margin-left: 8px; diff --git a/src/core/stylesheets/core.theme b/src/core/stylesheets/core.theme index c82961d..2da3887 100644 --- a/src/core/stylesheets/core.theme +++ b/src/core/stylesheets/core.theme @@ -1,5 +1,5 @@ .THEME_NAME { - color: rgba(0, 0, 0, .87); + color: #{'BACKGROUND-CONTRAST-0.87'}; background-color: #{'BACKGROUND-COLOR-A100'}; :not(input):not(textarea)::selection { @@ -8,11 +8,23 @@ } a:not(.md-button) { - color: #{'PRIMARY-COLOR'}; - text-decoration: none; + color: #{'ACCENT-COLOR'}; &:hover { - color: #{'PRIMARY-COLOR-800'}; + color: #{'ACCENT-COLOR-800'}; } } } + + +/* Typography */ + +.THEME_NAME { + .md-caption, + .md-display-1, + .md-display-2, + .md-display-3, + .md-display-4 { + color: #{'BACKGROUND-CONTRAST-0.57'}; + } +} diff --git a/src/core/stylesheets/structure.scss b/src/core/stylesheets/structure.scss index 56c0be6..1df1501 100644 --- a/src/core/stylesheets/structure.scss +++ b/src/core/stylesheets/structure.scss @@ -10,10 +10,7 @@ body { -webkit-font-smoothing: antialiased; color: rgba(#000, .87); font-family: $font-roboto; - font-size: 14px; - font-weight: 400; - letter-spacing: .010em; - line-height: 20px; + @extend .md-body-1; } ::-webkit-scrollbar { diff --git a/src/core/stylesheets/type.scss b/src/core/stylesheets/type.scss index e69de29..aaf6ee5 100644 --- a/src/core/stylesheets/type.scss +++ b/src/core/stylesheets/type.scss @@ -0,0 +1,77 @@ +/* Text and Titles */ + +.md-caption { + font-size: 12px; + font-weight: 400; + letter-spacing: .02em; + line-height: 17px; +} + +.md-body-1 { + font-size: 14px; + font-weight: 400; + letter-spacing: .01em; + line-height: 20px; +} + +.md-body-2 { + font-size: 14px; + font-weight: 500; + letter-spacing: .01em; + line-height: 24px; +} + +.md-subheading { + font-size: 16px; + font-weight: 400; + letter-spacing: .01em; + line-height: 24px; +} + +.md-title { + font-size: 20px; + font-weight: 500; + letter-spacing: .005em; + line-height: 26px; +} + +.md-headline { + font-size: 24px; + font-weight: 400; + letter-spacing: 0; + line-height: 32px; +} + +.md-display-1 { + font-size: 34px; + font-weight: 400; + letter-spacing: 0; + line-height: 40px; +} + +.md-display-2 { + font-size: 45px; + font-weight: 400; + letter-spacing: 0; + line-height: 48px; +} + +.md-display-3 { + font-size: 56px; + font-weight: 400; + letter-spacing: -.005em; + line-height: 58px; +} + +.md-display-4 { + font-size: 112px; + font-weight: 400; + letter-spacing: -.01em; + line-height: 112px; +} + +/* Links */ + +a { + text-decoration: none; +} diff --git a/src/docs/App.vue b/src/docs/App.vue index c0fa2a2..b767c57 100644 --- a/src/docs/App.vue +++ b/src/docs/App.vue @@ -173,10 +173,6 @@ } } - .md-theme-default .main-header { - color: #fff; - } - .main-header { position: relative; z-index: 3; @@ -187,6 +183,11 @@ } } + .md-toolbar, + .md-title { + color: #fff; + } + .md-title { .page-title { margin-left: 0; @@ -206,11 +207,11 @@ .main-sidebar.md-sidenav { .md-sidenav-content { + width: $sizebar-size; display: flex; flex-flow: column; @media (min-width: 1280px) { - width: $sizebar-size; top: 0; pointer-events: auto; transform: translate3d(0, 0, 0); @@ -288,23 +289,22 @@ position: absolute; top: 0; right: 0; - left: 280px; + left: 0; transition: $swift-ease-out; + + @media (min-width: 1280px) { + left: 280px; + } } .md-router-enter, .md-router-leave-active { - opacity: 0; + opacity: .2; } .md-router-enter { - .single-page-banner .md-toolbar { - min-height: 64px; - padding-top: 0; - - .md-title { - font-size: 20px; - } + .md-display-2 { + transform: translate3D(0, -36px, 0); } } diff --git a/src/docs/components/demo-page.vue b/src/docs/components/demo-page.vue index cd01a8e..1c13a16 100644 --- a/src/docs/components/demo-page.vue +++ b/src/docs/components/demo-page.vue @@ -66,7 +66,7 @@ } .md-tab { - max-width: 960px; + max-width: 1024px; font-size: 16px; line-height: 1.6em; } diff --git a/src/docs/components/single-page-banner.vue b/src/docs/components/single-page-banner.vue index 2363c1c..2f300bd 100644 --- a/src/docs/components/single-page-banner.vue +++ b/src/docs/components/single-page-banner.vue @@ -1,7 +1,7 @@