diff --git a/README.md b/README.md index 86ea7e8d26..0aca3c91c0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,28 @@ -# Setup -1. `sudo npm install -g harp` -2. cd into root directory +# Angular.io +Angular.io is currently the preview site for Angular 2. This site also includes links to other helpful angular resources including Angular 1.X, Angular Material, and AngularFire. + +## How you can help +- [File an issue on github](https://github.com/angular/angular.io/issues) +- [Contribute to Angular.io](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md) + + +## Development Setup +1. Install Harp `sudo npm install -g harp` +2. cd into root directory `angular.io/` 3. run `harp server` -4. open [http://localhost:9000/](http://localhost:9000/) \ No newline at end of file +4. Open this url in the browser: [http://localhost:9000/](http://localhost:9000/) + + +## Technology Used +- Angular 1.x: The production ready version of Angular +- Angular Material: An implementation of Material Design in Angular.js +- Harp: The static web server with built-in preprocessing. +- Sass: A professional grade CSS extension language +- Normalize: A modern, HTML5-ready alternative to CSS resets +- Grids: A highly customizable CSS Grid Framework built with Sass +- Prettify: A JS module and CSS for syntax highlighting of source code snippets. +- Icomoon: Custom built icon fonts + + +## License +Powered by Google ©2010-2015. Code licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). Documentation licensed under [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/). \ No newline at end of file diff --git a/public/_includes/_head-include.jade b/public/_includes/_head-include.jade index 0cf9578cc7..81c2036de8 100644 --- a/public/_includes/_head-include.jade +++ b/public/_includes/_head-include.jade @@ -14,7 +14,6 @@ else if language else title #{title} - Angular - meta(charset="utf-8") meta(http-equiv="X-UA-Compatible" content="IE=edge") meta(name="description" content="#{description}") @@ -23,13 +22,37 @@ meta(name="robots" content="all") meta(name="referrer" content="origin") meta(name="viewport" id="viewport" content="width=device-width, initial-scale=1") +meta(property="og:title" content="Angular") meta(property="og:image" content="/resources/images/logos/standard/shield-large.png") meta(property="og:image:type" content="image/png") meta(property="og:image:width" content="184") meta(property="og:image:height" content="200") +meta(property="og:description" content="#{description}") + +meta(itemprop="name" content="Angular") +meta(itemprop="description" content="#{description}") +meta(itemprop="image" content="https://angular.io/resources/images/logos/standard/shield-large.png") link(rel="icon" type="image/x-icon" href="/resources/images/icons/favicon.ico") link(rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/0.7.1/angular-material.min.css") link(href='https://fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700' rel='stylesheet' type='text/css') link(rel="stylesheet" href="/resources/css/vendor/icomoon/style.css") -link(rel="stylesheet" href="/resources/css/main.css") \ No newline at end of file +link(rel="stylesheet" href="/resources/css/main.css") + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/_includes/_hero-home.jade b/public/_includes/_hero-home.jade index 1073679107..4eca8a6912 100644 --- a/public/_includes/_hero-home.jade +++ b/public/_includes/_hero-home.jade @@ -15,4 +15,4 @@ header(class="background-sky") h4.text-subhead The Official Angular Conference a(href="https://www.youtube.com/watch?v=QHulaj5ZxbI&index=1&list=PLOETEcp3DkCoNnlhE-7fovYvqwVPrRiY7" - class="button button-large button-banner" md-button) Watch ng-conf + class="button button-large button-banner" md-button) Watch ng-conf \ No newline at end of file diff --git a/public/_layout.jade b/public/_layout.jade index faab1b7981..3698e2e746 100644 --- a/public/_layout.jade +++ b/public/_layout.jade @@ -1,5 +1,5 @@ doctype -html(lang="en" ng-app="angularIOApp") +html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Framework") head != partial("/_includes/_head-include") diff --git a/public/about/index.jade b/public/about/index.jade index 403d8eefbe..a29d60c5c0 100644 --- a/public/about/index.jade +++ b/public/about/index.jade @@ -12,19 +12,26 @@ .c2   .clear -.grid-fluid.l-space-bottom-8 +.grid-fluid.l-space-bottom-6 + h3.text-headline.text-uppercase.text-center Current Contributors + + for person, name in bios - div.c3 - md-card.bio-card - img(src="#{person.picture}" class="md-card-image" alt="#{name}") + .c3 + md-card(class="bio-card" data-website="#{person.website}" data-twitter="#{person.twitter}" data-pic="#{person.picture}" data-bio="#{person.bio}" data-name="#{person.name}" ng-click="showBio($event)") + header + image(src="#{person.picture}" alt="#person.name") + + nav + button(aria-label="View Bio") View Bio + + if person.twitter + a(title="twitter" href="https://twitter.com/#{person.twitter}" ng-click="$event.stopPropagation()") + + if person.website + a(title="website" href="#{person.website}" ng-click="$event.stopPropagation()") + md-card-content - h3.text-headline #{person.name} - - if person.twitter - a(href="https://twitter.com/#{person.twitter}" class="bio-link") @#{person.twitter} - - if person.website - a(href="#{person.website}" class="bio-link") Website - - p(class="text-body" data-pic="#{person.picture}" data-name="#{person.name}" ng-click="showBio($event)") #{person.bio} + h3.text-headline.bio-card-name #{person.name} + p(class="bio-card-content text-body") #{person.bio} diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json index 37b0ad79c0..625f3be00a 100644 --- a/public/docs/dart/latest/_data.json +++ b/public/docs/dart/latest/_data.json @@ -24,7 +24,6 @@ "help": { "icon": "chat", - "title": "Help & Support", - "subtitle": "Developers passionate about solving problems" + "title": "Help & Support" } } diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index 4b965e855e..ef0ce55dad 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/latest/_data.json @@ -24,7 +24,6 @@ "help": { "icon": "chat", - "title": "Help & Support", - "subtitle": "Developers passionate about solving problems" + "title": "Help & Support" } } diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade index 6131346077..fe3504a4e9 100644 --- a/public/docs/js/latest/quickstart.jade +++ b/public/docs/js/latest/quickstart.jade @@ -232,8 +232,8 @@ p. <script> // Rewrite the paths to load the files System.paths = { - 'angular2/*': '/quickstart/angular2/*.js', // Angular - 'rtts_assert/*': '/quickstart/rtts_assert/*.js', // Runtime assertions + 'angular2/*':'/quickstart/angular2/*.js', // Angular + 'rtts_assert/*': '/quickstart/rtts_assert/*.js', //Runtime assertions 'app': 'app.es6' // The my-app component }; @@ -273,6 +273,4 @@ p. // WHAT'S NEXT... ########################## .l-main-section - h2#section-transpile Great job! Next step... - - p Learn some template syntax for extra credit. + h2#section-transpile Great job! We'll have the next steps out soon. diff --git a/public/docs/styleguide.jade b/public/docs/styleguide.jade index 8d1861e56b..b707597884 100644 --- a/public/docs/styleguide.jade +++ b/public/docs/styleguide.jade @@ -11,6 +11,14 @@ var name = "Alex Wolfe"; alert(name); + .l-sub-section + h3 Specify starting line number + + pre(class="prettyprint linenums:4") + code. + pre.prettyprint.linenums:4 + var title = "This starts on line four"; + .l-main-section h2 Alerts diff --git a/public/features.jade b/public/features.jade index 19da6d2bda..ebb110f74d 100644 --- a/public/features.jade +++ b/public/features.jade @@ -20,7 +20,7 @@ .c7 h3.text-headline.text-uppercase Future Ready p.text-body. - Angular 2 is written in written in ECMAScript 6 (ES6), + Angular 2 is written in ECMAScript 6 (ES6), with the addition of types and annotations. ES6 allows Angular to benefit from the best of JavaScript, while maintaining clean and easy-to-read code. diff --git a/public/resources/css/_state.scss b/public/resources/css/_state.scss index 92e8899394..0e1f1c71b3 100644 --- a/public/resources/css/_state.scss +++ b/public/resources/css/_state.scss @@ -1,6 +1,24 @@ +/* +* States +* +* Utility classes for different element states +*/ + .is-hidden { display: none !important; } + .is-visible { display: block !important; -} \ No newline at end of file +} + +.is-visually-hidden { + height: 1px; + width: 1px; + overflow: hidden; + opacity: 0.01; + position: absolute; + bottom: 0px; + right: 0px; + z-index: $layer-1; +} diff --git a/public/resources/css/layout/_layout.scss b/public/resources/css/layout/_layout.scss index 7e57e485a7..dc4938e406 100644 --- a/public/resources/css/layout/_layout.scss +++ b/public/resources/css/layout/_layout.scss @@ -50,6 +50,7 @@ screen and (max-device-width: $phone-breakpoint), screen and (max-width: $tablet-breakpoint) { padding-left: 0px; + padding-top: 104px; } } diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss index 024cfc4201..8fdd3b59fc 100644 --- a/public/resources/css/main.scss +++ b/public/resources/css/main.scss @@ -30,6 +30,7 @@ @import 'module/overlay'; @import 'module/alert'; @import 'module/card'; +@import 'module/modal'; /* diff --git a/public/resources/css/module/_bio-card.scss b/public/resources/css/module/_bio-card.scss index 775d1c5ce0..5337ff2b8d 100644 --- a/public/resources/css/module/_bio-card.scss +++ b/public/resources/css/module/_bio-card.scss @@ -1,31 +1,74 @@ .bio-card { - max-width: 360px; - height: 420px; - margin-bottom: $unit * 4; - overflow: hidden; + margin: 0px 0px ($unit * 4) 0px; + position: relative; + cursor: pointer; + box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.26); + background: $snow; + transition: all .3s; - h3 { - margin: 0px 0px $unit 0px; - white-space: nowrap; - } + &:hover { + transform: translate3d(0,-3px,0); + box-shadow: 0px 8px 16px 0 rgba(0, 0, 0, 0.4); - .bio-link { - font-size: 14px; - text-decoration: none; - display: inline-block; - margin: 0px $unit $unit 0px; - - &:last-child { - margin: 0px 0px $unit 0px + nav { + opacity: 1; } } - img { - width: 100%; + + // HEADER + + header { + position: relative; + overflow: hidden; + border-radius: 2px 2px 0px 0px; + + nav { + transition: opacity .5s; + position: absolute; + bottom: 3px; + left: 0; + right: 0; + z-index: $layer-1; + padding: $unit; + background: rgba($steel, .4); + opacity: 0; + + button { + font-size: 14px; + color: $snow; + text-transform: uppercase; + opacity: .87; + background: none; + border: none; + } + + a { + color: $snow; + font-size: 20px; + text-decoration: none; + opacity: .87; + margin-right: $unit; + float: right; + } + } + } + + + // MAIN CONTENT + + h3 { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: $metal; + text-transform: uppercase; + font-size: 18px; + margin-bottom: $unit; } p { - height: 72px; + white-space: nowrap; overflow: hidden; cursor: pointer; font-size: 14px; diff --git a/public/resources/css/module/_buttons.scss b/public/resources/css/module/_buttons.scss index acca95c4fc..470e7f17cd 100644 --- a/public/resources/css/module/_buttons.scss +++ b/public/resources/css/module/_buttons.scss @@ -16,6 +16,12 @@ // SIZES + &.button-small { + font-size: 12px; + line-height: $unit * 3; + padding: 0px ($unit * 1); + } + &.button-large { font-size: 15px; line-height: $unit * 6; @@ -41,6 +47,11 @@ color: rgba($steel, .87); } + &.button-subtle { + background: $mist; + color: darken($cloud, 10%); + } + &.button-navy { background: $ocean; color: rgba($snow, .87); diff --git a/public/resources/css/module/_code.scss b/public/resources/css/module/_code.scss index 83fc8caa61..242155595f 100644 --- a/public/resources/css/module/_code.scss +++ b/public/resources/css/module/_code.scss @@ -37,7 +37,9 @@ box-shadow: 0px 2px 5px rgba($coal, .3); padding: ($unit * 2) ($unit * 4); - &.linenums { + &.linenums, + &[class^="linenums:"], + &[class*=" linenums:"] { padding: 0px; } diff --git a/public/resources/css/module/_main-nav.scss b/public/resources/css/module/_main-nav.scss index ad110c8312..9921eef0ec 100644 --- a/public/resources/css/module/_main-nav.scss +++ b/public/resources/css/module/_main-nav.scss @@ -75,8 +75,9 @@ box-shadow: 0px 2px 5px rgba(0, 0, 0, .3); float: none; position: absolute; - top: 0px; - right: $unit; + top: 56px; + right: 0px; + left: 0px; z-index: $layer-6; background: $ocean; display: none; diff --git a/public/resources/css/module/_modal.scss b/public/resources/css/module/_modal.scss new file mode 100644 index 0000000000..dd57c3ac58 --- /dev/null +++ b/public/resources/css/module/_modal.scss @@ -0,0 +1,17 @@ +.modal { + h3 { + margin-bottom: $unit; + } + + img { + float: left; + margin: 0px ($unit * 3) ($unit * 3) 0px; + border-radius: 4px; + } + + .button { + margin-bottom: $unit * 3; + margin-right: $unit; + color: $blueberry; + } +} \ No newline at end of file diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.eot b/public/resources/css/vendor/icomoon/fonts/icomoon.eot index f3f224b9a6..d275573740 100755 Binary files a/public/resources/css/vendor/icomoon/fonts/icomoon.eot and b/public/resources/css/vendor/icomoon/fonts/icomoon.eot differ diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.svg b/public/resources/css/vendor/icomoon/fonts/icomoon.svg index 56511d243b..cf07f84430 100755 --- a/public/resources/css/vendor/icomoon/fonts/icomoon.svg +++ b/public/resources/css/vendor/icomoon/fonts/icomoon.svg @@ -14,11 +14,10 @@ - + - @@ -50,11 +49,11 @@ - + \ No newline at end of file diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.ttf b/public/resources/css/vendor/icomoon/fonts/icomoon.ttf index b8f33b7112..d0b49f91b5 100755 Binary files a/public/resources/css/vendor/icomoon/fonts/icomoon.ttf and b/public/resources/css/vendor/icomoon/fonts/icomoon.ttf differ diff --git a/public/resources/css/vendor/icomoon/fonts/icomoon.woff b/public/resources/css/vendor/icomoon/fonts/icomoon.woff index 72fbf1f416..4a0d33b603 100755 Binary files a/public/resources/css/vendor/icomoon/fonts/icomoon.woff and b/public/resources/css/vendor/icomoon/fonts/icomoon.woff differ diff --git a/public/resources/css/vendor/icomoon/selection.json b/public/resources/css/vendor/icomoon/selection.json index 7068cea48e..a09c24e8c5 100755 --- a/public/resources/css/vendor/icomoon/selection.json +++ b/public/resources/css/vendor/icomoon/selection.json @@ -114,6 +114,34 @@ "setIdx": 0, "iconIdx": 397 }, + { + "icon": { + "paths": [ + "M1024 194.418c-37.676 16.708-78.164 28.002-120.66 33.080 43.372-26 76.686-67.17 92.372-116.23-40.596 24.078-85.556 41.56-133.41 50.98-38.32-40.83-92.922-66.34-153.346-66.34-116.022 0-210.088 94.058-210.088 210.078 0 16.466 1.858 32.5 5.44 47.878-174.6-8.764-329.402-92.4-433.018-219.506-18.084 31.028-28.446 67.116-28.446 105.618 0 72.888 37.088 137.192 93.46 174.866-34.438-1.092-66.832-10.542-95.154-26.278-0.020 0.876-0.020 1.756-0.020 2.642 0 101.788 72.418 186.696 168.522 206-17.626 4.8-36.188 7.372-55.348 7.372-13.538 0-26.698-1.32-39.528-3.772 26.736 83.46 104.32 144.206 196.252 145.896-71.9 56.35-162.486 89.934-260.916 89.934-16.958 0-33.68-0.994-50.116-2.94 92.972 59.61 203.402 94.394 322.042 94.394 386.422 0 597.736-320.124 597.736-597.744 0-9.108-0.206-18.168-0.61-27.18 41.056-29.62 76.672-66.62 104.836-108.748z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "twitter", + "brand", + "tweet", + "social" + ], + "defaultCode": 58525, + "grid": 16 + }, + "attrs": [], + "properties": { + "id": 1302, + "order": 55, + "prevSize": 32, + "code": 60049, + "ligatures": "twitter, brand11", + "name": "twitter" + }, + "setIdx": 0, + "iconIdx": 401 + }, { "icon": { "paths": [ @@ -159,7 +187,7 @@ }, "attrs": [], "properties": { - "order": 55, + "order": 57, "id": 1581, "prevSize": 32, "code": 60104, @@ -414,7 +442,7 @@ "attrs": [], "properties": { "id": 85, - "order": 35, + "order": 56, "prevSize": 24, "code": 58904, "name": "polymer" @@ -446,29 +474,6 @@ "setIdx": 1, "iconIdx": 87 }, - { - "icon": { - "paths": [ - "M128 640h768v-85.333h-768v85.333zM128 810.667h768v-85.333h-768v85.333zM128 469.333h768v-85.333h-768v85.333zM128 213.333v85.333h768v-85.333h-768z" - ], - "attrs": [], - "isMulticolor": false, - "tags": [ - "reorder" - ], - "grid": 24 - }, - "attrs": [], - "properties": { - "id": 91, - "order": 8, - "prevSize": 24, - "code": 58887, - "name": "reorder" - }, - "setIdx": 1, - "iconIdx": 91 - }, { "icon": { "paths": [ @@ -561,29 +566,6 @@ "setIdx": 1, "iconIdx": 115 }, - { - "icon": { - "paths": [ - "M512 42.667l-384 170.667v256c0 237.013 163.627 458.027 384 512 220.373-53.973 384-274.987 384-512v-256l-384-170.667zM426.667 725.333l-170.667-170.667 60.373-60.373 110.293 110.293 280.96-280.96 60.373 60.373-341.333 341.333z" - ], - "attrs": [], - "isMulticolor": false, - "tags": [ - "verified-user" - ], - "grid": 24 - }, - "attrs": [], - "properties": { - "id": 144, - "order": 12, - "prevSize": 24, - "code": 58891, - "name": "verified-user" - }, - "setIdx": 1, - "iconIdx": 144 - }, { "icon": { "paths": [ @@ -760,9 +742,9 @@ "attrs": [], "properties": { "id": 213, - "order": 56, + "order": 58, "prevSize": 24, - "code": 58923, + "code": 58887, "name": "web" }, "setIdx": 1, diff --git a/public/resources/css/vendor/icomoon/style.css b/public/resources/css/vendor/icomoon/style.css index 056efd3890..434bad5507 100755 --- a/public/resources/css/vendor/icomoon/style.css +++ b/public/resources/css/vendor/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src:url('fonts/icomoon.eot?ff1o1p'); - src:url('fonts/icomoon.eot?#iefixff1o1p') format('embedded-opentype'), - url('fonts/icomoon.woff?ff1o1p') format('woff'), - url('fonts/icomoon.ttf?ff1o1p') format('truetype'), - url('fonts/icomoon.svg?ff1o1p#icomoon') format('svg'); + src:url('fonts/icomoon.eot?-k7kbva'); + src:url('fonts/icomoon.eot?#iefix-k7kbva') format('embedded-opentype'), + url('fonts/icomoon.woff?-k7kbva') format('woff'), + url('fonts/icomoon.ttf?-k7kbva') format('truetype'), + url('fonts/icomoon.svg?-k7kbva#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -39,6 +39,10 @@ content: "\ea8d"; } +.icon-twitter:before { + content: "\ea91"; +} + .icon-twitter2:before { content: "\ea92"; } @@ -95,10 +99,6 @@ content: "\e606"; } -.icon-reorder:before { - content: "\e607"; -} - .icon-search:before { content: "\e608"; } @@ -115,10 +115,6 @@ content: "\e60a"; } -.icon-verified-user:before { - content: "\e60b"; -} - .icon-view-module:before { content: "\e61a"; } @@ -148,7 +144,7 @@ } .icon-web:before { - content: "\e62b"; + content: "\e607"; } .icon-call-split:before { diff --git a/public/resources/images/bios/placeholder.png b/public/resources/images/bios/placeholder.png new file mode 100644 index 0000000000..8b0db9efb5 Binary files /dev/null and b/public/resources/images/bios/placeholder.png differ diff --git a/public/resources/images/favicons/apple-touch-icon-144x144.png b/public/resources/images/favicons/apple-touch-icon-144x144.png new file mode 100644 index 0000000000..66c48b42fc Binary files /dev/null and b/public/resources/images/favicons/apple-touch-icon-144x144.png differ diff --git a/public/resources/images/favicons/apple-touch-icon-152x152.png b/public/resources/images/favicons/apple-touch-icon-152x152.png new file mode 100644 index 0000000000..d93afa6f20 Binary files /dev/null and b/public/resources/images/favicons/apple-touch-icon-152x152.png differ diff --git a/public/resources/images/favicons/apple-touch-icon-180x180.png b/public/resources/images/favicons/apple-touch-icon-180x180.png new file mode 100644 index 0000000000..d44a0f2236 Binary files /dev/null and b/public/resources/images/favicons/apple-touch-icon-180x180.png differ diff --git a/public/resources/images/favicons/apple-touch-icon-precomposed.png b/public/resources/images/favicons/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..987e17f8b2 Binary files /dev/null and b/public/resources/images/favicons/apple-touch-icon-precomposed.png differ diff --git a/public/resources/images/favicons/apple-touch-icon.png b/public/resources/images/favicons/apple-touch-icon.png new file mode 100644 index 0000000000..d44a0f2236 Binary files /dev/null and b/public/resources/images/favicons/apple-touch-icon.png differ diff --git a/public/resources/images/favicons/favicon-16x16.png b/public/resources/images/favicons/favicon-16x16.png new file mode 100644 index 0000000000..e0c3fee47b Binary files /dev/null and b/public/resources/images/favicons/favicon-16x16.png differ diff --git a/public/resources/images/favicons/favicon-194x194.png b/public/resources/images/favicons/favicon-194x194.png new file mode 100644 index 0000000000..8506467cac Binary files /dev/null and b/public/resources/images/favicons/favicon-194x194.png differ diff --git a/public/resources/images/favicons/favicon-32x32.png b/public/resources/images/favicons/favicon-32x32.png new file mode 100644 index 0000000000..b014ee6dea Binary files /dev/null and b/public/resources/images/favicons/favicon-32x32.png differ diff --git a/public/resources/images/favicons/favicon-96x96.png b/public/resources/images/favicons/favicon-96x96.png new file mode 100644 index 0000000000..4dace951fa Binary files /dev/null and b/public/resources/images/favicons/favicon-96x96.png differ diff --git a/public/resources/images/favicons/favicon.ico b/public/resources/images/favicons/favicon.ico new file mode 100644 index 0000000000..cebb174068 Binary files /dev/null and b/public/resources/images/favicons/favicon.ico differ diff --git a/public/resources/images/favicons/manifest.json b/public/resources/images/favicons/manifest.json new file mode 100644 index 0000000000..8cd1842f85 --- /dev/null +++ b/public/resources/images/favicons/manifest.json @@ -0,0 +1,41 @@ +{ + "name": "Angular.io", + "icons": [ + { + "src": "\/android-chrome-36x36.png", + "sizes": "36x36", + "type": "image\/png", + "density": "0.75" + }, + { + "src": "\/android-chrome-48x48.png", + "sizes": "48x48", + "type": "image\/png", + "density": "1.0" + }, + { + "src": "\/android-chrome-72x72.png", + "sizes": "72x72", + "type": "image\/png", + "density": "1.5" + }, + { + "src": "\/android-chrome-96x96.png", + "sizes": "96x96", + "type": "image\/png", + "density": "2.0" + }, + { + "src": "\/android-chrome-144x144.png", + "sizes": "144x144", + "type": "image\/png", + "density": "3.0" + }, + { + "src": "\/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image\/png", + "density": "4.0" + } + ] +} diff --git a/public/resources/js/site.js b/public/resources/js/site.js index 18f6409cd0..74db48fb06 100644 --- a/public/resources/js/site.js +++ b/public/resources/js/site.js @@ -37,21 +37,47 @@ angularIO.controller('AppCtrl', ['$scope', '$mdDialog', function($scope, $mdDial $scope.showMenu = !$scope.showMenu; }; - // SHOW FULL ABOUT US PAGE BIO - $scope.showBio = function (event) { - var person = angular.element(event.currentTarget); - var bio = person.text(); + // BIO MODAL + $scope.showBio = function($event) { + var parentEl = angular.element(document.body); + var person = angular.element($event.currentTarget); var name = person.attr('data-name'); - //var pic = person.data('data-pic'); + var bio = person.attr('data-bio'); + var pic = person.attr('data-pic'); + var twitter = person.attr('data-twitter'); + var website = person.attr('data-website'); + var $twitter = twitter !== 'undefined' ? 'Twitter' : ''; + var $website = website !== 'undefined' ? 'Website' : ''; - $mdDialog.show( - $mdDialog.alert() - .title(name) - .content(bio) - .ariaLabel('Biography') - .ok('Close Bio') - .targetEvent(event) - ); + $mdDialog.show({ + parent: parentEl, + targetEvent: $event, + template: + '' + + ' ' + + ' ' + + '

' + name + '

' + + ' ' + + '

' + bio + '

' + + '
' + + '
' + + ' ' + + ' Close Bio' + + ' ' + + '
' + + '
', + locals: { + items: $scope.items + }, + controller: DialogController + }); + + function DialogController(scope, $mdDialog, items) { + scope.items = items; + scope.closeDialog = function() { + $mdDialog.hide(); + }; + } }; // INITIALIZE PRETTY PRINT @@ -59,3 +85,5 @@ angularIO.controller('AppCtrl', ['$scope', '$mdDialog', function($scope, $mdDial }]); + +