From 9af4a31457fdeb56e15ee7b666858635f00fffbe Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Thu, 19 Feb 2015 17:13:47 -0800 Subject: [PATCH] updates --- .../{_head-includes.jade => _head-include.jade} | 0 public/_includes/_main-nav.jade | 15 ++++++++------- public/_layout.jade | 2 +- public/docs/search.md | 0 public/resources/css/main.scss | 16 +++++++++++++--- public/resources/css/module/_hero.scss | 0 public/resources/css/module/_main-nav.scss | 11 +++++++++++ public/resources/js/site.js | 1 - 8 files changed, 33 insertions(+), 12 deletions(-) rename public/_includes/{_head-includes.jade => _head-include.jade} (100%) create mode 100644 public/docs/search.md create mode 100644 public/resources/css/module/_hero.scss create mode 100644 public/resources/css/module/_main-nav.scss diff --git a/public/_includes/_head-includes.jade b/public/_includes/_head-include.jade similarity index 100% rename from public/_includes/_head-includes.jade rename to public/_includes/_head-include.jade diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade index ea56f9edd3..cef0c8b977 100644 --- a/public/_includes/_main-nav.jade +++ b/public/_includes/_main-nav.jade @@ -1,8 +1,9 @@ -nav - h1 Angular by Google +md-toolbar(layout="row" class="main-nav" md-scroll-shrink) + nav.md-toolbar-tools + h1 Angular by Google - ul - li Features - li Docs - li About - li Install + ul + li Features + li Docs + li About + li Install diff --git a/public/_layout.jade b/public/_layout.jade index 5e7e646b53..b17a2171ad 100644 --- a/public/_layout.jade +++ b/public/_layout.jade @@ -1,5 +1,5 @@ doctype -html(lang="en" ng-app="StarterApp") +html(lang="en" layout="column" ng-app="StarterApp") head != partial("/_includes/_head-include") body(layout="column" ng-controller="AppCtrl") diff --git a/public/docs/search.md b/public/docs/search.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss index d6ed829bbc..43953a0e9d 100644 --- a/public/resources/css/main.scss +++ b/public/resources/css/main.scss @@ -1,7 +1,17 @@ +/* +* BASE FILES +* +*/ + @import 'options'; @import 'base'; @import 'theme'; -body { - background: #EEE; -} \ No newline at end of file + +/* +* MODULES +* +*/ + +@import 'module/main-nav'; +@import 'module/hero'; \ No newline at end of file diff --git a/public/resources/css/module/_hero.scss b/public/resources/css/module/_hero.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/resources/css/module/_main-nav.scss b/public/resources/css/module/_main-nav.scss new file mode 100644 index 0000000000..371700e322 --- /dev/null +++ b/public/resources/css/module/_main-nav.scss @@ -0,0 +1,11 @@ +.main-nav { + ul { + list-style-type: none; + margin: 0px; + padding: 0px; + + li { + margin: 0px; + } + } +} \ No newline at end of file diff --git a/public/resources/js/site.js b/public/resources/js/site.js index bddad0a487..194157d77a 100644 --- a/public/resources/js/site.js +++ b/public/resources/js/site.js @@ -4,5 +4,4 @@ app.controller('AppCtrl', ['$scope', '$mdSidenav', function($scope, $mdSidenav){ $scope.toggleSidenav = function(menuId) { $mdSidenav(menuId).toggle(); }; - }]); \ No newline at end of file