From 6f2775b5768cb15496764408fd22b1b6858395c5 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Tue, 24 Feb 2015 06:38:30 -0800 Subject: [PATCH] Update to core navigation components --- public/_includes/_footer.jade | 56 ++- public/_includes/_head-include.jade | 1 + public/_includes/_main-nav.jade | 7 +- public/_layout.jade | 4 +- public/resources/css/_base.scss | 427 ++++++++++++++++++ public/resources/css/_layout.scss | 7 + public/resources/css/_options.scss | 21 +- public/resources/css/_state.scss | 0 public/resources/css/_theme.scss | 118 +++++ public/resources/css/main.scss | 3 + public/resources/css/module/_main-footer.scss | 43 ++ public/resources/css/module/_main-nav.scss | 16 + public/resources/js/site.js | 20 +- 13 files changed, 710 insertions(+), 13 deletions(-) create mode 100644 public/resources/css/_layout.scss create mode 100644 public/resources/css/_state.scss create mode 100644 public/resources/css/module/_main-footer.scss diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade index e0af6c00b9..ca542e0584 100644 --- a/public/_includes/_footer.jade +++ b/public/_includes/_footer.jade @@ -1,9 +1,51 @@ -nav.footer +.main-footer + nav(class="background-silver" layout="row" layout-sm="column") - section - h3 About - ul - li Press Kit + section(flex) + p logo here - p Created by Google ©2010-2015 - p Code licensed under the The MIT License. Documentation licensed under CC BY 3.0. \ No newline at end of file + section(flex) + h3.text-headline ANGULAR + + ul.text-body + li Angular 2.0 + li Angular 1.X + li AngularDart 1.X + li Angular Material + li AngularFire + + section(flex) + h3.text-headline LEARN + + ul.text-body + li 5 Min Quickstart + li Angular 1.X + li AngularDart 1.X + li Angular Material + li AngularFire + + + section(flex) + h3.text-headline HELP + + ul.text-body + li Angular 2.0 + li Angular 1.X + li AngularDart 1.X + li Angular Material + li AngularFire + + + section(flex) + h3.text-headline COMMUNITY + + ul.text-body + li Angular 2.0 + li Angular 1.X + li AngularDart 1.X + li Angular Material + li AngularFire + + + footer(class="background-steel") + small.text-caption Powered by Google ©2010-2015. Code licensed under the The MIT License. Documentation licensed under CC BY 3.0. \ No newline at end of file diff --git a/public/_includes/_head-include.jade b/public/_includes/_head-include.jade index 5cd6b203bb..6ef57983ab 100644 --- a/public/_includes/_head-include.jade +++ b/public/_includes/_head-include.jade @@ -1,2 +1,3 @@ link(rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/0.7.0/angular-material.min.css") +link(href='http://fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700' rel='stylesheet' type='text/css') link(rel="stylesheet" href="/resources/css/main.css") \ No newline at end of file diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade index cef0c8b977..0cf28f1419 100644 --- a/public/_includes/_main-nav.jade +++ b/public/_includes/_main-nav.jade @@ -1,4 +1,4 @@ -md-toolbar(layout="row" class="main-nav" md-scroll-shrink) +md-toolbar(class="main-nav background-regal" md-scroll-shrink) nav.md-toolbar-tools h1 Angular by Google @@ -6,4 +6,7 @@ md-toolbar(layout="row" class="main-nav" md-scroll-shrink) li Features li Docs li About - li Install + + ul.md-tools + li + md-button(class="cta" href="/install/") Install \ No newline at end of file diff --git a/public/_layout.jade b/public/_layout.jade index b17a2171ad..05d04f8b2e 100644 --- a/public/_layout.jade +++ b/public/_layout.jade @@ -1,7 +1,9 @@ doctype -html(lang="en" layout="column" ng-app="StarterApp") +html(lang="en" layout="column" ng-app="myApp") + head != partial("/_includes/_head-include") + body(layout="column" ng-controller="AppCtrl") != partial("/_includes/_main-nav") != yield diff --git a/public/resources/css/_base.scss b/public/resources/css/_base.scss index e69de29bb2..81c6f31ea4 100644 --- a/public/resources/css/_base.scss +++ b/public/resources/css/_base.scss @@ -0,0 +1,427 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} \ No newline at end of file diff --git a/public/resources/css/_layout.scss b/public/resources/css/_layout.scss new file mode 100644 index 0000000000..95bf65030c --- /dev/null +++ b/public/resources/css/_layout.scss @@ -0,0 +1,7 @@ +.l-left { + float: left; +} + +.l-right { + float: right; +} \ No newline at end of file diff --git a/public/resources/css/_options.scss b/public/resources/css/_options.scss index 1eaf944dd1..24a9cf97b7 100644 --- a/public/resources/css/_options.scss +++ b/public/resources/css/_options.scss @@ -1,3 +1,20 @@ +/* +* Typographic Variables +* +*/ + +$brand-font: 'Roboto', "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; +$mono-font: Monaco, "Lucida Console", monospace; + + +/* +* Metric Variables +* +*/ + +$unit: 8px; + + /* * Color Variables * @@ -30,4 +47,6 @@ $platinum: #536E7A; $cloud: #AFBEC5; $fog: #CFD8DC; $mist: #ECEFF1; -$snow: #FFFFFF; \ No newline at end of file +$snow: #FFFFFF; + + diff --git a/public/resources/css/_state.scss b/public/resources/css/_state.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/resources/css/_theme.scss b/public/resources/css/_theme.scss index e69de29bb2..d424f6092b 100644 --- a/public/resources/css/_theme.scss +++ b/public/resources/css/_theme.scss @@ -0,0 +1,118 @@ +/* +* Background Colors +* +* Background utility classes to add color to elements +*/ + +.background-regal { + background: $regal; + color: $snow; +} + +.background-charcoal { + background: $charcoal; + color: $snow; +} + +.background-steel { + background: $steel; + color: $snow; +} + +.background-silver { + background: $silver; + color: $snow; +} + + +/* +* Text Colors +* +* Text color utility color classes +*/ + +.text-snow { + color: $snow; +} + + + +/* +* Typographic Styles +* +* Material Design Typographic Styles +*/ + +.text-display-4 { + margin: 0px 0px ($unit * 2) 0px; + font-size: 112px; + font-weight: 300; + opacity: .54; + line-height: 118px; +} + +.text-display-3 { + margin: 0px 0px ($unit * 2) 0px; + font-size: 56px; + font-weight: 400; + opacity: .54; + line-height: 118px; +} + +.text-display-2 { + margin: 0px 0px ($unit * 2) 0px; + font-size: 45px; + font-weight: 400; + opacity: .54; + line-height: 48px; +} + +.text-display-1 { + margin: 0px 0px ($unit * 2) 0px; + font-size: 34px; + font-weight: 400; + opacity: .54; + line-height: 40px; +} + +.text-headline { + margin: 0px 0px ($unit * 2) 0px; + font-size: 24px; + font-weight: 400; + opacity: .87; + line-height: 32px; +} + +.text-title { + margin: 0px 0px ($unit * 2) 0px; + font-size: 20px; + font-weight: 500; + opacity: .87; + line-height: 32px; +} + +.text-subhead { + margin: 0px 0px ($unit * 2) 0px; + font-size: 16px; + font-weight: 400; + opacity: .87; + line-height: 28px; +} + +.text-body { + font-size: 14px; + font-weight: 500; + opacity: .87; + line-height: 24px; +} + +.text-caption { + margin: 0px 0px ($unit * 2) 0px; + font-size: 12px; + font-weight: 400; + opacity: .54; + line-height: 20px; +} + + + diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss index 43953a0e9d..90aaaf6e38 100644 --- a/public/resources/css/main.scss +++ b/public/resources/css/main.scss @@ -5,6 +5,8 @@ @import 'options'; @import 'base'; +@import 'state'; +@import 'layout'; @import 'theme'; @@ -14,4 +16,5 @@ */ @import 'module/main-nav'; +@import 'module/main-footer'; @import 'module/hero'; \ No newline at end of file diff --git a/public/resources/css/module/_main-footer.scss b/public/resources/css/module/_main-footer.scss new file mode 100644 index 0000000000..7795974a85 --- /dev/null +++ b/public/resources/css/module/_main-footer.scss @@ -0,0 +1,43 @@ +/* +* Main Site Footer +* +* This module contains styles for the main site footer. The +* footer contains a launchpad (lists of links) and general +* copyright and licensing information found at the bottom +* of each page +*/ + +.main-footer { + nav { + padding: $unit * 6; + } + + ul { + padding: 0px; + margin: 0px; + list-style-type: none; + + li { + margin: 0px; + } + + a { + color: $snow; + text-decoration: none; + + &:hover { + text-decoration: underline; + opacity: 1; + } + } + } + + footer { + text-align: center; + padding: $unit * 2; + + a { + + } + } +} \ No newline at end of file diff --git a/public/resources/css/module/_main-nav.scss b/public/resources/css/module/_main-nav.scss index 371700e322..17beb55f7e 100644 --- a/public/resources/css/module/_main-nav.scss +++ b/public/resources/css/module/_main-nav.scss @@ -1,4 +1,15 @@ .main-nav { + height: 56px; + min-height: 56px; + + h1 { + margin: 0px ($unit * 5) 0px 0px; + padding: 0px; + height: 34px; + width: 134px; + overflow: hidden; + } + ul { list-style-type: none; margin: 0px; @@ -6,6 +17,11 @@ li { margin: 0px; + display: inline; } } + + .cta { + display: block; + } } \ No newline at end of file diff --git a/public/resources/js/site.js b/public/resources/js/site.js index 194157d77a..d5363a3118 100644 --- a/public/resources/js/site.js +++ b/public/resources/js/site.js @@ -1,7 +1,23 @@ -var app = angular.module('StarterApp', ['ngMaterial']); +var app = angular.module('myApp', ['ngMaterial']) +.config(function($mdThemingProvider) { + $mdThemingProvider.theme('default') + .primaryPalette('blue', { + 'default': '700', // by default use shade 400 from the pink palette for primary intentions + 'hue-1': '100', // use shade 100 for the md-hue-1 class + 'hue-2': '600', // use shade 600 for the md-hue-2 class + 'hue-3': 'A100' // use shade A100 for the md-hue-3 class + }) + // If you specify less than all of the keys, it will inherit from the + // default shades + .accentPalette('purple', { + 'default': '200' // use shade 200 for default, and keep all other shades the same + }); +}); app.controller('AppCtrl', ['$scope', '$mdSidenav', function($scope, $mdSidenav){ $scope.toggleSidenav = function(menuId) { $mdSidenav(menuId).toggle(); }; -}]); \ No newline at end of file +}]); + +