From 8fe31556bb9bf6f0d7f2b7bc51ff1e6ae94f5a66 Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Thu, 5 Jan 2017 15:09:32 +0000 Subject: [PATCH 1/8] Adding utility classes for pulling elements left or right. --- src/app/material-docs-app.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/material-docs-app.scss b/src/app/material-docs-app.scss index 9947a7ca8..8f74b8e6c 100644 --- a/src/app/material-docs-app.scss +++ b/src/app/material-docs-app.scss @@ -16,3 +16,11 @@ app-navbar { position: relative; z-index: 10; } + +.pull-right { + float: right; +} + +.pull-left { + float: left; +} From b129ae6e3667f710db18a9a529c09d5efcd5f22f Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Thu, 5 Jan 2017 15:09:52 +0000 Subject: [PATCH 2/8] Adding GitHub SVG logo created in the same style as the Angular logo in the navbar. --- .../img/homepage/github-circle-white-transparent.svg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/assets/img/homepage/github-circle-white-transparent.svg diff --git a/src/assets/img/homepage/github-circle-white-transparent.svg b/src/assets/img/homepage/github-circle-white-transparent.svg new file mode 100644 index 000000000..edb7f063c --- /dev/null +++ b/src/assets/img/homepage/github-circle-white-transparent.svg @@ -0,0 +1,12 @@ + + + + github-circle-white-transparent + Created with Sketch. + + + + + + + \ No newline at end of file From 4a63bf021898f2042bbc3830604739f077cec020 Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Thu, 5 Jan 2017 15:10:53 +0000 Subject: [PATCH 3/8] Adding GitHub link to the navbar. --- src/app/shared/navbar/navbar.html | 7 ++++++- src/app/shared/navbar/navbar.scss | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/shared/navbar/navbar.html b/src/app/shared/navbar/navbar.html index d7d02dc62..74a6131dd 100644 --- a/src/app/shared/navbar/navbar.html +++ b/src/app/shared/navbar/navbar.html @@ -8,5 +8,10 @@ Components Guides + + + GitHub + - diff --git a/src/app/shared/navbar/navbar.scss b/src/app/shared/navbar/navbar.scss index 0a90fedb8..58771446a 100644 --- a/src/app/shared/navbar/navbar.scss +++ b/src/app/shared/navbar/navbar.scss @@ -7,3 +7,9 @@ height: 26px; vertical-align: middle; } + +.docs-github-logo { + margin: 0 7px 2px 0; + height: 21px; + vertical-align: middle; +} From 238144ac8767e935e2e66a1c7075d6d37d1e4069 Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Mon, 13 Mar 2017 17:00:55 +0000 Subject: [PATCH 4/8] Removed pull classes will use flex box to layout navbar instead. --- src/app/material-docs-app.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/material-docs-app.scss b/src/app/material-docs-app.scss index 8f74b8e6c..9947a7ca8 100644 --- a/src/app/material-docs-app.scss +++ b/src/app/material-docs-app.scss @@ -16,11 +16,3 @@ app-navbar { position: relative; z-index: 10; } - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} From f4f4813b6f7f730ea8e8966496be54a1837c24fc Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Mon, 13 Mar 2017 17:01:10 +0000 Subject: [PATCH 5/8] Removed redundant span. --- src/app/shared/navbar/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/navbar/navbar.html b/src/app/shared/navbar/navbar.html index 74a6131dd..9471dfe7f 100644 --- a/src/app/shared/navbar/navbar.html +++ b/src/app/shared/navbar/navbar.html @@ -12,6 +12,6 @@ - GitHub + GitHub From b76f14db7eb1cf1ad0700e71860b49f97c25754d Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Mon, 13 Mar 2017 17:12:52 +0000 Subject: [PATCH 6/8] Optimized GitHub SVG icon with svgo. --- .../homepage/github-circle-white-transparent.svg | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/assets/img/homepage/github-circle-white-transparent.svg b/src/assets/img/homepage/github-circle-white-transparent.svg index edb7f063c..715c08e45 100644 --- a/src/assets/img/homepage/github-circle-white-transparent.svg +++ b/src/assets/img/homepage/github-circle-white-transparent.svg @@ -1,12 +1 @@ - - - - github-circle-white-transparent - Created with Sketch. - - - - - - - \ No newline at end of file +github-circle-white-transparent \ No newline at end of file From 0bfb32644b3c0b4f0a1ad35d4941495f30559059 Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Mon, 13 Mar 2017 17:32:44 +0000 Subject: [PATCH 7/8] Linting. --- src/app/shared/navbar/navbar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/navbar/navbar.scss b/src/app/shared/navbar/navbar.scss index 58771446a..1c4cf9763 100644 --- a/src/app/shared/navbar/navbar.scss +++ b/src/app/shared/navbar/navbar.scss @@ -3,13 +3,13 @@ } .docs-angular-logo { - margin: 0 4px 3px 0; height: 26px; + margin: 0 4px 3px 0; vertical-align: middle; } .docs-github-logo { - margin: 0 7px 2px 0; height: 21px; + margin: 0 7px 2px 0; vertical-align: middle; } From 4206ed69ce1da9cbba67418759e4d070a1f55b7c Mon Sep 17 00:00:00 2001 From: Joshua Barnett Date: Mon, 13 Mar 2017 17:33:14 +0000 Subject: [PATCH 8/8] Laid out navbar using flex box. --- src/app/shared/navbar/navbar.html | 2 +- src/app/shared/navbar/navbar.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/shared/navbar/navbar.html b/src/app/shared/navbar/navbar.html index 9471dfe7f..e40dba273 100644 --- a/src/app/shared/navbar/navbar.html +++ b/src/app/shared/navbar/navbar.html @@ -8,7 +8,7 @@ Components Guides - + diff --git a/src/app/shared/navbar/navbar.scss b/src/app/shared/navbar/navbar.scss index 1c4cf9763..a6db42611 100644 --- a/src/app/shared/navbar/navbar.scss +++ b/src/app/shared/navbar/navbar.scss @@ -1,5 +1,13 @@ .docs-navbar { + display: flex; + flex-wrap: wrap; padding: 8px 16px; + + > .mat-button { + &:last-child { + margin-left: auto; + } + } } .docs-angular-logo {