diff --git a/public/_includes/_docs-nav.jade b/public/_includes/_docs-nav.jade index a6e1c0215b..47c3dc926b 100644 --- a/public/_includes/_docs-nav.jade +++ b/public/_includes/_docs-nav.jade @@ -3,8 +3,9 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav input(type="search" placeholder="SEARCH DOCS...") ul.side-nav-primary - for page, slug in public.docs[current.path[1]][current.path[2]]._data - name = page.menuTitle || page.title - selected = current.path[3] == slug ? 'is-selected':'' + if current.path[2] + for page, slug in public.docs[current.path[1]][current.path[2]]._data + name = page.menuTitle || page.title + selected = current.path[3] == slug ? 'is-selected':'' - li #{name} + li #{name} diff --git a/public/_includes/_scripts-include.jade b/public/_includes/_scripts-include.jade index 0bc44ad02a..a4edfa97ef 100644 --- a/public/_includes/_scripts-include.jade +++ b/public/_includes/_scripts-include.jade @@ -13,3 +13,13 @@ script(src="/resources/js/vendor/lang-dart.js") script(src="/resources/js/site.js") + + +script + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-8594346-15', 'auto'); + ga('send', 'pageview') \ No newline at end of file diff --git a/public/docs/_data.json b/public/docs/_data.json index 4bc88f642c..daade7e3ea 100644 --- a/public/docs/_data.json +++ b/public/docs/_data.json @@ -13,6 +13,7 @@ "styleguide": { "title": "Docs Style Guide", "subtitle": "Design & Layout Patterns For Documentation", - "layout": "../_layout" + "layout": "../_layout", + "autoformat": "true" } } diff --git a/public/docs/js/2_0_0-alpha_11/_data.json b/public/docs/js/2_0_0-alpha_11/_data.json deleted file mode 100644 index cfdd90e9df..0000000000 --- a/public/docs/js/2_0_0-alpha_11/_data.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "index": { - "title": "Angular Docs" - }, - - "quickstart": { - "title": "5 Min Quickstart" - }, - - "resources": { - "title": "Angular Resources" - }, - - "api": { - "title": "API Proposal" - }, - - "help": { - "title": "Help & Support" - } -} \ No newline at end of file diff --git a/public/docs/js/2_0_0-alpha_11/api.jade b/public/docs/js/2_0_0-alpha_11/api.jade deleted file mode 100644 index 139f0460fa..0000000000 --- a/public/docs/js/2_0_0-alpha_11/api.jade +++ /dev/null @@ -1 +0,0 @@ -H1 API \ No newline at end of file diff --git a/public/docs/js/2_0_0-alpha_11/help.jade b/public/docs/js/2_0_0-alpha_11/help.jade deleted file mode 100644 index f167aa05e6..0000000000 --- a/public/docs/js/2_0_0-alpha_11/help.jade +++ /dev/null @@ -1 +0,0 @@ -h1 Help & Support \ No newline at end of file diff --git a/public/docs/js/2_0_0-alpha_11/index.jade b/public/docs/js/2_0_0-alpha_11/index.jade deleted file mode 100644 index acb2d94ebc..0000000000 --- a/public/docs/js/2_0_0-alpha_11/index.jade +++ /dev/null @@ -1,20 +0,0 @@ - -div.c4 - md-card - md-card-content - h2 Paracosm - p he titles of Washed Out's breakthrough song and the first single from Paracosm share the * two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... - - -div.c4 - md-card - md-card-content - h2 Paracosm - p he titles of Washed Out's breakthrough song and the first single from Paracosm share the * two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... - - -div.c4 - md-card - md-card-content - h2 Paracosm - p he titles of Washed Out's breakthrough song and the first single from Paracosm share the * two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... diff --git a/public/docs/js/2_0_0-alpha_11/quickstart.jade b/public/docs/js/2_0_0-alpha_11/quickstart.jade deleted file mode 100644 index 7ebceb95b8..0000000000 --- a/public/docs/js/2_0_0-alpha_11/quickstart.jade +++ /dev/null @@ -1 +0,0 @@ -h1 JavaScript Quickstart diff --git a/public/docs/js/2_0_0-alpha_11/resources.jade b/public/docs/js/2_0_0-alpha_11/resources.jade deleted file mode 100644 index 9516dd6160..0000000000 --- a/public/docs/js/2_0_0-alpha_11/resources.jade +++ /dev/null @@ -1 +0,0 @@ -h1 resources \ No newline at end of file diff --git a/public/docs/styleguide.jade b/public/docs/styleguide.jade index b34bf20d30..8d1861e56b 100644 --- a/public/docs/styleguide.jade +++ b/public/docs/styleguide.jade @@ -1 +1,27 @@ -adsf \ No newline at end of file +.l-main-section + h2 Code Examples + + p To create a code example like the one below, simple copy the code + + pre.prettyprint.linenums + code. + pre.prettyprint.linenums + code. + //SOME CODE + var name = "Alex Wolfe"; + alert(name); + +.l-main-section + h2 Alerts + + p Single line statments that are additional or critical to the content of a section or page. + + .alert.is-critical A very critical alert + .alert.is-important A very important alert + .alert.is-helpful A very helpful alert + + pre.prettyprint.linenums + code. + .alert.is-critical A very critical alert + .alert.is-important A very important alert + .alert.is-helpful A very helpful alert \ No newline at end of file diff --git a/public/download/_data.json b/public/download/_data.json new file mode 100644 index 0000000000..ca0ea9d492 --- /dev/null +++ b/public/download/_data.json @@ -0,0 +1,13 @@ +{ + "index": { + "title": "Angular Docs", + "subtitle": "Choose a language for Angular", + + "downloads": { + "angular2": { + + } + + } + } +} diff --git a/public/download/index.jade b/public/download/index.jade new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/resources/css/_options.scss b/public/resources/css/_options.scss index a13f62f49c..442ace0505 100644 --- a/public/resources/css/_options.scss +++ b/public/resources/css/_options.scss @@ -9,7 +9,21 @@ // GREEN COLORS $cactus: #8BC34A; +// YELLOW +$sunshine: #FFF59D; + +// ORANGE +$sand: #FFF8E1; +$citrus: #FF8F00; + +// RED COLORS +$peach: #ffebee; +$squid: #EF3872; +$cardinal: #E23237; +$ruby: #B52E31; + // BLUE COLORS +$light: #E3F2FD; $sky: #0085D3; $regal: #0273D4; $blueberry: #0262C2; @@ -18,11 +32,6 @@ $ocean: #0143A3; //PURPLE $grape: #9575CD; -// RED COLORS -$squid: #EF3872; -$cardinal: #E23237; -$ruby: #B52E31; - // DARK GRAY COLORS $coal: #000000; $steel: #253238; @@ -37,8 +46,6 @@ $fog: #CFD8DC; $mist: #ECEFF1; $snow: #FFFFFF; -// YELLOW -$sunshine: #FFF59D; /* * Typography diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss index 6cd3b37365..1af1c17dfc 100644 --- a/public/resources/css/main.scss +++ b/public/resources/css/main.scss @@ -28,6 +28,7 @@ @import 'module/sticker'; @import 'module/bio-card'; @import 'module/overlay'; +@import 'module/alert'; /* diff --git a/public/resources/css/module/_alert.scss b/public/resources/css/module/_alert.scss new file mode 100644 index 0000000000..b308f7eabb --- /dev/null +++ b/public/resources/css/module/_alert.scss @@ -0,0 +1,25 @@ +.alert { + border-width: 2px; + border-style: solid; + padding: $unit ($unit * 2); + line-height: $unit * 4; + font-size: 14px; + border-radius: 4px; + color: $steel; + margin-bottom: $unit * 2; + + &.is-critical { + border-color: $cardinal; + background: $peach; + } + + &.is-important { + border-color: $citrus; + background: $sand; + } + + &.is-helpful { + border-color: $blueberry; + background: $light; + } +} \ No newline at end of file