From 166834f03505ec7e766cb5d6d7151310fbf54d49 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 30 Sep 2014 11:47:11 -0400 Subject: profile stuff --- views/profile.ejs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'views/profile.ejs') diff --git a/views/profile.ejs b/views/profile.ejs index ada3d52..34b0bee 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -8,17 +8,17 @@
[[- include partials/header ]] - - +
[[ if (profile.photo && profile.photo.length) { ]] -
+
+
[[ } else { ]] - + [[ } ]] - - -
- +
-
+
+

[[- profile.displayName ]]

[[ if (profile.location) { ]] @@ -35,9 +35,9 @@ @[[- profile.twitterName ]] [[ } ]] -
+
+ + [[ if (projects.length) { ]]

[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

-- cgit v1.2.3-70-g09d2 From 7562a585d47e79fa5fa8a32885f7b4bd29da4a39 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 30 Sep 2014 15:42:25 -0400 Subject: fixed header --- public/assets/stylesheets/app.css | 77 +++++++++------------------------------ views/partials/header.ejs | 9 ++++- views/profile.ejs | 2 +- 3 files changed, 25 insertions(+), 63 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 8554d59..2b6cc3e 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -45,6 +45,15 @@ a{ text-decoration: none; } +#header { + position: fixed; + width: 100%; + top: 0; + left: 0; + background: white; + z-index: 6; +} + /*page*/ .topLogo { @@ -58,9 +67,6 @@ a{ cursor: -moz-grabbing; } -.floatimgImg.edit { - -} .floatingSwatch { width: 50px; @@ -266,57 +272,6 @@ iframe.embed { } - -/* -.room1 { - position: relative; - overflow: hidden; - background-image:url(https://s3.amazonaws.com/luckyplop/7eb159e99924e6e371046d6fa12e566fd77901c9.jpg); -} -.room2 { - background-image:url(https://s3.amazonaws.com/luckyplop/fd4ebe8a7a4246c8273fc999fb1ef0d6a8260b8c.png); -} - -.room1 form textarea { - width: 226px; -} - -.room1 .radio-group { - width: 226px; -} - -.room1 .radio-group__label { - width: 106px; - font-size: 13px; -} - -.room1 .formHolder { - top: 0; - padding-top: 10px; - display: table; - width: 100%; - height: 100%; - background: rgba(255,255,255,0.9); - -webkit-transform:translateY(-100%); - transform:translateY(-100%); -} - -.room1 form { - padding: 0 10px; - max-width: 440px; -} - -.room1 .formInner { - display: table-cell; - vertical-align: middle; -} - -.room1.editing .formHolder { - -webkit-transform:translateY(0); - transform:translateY(0); -} -*/ - .page .questions { background: #55efcb; color:white; @@ -433,6 +388,7 @@ iframe.embed { background-color: lightyellow; display: table; height: 50vh; + border-top: 1px solid; float: left; } @@ -1778,12 +1734,13 @@ form li textarea { } .hero { - float:left; - width:100%; - clear:both; - height:70vh; - display:table; - background-size:cover; + float: left; + width: 100%; + clear: both; + height: 80vh; + display: table; + background-size: cover; + margin-top: 63px; } .hero .circle { font-size: 20px; diff --git a/views/partials/header.ejs b/views/partials/header.ejs index a48c5e1..d46155f 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -1,3 +1,4 @@ + diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 3d95fb9..10a160e 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -1,7 +1,7 @@
-
+
Upload File
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 305a602..f5e3b5b 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -13,8 +13,8 @@
- - + + + class="ion-ios7-keypad-outline"> + class="ion-ios7-sunny-outline"> [[ if (user.username == "test12343") { ]] + class="ion-ios7-compose-outline"> [[ } ]] + class="ion-key">
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 95cf827..01cf771 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -3,12 +3,12 @@ Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> -
+
- +
@@ -17,9 +17,14 @@ -->
- +
+ +
+ + +
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs index ca03ec8..0ca89c5 100644 --- a/views/controls/reader/media-player.ejs +++ b/views/controls/reader/media-player.ejs @@ -1,13 +1,13 @@
- - + + - - + + diff --git a/views/home.ejs b/views/home.ejs index a6f5a88..51d5a92 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -17,7 +17,7 @@
Create 3D Rooms
-
+
Watch video.
diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 1b7b498..ea579cc 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -69,7 +69,7 @@ [[ } ]] [[ if (opt.editing) { ]] - + [[ } ]] [[ } else { ]] diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs index 98f0acc..08c9e99 100644 --- a/views/partials/sign-in.ejs +++ b/views/partials/sign-in.ejs @@ -5,7 +5,7 @@
- +
  • @@ -38,7 +38,7 @@
    - +
  • diff --git a/views/profile.ejs b/views/profile.ejs index 9cfb40d..22c824c 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -14,7 +14,7 @@
    • [[ } else { ]]
    - +
    [[ } ]]
    -- cgit v1.2.3-70-g09d2 From eb1d33b2c32c15821a6307306ca46fda262eb8b9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 7 Oct 2014 17:26:29 -0400 Subject: no projects --- views/profile.ejs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'views/profile.ejs') diff --git a/views/profile.ejs b/views/profile.ejs index 22c824c..b64e1d5 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -41,11 +41,15 @@ [[ if (projects.length) { ]]

    [[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

    - [[ } ]] - [[ include projects/list-projects ]] + [[ include projects/list-projects ]] - view more + view more + [[ } else { ]] +

    Welcome to VVALLS

    +

    + You don't have any projects yet. To get started click "New Project" up at the top of the screen. + [[ } ]] [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] -- cgit v1.2.3-70-g09d2 From ea5cce0042a6448636d4bd583c1200c26a7efe87 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 7 Oct 2014 17:34:36 -0400 Subject: no profile pic thing --- public/assets/stylesheets/app.css | 30 +++++++++++++++++++++++------- views/profile.ejs | 6 +++++- 2 files changed, 28 insertions(+), 8 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 0831a36..cef90a9 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -9,7 +9,9 @@ body,textarea,input { font-family: 'Lato', sans-serif; } - +input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill { + background:white; +} *, *:before, *:after { moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } @@ -468,14 +470,27 @@ iframe.embed { /* PROFILE PAGE */ .profilePic { - font-size: 148px; background-size: cover; background-position: center; width: 40%; height: 50vh; float: left; + display:table; } +.profilePic .ion-ios7-person-outline { + font-size: 100px; +} + + +.noPic input { + position: absolute; + width: 40%; + height: 48vh; + margin-top: -33vh; + margin-left: -20%; + opacity: 0; +} .topLinks { float: right; z-index: 3; @@ -1197,11 +1212,11 @@ iframe.embed { text-transform: none; -webkit-font-smoothing: antialiased; font-size: 40px; - margin-top: -62px; + margin-top: -50px; position: absolute; background: #FF3B30; border-radius: 1000px; - margin-left: -59px; + margin-left: -50px; color: white; width: 50px; height: 50px; @@ -2036,8 +2051,9 @@ form li textarea { letter-spacing: 2px; } .facebook b { - float: left; - font-size: 50px; + float: left; + font-size: 50px; + margin: 0 0 0 20px; } a[data-role="forgot-password"] { @@ -2049,7 +2065,7 @@ a[data-role="forgot-password"] { vertical-align: bottom; padding-right: 14px; font-size: 19px; - line-height: 16px; + line-height: 7px; } .aboutRoom { diff --git a/views/profile.ejs b/views/profile.ejs index 22c824c..6a5b3ea 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -13,8 +13,12 @@
    [[ } else { ]] -
    +
    + +
    click to add profile pic
    + +
    [[ } ]]
    -- cgit v1.2.3-70-g09d2 From 18807004461e3d0c0e3483a0acaccf879df33884 Mon Sep 17 00:00:00 2001 From: ryderr Date: Wed, 8 Oct 2014 15:53:23 -0400 Subject: no projects thingy --- public/assets/stylesheets/app.css | 50 +++++++++++++++++++++++++++++++++++---- views/profile.ejs | 20 ++++++++++++---- 2 files changed, 62 insertions(+), 8 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 60c66f8..76196be 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -10,7 +10,7 @@ body,textarea,input { font-family: 'Lato', sans-serif; } input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill { - background:white; + background:white!important; } *, *:before, *:after { moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -437,7 +437,7 @@ iframe.embed { .page h1 { font-size: 80px; font-weight: 100; - padding: 60px 0 25px 0; + padding: 20px 0 25px 0; float: left; width: 100%; border-top: 1px solid; @@ -476,6 +476,8 @@ iframe.embed { width: 100%; padding: 80px 0; background: #f9f9f9; + float: left; + clear: both; } .footer a, .footer span{ @@ -614,11 +616,49 @@ iframe.embed { .profilepage .bio span:last-of-type:after { display: none; } +.profilepage .about h2 { + text-align: center; + font-weight: 300; + font-size: 32px; +} +.profilepage .about h2:nth-child(2){ + margin:34px 0; +} +.about { + background-color: #ffffff;background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScyODkuNScgaGVpZ2h0PScyODkuNScgdmlld0JveD0nMCAwIDI4OS41IDI4OS41Jz4KCTxkZWZzPgoJCTxwYXR0ZXJuIGlkPSdibHVlc3RyaXBlJyBwYXR0ZXJuVW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4PScwJyB5PScwJyB3aWR0aD0nNTcuOScgaGVpZ2h0PSc1Ny45JyB2aWV3Qm94PScwIDAgMTE1LjggMTE1LjgnID4KCQk8cmVjdCB3aWR0aD0nMTEwJScgaGVpZ2h0PScxMTAlJyBmaWxsPScjZmZmZmZmJy8+CgkJCTxwYXRoIGQ9J00xLDFoMTE1Ljh2MTE1LjhoLTExNS44di0xMTUuOCcgZmlsbC1vcGFjaXR5PScwJyBzdHJva2Utd2lkdGg9JzAuOCcgc3Ryb2tlLWRhc2hhcnJheT0nMCwxLDEnIHN0cm9rZT0nI2NjY2NjYycvPgoJCTwvcGF0dGVybj4gCgkJPGZpbHRlciBpZD0nZnV6eicgeD0nMCcgeT0nMCc+CgkJCTxmZVR1cmJ1bGVuY2UgdHlwZT0ndHVyYnVsZW5jZScgcmVzdWx0PSd0JyBiYXNlRnJlcXVlbmN5PScuMiAuMycgbnVtT2N0YXZlcz0nNScgc3RpdGNoVGlsZXM9J3N0aXRjaCcvPgoJCQk8ZmVDb2xvck1hdHJpeCB0eXBlPSdzYXR1cmF0ZScgaW49J3QnIHZhbHVlcz0nMCcvPgoJCTwvZmlsdGVyPgoJPC9kZWZzPgoJPHJlY3Qgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScgZmlsbD0ndXJsKCNibHVlc3RyaXBlKScvPgo8cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWx0ZXI9J3VybCgjZnV6eiknIG9wYWNpdHk9JzAnLz4KPC9zdmc+Cg=='); + background-attachment: fixed; + +} +.profilepage .about h2 .btn { + border: 1px solid; + font-weight: 500; + padding: 10px; + font-size: 18px; +} +.profilepage .about h2 .btn:hover { + background:black; + color:white; +} .templates { overflow: auto; max-height: 80%; width: 100%; } + +.templates::-webkit-scrollbar { + width: 5px; + height: 5px; +} + +.templates::-webkit-scrollbar-thumb { +background-color: white; +border-left: 1px solid black; +} + +.templates::-webkit-scrollbar-track { + background-color: transparent; +} + .no-templates { display: none; } @@ -628,8 +668,8 @@ iframe.embed { background-size: contain; background-repeat: no-repeat; background-color: #fff; - width: 20vw; - height: 20vw; + width: 15vw; + height: 14vw; display: inline-block; margin: 4vw; background-color: #ddd; @@ -1899,6 +1939,8 @@ form div.hidden { } form h3.link { content:"?"; + margin-top: 0; + padding: 0 0 10px 0; } form h3.link:after { content:"?"; diff --git a/views/profile.ejs b/views/profile.ejs index d977844..adc9562 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -41,7 +41,7 @@ [[ } ]]
    -
    + [[ if (projects.length) { ]]

    [[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

    @@ -50,11 +50,23 @@ view more [[ } else { ]] +

    Welcome to VVALLS

    -

    - You don't have any projects yet. To get started click "New Project" up at the top of the screen. +
    +

    + VValls lets you create awesome 3D rooms. +

    + +

    + You don't have any projects yet. +

    +

    + Create a New Project +

    + +
    [[ } ]] - +
    [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] [[ include projects/edit-project ]] -- cgit v1.2.3-70-g09d2 From 32710444724fa6271d7d1d86a917be3b7457217c Mon Sep 17 00:00:00 2001 From: ryderr Date: Wed, 8 Oct 2014 15:54:05 -0400 Subject: data role --- views/profile.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views/profile.ejs') diff --git a/views/profile.ejs b/views/profile.ejs index adc9562..5ff2eb0 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -61,7 +61,7 @@ You don't have any projects yet.

    - Create a New Project + Create a New Project

    -- cgit v1.2.3-70-g09d2 From e35d5df30c8106bc1f4bfcbd1ba0094d8e6bc642 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 10 Oct 2014 15:59:50 -0400 Subject: change profile avatar --- public/assets/javascripts/ui/site/ProfileView.js | 19 +++++++++++++++++++ public/assets/stylesheets/app.css | 1 + server/lib/api/projects.js | 4 ++-- server/lib/util.js | 2 +- server/lib/views/index.js | 1 + views/profile.ejs | 8 ++++++-- views/projects/list-projects.ejs | 4 ++-- 7 files changed, 32 insertions(+), 7 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/javascripts/ui/site/ProfileView.js b/public/assets/javascripts/ui/site/ProfileView.js index 76d733c..8471abc 100644 --- a/public/assets/javascripts/ui/site/ProfileView.js +++ b/public/assets/javascripts/ui/site/ProfileView.js @@ -21,6 +21,25 @@ var ProfileView = View.extend({ }, uploadAvatar: function(){ + var fd = new FormData(), hasCSRF = false + var files = this.$("#profile_avatar")[0].files + if (! files.length) return + + fd.append("avatar", files[0]); + fd.append("_csrf", $("[name=_csrf]").val()) + + var request = $.ajax({ + url: "/api/profile", + type: "put", + data: fd, + dataType: "json", + processData: false, + contentType: false, + }) + + request.done($.proxy(function (response) { + window.location.href = "/profile" + }, this)); } }) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 57cb8fc..29f7888 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -679,6 +679,7 @@ iframe.embed { } .profilepage .about h2 .btn { + float: none; border: 1px solid; font-weight: 500; padding: 10px; diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js index 5bd3d0f..c04f4f6 100644 --- a/server/lib/api/projects.js +++ b/server/lib/api/projects.js @@ -34,7 +34,7 @@ var projects = { data.user_id = req.user._id data.name = util.sanitize(data.name) - data.slug = util.slugify(data.name) + data.slug = util.slugify(data.name) + "-" + (+new Date) data.description = util.sanitize(data.description) data.rooms = JSON.parse(data.rooms) data.walls = JSON.parse(data.walls) @@ -91,7 +91,7 @@ var projects = { // data.user_id = req.user._id data.name = util.sanitize(data.name) if (data.name != doc.name) { - data.slug = util.slugify(data.name) + data.slug = util.slugify(data.name) + "-" + (+new Date) } data.description = util.sanitize(data.description) data.updated_at = new Date () diff --git a/server/lib/util.js b/server/lib/util.js index 2841cc5..791d3e2 100644 --- a/server/lib/util.js +++ b/server/lib/util.js @@ -13,7 +13,7 @@ var util = {} util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") } util.slugify = function (s){ - return (s + "-" + (+new Date) || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-") + return (s || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-") } util.sanitize = function (s){ return (s || "").replace(entities, "") diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 637b061..5b1a72e 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -165,6 +165,7 @@ var views = module.exports = { function done(err, user, projects){ if (! user) { return res.redirect('/') } res.render('profile', { + isOwnProfile: String(user._id) == (req.user && String(req.user._id)), profile: user, projects: projects || [], }) diff --git a/views/profile.ejs b/views/profile.ejs index 5ff2eb0..2909fb8 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -16,8 +16,10 @@
    -
    click to add profile pic
    - + [[ if (isOwnProfile) { ]] +
    click to add profile pic
    + + [[ } ]]
    [[ } ]] @@ -57,12 +59,14 @@ VValls lets you create awesome 3D rooms. + [[ if (isOwnProfile) { ]]

    You don't have any projects yet.

    Create a New Project

    + [[ } ]] [[ } ]] diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index c47dee0..9dbd7d2 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -5,9 +5,9 @@ [[ projects.forEach(function(project, i) { ]] [[ if (String(user._id) == String(project.user_id)) { ]] - + [[ } else { ]] - + [[ } ]] -- cgit v1.2.3-70-g09d2 From 211da757666a6f9ee89160472e363bcf4732d1c9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 10 Oct 2014 16:48:26 -0400 Subject: show max 6 projects at a time --- public/assets/javascripts/ui/editor/MediaUpload.js | 1 + public/assets/stylesheets/app.css | 6 +++++- server/lib/api/projects.js | 4 ++-- views/home.ejs | 2 -- views/profile.ejs | 2 -- views/projects/list-projects.ejs | 7 ++++++- 6 files changed, 14 insertions(+), 8 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js index 3f425c3..bab4679 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -56,6 +56,7 @@ var MediaUpload = UploadView.extend({ console.log(media) this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia) this.parent.mediaViewer.$deleteMedia.show() + this.parent.mediaViewer.$noMedia.hide() }, beforeUpload: function(){ diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index fc7512a..c90dad4 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -406,6 +406,8 @@ iframe.embed { } .page .viewMore { + clear: both; float: none; + margin: 20px auto; text-decoration: none; font-size: 22px; display: block; @@ -1252,7 +1254,9 @@ border-left: 1px solid black; .myMedia.inactive { opacity:0; } - +.noMedia { + margin: 40px; +} .foundMedia { position:absolute; top:0; diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js index c04f4f6..47e0458 100644 --- a/server/lib/api/projects.js +++ b/server/lib/api/projects.js @@ -67,6 +67,8 @@ var projects = { return docs.create(req, res) } + var data = util.cleanQuery(req.body) + if (req.files.thumbnail) { upload.put("projects", req.files.thumbnail, { unacceptable: function(err){ @@ -86,8 +88,6 @@ var projects = { Project.findOne({ _id: _id }, function(err, doc){ if (err || ! doc) { return res.json({ error: err }) } - var data = util.cleanQuery(req.body) - // data.user_id = req.user._id data.name = util.sanitize(data.name) if (data.name != doc.name) { diff --git a/views/home.ejs b/views/home.ejs index 16b00e7..8910070 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -65,8 +65,6 @@ [[ include projects/list-projects ]] - View More - [[ include partials/confirm-modal ]] [[ include projects/layouts-modal ]] [[ include partials/sign-in ]] diff --git a/views/profile.ejs b/views/profile.ejs index 2909fb8..1be0702 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -49,8 +49,6 @@

    [[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

    [[ include projects/list-projects ]] - - view more [[ } else { ]]

    Welcome to VVALLS

    diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index 9dbd7d2..eb66449 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -3,7 +3,7 @@
    [[ projects.forEach(function(project, i) { ]] - + [[ if (i > 5) { return } ]] [[ if (String(user._id) == String(project.user_id)) { ]] [[ } else { ]] @@ -30,6 +30,11 @@ [[ }) ]] + + [[ if (projects.length > 6) { ]] + view more + [[ } ]] +
    [[ } ]] -- cgit v1.2.3-70-g09d2 From 3d22e7ad8320ae120586ec1ad26e11016598c821 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 4 Nov 2014 15:46:37 -0500 Subject: user has no projects --- public/assets/stylesheets/app.css | 15 +++++++++++++++ views/profile.ejs | 16 +++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index c190f35..7b8dd26 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -783,6 +783,21 @@ iframe.embed { .profilepage .about h2:nth-child(2){ margin:34px 0; } +.profilepage .about h2 a.homeLink { + background: white; + border: 1px solid black; + padding: 10px; +} +.profilepage .about h2 a.homeLink:hover { + background: black; + border: 1px solid black; + color: white; +} +.profilepage .about h3 { + font-size: 13px; + font-weight: 300; + text-align: center; +} .about { background-color: #ffffff;background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScyODkuNScgaGVpZ2h0PScyODkuNScgdmlld0JveD0nMCAwIDI4OS41IDI4OS41Jz4KCTxkZWZzPgoJCTxwYXR0ZXJuIGlkPSdibHVlc3RyaXBlJyBwYXR0ZXJuVW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4PScwJyB5PScwJyB3aWR0aD0nNTcuOScgaGVpZ2h0PSc1Ny45JyB2aWV3Qm94PScwIDAgMTE1LjggMTE1LjgnID4KCQk8cmVjdCB3aWR0aD0nMTEwJScgaGVpZ2h0PScxMTAlJyBmaWxsPScjZmZmZmZmJy8+CgkJCTxwYXRoIGQ9J00xLDFoMTE1Ljh2MTE1LjhoLTExNS44di0xMTUuOCcgZmlsbC1vcGFjaXR5PScwJyBzdHJva2Utd2lkdGg9JzAuOCcgc3Ryb2tlLWRhc2hhcnJheT0nMCwxLDEnIHN0cm9rZT0nI2NjY2NjYycvPgoJCTwvcGF0dGVybj4gCgkJPGZpbHRlciBpZD0nZnV6eicgeD0nMCcgeT0nMCc+CgkJCTxmZVR1cmJ1bGVuY2UgdHlwZT0ndHVyYnVsZW5jZScgcmVzdWx0PSd0JyBiYXNlRnJlcXVlbmN5PScuMiAuMycgbnVtT2N0YXZlcz0nNScgc3RpdGNoVGlsZXM9J3N0aXRjaCcvPgoJCQk8ZmVDb2xvck1hdHJpeCB0eXBlPSdzYXR1cmF0ZScgaW49J3QnIHZhbHVlcz0nMCcvPgoJCTwvZmlsdGVyPgoJPC9kZWZzPgoJPHJlY3Qgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScgZmlsbD0ndXJsKCNibHVlc3RyaXBlKScvPgo8cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWx0ZXI9J3VybCgjZnV6eiknIG9wYWNpdHk9JzAnLz4KPC9zdmc+Cg=='); background-attachment: fixed; diff --git a/views/profile.ejs b/views/profile.ejs index 1be0702..272deb7 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -58,14 +58,16 @@ [[ if (isOwnProfile) { ]] -

    - You don't have any projects yet. -

    -

    - Create a New Project -

    +

    + You don't have any projects yet. +

    +

    + Create a New Project +

    + [[ } else { ]] +

    Learn more about VValls

    +

    This person has no projects.

    [[ } ]] - [[ } ]] -- cgit v1.2.3-70-g09d2 From 51e66500905eb0bde1d5ba4c115277bc5e6d9ffd Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 7 Nov 2014 15:04:00 -0500 Subject: new window links --- views/profile.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views/profile.ejs') diff --git a/views/profile.ejs b/views/profile.ejs index 272deb7..5043df6 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -33,12 +33,12 @@ [[ } ]] [[ if (profile.website && profile.website.length) { ]] - [[- profile.website ]] + [[- profile.website ]] [[ } ]] [[ if (profile.twitterName && profile.twitterName.length) { ]] - @[[- profile.twitterName ]] + @[[- profile.twitterName ]] [[ } ]] -- cgit v1.2.3-70-g09d2 From 6b665588eaf1690d6717edabe64882e091731117 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 10 Dec 2014 14:20:52 -0500 Subject: get accurate project count --- server/lib/views/index.js | 16 +++++++++++++--- views/profile.ejs | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'views/profile.ejs') diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 6ceef7e..8c3e63d 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -171,15 +171,20 @@ var views = module.exports = { if ( ! isOwnProfile ) { criteria.privacy = false } - views_middleware.fetchProjects(criteria, null, null, done) + views_middleware.fetchProjects(criteria, null, null, function(err, projects){ + views_middleware.fetchUserProjectCount(criteria, function(projectCount){ + done(err, projects, projectCount) + }) + }) } - function done(err, projects){ + function done(err, projects, projectCount){ if (! user) { return res.redirect('/') } res.render('profile', { isOwnProfile: isOwnProfile, profile: user, projects: projects || [], + projectCount: projectCount, ogTitle: "VValls: Profile of " + user.displayName, ogUrl: "http://vvalls.com/profile/" + user.username + "/", ogImage: user.photo, @@ -240,5 +245,10 @@ var views_middleware = { }) next(err, projects) }) - } + }, + fetchUserProjectCount: function(criteria, next){ + Project.count(criteria, function(err, count){ + next(count || 0) + }) + }, } diff --git a/views/profile.ejs b/views/profile.ejs index 5043df6..a62652c 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -46,7 +46,7 @@ [[ if (projects.length) { ]] -

    [[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

    +

    [[- profile.username ]] has [[- projectCount ]] project[[- projectCount != 1 ? "s" : "" ]]

    [[ include projects/list-projects ]] [[ } else { ]] -- cgit v1.2.3-70-g09d2 From 9c6f8f8568d20d75eb22955dbf2752ea777e59f8 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 7 Jan 2015 14:34:41 -0500 Subject: stub in brochure page --- public/assets/stylesheets/app.css | 14 +++++++ server/lib/schemas/Plan.js | 6 +++ server/lib/schemas/Subscription.js | 2 +- server/lib/views/index.js | 5 +++ server/lib/views/subscription.js | 1 - views/about/_blank.ejs | 2 +- views/about/about.ejs | 16 +------- views/about/brochure.ejs | 79 ++++++++++++++++++++++++++++++++++++++ views/about/howto.ejs | 2 +- views/builder.ejs | 2 +- views/docs.ejs | 2 +- views/editor.ejs | 2 +- views/home.ejs | 2 +- views/modal.ejs | 2 +- views/profile.ejs | 2 +- views/reader.ejs | 2 +- views/staff/_header.ejs | 2 +- 17 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 views/about/brochure.ejs (limited to 'views/profile.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index aecd6be..0463e26 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -673,7 +673,21 @@ iframe.embed { font-weight: 300; } +.aboutintro { + text-align: center; + line-height: 43px; + font-size: 24px; + padding: 5% 0; + font-weight: 300; +} +.aboutintro .inner { + max-width: 800px; + margin: 0 auto; + text-align: center; +} + /* PROFILE PAGE */ + .profilePic { background-size: cover; background-position: center; diff --git a/server/lib/schemas/Plan.js b/server/lib/schemas/Plan.js index 3e74997..1057bb2 100644 --- a/server/lib/schemas/Plan.js +++ b/server/lib/schemas/Plan.js @@ -13,6 +13,12 @@ var PlanSchema = new mongoose.Schema({ monthly_price: { type: Number }, yearly_price: { type: Number }, + basic_layout_monthly_price: { type: Number }, + basic_layout_yearly_price: { type: Number }, + + pro_layout_monthly_price: { type: Number }, + pro_layout_yearly_price: { type: Number }, + basic_layout_limit: { type: Number }, pro_layout_limit: { type: Number }, diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js index 8d0b10e..8315009 100644 --- a/server/lib/schemas/Subscription.js +++ b/server/lib/schemas/Subscription.js @@ -15,7 +15,7 @@ var SubscriptionSchema = new mongoose.Schema({ plans: [{ tier: { type: String }, monthly: { type: Boolean }, - }] + }], created_at: { type: Date, default: Date.now }, updated_at: { type: Date, default: Date.now }, diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 3326499..5f9088b 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,6 +111,11 @@ var views = module.exports = { res.render('about/' + name) return } + if (name == "brochure") { + // TODO: fetch plans + res.render('about/' + name) + return + } if (name == "about" || name == "index") { res.render('about/' + name) return diff --git a/server/lib/views/subscription.js b/server/lib/views/subscription.js index 77db1a0..ba54bb4 100644 --- a/server/lib/views/subscription.js +++ b/server/lib/views/subscription.js @@ -12,7 +12,6 @@ var subscription = module.exports = { fields: { user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip", - project: "_id name slug user_id privacy created_at updated_at", }, defaults: { diff --git a/views/about/_blank.ejs b/views/about/_blank.ejs index 0e9ea7e..3c23fa7 100644 --- a/views/about/_blank.ejs +++ b/views/about/_blank.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include ../partials/meta ]] diff --git a/views/about/about.ejs b/views/about/about.ejs index dd536be..2aec982 100644 --- a/views/about/about.ejs +++ b/views/about/about.ejs @@ -1,7 +1,7 @@ - vvalls + About VValls [[ include ../partials/meta ]] @@ -50,17 +50,3 @@ [[ include ../partials/scripts ]] - \ No newline at end of file diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs new file mode 100644 index 0000000..00083cf --- /dev/null +++ b/views/about/brochure.ejs @@ -0,0 +1,79 @@ + + + + VValls Subscriptions + [[ include ../partials/meta ]] + + +
    + [[ include ../partials/header ]] + +

    Subscriptions

    + +
    +
    + Want to get more out of VValls? Consider becoming a subscription user. +
    +
    + +
    +

    [[- plans.free.name ]]

    +
      +
    • One exhibition with pre-designed template floor plan +
    +
    + +
    +

    [[- plans.premium.name ]]

    +
      +
    • $[[- plans.premium.monthly_price ]]/mo or $[[- plans.premium.yearly_price ]]/year +
    • [[- plans.premium.stock_layout_project_limit ]] exhibitions included with pre-designed template floor plans +
    • Each new basic floor plan costs $[[- plans.premium.basic_layout_monthly_price ]]/mo + or $[[- plans.premium.basic_layout_yearly_price ]]/year, minimum 3 months +
    • Each new basic floor plan can have up to [[- plans.premium.basic_layout_project_limit ]] exhibitions +
    • VValls logo appears when embedding an exhibition on a web page +
    +
    + +
    +

    [[- plans.pro.name ]]

    +
      +
    • $[[- plans.pro.monthly_price ]]/mo or $[[- plans.pro.yearly_price ]]/year +
    • Comes with [[- plans.premium.pro_layout_limit ]] pro floor plan and [[- plans.premium.pro_layout_project_limit ]] exhibitions +
    • Each new pro floor plan costs $[[- plans.pro.pro_layout_monthly_price ]]/mo + or $[[- plans.pro.pro_layout_yearly_price ]]/year, minimum 3 months +
    • Each new pro floor plan can have up to [[- plans.pro.pro_layout_project_limit ]] exhibitions +
    • Includes planning for 3D objects in the room +
    • No VValls logo on embed +
    +
    + +
    + Buying any extra floor plan unlocks collaboration. Invite an artist or curator to work on the exhibition with you. +
    + +
    + Basic Floor plan: Rectangle-based design of any dimension. +
    + +
    + Pro Floor plan: Trace an arbitrary floorplan. +
    + + +
    +

    Custom

    + We offer many types of customizations and white-label options for business and educational uses. + Contact us for more information +
    + + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +
    + +[[ include ../partials/scripts ]] + diff --git a/views/about/howto.ejs b/views/about/howto.ejs index 5278a40..914c3b3 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -1,7 +1,7 @@ - vvalls + How to Use VValls [[ include ../partials/meta ]] diff --git a/views/builder.ejs b/views/builder.ejs index afb8c66..0ba4238 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/docs.ejs b/views/docs.ejs index b3ead82..a1f081f 100644 --- a/views/docs.ejs +++ b/views/docs.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/editor.ejs b/views/editor.ejs index 656615c..74e4d6d 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/home.ejs b/views/home.ejs index 36fc2fc..ffb0976 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/modal.ejs b/views/modal.ejs index 7ca869c..732953d 100644 --- a/views/modal.ejs +++ b/views/modal.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/profile.ejs b/views/profile.ejs index a62652c..88af6b0 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -1,7 +1,7 @@ - vvalls + VValls | [[- profile.displayName ]] [[ include partials/meta ]] diff --git a/views/reader.ejs b/views/reader.ejs index 6c9856a..7035356 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/staff/_header.ejs b/views/staff/_header.ejs index 3bbf4f1..a73c12e 100644 --- a/views/staff/_header.ejs +++ b/views/staff/_header.ejs @@ -1,7 +1,7 @@ - vvalls | staff + VValls | staff [[ include ../partials/meta ]] -- cgit v1.2.3-70-g09d2 From 5efb0ed941ed80136e63014c4f615574b2b613d7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 23 Jan 2015 17:58:41 -0500 Subject: edit subscription partial stub --- server/lib/api/index.js | 1 + server/lib/api/subscription.js | 22 ++++++++++ server/lib/schemas/Subscription.js | 3 +- server/lib/webhook/config.js | 6 --- server/lib/webhook/recurly-config.js | 6 +++ server/lib/webhook/webhook.js | 8 ++-- views/about/brochure.ejs | 12 +++--- views/partials/edit-subscription.ejs | 33 +++++++++++++++ views/profile.ejs | 82 ++++++++++++++++++++---------------- 9 files changed, 119 insertions(+), 54 deletions(-) create mode 100644 server/lib/api/subscription.js delete mode 100644 server/lib/webhook/config.js create mode 100644 server/lib/webhook/recurly-config.js create mode 100644 views/partials/edit-subscription.ejs (limited to 'views/profile.ejs') diff --git a/server/lib/api/index.js b/server/lib/api/index.js index 11e13fc..9478d9b 100644 --- a/server/lib/api/index.js +++ b/server/lib/api/index.js @@ -8,6 +8,7 @@ var api = { projects: require('./projects'), rooms: require('./rooms'), collaborator: require('./collaborator'), + subscription: require('./subscription'), } module.exports = api diff --git a/server/lib/api/subscription.js b/server/lib/api/subscription.js new file mode 100644 index 0000000..6fe8c61 --- /dev/null +++ b/server/lib/api/subscription.js @@ -0,0 +1,22 @@ +/* jshint node: true */ + +var _ = require('lodash'), + util = require('../util'), + upload = require('../upload'), + config = require('../../../config.json'), + User = require('../schemas/User'), + Project = require('../schemas/Project'), + Layout = require('../schemas/Layout'), + Subscription = require('../schemas/Subscription'); + +var subscription = module.exports = { + +/* + index: function(req, res){ + Project.find({ user_id: req.user._id }, function(err, docs){ + res.json(docs) + }) + }, +*/ + +}; \ No newline at end of file diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js index 99e4ebf..2f49ea1 100644 --- a/server/lib/schemas/Subscription.js +++ b/server/lib/schemas/Subscription.js @@ -9,9 +9,8 @@ var mongoose = require('mongoose'), var SubscriptionSchema = new mongoose.Schema({ user_id: { type: mongoose.Schema.ObjectId, index: true }, - plan_level: { type: Number, default: 0 }, plan_type: { type: String, default: "free" }, - last_charged: { type: Date, default: null }, + plan_period: { type: String, default: "monthly" }, subscription_uuid: { type: String }, subscription_add_ons: [{ diff --git a/server/lib/webhook/config.js b/server/lib/webhook/config.js deleted file mode 100644 index 3d7e1c5..0000000 --- a/server/lib/webhook/config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - API_KEY: process.env['VVALLS_RECURLY_SECRET'], - SUBDOMAIN: 'vvalls', - ENVIRONMENT: 'sandbox', - DEBUG: true, -}; diff --git a/server/lib/webhook/recurly-config.js b/server/lib/webhook/recurly-config.js new file mode 100644 index 0000000..3d7e1c5 --- /dev/null +++ b/server/lib/webhook/recurly-config.js @@ -0,0 +1,6 @@ +module.exports = { + API_KEY: process.env['VVALLS_RECURLY_SECRET'], + SUBDOMAIN: 'vvalls', + ENVIRONMENT: 'sandbox', + DEBUG: true, +}; diff --git a/server/lib/webhook/webhook.js b/server/lib/webhook/webhook.js index 2e5e627..e9a7925 100644 --- a/server/lib/webhook/webhook.js +++ b/server/lib/webhook/webhook.js @@ -20,7 +20,7 @@ var User = require('../schemas/User'), moment = require('moment'), xml2js = require('xml2js'), Recurly = require('node-recurly'), - recurly = new Recurly(require('./config')); + recurly = new Recurly(require('./recurly-config')); var parser = new xml2js.Parser(); @@ -64,12 +64,14 @@ var subscribe = module.exports = { var plan_period = plan[1] user.plan_type = plan_type - user.plan_period = plan_period user.plan_level = subscribe.plan_level[plan_type] var subscriber = new Subscription () - subscriber.user_id = user._id subscriber.uuid = data.subscription.uuid + subscriber.user_id = user._id + subscriber.plan_type = plan_type + subscriber.plan_period = plan_period + subscriber.plan_level = subscribe.plan_level[plan_type] subscriber.add_ons = subscription.add_ons.map(function(add_on){ return { name: add_on.plan, diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs index cffa51f..1c808f8 100644 --- a/views/about/brochure.ejs +++ b/views/about/brochure.ejs @@ -35,9 +35,9 @@
  • [[ if (! logged_in) { ]] - [[ } else if (! profile.plan_level || profile.plan_level < plan.level) { ]] - - [[ } else if (profile.plan_level == plan.level) { ]] + [[ } else if (! user.plan_level || user.plan_level < plan.level) { ]] + + [[ } else if (user.plan_level == plan.level) { ]] Current Level [[ } else { ]] [[ } ]] @@ -57,9 +57,9 @@
  • [[ if (! logged_in) { ]] - [[ } else if (! profile.plan_level || profile.plan_level < plan.level) { ]] - - [[ } else if (profile.plan_level == plan.level) { ]] + [[ } else if (! user.plan_level || user.plan_level < plan.level) { ]] + + [[ } else if (user.plan_level == plan.level) { ]] Current Level [[ } ]] diff --git a/views/partials/edit-subscription.ejs b/views/partials/edit-subscription.ejs new file mode 100644 index 0000000..0aa5281 --- /dev/null +++ b/views/partials/edit-subscription.ejs @@ -0,0 +1,33 @@ +
    + X +
    + + +
      +
    • +

      Edit Subscription

      +
      • +
    • + [[ if (! user.plan_level) { ]] + You are currently using the free plan. For access to all of Vvalls features, + consider upgrading to a paid plan. +

      + View the Plans + [[ } else { ]] + Your current plan level is XXX + You have been a member since XXX + $cost/month OR $cost/year + + You are using N basic layouts + Buy more + + You are using N pro layouts + Buy more / Upgrade your account + + Cancel your subscription + [[ } ]] +

      • +
    + +
    +
    diff --git a/views/profile.ejs b/views/profile.ejs index 88af6b0..e149847 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -9,48 +9,53 @@ [[- include partials/header ]]
    - [[ if (profile.photo && profile.photo.length) { ]] -
    -
    - [[ } else { ]] -
    - - - [[ if (isOwnProfile) { ]] -
    click to add profile pic
    - - [[ } ]] -     -
    + [[ if (profile.photo && profile.photo.length) { ]] +
    +
    + [[ } else { ]] +
    + + + [[ if (isOwnProfile) { ]] +
    click to add profile pic
    + [[ } ]] -
    -
    -

    [[- profile.displayName ]]

    - [[ if (profile.location) { ]] - - [[- profile.location ]] - - [[ } ]] - [[ if (profile.website && profile.website.length) { ]] - - [[- profile.website ]] - - [[ } ]] - [[ if (profile.twitterName && profile.twitterName.length) { ]] - - @[[- profile.twitterName ]] - - [[ } ]] -
    -
    - +     +
    + [[ } ]] +
    +
    +

    [[- profile.displayName ]]

    + [[ if (profile.location) { ]] + + [[- profile.location ]] + + [[ } ]] + [[ if (profile.website && profile.website.length) { ]] + + [[- profile.website ]] + + [[ } ]] + [[ if (profile.twitterName && profile.twitterName.length) { ]] + + @[[- profile.twitterName ]] + + [[ } ]] + [[ if (profile.plan_level == 1) { ]] + PREMIUM + [[ } else if (profile.plan_level == 2) { ]] + PRO + [[ } ]] +
    +
    [[ if (projects.length) { ]] +

    [[- profile.username ]] has [[- projectCount ]] project[[- projectCount != 1 ? "s" : "" ]]

    - [[ include projects/list-projects ]] + [[ } else { ]] - +

    Welcome to VVALLS

    @@ -69,8 +74,11 @@

    This person has no projects.

    [[ } ]]
    + [[ } ]] -
    + + + [[ include partials/edit-subscription ]] [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] [[ include projects/edit-project ]] -- cgit v1.2.3-70-g09d2 From c0e5a31151dcdbf2b08707fba9008d003d87cd4f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 28 Apr 2015 19:09:09 -0400 Subject: upgrade ionicons --- public/assets/fonts/ionicons.eot | Bin 101984 -> 120724 bytes public/assets/fonts/ionicons.svg | 1725 +++++++++++++++---------- public/assets/fonts/ionicons.ttf | Bin 164548 -> 188508 bytes public/assets/fonts/ionicons.woff | Bin 57276 -> 67904 bytes public/assets/javascripts/ui/site/HomeView.js | 2 +- public/assets/stylesheets/app.css | 12 +- public/assets/stylesheets/ionicons.css | 884 ++++++++----- views/controls/builder/settings.ejs | 2 +- views/controls/builder/toolbar.ejs | 6 +- views/controls/editor/media-drawer.ejs | 2 +- views/controls/editor/media-editor.ejs | 4 +- views/controls/editor/settings.ejs | 6 +- views/controls/editor/toolbar.ejs | 14 +- views/controls/editor/wallpaper.ejs | 2 +- views/controls/reader/about-room.ejs | 2 +- views/home.ejs | 4 +- views/profile.ejs | 2 +- 17 files changed, 1627 insertions(+), 1040 deletions(-) (limited to 'views/profile.ejs') diff --git a/public/assets/fonts/ionicons.eot b/public/assets/fonts/ionicons.eot index 52b1e57..92a3f20 100755 Binary files a/public/assets/fonts/ionicons.eot and b/public/assets/fonts/ionicons.eot differ diff --git a/public/assets/fonts/ionicons.svg b/public/assets/fonts/ionicons.svg index 5c8c909..49fc8f3 100755 --- a/public/assets/fonts/ionicons.svg +++ b/public/assets/fonts/ionicons.svg @@ -1,11 +1,11 @@ -Created by FontForge 20120731 at Mon Jun 16 14:44:31 2014 +Created by FontForge 20120731 at Thu Dec 4 09:51:48 2014 By Adam Bradley Created by Adam Bradley with FontForge 2.0 (http://fontforge.sf.net) @@ -19,189 +19,307 @@ Created by Adam Bradley with FontForge 2.0 (http://fontforge.sf.net) panose-1="2 0 6 3 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="-0.5 -64.0026 512.487 448" + bbox="-0.54049 -64 512.487 448" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F100-F358" + unicode-range="U+F100-F4F7" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - +d="M160 128c-38 0 -69 31 -69 69v150c0 38 31 69 69 69s69 -31 69 -69v-150c0 -38 -31 -69 -69 -69zM281 203h39c0 -78 -62 -142 -137 -153v-82h-46v82c-75 10 -137 75 -137 153h39c0 -69 58 -116 121 -116s121 47 121 116z" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -276,10 +401,8 @@ d="M438 256c6 0 10 -4 10 -10v-108c0 -6 -4 -10 -10 -10h-37v-54c0 -6 -4 -10 -10 -1 +d="M80 256h240v-224c0 -9 -7 -16 -16 -16h-208c-9 0 -16 7 -16 16v224zM296 104v48c0 4 -4 8 -8 8s-8 -4 -8 -8v-48c0 -4 4 -8 8 -8s8 4 8 8zM288 176c4 0 8 4 8 8s-4 8 -8 8s-8 -4 -8 -8s4 -8 8 -8zM381 416c3 0 3 -2 3 -3s-2 -3 -3 -5s-13 -20 -13 -40v-336 +c0 -35 -29 -64 -64 -64h-208c-35 0 -64 29 -64 64v307c0 32 -2 33 -32 37c0 12 11 40 65 40h316zM336 368c0 5 0 16 1 16h-273c-1 0 -3 0 -4 -1c5 -7 4 -32 4 -44v-307c0 -18 14 -32 32 -32h210c17 0 30 14 30 32v336z" /> + @@ -324,8 +451,8 @@ h192v-16h-192zM64 96v16h96v-16h-96zM320 96v48h64v-48h-64z" /> d="M0 352h512v-256h-512v256zM193 128c-20 23 -33 58 -33 96s13 73 33 96h-97c0 -35 -29 -64 -64 -64v-80c27 0 48 -21 48 -48h113zM298 187c3 4 4 9 4 15c0 3 0 5 -1 8s-2 6 -4 8s-4 4 -7 6s-6 4 -10 5c-1 0 -4 1 -7 2s-5 0 -8 1v31c2 -1 5 -2 7 -3c4 -3 6 -7 7 -13h20 c0 5 -2 9 -4 13s-5 8 -9 11s-9 5 -14 6c-2 1 -5 2 -7 2v9h-18v-9c-2 0 -4 -1 -6 -2c-5 -1 -10 -2 -14 -5s-7 -6 -9 -10s-4 -9 -4 -14c0 -3 0 -5 1 -8s2 -5 4 -7s5 -5 8 -7s7 -4 12 -5c3 -1 6 0 8 -1v-35c-3 1 -6 2 -9 4s-5 4 -6 7s-2 6 -2 9h-20c0 -5 2 -11 4 -16 c3 -5 6 -8 10 -11s9 -6 15 -7c3 -1 5 -2 8 -2v-9h18v9c3 0 6 1 9 2c5 1 10 2 14 5s7 7 10 11zM480 176v80c-35 0 -64 29 -64 64h-97c20 -23 33 -58 33 -96s-13 -73 -33 -96h113c0 27 22 48 48 48zM64 224c0 21 11 32 32 32s32 -11 32 -32s-11 -32 -32 -32s-32 11 -32 32z -M384 224c0 21 11 32 32 32s32 -11 32 -32s-11 -32 -32 -32s-32 11 -32 32zM273 213c2 -1 4 -2 6 -4s3 -5 3 -9c0 -2 0 -4 -1 -6s-2 -4 -4 -5s-5 -3 -8 -4c-1 0 -2 -1 -4 -1v31c3 -1 6 -1 8 -2zM236 257c1 2 3 3 5 4s4 2 6 2v-26c-4 1 -7 3 -9 5s-4 4 -4 8c0 3 1 5 2 7zM0 64 -v16h512v-16h-512zM0 32v16h512v-16h-512z" /> +M384 224c0 21 11 32 32 32s32 -11 32 -32s-11 -32 -32 -32s-32 11 -32 32zM273 213c2 -1 4 -2 6 -4s3 -5 3 -9c0 -2 0 -4 -1 -6s-2 -4 -4 -5s-5 -3 -8 -4c-1 0 -2 -1 -4 -1v31c3 -1 6 -1 8 -2zM236 257c1 2 3 3 5 4s4 2 6 2v-26c-4 1 -7 3 -9 5s-4 4 -4 8c0 3 1 5 2 7zM0 32 +v32h512v-32h-512z" /> @@ -358,14 +485,13 @@ d="M170 192v0v0l-167 174c-4 4 -4 12 0 16l30 30c4 4 12 5 16 1l204 -213c2 -2 3 -5 +d="M80 288c2 20 10 35 28 40l1 1c12 3 21 7 21 20v21c0 26 21 46 46 46s46 -20 46 -46v-21c0 -13 9 -18 21 -21h2c18 -5 25 -20 27 -40h-192zM176 384c-8 0 -13 -6 -13 -14s5 -14 13 -14s14 6 14 14s-6 14 -14 14zM325 384c15 0 27 -12 27 -28v-360c0 -16 -12 -28 -27 -28 +h-149h-148c-15 0 -28 12 -28 28v360c0 16 13 28 28 28h73v-13c0 -11 -9 -19 -19 -19h-37c-7 0 -12 -6 -12 -13v-327c0 -6 5 -12 11 -12h265c6 0 11 6 11 12v327c0 7 -5 13 -12 13h-37c-10 0 -20 8 -20 19v13h74zM64 224v32h112v-32h-112zM64 32v32h160v-32h-160zM64 96v32 +h129v-32h-129zM64 160v32h208v-32h-208z" /> +d="M224 416c124 0 224 -100 224 -224s-100 -224 -224 -224s-224 100 -224 224s100 224 224 224zM360 56c10 10 19 21 26 33l-27 16l8 14l27 -16c13 25 21 52 22 81h-32v16h32c-1 29 -9 56 -22 81l-27 -16l-8 14l27 16c-7 12 -16 23 -26 33s-21 19 -33 26l-16 -27l-14 8 +l16 27c-25 13 -52 21 -81 22v-32h-16v32c-29 -1 -56 -9 -81 -22l16 -27l-14 -8l-16 27c-12 -7 -23 -16 -33 -26s-19 -21 -26 -33l27 -16l-8 -14l-27 16c-13 -25 -21 -52 -22 -81h32v-16h-32c1 -29 9 -56 22 -81l27 16l8 -14l-27 -16c7 -12 16 -23 26 -33s21 -19 33 -26 +l16 27l14 -8l-16 -27c25 -13 52 -21 81 -22v32h16v-32c29 1 56 9 81 22l-16 27l14 8l16 -27c12 7 23 16 33 26zM368 207v-32h-117c-6 -9 -16 -15 -27 -15c-18 0 -32 14 -32 32c0 12 6 22 16 28v68h32v-68c5 -3 9 -8 12 -13h116z" /> @@ -406,6 +532,8 @@ s9 5 9 10v150z" /> d="M0 32v64h64v-64h-64zM96 32v128h64v-128h-64zM192 32v224h64v-224h-64zM288 32v320h64v-320h-64z" /> + @@ -421,33 +549,36 @@ d="M287 279c1 -3 1 -5 1 -9v-244c0 -13 -9 -26 -21 -26h-243c-12 0 -24 13 -24 26v33 +d="M325 322c2 -4 7 -12 3 -15c-3 -2 -10 -2 -13 5s0 11 -5 9s-7 3 -6 4c1 2 3 3 5 4c0 2 -4 8 2 7c4 -1 12 -10 14 -14zM344 277v0v0zM403 251c0 0 -2 0 0 0v0zM224 416c124 0 224 -100 224 -224s-100 -224 -224 -224s-224 100 -224 224s100 224 224 224zM141 19l8 -4 +c3 -1 6 -2 10 -3c14 -5 28 -8 43 -10c28 -3 56 -1 83 8c15 5 30 11 43 20c6 4 6 16 10 24c8 16 -2 33 12 47c12 14 4 19 4 34c0 10 8 18 4 29c-1 4 -7 -3 -9 1c-5 7 -21 1 -28 2c-13 2 -24 14 -33 23c-5 5 0 20 1 26c4 15 0 33 19 38c5 1 5 9 10 11c5 1 10 3 15 4 +c9 1 17 -2 26 -2c10 0 14 -5 22 -11c7 -6 13 -3 22 -5c7 0 0 5 -2 8c-3 2 -6 2 -8 2c-16 4 -23 22 -36 30c-6 3 -9 2 -11 0c-1 -1 1 -12 1 -12c-1 -3 -10 -4 -13 -5c-9 -2 -29 17 -15 22c4 1 27 5 24 15c-3 6 2 13 -5 14c-8 1 -7 7 -15 8c-5 1 -5 11 -5 14c0 9 2 6 9 7 +c-17 11 -37 19 -57 24c-1 -3 -5 -12 -8 -12c-5 -1 -6 0 -9 -3c-9 -10 -16 -28 -25 -7c-4 11 5 19 2 28h-6h-3c6 -12 -5 -18 -8 -19c-8 0 -10 5 -17 4c-4 -1 -7 4 -11 2s-13 -8 -14 -12c-3 -12 6 -13 14 -6c6 6 17 12 25 6c6 -5 5 -9 5 -14s-1 -18 -9 -16c-4 1 -7 6 -11 3 +c-8 -7 -18 -6 -29 -9c-10 -2 -16 -6 -25 -9c-8 -3 -11 -4 -12 -12c0 -2 0 -14 -3 -15c-5 -2 -8 22 -22 20c-12 -1 -30 -13 -25 -28c2 -5 28 -3 10 -14c-2 -1 2 -17 2 -20c1 -8 13 -18 21 -10c6 6 6 5 14 2c15 -8 33 -15 45 -27c6 -6 9 -24 17 -28c9 -5 19 -5 26 -14 +c6 -7 -2 -19 -8 -23c-4 -2 -12 -24 -16 -29c-2 -4 -12 -6 -16 -7c-3 0 -7 -9 -9 -11c-7 -7 -8 -13 -17 -19c-18 -12 -22 -23 -18 -44c2 -8 5 -13 11 -16zM100 46l2 -2c7 -6 15 -11 23 -16c-21 21 -23 49 -21 78l3 24c1 3 -4 7 -4 11c0 10 0 5 -8 13c-4 4 -10 11 -12 17 +c-7 16 1 30 10 43c9 14 -7 20 -10 32c-1 6 -7 6 -6 12c1 7 -4 5 -9 9c-12 8 -1 20 -7 26c-43 -70 -36 -162 16 -224c1 -1 0 -1 1 -2h1c3 -4 6 -8 9 -11s7 -6 10 -9z" /> + +d="M381 259l-250 -251l-91 91l251 250zM440 360c12 -12 11 -32 -2 -45l-45 -45l-91 91l45 45c13 13 33 14 45 2zM32 85l85 -85l-117 -32z" /> + + + @@ -475,9 +606,6 @@ c0 -65 36 -121 90 -150c6 -3 13 -7 19 -9c2 -1 3 -1 5 -2c9 -3 19 -5 29 -7c9 -2 18 l53 -52l-36 -41zM178 58l38 113h-85l139 155l-38 -113h85z" /> - - - +d="M224 416c124 0 224 -36 224 -80c0 -8 -3 -15 -9 -22v0c-35 -43 -151 -179 -151 -218v-4v-83v0c0 -23 -29 -41 -64 -41s-64 18 -64 41v0v87c0 39 -117 177 -149 216v0c-7 8 -11 16 -11 24c0 44 100 80 224 80zM224 288c92 0 176 22 176 48s-83 48 -176 48 +s-176 -22 -176 -48s84 -48 176 -48z" /> - + - - @@ -565,463 +681,554 @@ d="M448 195c2 -124 -97 -225 -221 -227s-225 97 -227 221s97 225 221 227s225 -97 22 - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - + + - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - + + - - - - - - - - - - + + + + - - - - - - - + + - - - - + - - - - - - - - - - - - + - - - - + + - - - - - + + - - - - - - - + + - - - - - - - - - - - + + - - - - - - - - - - - - - - + + - - - - - - - - + + - - - - - + + + + + - - - + + + d="M84 341c-21 0 -37 17 -37 38s16 37 37 37s37 -16 37 -37s-16 -38 -37 -38zM121 333c28 0 47 -24 47 -48v-114c0 -22 -32 -22 -32 0v105h-5v-286c0 -28 -41 -31 -43 0v165h-1h-7v-165c-1 -29 -43 -30 -43 0v286h-6v-105c0 -22 -31 -22 -31 0v114c0 24 19 48 47 48h37h37z " /> +d="M441 311c4 -3 7 -8 7 -14v-281c0 -6 -2 -11 -7 -14c-2 -1 -5 -2 -7 -2c-3 0 -6 0 -8 2l-97 66l-97 -66c-5 -3 -10 -3 -15 0l-97 66l-97 -66c-5 -3 -10 -3 -15 0s-8 8 -8 14v281c0 6 3 11 7 14l105 71c5 3 10 3 15 0l97 -66l98 66c5 3 10 3 15 0zM103 95v242l-71 -50v-242 +zM135 95l73 -49v129l-4 -11c-7 2 -13 6 -20 10l8 13c5 -3 11 -6 16 -8v109l-73 49v-101c4 -2 9 -4 13 -7l-10 -13c-1 1 -2 1 -3 2v-123zM240 46l73 49v109c0 -1 -1 -1 -1 -2l-6 -6l-12 11l6 6c3 3 5 7 8 10l5 -5v119l-73 -49v-112h7l3 -15c-3 0 -6 -1 -9 -1h-1v-114zM416 46 +v242l-71 49v-88c3 1 5 1 8 2l4 -16c-4 -1 -8 -1 -12 -3v-137zM97 227c-3 -1 -11 -5 -14 -7l-11 12c4 3 8 6 12 8c3 2 6 3 9 4l5 -15c-2 -1 1 -1 -1 -2zM265 182c5 3 10 5 15 10l11 -12c-6 -6 -12 -10 -19 -13zM67 192v-1l-15 5v1c2 7 4 13 9 20l13 -9c-4 -5 -5 -10 -7 -16z +M166 210c3 -4 7 -8 11 -11l-11 -12c-4 4 -8 9 -12 13l-3 3l12 11c1 -1 2 -3 3 -4zM376 218l-11 12l10 10l-10 10l11 12l10 -11l11 11l11 -12l-10 -10l10 -10l-11 -12l-11 11z" /> @@ -1443,6 +1656,11 @@ c-12 0 -23 -3 -33 -9l-80 138c35 20 73 31 113 31s78 -10 113 -30l-81 -139c-10 6 -2 + + +d="M315 318c10 -4 12 -13 9 -20l-148 -330s-143 320 -148 331s2 16 9 19c39 18 90 28 139 28s96 -9 139 -28zM112 256c18 0 32 14 32 32s-14 32 -32 32s-32 -14 -32 -32s14 -32 32 -32zM176 109c18 0 32 14 32 32s-14 32 -32 32s-32 -14 -32 -32s14 -32 32 -32zM240 224 +c18 0 32 14 32 32s-14 32 -32 32s-32 -14 -32 -32s14 -32 32 -32zM342 382c6 -3 10 -6 10 -13c0 -1 0 -3 -1 -5l-8 -19c-3 -5 -8 -9 -14 -9c-1 0 -3 1 -6 2c-41 18 -95 30 -147 30s-102 -11 -147 -30c-3 -1 -4 -2 -6 -2c-6 0 -11 4 -14 9l-8 19s-1 2 -1 5c0 8 6 12 10 14 +c49 21 107 33 166 33s118 -13 166 -34z" /> @@ -1521,21 +1737,16 @@ d="M48 324v-68h-48v68c0 33 28 60 61 60h67v-48h-68c-7 0 -12 -5 -12 -12zM356 384c3 c0 -7 5 -12 12 -12z" /> - + - + - + + + + + + + + + @@ -1629,19 +1869,25 @@ d="M113 371l79 -66l-114 -71l-78 63zM27 295l52 -42l86 53l-53 46zM306 235l78 -63l- l-78 -63l-114 71l79 66zM219 305l86 -52l52 42l-85 56z" /> + + - - + + + + @@ -1685,12 +1935,32 @@ h48c9 0 16 7 16 16zM337 32c9 0 15 7 15 16v176h-52c3 -10 4 -21 4 -32c0 -30 -11 -5 d="M112 192c0 53 27 80 80 80s80 -27 80 -80s-27 -80 -80 -80s-80 27 -80 80zM113 271c-14 -14 -23 -29 -28 -47h-85v112c0 13 4 25 14 34s22 14 35 14h288c13 0 24 -5 33 -14s14 -21 14 -34v-112h-84c-5 18 -14 33 -28 47c-22 22 -49 33 -80 33s-57 -11 -79 -33zM352 300 v39c0 4 -2 7 -4 9s-5 4 -9 4h-38c-4 0 -7 -2 -9 -4s-4 -5 -4 -9v-39c0 -4 2 -7 4 -9s5 -3 9 -3h38c4 0 7 1 9 3s4 5 4 9zM272 113c22 22 32 48 32 79h80v-144c0 -13 -5 -24 -14 -34s-20 -14 -33 -14h-288c-13 0 -24 4 -34 14s-15 21 -15 34v144h81c0 -31 10 -57 32 -79 s48 -33 79 -33s58 11 80 33z" /> + + + + + + + + + - + + + + + + + + + - + + @@ -1845,11 +2171,16 @@ h-208c-15 0 -15 3 -17 15l-19 242c-1 12 0 15 17 15h246z" /> + + +d="M224 384l224 -111l-92 -60l-132 -85l-160 102v-198l-32 16v203l-32 21zM358 192l10 -82c-16 -12 -112 -78 -144 -110c-32 32 -128 98 -144 110l9 82l135 -88z" /> diff --git a/public/assets/fonts/ionicons.ttf b/public/assets/fonts/ionicons.ttf index cc67b2f..c4e4632 100755 Binary files a/public/assets/fonts/ionicons.ttf and b/public/assets/fonts/ionicons.ttf differ diff --git a/public/assets/fonts/ionicons.woff b/public/assets/fonts/ionicons.woff index 1d7b977..5f3a14e 100755 Binary files a/public/assets/fonts/ionicons.woff and b/public/assets/fonts/ionicons.woff differ diff --git a/public/assets/javascripts/ui/site/HomeView.js b/public/assets/javascripts/ui/site/HomeView.js index a04bac1..20452bd 100644 --- a/public/assets/javascripts/ui/site/HomeView.js +++ b/public/assets/javascripts/ui/site/HomeView.js @@ -22,7 +22,7 @@ var HomeView = View.extend({ player.api('play') }) - $('.videoModal .ion-ios7-close-empty').click( function(){ + $('.videoModal .ion-ios-close-empty').click( function(){ player.api('pause') hide() }) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 6adb2a0..f4182d1 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -139,7 +139,7 @@ a{ background: rgba(255,255,255,0.9); } -.videoModal .ion-ios7-close-empty { +.videoModal .ion-ios-close-empty { position: absolute; right: 50px; top: 10px; @@ -148,7 +148,7 @@ a{ color:#444; } -.desktop .videoModal .ion-ios7-close-empty:hover { +.desktop .videoModal .ion-ios-close-empty:hover { color:black; } @@ -703,7 +703,7 @@ iframe.embed { border-right: 1px solid; } -.profilePic .ion-ios7-person-outline { +.profilePic .ion-ios-person-outline { font-size: 100px; } @@ -1466,7 +1466,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; } font-weight:600; } -.menu span.ion-ios7-sunny-outline:hover:after { +.menu span.ion-ios-sunny-outline:hover:after { width: 130px; } @@ -1634,7 +1634,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; } transform: translateY(0%); } -.fileUpload .ion-ios7-upload-outline { +.fileUpload .ion-ios-upload-outline { font-size:40px; } .fileUpload .upload-icon.uploading { @@ -3374,7 +3374,7 @@ a[data-role="forgot-password"] { .footer { padding:50px 0 120px 0; } - .videoModal .ion-ios7-close-empty { + .videoModal .ion-ios-close-empty { right: 10px; top: 20px; } diff --git a/public/assets/stylesheets/ionicons.css b/public/assets/stylesheets/ionicons.css index 34c20e2..885aa6b 100755 --- a/public/assets/stylesheets/ionicons.css +++ b/public/assets/stylesheets/ionicons.css @@ -1,25 +1,17 @@ +@charset "UTF-8"; /*! - Ionicons, v1.5.2 + Ionicons, v2.0.0 Created by Ben Sperry for the Ionic Framework, http://ionicons.com/ https://twitter.com/benjsperry https://twitter.com/ionicframework MIT License: https://github.com/driftyco/ionicons + + Android-style icons originally built by Google’s + Material Design Icons: https://github.com/google/material-design-icons + used under CC BY http://creativecommons.org/licenses/by/4.0/ + Modified icons to fit ionicon’s grid from original. */ -@font-face { font-family: "Ionicons"; src: url("../fonts/ionicons.eot?v=1.5.2"); src: url("../fonts/ionicons.eot?v=1.5.2#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.5.2") format("truetype"), url("../fonts/ionicons.woff?v=1.5.2") format("woff"), url("../fonts/ionicons.svg?v=1.5.2#Ionicons") format("svg"); font-weight: normal; font-style: normal; } -.ion, .ion-loading-a, .ion-loading-b, .ion-loading-c, .ion-loading-d, .ion-looping, .ion-refreshing, .ion-ios7-reloading, .ionicons, .ion-alert:before, .ion-alert-circled:before, .ion-android-add:before, .ion-android-add-contact:before, .ion-android-alarm:before, .ion-android-archive:before, .ion-android-arrow-back:before, .ion-android-arrow-down-left:before, .ion-android-arrow-down-right:before, .ion-android-arrow-forward:before, .ion-android-arrow-up-left:before, .ion-android-arrow-up-right:before, .ion-android-battery:before, .ion-android-book:before, .ion-android-calendar:before, .ion-android-call:before, .ion-android-camera:before, .ion-android-chat:before, .ion-android-checkmark:before, .ion-android-clock:before, .ion-android-close:before, .ion-android-contact:before, .ion-android-contacts:before, .ion-android-data:before, .ion-android-developer:before, .ion-android-display:before, .ion-android-download:before, .ion-android-drawer:before, .ion-android-dropdown:before, .ion-android-earth:before, .ion-android-folder:before, .ion-android-forums:before, .ion-android-friends:before, .ion-android-hand:before, .ion-android-image:before, .ion-android-inbox:before, .ion-android-information:before, .ion-android-keypad:before, .ion-android-lightbulb:before, .ion-android-locate:before, .ion-android-location:before, .ion-android-mail:before, .ion-android-microphone:before, .ion-android-mixer:before, .ion-android-more:before, .ion-android-note:before, .ion-android-playstore:before, .ion-android-printer:before, .ion-android-promotion:before, .ion-android-reminder:before, .ion-android-remove:before, .ion-android-search:before, .ion-android-send:before, .ion-android-settings:before, .ion-android-share:before, .ion-android-social:before, .ion-android-social-user:before, .ion-android-sort:before, .ion-android-stair-drawer:before, .ion-android-star:before, .ion-android-stopwatch:before, .ion-android-storage:before, .ion-android-system-back:before, .ion-android-system-home:before, .ion-android-system-windows:before, .ion-android-timer:before, .ion-android-trash:before, .ion-android-user-menu:before, .ion-android-volume:before, .ion-android-wifi:before, .ion-aperture:before, .ion-archive:before, .ion-arrow-down-a:before, .ion-arrow-down-b:before, .ion-arrow-down-c:before, .ion-arrow-expand:before, .ion-arrow-graph-down-left:before, .ion-arrow-graph-down-right:before, .ion-arrow-graph-up-left:before, .ion-arrow-graph-up-right:before, .ion-arrow-left-a:before, .ion-arrow-left-b:before, .ion-arrow-left-c:before, .ion-arrow-move:before, .ion-arrow-resize:before, .ion-arrow-return-left:before, .ion-arrow-return-right:before, .ion-arrow-right-a:before, .ion-arrow-right-b:before, .ion-arrow-right-c:before, .ion-arrow-shrink:before, .ion-arrow-swap:before, .ion-arrow-up-a:before, .ion-arrow-up-b:before, .ion-arrow-up-c:before, .ion-asterisk:before, .ion-at:before, .ion-bag:before, .ion-battery-charging:before, .ion-battery-empty:before, .ion-battery-full:before, .ion-battery-half:before, .ion-battery-low:before, .ion-beaker:before, .ion-beer:before, .ion-bluetooth:before, .ion-bonfire:before, .ion-bookmark:before, .ion-briefcase:before, .ion-bug:before, .ion-calculator:before, .ion-calendar:before, .ion-camera:before, .ion-card:before, .ion-cash:before, .ion-chatbox:before, .ion-chatbox-working:before, .ion-chatboxes:before, .ion-chatbubble:before, .ion-chatbubble-working:before, .ion-chatbubbles:before, .ion-checkmark:before, .ion-checkmark-circled:before, .ion-checkmark-round:before, .ion-chevron-down:before, .ion-chevron-left:before, .ion-chevron-right:before, .ion-chevron-up:before, .ion-clipboard:before, .ion-clock:before, .ion-close:before, .ion-close-circled:before, .ion-close-round:before, .ion-closed-captioning:before, .ion-cloud:before, .ion-code:before, .ion-code-download:before, .ion-code-working:before, .ion-coffee:before, .ion-compass:before, .ion-compose:before, .ion-connection-bars:before, .ion-contrast:before, .ion-cube:before, .ion-disc:before, .ion-document:before, .ion-document-text:before, .ion-drag:before, .ion-earth:before, .ion-edit:before, .ion-egg:before, .ion-eject:before, .ion-email:before, .ion-eye:before, .ion-eye-disabled:before, .ion-female:before, .ion-filing:before, .ion-film-marker:before, .ion-fireball:before, .ion-flag:before, .ion-flame:before, .ion-flash:before, .ion-flash-off:before, .ion-flask:before, .ion-folder:before, .ion-fork:before, .ion-fork-repo:before, .ion-forward:before, .ion-funnel:before, .ion-game-controller-a:before, .ion-game-controller-b:before, .ion-gear-a:before, .ion-gear-b:before, .ion-grid:before, .ion-hammer:before, .ion-happy:before, .ion-headphone:before, .ion-heart:before, .ion-heart-broken:before, .ion-help:before, .ion-help-buoy:before, .ion-help-circled:before, .ion-home:before, .ion-icecream:before, .ion-icon-social-google-plus:before, .ion-icon-social-google-plus-outline:before, .ion-image:before, .ion-images:before, .ion-information:before, .ion-information-circled:before, .ion-ionic:before, .ion-ios7-alarm:before, .ion-ios7-alarm-outline:before, .ion-ios7-albums:before, .ion-ios7-albums-outline:before, .ion-ios7-americanfootball:before, .ion-ios7-americanfootball-outline:before, .ion-ios7-analytics:before, .ion-ios7-analytics-outline:before, .ion-ios7-arrow-back:before, .ion-ios7-arrow-down:before, .ion-ios7-arrow-forward:before, .ion-ios7-arrow-left:before, .ion-ios7-arrow-right:before, .ion-ios7-arrow-thin-down:before, .ion-ios7-arrow-thin-left:before, .ion-ios7-arrow-thin-right:before, .ion-ios7-arrow-thin-up:before, .ion-ios7-arrow-up:before, .ion-ios7-at:before, .ion-ios7-at-outline:before, .ion-ios7-barcode:before, .ion-ios7-barcode-outline:before, .ion-ios7-baseball:before, .ion-ios7-baseball-outline:before, .ion-ios7-basketball:before, .ion-ios7-basketball-outline:before, .ion-ios7-bell:before, .ion-ios7-bell-outline:before, .ion-ios7-bolt:before, .ion-ios7-bolt-outline:before, .ion-ios7-bookmarks:before, .ion-ios7-bookmarks-outline:before, .ion-ios7-box:before, .ion-ios7-box-outline:before, .ion-ios7-briefcase:before, .ion-ios7-briefcase-outline:before, .ion-ios7-browsers:before, .ion-ios7-browsers-outline:before, .ion-ios7-calculator:before, .ion-ios7-calculator-outline:before, .ion-ios7-calendar:before, .ion-ios7-calendar-outline:before, .ion-ios7-camera:before, .ion-ios7-camera-outline:before, .ion-ios7-cart:before, .ion-ios7-cart-outline:before, .ion-ios7-chatboxes:before, .ion-ios7-chatboxes-outline:before, .ion-ios7-chatbubble:before, .ion-ios7-chatbubble-outline:before, .ion-ios7-checkmark:before, .ion-ios7-checkmark-empty:before, .ion-ios7-checkmark-outline:before, .ion-ios7-circle-filled:before, .ion-ios7-circle-outline:before, .ion-ios7-clock:before, .ion-ios7-clock-outline:before, .ion-ios7-close:before, .ion-ios7-close-empty:before, .ion-ios7-close-outline:before, .ion-ios7-cloud:before, .ion-ios7-cloud-download:before, .ion-ios7-cloud-download-outline:before, .ion-ios7-cloud-outline:before, .ion-ios7-cloud-upload:before, .ion-ios7-cloud-upload-outline:before, .ion-ios7-cloudy:before, .ion-ios7-cloudy-night:before, .ion-ios7-cloudy-night-outline:before, .ion-ios7-cloudy-outline:before, .ion-ios7-cog:before, .ion-ios7-cog-outline:before, .ion-ios7-compose:before, .ion-ios7-compose-outline:before, .ion-ios7-contact:before, .ion-ios7-contact-outline:before, .ion-ios7-copy:before, .ion-ios7-copy-outline:before, .ion-ios7-download:before, .ion-ios7-download-outline:before, .ion-ios7-drag:before, .ion-ios7-email:before, .ion-ios7-email-outline:before, .ion-ios7-expand:before, .ion-ios7-eye:before, .ion-ios7-eye-outline:before, .ion-ios7-fastforward:before, .ion-ios7-fastforward-outline:before, .ion-ios7-filing:before, .ion-ios7-filing-outline:before, .ion-ios7-film:before, .ion-ios7-film-outline:before, .ion-ios7-flag:before, .ion-ios7-flag-outline:before, .ion-ios7-folder:before, .ion-ios7-folder-outline:before, .ion-ios7-football:before, .ion-ios7-football-outline:before, .ion-ios7-gear:before, .ion-ios7-gear-outline:before, .ion-ios7-glasses:before, .ion-ios7-glasses-outline:before, .ion-ios7-heart:before, .ion-ios7-heart-outline:before, .ion-ios7-help:before, .ion-ios7-help-empty:before, .ion-ios7-help-outline:before, .ion-ios7-home:before, .ion-ios7-home-outline:before, .ion-ios7-infinite:before, .ion-ios7-infinite-outline:before, .ion-ios7-information:before, .ion-ios7-information-empty:before, .ion-ios7-information-outline:before, .ion-ios7-ionic-outline:before, .ion-ios7-keypad:before, .ion-ios7-keypad-outline:before, .ion-ios7-lightbulb:before, .ion-ios7-lightbulb-outline:before, .ion-ios7-location:before, .ion-ios7-location-outline:before, .ion-ios7-locked:before, .ion-ios7-locked-outline:before, .ion-ios7-loop:before, .ion-ios7-loop-strong:before, .ion-ios7-medkit:before, .ion-ios7-medkit-outline:before, .ion-ios7-mic:before, .ion-ios7-mic-off:before, .ion-ios7-mic-outline:before, .ion-ios7-minus:before, .ion-ios7-minus-empty:before, .ion-ios7-minus-outline:before, .ion-ios7-monitor:before, .ion-ios7-monitor-outline:before, .ion-ios7-moon:before, .ion-ios7-moon-outline:before, .ion-ios7-more:before, .ion-ios7-more-outline:before, .ion-ios7-musical-note:before, .ion-ios7-musical-notes:before, .ion-ios7-navigate:before, .ion-ios7-navigate-outline:before, .ion-ios7-paper:before, .ion-ios7-paper-outline:before, .ion-ios7-paperplane:before, .ion-ios7-paperplane-outline:before, .ion-ios7-partlysunny:before, .ion-ios7-partlysunny-outline:before, .ion-ios7-pause:before, .ion-ios7-pause-outline:before, .ion-ios7-paw:before, .ion-ios7-paw-outline:before, .ion-ios7-people:before, .ion-ios7-people-outline:before, .ion-ios7-person:before, .ion-ios7-person-outline:before, .ion-ios7-personadd:before, .ion-ios7-personadd-outline:before, .ion-ios7-photos:before, .ion-ios7-photos-outline:before, .ion-ios7-pie:before, .ion-ios7-pie-outline:before, .ion-ios7-play:before, .ion-ios7-play-outline:before, .ion-ios7-plus:before, .ion-ios7-plus-empty:before, .ion-ios7-plus-outline:before, .ion-ios7-pricetag:before, .ion-ios7-pricetag-outline:before, .ion-ios7-pricetags:before, .ion-ios7-pricetags-outline:before, .ion-ios7-printer:before, .ion-ios7-printer-outline:before, .ion-ios7-pulse:before, .ion-ios7-pulse-strong:before, .ion-ios7-rainy:before, .ion-ios7-rainy-outline:before, .ion-ios7-recording:before, .ion-ios7-recording-outline:before, .ion-ios7-redo:before, .ion-ios7-redo-outline:before, .ion-ios7-refresh:before, .ion-ios7-refresh-empty:before, .ion-ios7-refresh-outline:before, .ion-ios7-reload:before, .ion-ios7-reloading:before, .ion-ios7-reverse-camera:before, .ion-ios7-reverse-camera-outline:before, .ion-ios7-rewind:before, .ion-ios7-rewind-outline:before, .ion-ios7-search:before, .ion-ios7-search-strong:before, .ion-ios7-settings:before, .ion-ios7-settings-strong:before, .ion-ios7-shrink:before, .ion-ios7-skipbackward:before, .ion-ios7-skipbackward-outline:before, .ion-ios7-skipforward:before, .ion-ios7-skipforward-outline:before, .ion-ios7-snowy:before, .ion-ios7-speedometer:before, .ion-ios7-speedometer-outline:before, .ion-ios7-star:before, .ion-ios7-star-half:before, .ion-ios7-star-outline:before, .ion-ios7-stopwatch:before, .ion-ios7-stopwatch-outline:before, .ion-ios7-sunny:before, .ion-ios7-sunny-outline:before, .ion-ios7-telephone:before, .ion-ios7-telephone-outline:before, .ion-ios7-tennisball:before, .ion-ios7-tennisball-outline:before, .ion-ios7-thunderstorm:before, .ion-ios7-thunderstorm-outline:before, .ion-ios7-time:before, .ion-ios7-time-outline:before, .ion-ios7-timer:before, .ion-ios7-timer-outline:before, .ion-ios7-toggle:before, .ion-ios7-toggle-outline:before, .ion-ios7-trash:before, .ion-ios7-trash-outline:before, .ion-ios7-undo:before, .ion-ios7-undo-outline:before, .ion-ios7-unlocked:before, .ion-ios7-unlocked-outline:before, .ion-ios7-upload:before, .ion-ios7-upload-outline:before, .ion-ios7-videocam:before, .ion-ios7-videocam-outline:before, .ion-ios7-volume-high:before, .ion-ios7-volume-low:before, .ion-ios7-wineglass:before, .ion-ios7-wineglass-outline:before, .ion-ios7-world:before, .ion-ios7-world-outline:before, .ion-ipad:before, .ion-iphone:before, .ion-ipod:before, .ion-jet:before, .ion-key:before, .ion-knife:before, .ion-laptop:before, .ion-leaf:before, .ion-levels:before, .ion-lightbulb:before, .ion-link:before, .ion-load-a:before, .ion-loading-a:before, .ion-load-b:before, .ion-loading-b:before, .ion-load-c:before, .ion-loading-c:before, .ion-load-d:before, .ion-loading-d:before, .ion-location:before, .ion-locked:before, .ion-log-in:before, .ion-log-out:before, .ion-loop:before, .ion-looping:before, .ion-magnet:before, .ion-male:before, .ion-man:before, .ion-map:before, .ion-medkit:before, .ion-merge:before, .ion-mic-a:before, .ion-mic-b:before, .ion-mic-c:before, .ion-minus:before, .ion-minus-circled:before, .ion-minus-round:before, .ion-model-s:before, .ion-monitor:before, .ion-more:before, .ion-mouse:before, .ion-music-note:before, .ion-navicon:before, .ion-navicon-round:before, .ion-navigate:before, .ion-network:before, .ion-no-smoking:before, .ion-nuclear:before, .ion-outlet:before, .ion-paper-airplane:before, .ion-paperclip:before, .ion-pause:before, .ion-person:before, .ion-person-add:before, .ion-person-stalker:before, .ion-pie-graph:before, .ion-pin:before, .ion-pinpoint:before, .ion-pizza:before, .ion-plane:before, .ion-planet:before, .ion-play:before, .ion-playstation:before, .ion-plus:before, .ion-plus-circled:before, .ion-plus-round:before, .ion-podium:before, .ion-pound:before, .ion-power:before, .ion-pricetag:before, .ion-pricetags:before, .ion-printer:before, .ion-pull-request:before, .ion-qr-scanner:before, .ion-quote:before, .ion-radio-waves:before, .ion-record:before, .ion-refresh:before, .ion-refreshing:before, .ion-reply:before, .ion-reply-all:before, .ion-ribbon-a:before, .ion-ribbon-b:before, .ion-sad:before, .ion-scissors:before, .ion-search:before, .ion-settings:before, .ion-share:before, .ion-shuffle:before, .ion-skip-backward:before, .ion-skip-forward:before, .ion-social-android:before, .ion-social-android-outline:before, .ion-social-apple:before, .ion-social-apple-outline:before, .ion-social-bitcoin:before, .ion-social-bitcoin-outline:before, .ion-social-buffer:before, .ion-social-buffer-outline:before, .ion-social-designernews:before, .ion-social-designernews-outline:before, .ion-social-dribbble:before, .ion-social-dribbble-outline:before, .ion-social-dropbox:before, .ion-social-dropbox-outline:before, .ion-social-facebook:before, .ion-social-facebook-outline:before, .ion-social-foursquare:before, .ion-social-foursquare-outline:before, .ion-social-freebsd-devil:before, .ion-social-github:before, .ion-social-github-outline:before, .ion-social-google:before, .ion-social-google-outline:before, .ion-social-googleplus:before, .ion-social-googleplus-outline:before, .ion-social-hackernews:before, .ion-social-hackernews-outline:before, .ion-social-instagram:before, .ion-social-instagram-outline:before, .ion-social-linkedin:before, .ion-social-linkedin-outline:before, .ion-social-pinterest:before, .ion-social-pinterest-outline:before, .ion-social-reddit:before, .ion-social-reddit-outline:before, .ion-social-rss:before, .ion-social-rss-outline:before, .ion-social-skype:before, .ion-social-skype-outline:before, .ion-social-tumblr:before, .ion-social-tumblr-outline:before, .ion-social-tux:before, .ion-social-twitter:before, .ion-social-twitter-outline:before, .ion-social-usd:before, .ion-social-usd-outline:before, .ion-social-vimeo:before, .ion-social-vimeo-outline:before, .ion-social-windows:before, .ion-social-windows-outline:before, .ion-social-wordpress:before, .ion-social-wordpress-outline:before, .ion-social-yahoo:before, .ion-social-yahoo-outline:before, .ion-social-youtube:before, .ion-social-youtube-outline:before, .ion-speakerphone:before, .ion-speedometer:before, .ion-spoon:before, .ion-star:before, .ion-stats-bars:before, .ion-steam:before, .ion-stop:before, .ion-thermometer:before, .ion-thumbsdown:before, .ion-thumbsup:before, .ion-toggle:before, .ion-toggle-filled:before, .ion-trash-a:before, .ion-trash-b:before, .ion-trophy:before, .ion-umbrella:before, .ion-university:before, .ion-unlocked:before, .ion-upload:before, .ion-usb:before, .ion-videocamera:before, .ion-volume-high:before, .ion-volume-low:before, .ion-volume-medium:before, .ion-volume-mute:before, .ion-wand:before, .ion-waterdrop:before, .ion-wifi:before, .ion-wineglass:before, .ion-woman:before, .ion-wrench:before, .ion-xbox:before { display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - -.ion-spin, .ion-loading-a, .ion-loading-b, .ion-loading-c, .ion-loading-d, .ion-looping, .ion-refreshing, .ion-ios7-reloading { -webkit-animation: spin 1s infinite linear; -moz-animation: spin 1s infinite linear; -o-animation: spin 1s infinite linear; animation: spin 1s infinite linear; } - -@-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } } -@-webkit-keyframes spin { 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } } -@-o-keyframes spin { 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } } -@-ms-keyframes spin { 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } } -@keyframes spin { 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } } -.ion-loading-a { -webkit-animation-timing-function: steps(8, start); -moz-animation-timing-function: steps(8, start); animation-timing-function: steps(8, start); } +@font-face { font-family: "Ionicons"; src: url("../fonts/ionicons.eot?v=2.0.0"); src: url("../fonts/ionicons.eot?v=2.0.0#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=2.0.0") format("truetype"), url("../fonts/ionicons.woff?v=2.0.0") format("woff"), url("../fonts/ionicons.svg?v=2.0.0#Ionicons") format("svg"); font-weight: normal; font-style: normal; } +.ion, .ionicons, .ion-alert:before, .ion-alert-circled:before, .ion-android-add:before, .ion-android-add-circle:before, .ion-android-alarm-clock:before, .ion-android-alert:before, .ion-android-apps:before, .ion-android-archive:before, .ion-android-arrow-back:before, .ion-android-arrow-down:before, .ion-android-arrow-dropdown:before, .ion-android-arrow-dropdown-circle:before, .ion-android-arrow-dropleft:before, .ion-android-arrow-dropleft-circle:before, .ion-android-arrow-dropright:before, .ion-android-arrow-dropright-circle:before, .ion-android-arrow-dropup:before, .ion-android-arrow-dropup-circle:before, .ion-android-arrow-forward:before, .ion-android-arrow-up:before, .ion-android-attach:before, .ion-android-bar:before, .ion-android-bicycle:before, .ion-android-boat:before, .ion-android-bookmark:before, .ion-android-bulb:before, .ion-android-bus:before, .ion-android-calendar:before, .ion-android-call:before, .ion-android-camera:before, .ion-android-cancel:before, .ion-android-car:before, .ion-android-cart:before, .ion-android-chat:before, .ion-android-checkbox:before, .ion-android-checkbox-blank:before, .ion-android-checkbox-outline:before, .ion-android-checkbox-outline-blank:before, .ion-android-checkmark-circle:before, .ion-android-clipboard:before, .ion-android-close:before, .ion-android-cloud:before, .ion-android-cloud-circle:before, .ion-android-cloud-done:before, .ion-android-cloud-outline:before, .ion-android-color-palette:before, .ion-android-compass:before, .ion-android-contact:before, .ion-android-contacts:before, .ion-android-contract:before, .ion-android-create:before, .ion-android-delete:before, .ion-android-desktop:before, .ion-android-document:before, .ion-android-done:before, .ion-android-done-all:before, .ion-android-download:before, .ion-android-drafts:before, .ion-android-exit:before, .ion-android-expand:before, .ion-android-favorite:before, .ion-android-favorite-outline:before, .ion-android-film:before, .ion-android-folder:before, .ion-android-folder-open:before, .ion-android-funnel:before, .ion-android-globe:before, .ion-android-hand:before, .ion-android-hangout:before, .ion-android-happy:before, .ion-android-home:before, .ion-android-image:before, .ion-android-laptop:before, .ion-android-list:before, .ion-android-locate:before, .ion-android-lock:before, .ion-android-mail:before, .ion-android-map:before, .ion-android-menu:before, .ion-android-microphone:before, .ion-android-microphone-off:before, .ion-android-more-horizontal:before, .ion-android-more-vertical:before, .ion-android-navigate:before, .ion-android-notifications:before, .ion-android-notifications-none:before, .ion-android-notifications-off:before, .ion-android-open:before, .ion-android-options:before, .ion-android-people:before, .ion-android-person:before, .ion-android-person-add:before, .ion-android-phone-landscape:before, .ion-android-phone-portrait:before, .ion-android-pin:before, .ion-android-plane:before, .ion-android-playstore:before, .ion-android-print:before, .ion-android-radio-button-off:before, .ion-android-radio-button-on:before, .ion-android-refresh:before, .ion-android-remove:before, .ion-android-remove-circle:before, .ion-android-restaurant:before, .ion-android-sad:before, .ion-android-search:before, .ion-android-send:before, .ion-android-settings:before, .ion-android-share:before, .ion-android-share-alt:before, .ion-android-star:before, .ion-android-star-half:before, .ion-android-star-outline:before, .ion-android-stopwatch:before, .ion-android-subway:before, .ion-android-sunny:before, .ion-android-sync:before, .ion-android-textsms:before, .ion-android-time:before, .ion-android-train:before, .ion-android-unlock:before, .ion-android-upload:before, .ion-android-volume-down:before, .ion-android-volume-mute:before, .ion-android-volume-off:before, .ion-android-volume-up:before, .ion-android-walk:before, .ion-android-warning:before, .ion-android-watch:before, .ion-android-wifi:before, .ion-aperture:before, .ion-archive:before, .ion-arrow-down-a:before, .ion-arrow-down-b:before, .ion-arrow-down-c:before, .ion-arrow-expand:before, .ion-arrow-graph-down-left:before, .ion-arrow-graph-down-right:before, .ion-arrow-graph-up-left:before, .ion-arrow-graph-up-right:before, .ion-arrow-left-a:before, .ion-arrow-left-b:before, .ion-arrow-left-c:before, .ion-arrow-move:before, .ion-arrow-resize:before, .ion-arrow-return-left:before, .ion-arrow-return-right:before, .ion-arrow-right-a:before, .ion-arrow-right-b:before, .ion-arrow-right-c:before, .ion-arrow-shrink:before, .ion-arrow-swap:before, .ion-arrow-up-a:before, .ion-arrow-up-b:before, .ion-arrow-up-c:before, .ion-asterisk:before, .ion-at:before, .ion-backspace:before, .ion-backspace-outline:before, .ion-bag:before, .ion-battery-charging:before, .ion-battery-empty:before, .ion-battery-full:before, .ion-battery-half:before, .ion-battery-low:before, .ion-beaker:before, .ion-beer:before, .ion-bluetooth:before, .ion-bonfire:before, .ion-bookmark:before, .ion-bowtie:before, .ion-briefcase:before, .ion-bug:before, .ion-calculator:before, .ion-calendar:before, .ion-camera:before, .ion-card:before, .ion-cash:before, .ion-chatbox:before, .ion-chatbox-working:before, .ion-chatboxes:before, .ion-chatbubble:before, .ion-chatbubble-working:before, .ion-chatbubbles:before, .ion-checkmark:before, .ion-checkmark-circled:before, .ion-checkmark-round:before, .ion-chevron-down:before, .ion-chevron-left:before, .ion-chevron-right:before, .ion-chevron-up:before, .ion-clipboard:before, .ion-clock:before, .ion-close:before, .ion-close-circled:before, .ion-close-round:before, .ion-closed-captioning:before, .ion-cloud:before, .ion-code:before, .ion-code-download:before, .ion-code-working:before, .ion-coffee:before, .ion-compass:before, .ion-compose:before, .ion-connection-bars:before, .ion-contrast:before, .ion-crop:before, .ion-cube:before, .ion-disc:before, .ion-document:before, .ion-document-text:before, .ion-drag:before, .ion-earth:before, .ion-easel:before, .ion-edit:before, .ion-egg:before, .ion-eject:before, .ion-email:before, .ion-email-unread:before, .ion-erlenmeyer-flask:before, .ion-erlenmeyer-flask-bubbles:before, .ion-eye:before, .ion-eye-disabled:before, .ion-female:before, .ion-filing:before, .ion-film-marker:before, .ion-fireball:before, .ion-flag:before, .ion-flame:before, .ion-flash:before, .ion-flash-off:before, .ion-folder:before, .ion-fork:before, .ion-fork-repo:before, .ion-forward:before, .ion-funnel:before, .ion-gear-a:before, .ion-gear-b:before, .ion-grid:before, .ion-hammer:before, .ion-happy:before, .ion-happy-outline:before, .ion-headphone:before, .ion-heart:before, .ion-heart-broken:before, .ion-help:before, .ion-help-buoy:before, .ion-help-circled:before, .ion-home:before, .ion-icecream:before, .ion-image:before, .ion-images:before, .ion-information:before, .ion-information-circled:before, .ion-ionic:before, .ion-ios-alarm:before, .ion-ios-alarm-outline:before, .ion-ios-albums:before, .ion-ios-albums-outline:before, .ion-ios-americanfootball:before, .ion-ios-americanfootball-outline:before, .ion-ios-analytics:before, .ion-ios-analytics-outline:before, .ion-ios-arrow-back:before, .ion-ios-arrow-down:before, .ion-ios-arrow-forward:before, .ion-ios-arrow-left:before, .ion-ios-arrow-right:before, .ion-ios-arrow-thin-down:before, .ion-ios-arrow-thin-left:before, .ion-ios-arrow-thin-right:before, .ion-ios-arrow-thin-up:before, .ion-ios-arrow-up:before, .ion-ios-at:before, .ion-ios-at-outline:before, .ion-ios-barcode:before, .ion-ios-barcode-outline:before, .ion-ios-baseball:before, .ion-ios-baseball-outline:before, .ion-ios-basketball:before, .ion-ios-basketball-outline:before, .ion-ios-bell:before, .ion-ios-bell-outline:before, .ion-ios-body:before, .ion-ios-body-outline:before, .ion-ios-bolt:before, .ion-ios-bolt-outline:before, .ion-ios-book:before, .ion-ios-book-outline:before, .ion-ios-bookmarks:before, .ion-ios-bookmarks-outline:before, .ion-ios-box:before, .ion-ios-box-outline:before, .ion-ios-briefcase:before, .ion-ios-briefcase-outline:before, .ion-ios-browsers:before, .ion-ios-browsers-outline:before, .ion-ios-calculator:before, .ion-ios-calculator-outline:before, .ion-ios-calendar:before, .ion-ios-calendar-outline:before, .ion-ios-camera:before, .ion-ios-camera-outline:before, .ion-ios-cart:before, .ion-ios-cart-outline:before, .ion-ios-chatboxes:before, .ion-ios-chatboxes-outline:before, .ion-ios-chatbubble:before, .ion-ios-chatbubble-outline:before, .ion-ios-checkmark:before, .ion-ios-checkmark-empty:before, .ion-ios-checkmark-outline:before, .ion-ios-circle-filled:before, .ion-ios-circle-outline:before, .ion-ios-clock:before, .ion-ios-clock-outline:before, .ion-ios-close:before, .ion-ios-close-empty:before, .ion-ios-close-outline:before, .ion-ios-cloud:before, .ion-ios-cloud-download:before, .ion-ios-cloud-download-outline:before, .ion-ios-cloud-outline:before, .ion-ios-cloud-upload:before, .ion-ios-cloud-upload-outline:before, .ion-ios-cloudy:before, .ion-ios-cloudy-night:before, .ion-ios-cloudy-night-outline:before, .ion-ios-cloudy-outline:before, .ion-ios-cog:before, .ion-ios-cog-outline:before, .ion-ios-color-filter:before, .ion-ios-color-filter-outline:before, .ion-ios-color-wand:before, .ion-ios-color-wand-outline:before, .ion-ios-compose:before, .ion-ios-compose-outline:before, .ion-ios-contact:before, .ion-ios-contact-outline:before, .ion-ios-copy:before, .ion-ios-copy-outline:before, .ion-ios-crop:before, .ion-ios-crop-strong:before, .ion-ios-download:before, .ion-ios-download-outline:before, .ion-ios-drag:before, .ion-ios-email:before, .ion-ios-email-outline:before, .ion-ios-eye:before, .ion-ios-eye-outline:before, .ion-ios-fastforward:before, .ion-ios-fastforward-outline:before, .ion-ios-filing:before, .ion-ios-filing-outline:before, .ion-ios-film:before, .ion-ios-film-outline:before, .ion-ios-flag:before, .ion-ios-flag-outline:before, .ion-ios-flame:before, .ion-ios-flame-outline:before, .ion-ios-flask:before, .ion-ios-flask-outline:before, .ion-ios-flower:before, .ion-ios-flower-outline:before, .ion-ios-folder:before, .ion-ios-folder-outline:before, .ion-ios-football:before, .ion-ios-football-outline:before, .ion-ios-game-controller-a:before, .ion-ios-game-controller-a-outline:before, .ion-ios-game-controller-b:before, .ion-ios-game-controller-b-outline:before, .ion-ios-gear:before, .ion-ios-gear-outline:before, .ion-ios-glasses:before, .ion-ios-glasses-outline:before, .ion-ios-grid-view:before, .ion-ios-grid-view-outline:before, .ion-ios-heart:before, .ion-ios-heart-outline:before, .ion-ios-help:before, .ion-ios-help-empty:before, .ion-ios-help-outline:before, .ion-ios-home:before, .ion-ios-home-outline:before, .ion-ios-infinite:before, .ion-ios-infinite-outline:before, .ion-ios-information:before, .ion-ios-information-empty:before, .ion-ios-information-outline:before, .ion-ios-ionic-outline:before, .ion-ios-keypad:before, .ion-ios-keypad-outline:before, .ion-ios-lightbulb:before, .ion-ios-lightbulb-outline:before, .ion-ios-list:before, .ion-ios-list-outline:before, .ion-ios-location:before, .ion-ios-location-outline:before, .ion-ios-locked:before, .ion-ios-locked-outline:before, .ion-ios-loop:before, .ion-ios-loop-strong:before, .ion-ios-medical:before, .ion-ios-medical-outline:before, .ion-ios-medkit:before, .ion-ios-medkit-outline:before, .ion-ios-mic:before, .ion-ios-mic-off:before, .ion-ios-mic-outline:before, .ion-ios-minus:before, .ion-ios-minus-empty:before, .ion-ios-minus-outline:before, .ion-ios-monitor:before, .ion-ios-monitor-outline:before, .ion-ios-moon:before, .ion-ios-moon-outline:before, .ion-ios-more:before, .ion-ios-more-outline:before, .ion-ios-musical-note:before, .ion-ios-musical-notes:before, .ion-ios-navigate:before, .ion-ios-navigate-outline:before, .ion-ios-nutrition:before, .ion-ios-nutrition-outline:before, .ion-ios-paper:before, .ion-ios-paper-outline:before, .ion-ios-paperplane:before, .ion-ios-paperplane-outline:before, .ion-ios-partlysunny:before, .ion-ios-partlysunny-outline:before, .ion-ios-pause:before, .ion-ios-pause-outline:before, .ion-ios-paw:before, .ion-ios-paw-outline:before, .ion-ios-people:before, .ion-ios-people-outline:before, .ion-ios-person:before, .ion-ios-person-outline:before, .ion-ios-personadd:before, .ion-ios-personadd-outline:before, .ion-ios-photos:before, .ion-ios-photos-outline:before, .ion-ios-pie:before, .ion-ios-pie-outline:before, .ion-ios-pint:before, .ion-ios-pint-outline:before, .ion-ios-play:before, .ion-ios-play-outline:before, .ion-ios-plus:before, .ion-ios-plus-empty:before, .ion-ios-plus-outline:before, .ion-ios-pricetag:before, .ion-ios-pricetag-outline:before, .ion-ios-pricetags:before, .ion-ios-pricetags-outline:before, .ion-ios-printer:before, .ion-ios-printer-outline:before, .ion-ios-pulse:before, .ion-ios-pulse-strong:before, .ion-ios-rainy:before, .ion-ios-rainy-outline:before, .ion-ios-recording:before, .ion-ios-recording-outline:before, .ion-ios-redo:before, .ion-ios-redo-outline:before, .ion-ios-refresh:before, .ion-ios-refresh-empty:before, .ion-ios-refresh-outline:before, .ion-ios-reload:before, .ion-ios-reverse-camera:before, .ion-ios-reverse-camera-outline:before, .ion-ios-rewind:before, .ion-ios-rewind-outline:before, .ion-ios-rose:before, .ion-ios-rose-outline:before, .ion-ios-search:before, .ion-ios-search-strong:before, .ion-ios-settings:before, .ion-ios-settings-strong:before, .ion-ios-shuffle:before, .ion-ios-shuffle-strong:before, .ion-ios-skipbackward:before, .ion-ios-skipbackward-outline:before, .ion-ios-skipforward:before, .ion-ios-skipforward-outline:before, .ion-ios-snowy:before, .ion-ios-speedometer:before, .ion-ios-speedometer-outline:before, .ion-ios-star:before, .ion-ios-star-half:before, .ion-ios-star-outline:before, .ion-ios-stopwatch:before, .ion-ios-stopwatch-outline:before, .ion-ios-sunny:before, .ion-ios-sunny-outline:before, .ion-ios-telephone:before, .ion-ios-telephone-outline:before, .ion-ios-tennisball:before, .ion-ios-tennisball-outline:before, .ion-ios-thunderstorm:before, .ion-ios-thunderstorm-outline:before, .ion-ios-time:before, .ion-ios-time-outline:before, .ion-ios-timer:before, .ion-ios-timer-outline:before, .ion-ios-toggle:before, .ion-ios-toggle-outline:before, .ion-ios-trash:before, .ion-ios-trash-outline:before, .ion-ios-undo:before, .ion-ios-undo-outline:before, .ion-ios-unlocked:before, .ion-ios-unlocked-outline:before, .ion-ios-upload:before, .ion-ios-upload-outline:before, .ion-ios-videocam:before, .ion-ios-videocam-outline:before, .ion-ios-volume-high:before, .ion-ios-volume-low:before, .ion-ios-wineglass:before, .ion-ios-wineglass-outline:before, .ion-ios-world:before, .ion-ios-world-outline:before, .ion-ipad:before, .ion-iphone:before, .ion-ipod:before, .ion-jet:before, .ion-key:before, .ion-knife:before, .ion-laptop:before, .ion-leaf:before, .ion-levels:before, .ion-lightbulb:before, .ion-link:before, .ion-load-a:before, .ion-load-b:before, .ion-load-c:before, .ion-load-d:before, .ion-location:before, .ion-lock-combination:before, .ion-locked:before, .ion-log-in:before, .ion-log-out:before, .ion-loop:before, .ion-magnet:before, .ion-male:before, .ion-man:before, .ion-map:before, .ion-medkit:before, .ion-merge:before, .ion-mic-a:before, .ion-mic-b:before, .ion-mic-c:before, .ion-minus:before, .ion-minus-circled:before, .ion-minus-round:before, .ion-model-s:before, .ion-monitor:before, .ion-more:before, .ion-mouse:before, .ion-music-note:before, .ion-navicon:before, .ion-navicon-round:before, .ion-navigate:before, .ion-network:before, .ion-no-smoking:before, .ion-nuclear:before, .ion-outlet:before, .ion-paintbrush:before, .ion-paintbucket:before, .ion-paper-airplane:before, .ion-paperclip:before, .ion-pause:before, .ion-person:before, .ion-person-add:before, .ion-person-stalker:before, .ion-pie-graph:before, .ion-pin:before, .ion-pinpoint:before, .ion-pizza:before, .ion-plane:before, .ion-planet:before, .ion-play:before, .ion-playstation:before, .ion-plus:before, .ion-plus-circled:before, .ion-plus-round:before, .ion-podium:before, .ion-pound:before, .ion-power:before, .ion-pricetag:before, .ion-pricetags:before, .ion-printer:before, .ion-pull-request:before, .ion-qr-scanner:before, .ion-quote:before, .ion-radio-waves:before, .ion-record:before, .ion-refresh:before, .ion-reply:before, .ion-reply-all:before, .ion-ribbon-a:before, .ion-ribbon-b:before, .ion-sad:before, .ion-sad-outline:before, .ion-scissors:before, .ion-search:before, .ion-settings:before, .ion-share:before, .ion-shuffle:before, .ion-skip-backward:before, .ion-skip-forward:before, .ion-social-android:before, .ion-social-android-outline:before, .ion-social-angular:before, .ion-social-angular-outline:before, .ion-social-apple:before, .ion-social-apple-outline:before, .ion-social-bitcoin:before, .ion-social-bitcoin-outline:before, .ion-social-buffer:before, .ion-social-buffer-outline:before, .ion-social-chrome:before, .ion-social-chrome-outline:before, .ion-social-codepen:before, .ion-social-codepen-outline:before, .ion-social-css3:before, .ion-social-css3-outline:before, .ion-social-designernews:before, .ion-social-designernews-outline:before, .ion-social-dribbble:before, .ion-social-dribbble-outline:before, .ion-social-dropbox:before, .ion-social-dropbox-outline:before, .ion-social-euro:before, .ion-social-euro-outline:before, .ion-social-facebook:before, .ion-social-facebook-outline:before, .ion-social-foursquare:before, .ion-social-foursquare-outline:before, .ion-social-freebsd-devil:before, .ion-social-github:before, .ion-social-github-outline:before, .ion-social-google:before, .ion-social-google-outline:before, .ion-social-googleplus:before, .ion-social-googleplus-outline:before, .ion-social-hackernews:before, .ion-social-hackernews-outline:before, .ion-social-html5:before, .ion-social-html5-outline:before, .ion-social-instagram:before, .ion-social-instagram-outline:before, .ion-social-javascript:before, .ion-social-javascript-outline:before, .ion-social-linkedin:before, .ion-social-linkedin-outline:before, .ion-social-markdown:before, .ion-social-nodejs:before, .ion-social-octocat:before, .ion-social-pinterest:before, .ion-social-pinterest-outline:before, .ion-social-python:before, .ion-social-reddit:before, .ion-social-reddit-outline:before, .ion-social-rss:before, .ion-social-rss-outline:before, .ion-social-sass:before, .ion-social-skype:before, .ion-social-skype-outline:before, .ion-social-snapchat:before, .ion-social-snapchat-outline:before, .ion-social-tumblr:before, .ion-social-tumblr-outline:before, .ion-social-tux:before, .ion-social-twitch:before, .ion-social-twitch-outline:before, .ion-social-twitter:before, .ion-social-twitter-outline:before, .ion-social-usd:before, .ion-social-usd-outline:before, .ion-social-vimeo:before, .ion-social-vimeo-outline:before, .ion-social-whatsapp:before, .ion-social-whatsapp-outline:before, .ion-social-windows:before, .ion-social-windows-outline:before, .ion-social-wordpress:before, .ion-social-wordpress-outline:before, .ion-social-yahoo:before, .ion-social-yahoo-outline:before, .ion-social-yen:before, .ion-social-yen-outline:before, .ion-social-youtube:before, .ion-social-youtube-outline:before, .ion-soup-can:before, .ion-soup-can-outline:before, .ion-speakerphone:before, .ion-speedometer:before, .ion-spoon:before, .ion-star:before, .ion-stats-bars:before, .ion-steam:before, .ion-stop:before, .ion-thermometer:before, .ion-thumbsdown:before, .ion-thumbsup:before, .ion-toggle:before, .ion-toggle-filled:before, .ion-transgender:before, .ion-trash-a:before, .ion-trash-b:before, .ion-trophy:before, .ion-tshirt:before, .ion-tshirt-outline:before, .ion-umbrella:before, .ion-university:before, .ion-unlocked:before, .ion-upload:before, .ion-usb:before, .ion-videocamera:before, .ion-volume-high:before, .ion-volume-low:before, .ion-volume-medium:before, .ion-volume-mute:before, .ion-wand:before, .ion-waterdrop:before, .ion-wifi:before, .ion-wineglass:before, .ion-woman:before, .ion-wrench:before, .ion-xbox:before { display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } .ion-alert:before { content: "\f101"; } @@ -27,27 +19,53 @@ .ion-android-add:before { content: "\f2c7"; } -.ion-android-add-contact:before { content: "\f2c6"; } +.ion-android-add-circle:before { content: "\f359"; } + +.ion-android-alarm-clock:before { content: "\f35a"; } + +.ion-android-alert:before { content: "\f35b"; } -.ion-android-alarm:before { content: "\f2c8"; } +.ion-android-apps:before { content: "\f35c"; } .ion-android-archive:before { content: "\f2c9"; } .ion-android-arrow-back:before { content: "\f2ca"; } -.ion-android-arrow-down-left:before { content: "\f2cb"; } +.ion-android-arrow-down:before { content: "\f35d"; } + +.ion-android-arrow-dropdown:before { content: "\f35f"; } + +.ion-android-arrow-dropdown-circle:before { content: "\f35e"; } + +.ion-android-arrow-dropleft:before { content: "\f361"; } + +.ion-android-arrow-dropleft-circle:before { content: "\f360"; } + +.ion-android-arrow-dropright:before { content: "\f363"; } + +.ion-android-arrow-dropright-circle:before { content: "\f362"; } + +.ion-android-arrow-dropup:before { content: "\f365"; } -.ion-android-arrow-down-right:before { content: "\f2cc"; } +.ion-android-arrow-dropup-circle:before { content: "\f364"; } .ion-android-arrow-forward:before { content: "\f30f"; } -.ion-android-arrow-up-left:before { content: "\f2cd"; } +.ion-android-arrow-up:before { content: "\f366"; } -.ion-android-arrow-up-right:before { content: "\f2ce"; } +.ion-android-attach:before { content: "\f367"; } -.ion-android-battery:before { content: "\f2cf"; } +.ion-android-bar:before { content: "\f368"; } -.ion-android-book:before { content: "\f2d0"; } +.ion-android-bicycle:before { content: "\f369"; } + +.ion-android-boat:before { content: "\f36a"; } + +.ion-android-bookmark:before { content: "\f36b"; } + +.ion-android-bulb:before { content: "\f36c"; } + +.ion-android-bus:before { content: "\f36d"; } .ion-android-calendar:before { content: "\f2d1"; } @@ -55,74 +73,156 @@ .ion-android-camera:before { content: "\f2d3"; } +.ion-android-cancel:before { content: "\f36e"; } + +.ion-android-car:before { content: "\f36f"; } + +.ion-android-cart:before { content: "\f370"; } + .ion-android-chat:before { content: "\f2d4"; } -.ion-android-checkmark:before { content: "\f2d5"; } +.ion-android-checkbox:before { content: "\f374"; } + +.ion-android-checkbox-blank:before { content: "\f371"; } + +.ion-android-checkbox-outline:before { content: "\f373"; } -.ion-android-clock:before { content: "\f2d6"; } +.ion-android-checkbox-outline-blank:before { content: "\f372"; } + +.ion-android-checkmark-circle:before { content: "\f375"; } + +.ion-android-clipboard:before { content: "\f376"; } .ion-android-close:before { content: "\f2d7"; } +.ion-android-cloud:before { content: "\f37a"; } + +.ion-android-cloud-circle:before { content: "\f377"; } + +.ion-android-cloud-done:before { content: "\f378"; } + +.ion-android-cloud-outline:before { content: "\f379"; } + +.ion-android-color-palette:before { content: "\f37b"; } + +.ion-android-compass:before { content: "\f37c"; } + .ion-android-contact:before { content: "\f2d8"; } .ion-android-contacts:before { content: "\f2d9"; } -.ion-android-data:before { content: "\f2da"; } +.ion-android-contract:before { content: "\f37d"; } + +.ion-android-create:before { content: "\f37e"; } + +.ion-android-delete:before { content: "\f37f"; } -.ion-android-developer:before { content: "\f2db"; } +.ion-android-desktop:before { content: "\f380"; } -.ion-android-display:before { content: "\f2dc"; } +.ion-android-document:before { content: "\f381"; } + +.ion-android-done:before { content: "\f383"; } + +.ion-android-done-all:before { content: "\f382"; } .ion-android-download:before { content: "\f2dd"; } -.ion-android-drawer:before { content: "\f310"; } +.ion-android-drafts:before { content: "\f384"; } + +.ion-android-exit:before { content: "\f385"; } + +.ion-android-expand:before { content: "\f386"; } + +.ion-android-favorite:before { content: "\f388"; } -.ion-android-dropdown:before { content: "\f2de"; } +.ion-android-favorite-outline:before { content: "\f387"; } -.ion-android-earth:before { content: "\f2df"; } +.ion-android-film:before { content: "\f389"; } .ion-android-folder:before { content: "\f2e0"; } -.ion-android-forums:before { content: "\f2e1"; } +.ion-android-folder-open:before { content: "\f38a"; } -.ion-android-friends:before { content: "\f2e2"; } +.ion-android-funnel:before { content: "\f38b"; } + +.ion-android-globe:before { content: "\f38c"; } .ion-android-hand:before { content: "\f2e3"; } -.ion-android-image:before { content: "\f2e4"; } +.ion-android-hangout:before { content: "\f38d"; } -.ion-android-inbox:before { content: "\f2e5"; } +.ion-android-happy:before { content: "\f38e"; } -.ion-android-information:before { content: "\f2e6"; } +.ion-android-home:before { content: "\f38f"; } + +.ion-android-image:before { content: "\f2e4"; } -.ion-android-keypad:before { content: "\f2e7"; } +.ion-android-laptop:before { content: "\f390"; } -.ion-android-lightbulb:before { content: "\f2e8"; } +.ion-android-list:before { content: "\f391"; } .ion-android-locate:before { content: "\f2e9"; } -.ion-android-location:before { content: "\f2ea"; } +.ion-android-lock:before { content: "\f392"; } .ion-android-mail:before { content: "\f2eb"; } +.ion-android-map:before { content: "\f393"; } + +.ion-android-menu:before { content: "\f394"; } + .ion-android-microphone:before { content: "\f2ec"; } -.ion-android-mixer:before { content: "\f2ed"; } +.ion-android-microphone-off:before { content: "\f395"; } + +.ion-android-more-horizontal:before { content: "\f396"; } + +.ion-android-more-vertical:before { content: "\f397"; } + +.ion-android-navigate:before { content: "\f398"; } + +.ion-android-notifications:before { content: "\f39b"; } + +.ion-android-notifications-none:before { content: "\f399"; } + +.ion-android-notifications-off:before { content: "\f39a"; } + +.ion-android-open:before { content: "\f39c"; } + +.ion-android-options:before { content: "\f39d"; } -.ion-android-more:before { content: "\f2ee"; } +.ion-android-people:before { content: "\f39e"; } -.ion-android-note:before { content: "\f2ef"; } +.ion-android-person:before { content: "\f3a0"; } + +.ion-android-person-add:before { content: "\f39f"; } + +.ion-android-phone-landscape:before { content: "\f3a1"; } + +.ion-android-phone-portrait:before { content: "\f3a2"; } + +.ion-android-pin:before { content: "\f3a3"; } + +.ion-android-plane:before { content: "\f3a4"; } .ion-android-playstore:before { content: "\f2f0"; } -.ion-android-printer:before { content: "\f2f1"; } +.ion-android-print:before { content: "\f3a5"; } -.ion-android-promotion:before { content: "\f2f2"; } +.ion-android-radio-button-off:before { content: "\f3a6"; } -.ion-android-reminder:before { content: "\f2f3"; } +.ion-android-radio-button-on:before { content: "\f3a7"; } + +.ion-android-refresh:before { content: "\f3a8"; } .ion-android-remove:before { content: "\f2f4"; } +.ion-android-remove-circle:before { content: "\f3a9"; } + +.ion-android-restaurant:before { content: "\f3aa"; } + +.ion-android-sad:before { content: "\f3ab"; } + .ion-android-search:before { content: "\f2f5"; } .ion-android-send:before { content: "\f2f6"; } @@ -131,33 +231,45 @@ .ion-android-share:before { content: "\f2f8"; } -.ion-android-social:before { content: "\f2fa"; } +.ion-android-share-alt:before { content: "\f3ac"; } -.ion-android-social-user:before { content: "\f2f9"; } - -.ion-android-sort:before { content: "\f2fb"; } +.ion-android-star:before { content: "\f2fc"; } -.ion-android-stair-drawer:before { content: "\f311"; } +.ion-android-star-half:before { content: "\f3ad"; } -.ion-android-star:before { content: "\f2fc"; } +.ion-android-star-outline:before { content: "\f3ae"; } .ion-android-stopwatch:before { content: "\f2fd"; } -.ion-android-storage:before { content: "\f2fe"; } +.ion-android-subway:before { content: "\f3af"; } + +.ion-android-sunny:before { content: "\f3b0"; } + +.ion-android-sync:before { content: "\f3b1"; } + +.ion-android-textsms:before { content: "\f3b2"; } + +.ion-android-time:before { content: "\f3b3"; } + +.ion-android-train:before { content: "\f3b4"; } + +.ion-android-unlock:before { content: "\f3b5"; } -.ion-android-system-back:before { content: "\f2ff"; } +.ion-android-upload:before { content: "\f3b6"; } -.ion-android-system-home:before { content: "\f300"; } +.ion-android-volume-down:before { content: "\f3b7"; } -.ion-android-system-windows:before { content: "\f301"; } +.ion-android-volume-mute:before { content: "\f3b8"; } -.ion-android-timer:before { content: "\f302"; } +.ion-android-volume-off:before { content: "\f3b9"; } -.ion-android-trash:before { content: "\f303"; } +.ion-android-volume-up:before { content: "\f3ba"; } -.ion-android-user-menu:before { content: "\f312"; } +.ion-android-walk:before { content: "\f3bb"; } -.ion-android-volume:before { content: "\f304"; } +.ion-android-warning:before { content: "\f3bc"; } + +.ion-android-watch:before { content: "\f3bd"; } .ion-android-wifi:before { content: "\f305"; } @@ -215,6 +327,10 @@ .ion-at:before { content: "\f10f"; } +.ion-backspace:before { content: "\f3bf"; } + +.ion-backspace-outline:before { content: "\f3be"; } + .ion-bag:before { content: "\f110"; } .ion-battery-charging:before { content: "\f111"; } @@ -237,6 +353,8 @@ .ion-bookmark:before { content: "\f26b"; } +.ion-bowtie:before { content: "\f3c0"; } + .ion-briefcase:before { content: "\f26c"; } .ion-bug:before { content: "\f2be"; } @@ -307,6 +425,8 @@ .ion-contrast:before { content: "\f275"; } +.ion-crop:before { content: "\f3c1"; } + .ion-cube:before { content: "\f318"; } .ion-disc:before { content: "\f12d"; } @@ -319,6 +439,8 @@ .ion-earth:before { content: "\f276"; } +.ion-easel:before { content: "\f3c2"; } + .ion-edit:before { content: "\f2bf"; } .ion-egg:before { content: "\f277"; } @@ -327,6 +449,12 @@ .ion-email:before { content: "\f132"; } +.ion-email-unread:before { content: "\f3c3"; } + +.ion-erlenmeyer-flask:before { content: "\f3c5"; } + +.ion-erlenmeyer-flask-bubbles:before { content: "\f3c4"; } + .ion-eye:before { content: "\f133"; } .ion-eye-disabled:before { content: "\f306"; } @@ -347,8 +475,6 @@ .ion-flash-off:before { content: "\f136"; } -.ion-flask:before { content: "\f138"; } - .ion-folder:before { content: "\f139"; } .ion-fork:before { content: "\f27a"; } @@ -359,10 +485,6 @@ .ion-funnel:before { content: "\f31b"; } -.ion-game-controller-a:before { content: "\f13b"; } - -.ion-game-controller-b:before { content: "\f13c"; } - .ion-gear-a:before { content: "\f13d"; } .ion-gear-b:before { content: "\f13e"; } @@ -373,6 +495,8 @@ .ion-happy:before { content: "\f31c"; } +.ion-happy-outline:before { content: "\f3c6"; } + .ion-headphone:before { content: "\f140"; } .ion-heart:before { content: "\f141"; } @@ -389,10 +513,6 @@ .ion-icecream:before { content: "\f27d"; } -.ion-icon-social-google-plus:before { content: "\f146"; } - -.ion-icon-social-google-plus-outline:before { content: "\f145"; } - .ion-image:before { content: "\f147"; } .ion-images:before { content: "\f148"; } @@ -403,479 +523,543 @@ .ion-ionic:before { content: "\f14b"; } -.ion-ios7-alarm:before { content: "\f14d"; } +.ion-ios-alarm:before { content: "\f3c8"; } + +.ion-ios-alarm-outline:before { content: "\f3c7"; } + +.ion-ios-albums:before { content: "\f3ca"; } + +.ion-ios-albums-outline:before { content: "\f3c9"; } + +.ion-ios-americanfootball:before { content: "\f3cc"; } + +.ion-ios-americanfootball-outline:before { content: "\f3cb"; } + +.ion-ios-analytics:before { content: "\f3ce"; } + +.ion-ios-analytics-outline:before { content: "\f3cd"; } + +.ion-ios-arrow-back:before { content: "\f3cf"; } + +.ion-ios-arrow-down:before { content: "\f3d0"; } + +.ion-ios-arrow-forward:before { content: "\f3d1"; } + +.ion-ios-arrow-left:before { content: "\f3d2"; } + +.ion-ios-arrow-right:before { content: "\f3d3"; } + +.ion-ios-arrow-thin-down:before { content: "\f3d4"; } + +.ion-ios-arrow-thin-left:before { content: "\f3d5"; } + +.ion-ios-arrow-thin-right:before { content: "\f3d6"; } + +.ion-ios-arrow-thin-up:before { content: "\f3d7"; } + +.ion-ios-arrow-up:before { content: "\f3d8"; } + +.ion-ios-at:before { content: "\f3da"; } + +.ion-ios-at-outline:before { content: "\f3d9"; } + +.ion-ios-barcode:before { content: "\f3dc"; } + +.ion-ios-barcode-outline:before { content: "\f3db"; } + +.ion-ios-baseball:before { content: "\f3de"; } + +.ion-ios-baseball-outline:before { content: "\f3dd"; } + +.ion-ios-basketball:before { content: "\f3e0"; } + +.ion-ios-basketball-outline:before { content: "\f3df"; } + +.ion-ios-bell:before { content: "\f3e2"; } + +.ion-ios-bell-outline:before { content: "\f3e1"; } + +.ion-ios-body:before { content: "\f3e4"; } + +.ion-ios-body-outline:before { content: "\f3e3"; } + +.ion-ios-bolt:before { content: "\f3e6"; } + +.ion-ios-bolt-outline:before { content: "\f3e5"; } -.ion-ios7-alarm-outline:before { content: "\f14c"; } +.ion-ios-book:before { content: "\f3e8"; } -.ion-ios7-albums:before { content: "\f14f"; } +.ion-ios-book-outline:before { content: "\f3e7"; } -.ion-ios7-albums-outline:before { content: "\f14e"; } +.ion-ios-bookmarks:before { content: "\f3ea"; } -.ion-ios7-americanfootball:before { content: "\f31f"; } +.ion-ios-bookmarks-outline:before { content: "\f3e9"; } -.ion-ios7-americanfootball-outline:before { content: "\f31e"; } +.ion-ios-box:before { content: "\f3ec"; } -.ion-ios7-analytics:before { content: "\f321"; } +.ion-ios-box-outline:before { content: "\f3eb"; } -.ion-ios7-analytics-outline:before { content: "\f320"; } +.ion-ios-briefcase:before { content: "\f3ee"; } -.ion-ios7-arrow-back:before { content: "\f150"; } +.ion-ios-briefcase-outline:before { content: "\f3ed"; } -.ion-ios7-arrow-down:before { content: "\f151"; } +.ion-ios-browsers:before { content: "\f3f0"; } -.ion-ios7-arrow-forward:before { content: "\f152"; } +.ion-ios-browsers-outline:before { content: "\f3ef"; } -.ion-ios7-arrow-left:before { content: "\f153"; } +.ion-ios-calculator:before { content: "\f3f2"; } -.ion-ios7-arrow-right:before { content: "\f154"; } +.ion-ios-calculator-outline:before { content: "\f3f1"; } -.ion-ios7-arrow-thin-down:before { content: "\f27e"; } +.ion-ios-calendar:before { content: "\f3f4"; } -.ion-ios7-arrow-thin-left:before { content: "\f27f"; } +.ion-ios-calendar-outline:before { content: "\f3f3"; } -.ion-ios7-arrow-thin-right:before { content: "\f280"; } +.ion-ios-camera:before { content: "\f3f6"; } -.ion-ios7-arrow-thin-up:before { content: "\f281"; } +.ion-ios-camera-outline:before { content: "\f3f5"; } -.ion-ios7-arrow-up:before { content: "\f155"; } +.ion-ios-cart:before { content: "\f3f8"; } -.ion-ios7-at:before { content: "\f157"; } +.ion-ios-cart-outline:before { content: "\f3f7"; } -.ion-ios7-at-outline:before { content: "\f156"; } +.ion-ios-chatboxes:before { content: "\f3fa"; } -.ion-ios7-barcode:before { content: "\f323"; } +.ion-ios-chatboxes-outline:before { content: "\f3f9"; } -.ion-ios7-barcode-outline:before { content: "\f322"; } +.ion-ios-chatbubble:before { content: "\f3fc"; } -.ion-ios7-baseball:before { content: "\f325"; } +.ion-ios-chatbubble-outline:before { content: "\f3fb"; } -.ion-ios7-baseball-outline:before { content: "\f324"; } +.ion-ios-checkmark:before { content: "\f3ff"; } -.ion-ios7-basketball:before { content: "\f327"; } +.ion-ios-checkmark-empty:before { content: "\f3fd"; } -.ion-ios7-basketball-outline:before { content: "\f326"; } +.ion-ios-checkmark-outline:before { content: "\f3fe"; } -.ion-ios7-bell:before { content: "\f159"; } +.ion-ios-circle-filled:before { content: "\f400"; } -.ion-ios7-bell-outline:before { content: "\f158"; } +.ion-ios-circle-outline:before { content: "\f401"; } -.ion-ios7-bolt:before { content: "\f15b"; } +.ion-ios-clock:before { content: "\f403"; } -.ion-ios7-bolt-outline:before { content: "\f15a"; } +.ion-ios-clock-outline:before { content: "\f402"; } -.ion-ios7-bookmarks:before { content: "\f15d"; } +.ion-ios-close:before { content: "\f406"; } -.ion-ios7-bookmarks-outline:before { content: "\f15c"; } +.ion-ios-close-empty:before { content: "\f404"; } -.ion-ios7-box:before { content: "\f15f"; } +.ion-ios-close-outline:before { content: "\f405"; } -.ion-ios7-box-outline:before { content: "\f15e"; } +.ion-ios-cloud:before { content: "\f40c"; } -.ion-ios7-briefcase:before { content: "\f283"; } +.ion-ios-cloud-download:before { content: "\f408"; } -.ion-ios7-briefcase-outline:before { content: "\f282"; } +.ion-ios-cloud-download-outline:before { content: "\f407"; } -.ion-ios7-browsers:before { content: "\f161"; } +.ion-ios-cloud-outline:before { content: "\f409"; } -.ion-ios7-browsers-outline:before { content: "\f160"; } +.ion-ios-cloud-upload:before { content: "\f40b"; } -.ion-ios7-calculator:before { content: "\f285"; } +.ion-ios-cloud-upload-outline:before { content: "\f40a"; } -.ion-ios7-calculator-outline:before { content: "\f284"; } +.ion-ios-cloudy:before { content: "\f410"; } -.ion-ios7-calendar:before { content: "\f163"; } +.ion-ios-cloudy-night:before { content: "\f40e"; } -.ion-ios7-calendar-outline:before { content: "\f162"; } +.ion-ios-cloudy-night-outline:before { content: "\f40d"; } -.ion-ios7-camera:before { content: "\f165"; } +.ion-ios-cloudy-outline:before { content: "\f40f"; } -.ion-ios7-camera-outline:before { content: "\f164"; } +.ion-ios-cog:before { content: "\f412"; } -.ion-ios7-cart:before { content: "\f167"; } +.ion-ios-cog-outline:before { content: "\f411"; } -.ion-ios7-cart-outline:before { content: "\f166"; } +.ion-ios-color-filter:before { content: "\f414"; } -.ion-ios7-chatboxes:before { content: "\f169"; } +.ion-ios-color-filter-outline:before { content: "\f413"; } -.ion-ios7-chatboxes-outline:before { content: "\f168"; } +.ion-ios-color-wand:before { content: "\f416"; } -.ion-ios7-chatbubble:before { content: "\f16b"; } +.ion-ios-color-wand-outline:before { content: "\f415"; } -.ion-ios7-chatbubble-outline:before { content: "\f16a"; } +.ion-ios-compose:before { content: "\f418"; } -.ion-ios7-checkmark:before { content: "\f16e"; } +.ion-ios-compose-outline:before { content: "\f417"; } -.ion-ios7-checkmark-empty:before { content: "\f16c"; } +.ion-ios-contact:before { content: "\f41a"; } -.ion-ios7-checkmark-outline:before { content: "\f16d"; } +.ion-ios-contact-outline:before { content: "\f419"; } -.ion-ios7-circle-filled:before { content: "\f16f"; } +.ion-ios-copy:before { content: "\f41c"; } -.ion-ios7-circle-outline:before { content: "\f170"; } +.ion-ios-copy-outline:before { content: "\f41b"; } -.ion-ios7-clock:before { content: "\f172"; } +.ion-ios-crop:before { content: "\f41e"; } -.ion-ios7-clock-outline:before { content: "\f171"; } +.ion-ios-crop-strong:before { content: "\f41d"; } -.ion-ios7-close:before { content: "\f2bc"; } +.ion-ios-download:before { content: "\f420"; } -.ion-ios7-close-empty:before { content: "\f2bd"; } +.ion-ios-download-outline:before { content: "\f41f"; } -.ion-ios7-close-outline:before { content: "\f2bb"; } +.ion-ios-drag:before { content: "\f421"; } -.ion-ios7-cloud:before { content: "\f178"; } +.ion-ios-email:before { content: "\f423"; } -.ion-ios7-cloud-download:before { content: "\f174"; } +.ion-ios-email-outline:before { content: "\f422"; } -.ion-ios7-cloud-download-outline:before { content: "\f173"; } +.ion-ios-eye:before { content: "\f425"; } -.ion-ios7-cloud-outline:before { content: "\f175"; } +.ion-ios-eye-outline:before { content: "\f424"; } -.ion-ios7-cloud-upload:before { content: "\f177"; } +.ion-ios-fastforward:before { content: "\f427"; } -.ion-ios7-cloud-upload-outline:before { content: "\f176"; } +.ion-ios-fastforward-outline:before { content: "\f426"; } -.ion-ios7-cloudy:before { content: "\f17a"; } +.ion-ios-filing:before { content: "\f429"; } -.ion-ios7-cloudy-night:before { content: "\f308"; } +.ion-ios-filing-outline:before { content: "\f428"; } -.ion-ios7-cloudy-night-outline:before { content: "\f307"; } +.ion-ios-film:before { content: "\f42b"; } -.ion-ios7-cloudy-outline:before { content: "\f179"; } +.ion-ios-film-outline:before { content: "\f42a"; } -.ion-ios7-cog:before { content: "\f17c"; } +.ion-ios-flag:before { content: "\f42d"; } -.ion-ios7-cog-outline:before { content: "\f17b"; } +.ion-ios-flag-outline:before { content: "\f42c"; } -.ion-ios7-compose:before { content: "\f17e"; } +.ion-ios-flame:before { content: "\f42f"; } -.ion-ios7-compose-outline:before { content: "\f17d"; } +.ion-ios-flame-outline:before { content: "\f42e"; } -.ion-ios7-contact:before { content: "\f180"; } +.ion-ios-flask:before { content: "\f431"; } -.ion-ios7-contact-outline:before { content: "\f17f"; } +.ion-ios-flask-outline:before { content: "\f430"; } -.ion-ios7-copy:before { content: "\f182"; } +.ion-ios-flower:before { content: "\f433"; } -.ion-ios7-copy-outline:before { content: "\f181"; } +.ion-ios-flower-outline:before { content: "\f432"; } -.ion-ios7-download:before { content: "\f184"; } +.ion-ios-folder:before { content: "\f435"; } -.ion-ios7-download-outline:before { content: "\f183"; } +.ion-ios-folder-outline:before { content: "\f434"; } -.ion-ios7-drag:before { content: "\f185"; } +.ion-ios-football:before { content: "\f437"; } -.ion-ios7-email:before { content: "\f187"; } +.ion-ios-football-outline:before { content: "\f436"; } -.ion-ios7-email-outline:before { content: "\f186"; } +.ion-ios-game-controller-a:before { content: "\f439"; } -.ion-ios7-expand:before { content: "\f30d"; } +.ion-ios-game-controller-a-outline:before { content: "\f438"; } -.ion-ios7-eye:before { content: "\f189"; } +.ion-ios-game-controller-b:before { content: "\f43b"; } -.ion-ios7-eye-outline:before { content: "\f188"; } +.ion-ios-game-controller-b-outline:before { content: "\f43a"; } -.ion-ios7-fastforward:before { content: "\f18b"; } +.ion-ios-gear:before { content: "\f43d"; } -.ion-ios7-fastforward-outline:before { content: "\f18a"; } +.ion-ios-gear-outline:before { content: "\f43c"; } -.ion-ios7-filing:before { content: "\f18d"; } +.ion-ios-glasses:before { content: "\f43f"; } -.ion-ios7-filing-outline:before { content: "\f18c"; } +.ion-ios-glasses-outline:before { content: "\f43e"; } -.ion-ios7-film:before { content: "\f18f"; } +.ion-ios-grid-view:before { content: "\f441"; } -.ion-ios7-film-outline:before { content: "\f18e"; } +.ion-ios-grid-view-outline:before { content: "\f440"; } -.ion-ios7-flag:before { content: "\f191"; } +.ion-ios-heart:before { content: "\f443"; } -.ion-ios7-flag-outline:before { content: "\f190"; } +.ion-ios-heart-outline:before { content: "\f442"; } -.ion-ios7-folder:before { content: "\f193"; } +.ion-ios-help:before { content: "\f446"; } -.ion-ios7-folder-outline:before { content: "\f192"; } +.ion-ios-help-empty:before { content: "\f444"; } -.ion-ios7-football:before { content: "\f329"; } +.ion-ios-help-outline:before { content: "\f445"; } -.ion-ios7-football-outline:before { content: "\f328"; } +.ion-ios-home:before { content: "\f448"; } -.ion-ios7-gear:before { content: "\f195"; } +.ion-ios-home-outline:before { content: "\f447"; } -.ion-ios7-gear-outline:before { content: "\f194"; } +.ion-ios-infinite:before { content: "\f44a"; } -.ion-ios7-glasses:before { content: "\f197"; } +.ion-ios-infinite-outline:before { content: "\f449"; } -.ion-ios7-glasses-outline:before { content: "\f196"; } +.ion-ios-information:before { content: "\f44d"; } -.ion-ios7-heart:before { content: "\f199"; } +.ion-ios-information-empty:before { content: "\f44b"; } -.ion-ios7-heart-outline:before { content: "\f198"; } +.ion-ios-information-outline:before { content: "\f44c"; } -.ion-ios7-help:before { content: "\f19c"; } +.ion-ios-ionic-outline:before { content: "\f44e"; } -.ion-ios7-help-empty:before { content: "\f19a"; } +.ion-ios-keypad:before { content: "\f450"; } -.ion-ios7-help-outline:before { content: "\f19b"; } +.ion-ios-keypad-outline:before { content: "\f44f"; } -.ion-ios7-home:before { content: "\f32b"; } +.ion-ios-lightbulb:before { content: "\f452"; } -.ion-ios7-home-outline:before { content: "\f32a"; } +.ion-ios-lightbulb-outline:before { content: "\f451"; } -.ion-ios7-infinite:before { content: "\f19e"; } +.ion-ios-list:before { content: "\f454"; } -.ion-ios7-infinite-outline:before { content: "\f19d"; } +.ion-ios-list-outline:before { content: "\f453"; } -.ion-ios7-information:before { content: "\f1a1"; } +.ion-ios-location:before { content: "\f456"; } -.ion-ios7-information-empty:before { content: "\f19f"; } +.ion-ios-location-outline:before { content: "\f455"; } -.ion-ios7-information-outline:before { content: "\f1a0"; } +.ion-ios-locked:before { content: "\f458"; } -.ion-ios7-ionic-outline:before { content: "\f1a2"; } +.ion-ios-locked-outline:before { content: "\f457"; } -.ion-ios7-keypad:before { content: "\f1a4"; } +.ion-ios-loop:before { content: "\f45a"; } -.ion-ios7-keypad-outline:before { content: "\f1a3"; } +.ion-ios-loop-strong:before { content: "\f459"; } -.ion-ios7-lightbulb:before { content: "\f287"; } +.ion-ios-medical:before { content: "\f45c"; } -.ion-ios7-lightbulb-outline:before { content: "\f286"; } +.ion-ios-medical-outline:before { content: "\f45b"; } -.ion-ios7-location:before { content: "\f1a6"; } +.ion-ios-medkit:before { content: "\f45e"; } -.ion-ios7-location-outline:before { content: "\f1a5"; } +.ion-ios-medkit-outline:before { content: "\f45d"; } -.ion-ios7-locked:before { content: "\f1a8"; } +.ion-ios-mic:before { content: "\f461"; } -.ion-ios7-locked-outline:before { content: "\f1a7"; } +.ion-ios-mic-off:before { content: "\f45f"; } -.ion-ios7-loop:before { content: "\f32d"; } +.ion-ios-mic-outline:before { content: "\f460"; } -.ion-ios7-loop-strong:before { content: "\f32c"; } +.ion-ios-minus:before { content: "\f464"; } -.ion-ios7-medkit:before { content: "\f289"; } +.ion-ios-minus-empty:before { content: "\f462"; } -.ion-ios7-medkit-outline:before { content: "\f288"; } +.ion-ios-minus-outline:before { content: "\f463"; } -.ion-ios7-mic:before { content: "\f1ab"; } +.ion-ios-monitor:before { content: "\f466"; } -.ion-ios7-mic-off:before { content: "\f1a9"; } +.ion-ios-monitor-outline:before { content: "\f465"; } -.ion-ios7-mic-outline:before { content: "\f1aa"; } +.ion-ios-moon:before { content: "\f468"; } -.ion-ios7-minus:before { content: "\f1ae"; } +.ion-ios-moon-outline:before { content: "\f467"; } -.ion-ios7-minus-empty:before { content: "\f1ac"; } +.ion-ios-more:before { content: "\f46a"; } -.ion-ios7-minus-outline:before { content: "\f1ad"; } +.ion-ios-more-outline:before { content: "\f469"; } -.ion-ios7-monitor:before { content: "\f1b0"; } +.ion-ios-musical-note:before { content: "\f46b"; } -.ion-ios7-monitor-outline:before { content: "\f1af"; } +.ion-ios-musical-notes:before { content: "\f46c"; } -.ion-ios7-moon:before { content: "\f1b2"; } +.ion-ios-navigate:before { content: "\f46e"; } -.ion-ios7-moon-outline:before { content: "\f1b1"; } +.ion-ios-navigate-outline:before { content: "\f46d"; } -.ion-ios7-more:before { content: "\f1b4"; } +.ion-ios-nutrition:before { content: "\f470"; } -.ion-ios7-more-outline:before { content: "\f1b3"; } +.ion-ios-nutrition-outline:before { content: "\f46f"; } -.ion-ios7-musical-note:before { content: "\f1b5"; } +.ion-ios-paper:before { content: "\f472"; } -.ion-ios7-musical-notes:before { content: "\f1b6"; } +.ion-ios-paper-outline:before { content: "\f471"; } -.ion-ios7-navigate:before { content: "\f1b8"; } +.ion-ios-paperplane:before { content: "\f474"; } -.ion-ios7-navigate-outline:before { content: "\f1b7"; } +.ion-ios-paperplane-outline:before { content: "\f473"; } -.ion-ios7-paper:before { content: "\f32f"; } +.ion-ios-partlysunny:before { content: "\f476"; } -.ion-ios7-paper-outline:before { content: "\f32e"; } +.ion-ios-partlysunny-outline:before { content: "\f475"; } -.ion-ios7-paperplane:before { content: "\f1ba"; } +.ion-ios-pause:before { content: "\f478"; } -.ion-ios7-paperplane-outline:before { content: "\f1b9"; } +.ion-ios-pause-outline:before { content: "\f477"; } -.ion-ios7-partlysunny:before { content: "\f1bc"; } +.ion-ios-paw:before { content: "\f47a"; } -.ion-ios7-partlysunny-outline:before { content: "\f1bb"; } +.ion-ios-paw-outline:before { content: "\f479"; } -.ion-ios7-pause:before { content: "\f1be"; } +.ion-ios-people:before { content: "\f47c"; } -.ion-ios7-pause-outline:before { content: "\f1bd"; } +.ion-ios-people-outline:before { content: "\f47b"; } -.ion-ios7-paw:before { content: "\f331"; } +.ion-ios-person:before { content: "\f47e"; } -.ion-ios7-paw-outline:before { content: "\f330"; } +.ion-ios-person-outline:before { content: "\f47d"; } -.ion-ios7-people:before { content: "\f1c0"; } +.ion-ios-personadd:before { content: "\f480"; } -.ion-ios7-people-outline:before { content: "\f1bf"; } +.ion-ios-personadd-outline:before { content: "\f47f"; } -.ion-ios7-person:before { content: "\f1c2"; } +.ion-ios-photos:before { content: "\f482"; } -.ion-ios7-person-outline:before { content: "\f1c1"; } +.ion-ios-photos-outline:before { content: "\f481"; } -.ion-ios7-personadd:before { content: "\f1c4"; } +.ion-ios-pie:before { content: "\f484"; } -.ion-ios7-personadd-outline:before { content: "\f1c3"; } +.ion-ios-pie-outline:before { content: "\f483"; } -.ion-ios7-photos:before { content: "\f1c6"; } +.ion-ios-pint:before { content: "\f486"; } -.ion-ios7-photos-outline:before { content: "\f1c5"; } +.ion-ios-pint-outline:before { content: "\f485"; } -.ion-ios7-pie:before { content: "\f28b"; } +.ion-ios-play:before { content: "\f488"; } -.ion-ios7-pie-outline:before { content: "\f28a"; } +.ion-ios-play-outline:before { content: "\f487"; } -.ion-ios7-play:before { content: "\f1c8"; } +.ion-ios-plus:before { content: "\f48b"; } -.ion-ios7-play-outline:before { content: "\f1c7"; } +.ion-ios-plus-empty:before { content: "\f489"; } -.ion-ios7-plus:before { content: "\f1cb"; } +.ion-ios-plus-outline:before { content: "\f48a"; } -.ion-ios7-plus-empty:before { content: "\f1c9"; } +.ion-ios-pricetag:before { content: "\f48d"; } -.ion-ios7-plus-outline:before { content: "\f1ca"; } +.ion-ios-pricetag-outline:before { content: "\f48c"; } -.ion-ios7-pricetag:before { content: "\f28d"; } +.ion-ios-pricetags:before { content: "\f48f"; } -.ion-ios7-pricetag-outline:before { content: "\f28c"; } +.ion-ios-pricetags-outline:before { content: "\f48e"; } -.ion-ios7-pricetags:before { content: "\f333"; } +.ion-ios-printer:before { content: "\f491"; } -.ion-ios7-pricetags-outline:before { content: "\f332"; } +.ion-ios-printer-outline:before { content: "\f490"; } -.ion-ios7-printer:before { content: "\f1cd"; } +.ion-ios-pulse:before { content: "\f493"; } -.ion-ios7-printer-outline:before { content: "\f1cc"; } +.ion-ios-pulse-strong:before { content: "\f492"; } -.ion-ios7-pulse:before { content: "\f335"; } +.ion-ios-rainy:before { content: "\f495"; } -.ion-ios7-pulse-strong:before { content: "\f334"; } +.ion-ios-rainy-outline:before { content: "\f494"; } -.ion-ios7-rainy:before { content: "\f1cf"; } +.ion-ios-recording:before { content: "\f497"; } -.ion-ios7-rainy-outline:before { content: "\f1ce"; } +.ion-ios-recording-outline:before { content: "\f496"; } -.ion-ios7-recording:before { content: "\f1d1"; } +.ion-ios-redo:before { content: "\f499"; } -.ion-ios7-recording-outline:before { content: "\f1d0"; } +.ion-ios-redo-outline:before { content: "\f498"; } -.ion-ios7-redo:before { content: "\f1d3"; } +.ion-ios-refresh:before { content: "\f49c"; } -.ion-ios7-redo-outline:before { content: "\f1d2"; } +.ion-ios-refresh-empty:before { content: "\f49a"; } -.ion-ios7-refresh:before { content: "\f1d6"; } +.ion-ios-refresh-outline:before { content: "\f49b"; } -.ion-ios7-refresh-empty:before { content: "\f1d4"; } +.ion-ios-reload:before { content: "\f49d"; } -.ion-ios7-refresh-outline:before { content: "\f1d5"; } +.ion-ios-reverse-camera:before { content: "\f49f"; } -.ion-ios7-reload:before, .ion-ios7-reloading:before { content: "\f28e"; } +.ion-ios-reverse-camera-outline:before { content: "\f49e"; } -.ion-ios7-reverse-camera:before { content: "\f337"; } +.ion-ios-rewind:before { content: "\f4a1"; } -.ion-ios7-reverse-camera-outline:before { content: "\f336"; } +.ion-ios-rewind-outline:before { content: "\f4a0"; } -.ion-ios7-rewind:before { content: "\f1d8"; } +.ion-ios-rose:before { content: "\f4a3"; } -.ion-ios7-rewind-outline:before { content: "\f1d7"; } +.ion-ios-rose-outline:before { content: "\f4a2"; } -.ion-ios7-search:before { content: "\f1da"; } +.ion-ios-search:before { content: "\f4a5"; } -.ion-ios7-search-strong:before { content: "\f1d9"; } +.ion-ios-search-strong:before { content: "\f4a4"; } -.ion-ios7-settings:before { content: "\f339"; } +.ion-ios-settings:before { content: "\f4a7"; } -.ion-ios7-settings-strong:before { content: "\f338"; } +.ion-ios-settings-strong:before { content: "\f4a6"; } -.ion-ios7-shrink:before { content: "\f30e"; } +.ion-ios-shuffle:before { content: "\f4a9"; } -.ion-ios7-skipbackward:before { content: "\f1dc"; } +.ion-ios-shuffle-strong:before { content: "\f4a8"; } -.ion-ios7-skipbackward-outline:before { content: "\f1db"; } +.ion-ios-skipbackward:before { content: "\f4ab"; } -.ion-ios7-skipforward:before { content: "\f1de"; } +.ion-ios-skipbackward-outline:before { content: "\f4aa"; } -.ion-ios7-skipforward-outline:before { content: "\f1dd"; } +.ion-ios-skipforward:before { content: "\f4ad"; } -.ion-ios7-snowy:before { content: "\f309"; } +.ion-ios-skipforward-outline:before { content: "\f4ac"; } -.ion-ios7-speedometer:before { content: "\f290"; } +.ion-ios-snowy:before { content: "\f4ae"; } -.ion-ios7-speedometer-outline:before { content: "\f28f"; } +.ion-ios-speedometer:before { content: "\f4b0"; } -.ion-ios7-star:before { content: "\f1e0"; } +.ion-ios-speedometer-outline:before { content: "\f4af"; } -.ion-ios7-star-half:before { content: "\f33a"; } +.ion-ios-star:before { content: "\f4b3"; } -.ion-ios7-star-outline:before { content: "\f1df"; } +.ion-ios-star-half:before { content: "\f4b1"; } -.ion-ios7-stopwatch:before { content: "\f1e2"; } +.ion-ios-star-outline:before { content: "\f4b2"; } -.ion-ios7-stopwatch-outline:before { content: "\f1e1"; } +.ion-ios-stopwatch:before { content: "\f4b5"; } -.ion-ios7-sunny:before { content: "\f1e4"; } +.ion-ios-stopwatch-outline:before { content: "\f4b4"; } -.ion-ios7-sunny-outline:before { content: "\f1e3"; } +.ion-ios-sunny:before { content: "\f4b7"; } -.ion-ios7-telephone:before { content: "\f1e6"; } +.ion-ios-sunny-outline:before { content: "\f4b6"; } -.ion-ios7-telephone-outline:before { content: "\f1e5"; } +.ion-ios-telephone:before { content: "\f4b9"; } -.ion-ios7-tennisball:before { content: "\f33c"; } +.ion-ios-telephone-outline:before { content: "\f4b8"; } -.ion-ios7-tennisball-outline:before { content: "\f33b"; } +.ion-ios-tennisball:before { content: "\f4bb"; } -.ion-ios7-thunderstorm:before { content: "\f1e8"; } +.ion-ios-tennisball-outline:before { content: "\f4ba"; } -.ion-ios7-thunderstorm-outline:before { content: "\f1e7"; } +.ion-ios-thunderstorm:before { content: "\f4bd"; } -.ion-ios7-time:before { content: "\f292"; } +.ion-ios-thunderstorm-outline:before { content: "\f4bc"; } -.ion-ios7-time-outline:before { content: "\f291"; } +.ion-ios-time:before { content: "\f4bf"; } -.ion-ios7-timer:before { content: "\f1ea"; } +.ion-ios-time-outline:before { content: "\f4be"; } -.ion-ios7-timer-outline:before { content: "\f1e9"; } +.ion-ios-timer:before { content: "\f4c1"; } -.ion-ios7-toggle:before { content: "\f33e"; } +.ion-ios-timer-outline:before { content: "\f4c0"; } -.ion-ios7-toggle-outline:before { content: "\f33d"; } +.ion-ios-toggle:before { content: "\f4c3"; } -.ion-ios7-trash:before { content: "\f1ec"; } +.ion-ios-toggle-outline:before { content: "\f4c2"; } -.ion-ios7-trash-outline:before { content: "\f1eb"; } +.ion-ios-trash:before { content: "\f4c5"; } -.ion-ios7-undo:before { content: "\f1ee"; } +.ion-ios-trash-outline:before { content: "\f4c4"; } -.ion-ios7-undo-outline:before { content: "\f1ed"; } +.ion-ios-undo:before { content: "\f4c7"; } -.ion-ios7-unlocked:before { content: "\f1f0"; } +.ion-ios-undo-outline:before { content: "\f4c6"; } -.ion-ios7-unlocked-outline:before { content: "\f1ef"; } +.ion-ios-unlocked:before { content: "\f4c9"; } -.ion-ios7-upload:before { content: "\f1f2"; } +.ion-ios-unlocked-outline:before { content: "\f4c8"; } -.ion-ios7-upload-outline:before { content: "\f1f1"; } +.ion-ios-upload:before { content: "\f4cb"; } -.ion-ios7-videocam:before { content: "\f1f4"; } +.ion-ios-upload-outline:before { content: "\f4ca"; } -.ion-ios7-videocam-outline:before { content: "\f1f3"; } +.ion-ios-videocam:before { content: "\f4cd"; } -.ion-ios7-volume-high:before { content: "\f1f5"; } +.ion-ios-videocam-outline:before { content: "\f4cc"; } -.ion-ios7-volume-low:before { content: "\f1f6"; } +.ion-ios-volume-high:before { content: "\f4ce"; } -.ion-ios7-wineglass:before { content: "\f294"; } +.ion-ios-volume-low:before { content: "\f4cf"; } -.ion-ios7-wineglass-outline:before { content: "\f293"; } +.ion-ios-wineglass:before { content: "\f4d1"; } -.ion-ios7-world:before { content: "\f1f8"; } +.ion-ios-wineglass-outline:before { content: "\f4d0"; } -.ion-ios7-world-outline:before { content: "\f1f7"; } +.ion-ios-world:before { content: "\f4d3"; } + +.ion-ios-world-outline:before { content: "\f4d2"; } .ion-ipad:before { content: "\f1f9"; } @@ -899,23 +1083,25 @@ .ion-link:before { content: "\f1fe"; } -.ion-load-a:before, .ion-loading-a:before { content: "\f29a"; } +.ion-load-a:before { content: "\f29a"; } -.ion-load-b:before, .ion-loading-b:before { content: "\f29b"; } +.ion-load-b:before { content: "\f29b"; } -.ion-load-c:before, .ion-loading-c:before { content: "\f29c"; } +.ion-load-c:before { content: "\f29c"; } -.ion-load-d:before, .ion-loading-d:before { content: "\f29d"; } +.ion-load-d:before { content: "\f29d"; } .ion-location:before { content: "\f1ff"; } +.ion-lock-combination:before { content: "\f4d4"; } + .ion-locked:before { content: "\f200"; } .ion-log-in:before { content: "\f29e"; } .ion-log-out:before { content: "\f29f"; } -.ion-loop:before, .ion-looping:before { content: "\f201"; } +.ion-loop:before { content: "\f201"; } .ion-magnet:before { content: "\f2a0"; } @@ -965,6 +1151,10 @@ .ion-outlet:before { content: "\f342"; } +.ion-paintbrush:before { content: "\f4d5"; } + +.ion-paintbucket:before { content: "\f4d6"; } + .ion-paper-airplane:before { content: "\f2c3"; } .ion-paperclip:before { content: "\f20f"; } @@ -1021,7 +1211,7 @@ .ion-record:before { content: "\f21b"; } -.ion-refresh:before, .ion-refreshing:before { content: "\f21c"; } +.ion-refresh:before { content: "\f21c"; } .ion-reply:before { content: "\f21e"; } @@ -1033,6 +1223,8 @@ .ion-sad:before { content: "\f34a"; } +.ion-sad-outline:before { content: "\f4d7"; } + .ion-scissors:before { content: "\f34b"; } .ion-search:before { content: "\f21f"; } @@ -1051,6 +1243,10 @@ .ion-social-android-outline:before { content: "\f224"; } +.ion-social-angular:before { content: "\f4d9"; } + +.ion-social-angular-outline:before { content: "\f4d8"; } + .ion-social-apple:before { content: "\f227"; } .ion-social-apple-outline:before { content: "\f226"; } @@ -1063,6 +1259,18 @@ .ion-social-buffer-outline:before { content: "\f228"; } +.ion-social-chrome:before { content: "\f4db"; } + +.ion-social-chrome-outline:before { content: "\f4da"; } + +.ion-social-codepen:before { content: "\f4dd"; } + +.ion-social-codepen-outline:before { content: "\f4dc"; } + +.ion-social-css3:before { content: "\f4df"; } + +.ion-social-css3-outline:before { content: "\f4de"; } + .ion-social-designernews:before { content: "\f22b"; } .ion-social-designernews-outline:before { content: "\f22a"; } @@ -1075,6 +1283,10 @@ .ion-social-dropbox-outline:before { content: "\f22e"; } +.ion-social-euro:before { content: "\f4e1"; } + +.ion-social-euro-outline:before { content: "\f4e0"; } + .ion-social-facebook:before { content: "\f231"; } .ion-social-facebook-outline:before { content: "\f230"; } @@ -1101,18 +1313,34 @@ .ion-social-hackernews-outline:before { content: "\f236"; } +.ion-social-html5:before { content: "\f4e3"; } + +.ion-social-html5-outline:before { content: "\f4e2"; } + .ion-social-instagram:before { content: "\f351"; } .ion-social-instagram-outline:before { content: "\f350"; } +.ion-social-javascript:before { content: "\f4e5"; } + +.ion-social-javascript-outline:before { content: "\f4e4"; } + .ion-social-linkedin:before { content: "\f239"; } .ion-social-linkedin-outline:before { content: "\f238"; } +.ion-social-markdown:before { content: "\f4e6"; } + +.ion-social-nodejs:before { content: "\f4e7"; } + +.ion-social-octocat:before { content: "\f4e8"; } + .ion-social-pinterest:before { content: "\f2b1"; } .ion-social-pinterest-outline:before { content: "\f2b0"; } +.ion-social-python:before { content: "\f4e9"; } + .ion-social-reddit:before { content: "\f23b"; } .ion-social-reddit-outline:before { content: "\f23a"; } @@ -1121,16 +1349,26 @@ .ion-social-rss-outline:before { content: "\f23c"; } +.ion-social-sass:before { content: "\f4ea"; } + .ion-social-skype:before { content: "\f23f"; } .ion-social-skype-outline:before { content: "\f23e"; } +.ion-social-snapchat:before { content: "\f4ec"; } + +.ion-social-snapchat-outline:before { content: "\f4eb"; } + .ion-social-tumblr:before { content: "\f241"; } .ion-social-tumblr-outline:before { content: "\f240"; } .ion-social-tux:before { content: "\f2c5"; } +.ion-social-twitch:before { content: "\f4ee"; } + +.ion-social-twitch-outline:before { content: "\f4ed"; } + .ion-social-twitter:before { content: "\f243"; } .ion-social-twitter-outline:before { content: "\f242"; } @@ -1143,6 +1381,10 @@ .ion-social-vimeo-outline:before { content: "\f244"; } +.ion-social-whatsapp:before { content: "\f4f0"; } + +.ion-social-whatsapp-outline:before { content: "\f4ef"; } + .ion-social-windows:before { content: "\f247"; } .ion-social-windows-outline:before { content: "\f246"; } @@ -1155,10 +1397,18 @@ .ion-social-yahoo-outline:before { content: "\f24a"; } +.ion-social-yen:before { content: "\f4f2"; } + +.ion-social-yen-outline:before { content: "\f4f1"; } + .ion-social-youtube:before { content: "\f24d"; } .ion-social-youtube-outline:before { content: "\f24c"; } +.ion-soup-can:before { content: "\f4f4"; } + +.ion-soup-can-outline:before { content: "\f4f3"; } + .ion-speakerphone:before { content: "\f2b2"; } .ion-speedometer:before { content: "\f2b3"; } @@ -1183,12 +1433,18 @@ .ion-toggle-filled:before { content: "\f354"; } +.ion-transgender:before { content: "\f4f5"; } + .ion-trash-a:before { content: "\f252"; } .ion-trash-b:before { content: "\f253"; } .ion-trophy:before { content: "\f356"; } +.ion-tshirt:before { content: "\f4f7"; } + +.ion-tshirt-outline:before { content: "\f4f6"; } + .ion-umbrella:before { content: "\f2b7"; } .ion-university:before { content: "\f357"; } diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index aae67d0..f7642ae 100644 --- a/views/controls/builder/settings.ejs +++ b/views/controls/builder/settings.ejs @@ -4,7 +4,7 @@
    - + Select Startpoint Move to Desired Point
    diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index 8b2e9b8..ad51f0e 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -2,7 +2,7 @@ + class="ion-ios-photos-outline"> + class="ion-ios-keypad-outline"> + class="ion-ios-sunny-outline"> + class="ion-ios-compose-outline">
    - +
    diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 974fe0f..a9ef738 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -5,7 +5,7 @@ [[ if (authorpic) { ]]
    [[ } else { ]] - + [[ } ]] [[- author ]] diff --git a/views/home.ejs b/views/home.ejs index 20723a5..b83e3e9 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -12,7 +12,7 @@
    Create 3D Rooms
    -
    +
    Watch video.
    @@ -78,7 +78,7 @@
    - +
    diff --git a/views/profile.ejs b/views/profile.ejs index e149847..63a07f5 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -15,7 +15,7 @@ [[ } else { ]]
    - + [[ if (isOwnProfile) { ]]
    click to add profile pic
    -- cgit v1.2.3-70-g09d2 From 685d5fd7b32ac868a0b2d8ac8a2a1b4120f274cf Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 27 Aug 2015 11:57:51 -0400 Subject: fork orthopolyline --- .../rectangles/engine/map/tools/ortho.js | 2 +- .../javascripts/rectangles/engine/shapes/ortho.js | 41 ++++++++++++++++++++++ .../rectangles/engine/shapes/polyline.js | 21 +++++++---- .../rectangles/engine/shapes/shapelist.js | 14 ++++++-- .../javascripts/ui/blueprint/BlueprintSettings.js | 3 +- .../javascripts/ui/blueprint/BlueprintUploader.js | 2 +- .../javascripts/ui/blueprint/BlueprintView.js | 22 ++++++++++++ public/assets/stylesheets/app.css | 4 +-- views/partials/header.ejs | 2 ++ views/partials/scripts.ejs | 1 + views/profile.ejs | 2 ++ 11 files changed, 99 insertions(+), 15 deletions(-) create mode 100644 public/assets/javascripts/rectangles/engine/shapes/ortho.js (limited to 'views/profile.ejs') diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js index 6ced728..374c822 100644 --- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js +++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js @@ -48,7 +48,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) { } else { map.ui.placing = true - shapes.workline = new Polyline () + shapes.workline = new OrthoPolyline () shapes.workline.add(p) first_point = prev_point = p horizontal = false diff --git a/public/assets/javascripts/rectangles/engine/shapes/ortho.js b/public/assets/javascripts/rectangles/engine/shapes/ortho.js new file mode 100644 index 0000000..8a8f928 --- /dev/null +++ b/public/assets/javascripts/rectangles/engine/shapes/ortho.js @@ -0,0 +1,41 @@ +// An OrthoPolyline is a Polyline where all angles are 90 degrees. + +var OrthoPolyline = Polyline.extend(function(base){ + var exports = {} + exports.type = function(){ + return "ortho" + } + exports.instantiate = function(){ + return new OrthoPolyline + } + exports.canCloseWith = function(p){ + return (this.points.length > 2 && this.points[0].distanceTo( p ) < 10/map.zoom) + } + exports.draw = function(ctx, fillStyle, strokeStyle){ + var points = this.points + if (! points.length) return + if (points.length == 1) { + ctx.fillStyle = "#f80" + map.draw.dot_at(this.points[0].a, points[0].b, 5) + } + if (points.length > 1) { + ctx.fillStyle = fillStyle + ctx.strokeStyle = strokeStyle + ctx.lineWidth = 2 / map.zoom + ctx.beginPath() + ctx.moveTo(points[0].a, points[0].b) + points.forEach(function(point, i){ + i && ctx.lineTo(point.a, point.b) + }) + strokeStyle && ctx.stroke() + if (! map.ui.placing || this.closed) { + fillStyle && ctx.fill() + } + } + } + exports.close = function(){ + this.points[this.points.length] = this.points[0] + this.closed = true + } + return exports +}) diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js index fc6cad7..65e22ad 100644 --- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js +++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js @@ -9,6 +9,12 @@ var Polyline = Fiber.extend(function(base){ this.mx_points = [] this.closed = false } + exports.type = function(){ + return "polyline" + } + exports.instantiate = function(){ + return new Polyline + } exports.add = function(p){ this.points.push( p ) this.mx_points.push( new MX.Point(p) ) @@ -25,19 +31,19 @@ var Polyline = Fiber.extend(function(base){ exports.getHeadAtIndex = function(index){ if (index == 0) { return null } if (index == this.points.length-1) { return this.clone() } - var head = new Polyline() + var head = this.instantiate() head.points = this.points.slice(0, index+1) return head } exports.getTailAtIndex = function(index){ if (index == this.points.length-1) { return null } if (index == 0) { return this.clone() } - var tail = new Polyline() + var tail = this.instantiate() tail.points = this.points.slice(index, this.points.length) return tail } exports.clone = function(){ - var clone = new Polyline() + var clone = this.instantiate() clone.points = this.points.concat() } exports.hasPointNear = function(p){ @@ -148,10 +154,13 @@ var Polyline = Fiber.extend(function(base){ return segments } exports.serialize = function(){ - return this.points.map(function(point){ return [point.a, point.b] }) + return { + type: this.type(), + points: this.points.map(function(point){ return [point.a, point.b] }), + } } - exports.deserialize = function(points){ - this.points = points.map(function(point){ return new vec2(point[0], point[1]) }) + exports.deserialize = function(data){ + this.points = (data.points || data).map(function(point){ return new vec2(point[0], point[1]) }) } exports.reset = function(){ this.mx_points.forEach(function(mx){ scene.remove(mx) }) diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js index 75ecae6..e5a70fb 100644 --- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js +++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js @@ -87,9 +87,17 @@ var ShapeList = Fiber.extend(function(base){ }) } exports.deserialize = function(data){ - data && data.forEach(function(points){ - var line = new Polyline() - line.deserialize(points) + data && data.forEach(function(shape_data){ + var line + switch (shape_data.type) { + case 'ortho': + line = new OrthoPolyline() + break + default: + line = new Polyline() + break + } + line.deserialize(shape_data) shapes.add(line) }.bind(this)) } diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js index 80c9355..8addb9c 100644 --- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js +++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js @@ -93,10 +93,9 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({ fd.append( "_id", this.$id.val() ) fd.append( "name", this.$name.val() ) fd.append( "shapes", JSON.stringify( shapes.serialize() ) ) - fd.append( "startPosition", JSON.stringify( this.parent.startPosition ) ) + fd.append( "startPosition", JSON.stringify( this.parent.quantizeStartPosition() ) ) fd.append( "wallHeight", this.parent.info.$height.unitVal() ) fd.append( "units", this.parent.info.$units.val() ) - return fd }, diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js index fe1073a..dc3c281 100644 --- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js +++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js @@ -65,7 +65,7 @@ var BlueprintUploader = UploadView.extend({ var $el = $(e.currentTarget) var media = $el.data("media") this.hide() - this.parent.scaler.pick(media, true) + this.parent.scaler.pick(media) }, destroy: function(e){ diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js index ecbb536..19b9e84 100644 --- a/public/assets/javascripts/ui/blueprint/BlueprintView.js +++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js @@ -29,6 +29,28 @@ var BlueprintView = View.extend({ orbiting: true, startPosition: {}, + quantizeStartPosition: function(){ + // + var regions = RegionList.build() + var pos = this.startPosition + var startPositionIsInARoom = regions.some(function(region){ + return region.contains(pos.x, pos.z) + }) + if (startPositionIsInARoom) { + return this.startPosition + } + else { + var center = regions[0].center() + return { + x: center.a, + y: viewHeight, + z: center.b, + rotationX: 0, + rotationY: Math.PI/2, + } + } + }, + buildMap: function(){ // i forget if this has to be global map = new Map ({ diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 634ea60..e4f1b27 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1156,6 +1156,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; } width: 100%; height: 100%; padding: 20px 0 40px 0; + text-align: center; } .templates-list, .userTemplatesList, @@ -1186,8 +1187,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; } } .templates span { - display: block; - float: left; + display: inline-block; margin: 1vw 0; width:20%; padding: 2vw; diff --git a/views/partials/header.ejs b/views/partials/header.ejs index bb8fc6e..ce9ffae 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -64,7 +64,9 @@ [[ if (profile && String(user._id) == String(profile._id)) { ]] Settings + [[ } else if (! profile) { ]] Profile [[ } ]] diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index bac4120..da3f0ba 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -86,6 +86,7 @@ + diff --git a/views/profile.ejs b/views/profile.ejs index 63a07f5..d3ae10e 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -78,7 +78,9 @@ [[ } ]]
    + [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] [[ include projects/edit-project ]] -- cgit v1.2.3-70-g09d2