diff --git a/config/default.json b/config/default.json index 04ff126..9c60ac3 100644 --- a/config/default.json +++ b/config/default.json @@ -3,6 +3,7 @@ "contact_email": "support@example.org", "endpoint": "http://localhost:9666", + "invite_code": "top-sekrit", "storage_region": "eu-central-1", //"storage_bucket": "sdeck-development", diff --git a/public/images/favicon.png b/public/images/favicon.png index 5b28e0c..ee15d20 100644 Binary files a/public/images/favicon.png and b/public/images/favicon.png differ diff --git a/public/images/sd6-icon-white.svg b/public/images/sd6-icon-white.svg new file mode 100644 index 0000000..58b2774 --- /dev/null +++ b/public/images/sd6-icon-white.svg @@ -0,0 +1,69 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/public/images/sd6-icon.svg b/public/images/sd6-icon.svg new file mode 100644 index 0000000..e645c61 --- /dev/null +++ b/public/images/sd6-icon.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/public/images/sd6-logo-black.svg b/public/images/sd6-logo-black.svg new file mode 100644 index 0000000..8e1360e --- /dev/null +++ b/public/images/sd6-logo-black.svg @@ -0,0 +1,129 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/javascripts/backend.js b/public/javascripts/backend.js index 5739fea..7970b82 100644 --- a/public/javascripts/backend.js +++ b/public/javascripts/backend.js @@ -274,8 +274,8 @@ function delete_user(u, password, on_success, on_error) { load_resource("delete", "/users/"+u._id +"?password="+password,null,on_success,on_error); } -function create_user(name, email, password, password_confirmation, on_success, on_error) { - load_resource("post", "/users", {email:email, nickname:name, password:password, password_confirmation: password_confirmation}, on_success, on_error); +function create_user(name, email, password, password_confirmation, invite_code, on_success, on_error) { + load_resource("post", "/users", {email:email, nickname:name, password:password, password_confirmation: password_confirmation, invite_code: invite_code}, on_success, on_error); } function create_session(email, password, on_success, on_error) { diff --git a/public/javascripts/spacedeck_sections.js b/public/javascripts/spacedeck_sections.js index f7b2b86..c3a5e7e 100644 --- a/public/javascripts/spacedeck_sections.js +++ b/public/javascripts/spacedeck_sections.js @@ -110,18 +110,30 @@ var SpacedeckSections = { color_picker_opacity: 255, swatches: [ - {id:0, hex:"#4a2f7e"}, - {id:1, hex:"#9b59b6"}, - {id:2, hex:"#3498db"}, - {id:3, hex:"#2ecc71"}, - {id:4, hex:"#f1c40f"}, - {id:5, hex:"#e67e22"}, - {id:6, hex:"#d55c4b"}, - {id:7, hex:"#6f4021"}, - {id:8, hex:"#ffffff"}, - {id:9, hex:"#95a5a6"}, - {id:10, hex:"#252525"}, - {id:11, hex:"rgba(0,0,0,0)"}, + {id:1, hex:"#ff00ff"}, + {id:2, hex:"#ffff00"}, + {id:3, hex:"#00ffff"}, + {id:5, hex:"#ff0000"}, + {id:6, hex:"#00ff00"}, + {id:7, hex:"#0000ff"}, + {id:8, hex:"#000000"}, + {id:9, hex:"#222222"}, + {id:10, hex:"#444444"}, + {id:11, hex:"#888888"}, + {id:12, hex:"#bbbbbb"}, + {id:13, hex:"#dddddd"}, + {id:14, hex:"#ffffff"}, + + {id:20, hex:"#4a2f7e"}, + {id:21, hex:"#9b59b6"}, + {id:22, hex:"#3498db"}, + {id:23, hex:"#2ecc71"}, + {id:24, hex:"#f1c40f"}, + {id:25, hex:"#e67e22"}, + {id:26, hex:"#d55c4b"}, + {id:27, hex:"#6f4021"}, + {id:29, hex:"#95a5a6"}, + {id:30, hex:"rgba(0,0,0,0)"}, ], swatches_text: [ @@ -1717,7 +1729,7 @@ var SpacedeckSections = { var a = { space_id: this.active_space._id, mime: "x-spacedeck/shape", - description: "Text", + description: "", x: point.x, y: point.y, z: point.z, @@ -1729,7 +1741,7 @@ var SpacedeckSections = { fill_color: "#000000", shape: shape_type, valign: "middle", - align: "center" + align: "center", }; if (this.guest_nickname) { @@ -2274,6 +2286,9 @@ var SpacedeckSections = { }, handle_section_paste: function(evt) { + // TODO: very confusing + return; + if (this.editing_artifact_id) return; var pastedText = null; diff --git a/public/javascripts/spacedeck_users.js b/public/javascripts/spacedeck_users.js index 5b29cd7..3fc1d8c 100644 --- a/public/javascripts/spacedeck_users.js +++ b/public/javascripts/spacedeck_users.js @@ -11,6 +11,7 @@ SpacedeckUsers = { login_email: "", login_password: "", signup_password: "", + signup_invite_code: "", signup_password_confirmation: "", account_remove_error: null, loading_user: false, @@ -122,7 +123,7 @@ SpacedeckUsers = { signup_guest: function(on_success) { }, - signup_submit: function($event, name, email, password, password_confirmation, on_success) { + signup_submit: function($event, name, email, password, password_confirmation, invite_code, on_success) { this.creating_user = true; this.signup_error = null; @@ -136,7 +137,7 @@ SpacedeckUsers = { $event.stopPropagation(); } - create_user(name, email, password, password_confirmation, function(session) { + create_user(name, email, password, password_confirmation, invite_code, function(session) { this.creating_user = false; this.login_submit(email, password, null, on_success); }.bind(this), function(req) { @@ -152,8 +153,8 @@ SpacedeckUsers = { }.bind(this)); }, - signup_submit_modal: function($event, name, email, password, password_confirmation) { - this.signup_submit($event, name, email, password, password_confirmation, function() { + signup_submit_modal: function($event, name, email, password, password_confirmation, invite_code) { + this.signup_submit($event, name, email, password, password_confirmation, invite_code, function() { alert("Success."); location.reload(); }); diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 6d40a5b..ea497e0 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,4 +1,5 @@ @charset "UTF-8"; +@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;900&display=swap"); @font-face { font-family: 'icon'; src: url("../fonts/icon-regular-webfont.eot"); @@ -2701,7 +2702,7 @@ hr { h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { color: inherit; font-family: inherit; - font-weight: 500; + font-weight: 900; line-height: 1.3; margin-top: 0px; margin-bottom: 1em; @@ -2734,8 +2735,7 @@ small { font-size: 75%; } a { - text-decoration: none; - color: #888; } + color: black; } dl { background-color: rgba(0, 0, 0, 0.05); @@ -2803,7 +2803,6 @@ input:invalid { top: 0; right: 0; line-height: 1; - font-size: 10px; margin: 12px; color: red; margin-right: 25px; @@ -2838,7 +2837,7 @@ select { vertical-align: middle; font-weight: 300; font-family: Inter; - font-size: 12pt; + font-size: 20px; line-height: normal; color: #222; background-color: rgba(0, 0, 0, 0.01); @@ -5901,6 +5900,14 @@ select { .rot45:hover > .icon { transform: rotateZ(45deg) translateX(-8px); } +.icon-svg { + background-size: 26px; + background-position: center; + background-repeat: no-repeat; } + +.icon-sd6 { + background-image: url(/images/sd6-icon-white.svg); } + .icon-bullet:before { content: "\2022"; } @@ -8096,7 +8103,7 @@ select { background-color: rgba(255, 255, 255, 0.05); } .btn.btn-dark { background-color: #222; - color: #888; } + color: #ffffff; } .btn.btn-medium { background-color: rgba(0, 0, 0, 0.05); color: #888; } @@ -8285,7 +8292,6 @@ select { margin-right: -5px; } .btn.btn-icon { padding: 0px !important; - font-weight: bold; max-width: 60px; } .btn.btn-icon.btn-xl { max-width: 80px; } @@ -8306,31 +8312,9 @@ select { position: absolute; top: 100%; left: 0; - font-size: 12pt; + font-size: 20px; color: #888; margin-top: 10px; } - .btn.btn-social { - position: relative; } - .btn.btn-social:hover .icon, - .btn.btn-social .number { - -webkit-transform: scale(0, 0); - -ms-transform: scale(0, 0); - transform: scale(0, 0); - opacity: 0; } - .btn.btn-social:hover .number { - -webkit-transition: all 0.1s 0.1s ease-in-out; - transition: all 0.1s 0.1s ease-in-out; - -webkit-transform: scale(1, 1); - -ms-transform: scale(1, 1); - transform: scale(1, 1); - opacity: 1; } - .btn.btn-social .number, - .btn.btn-social .icon { - -webkit-transition: all 0.1s 0s ease-in-out; - transition: all 0.1s 0s ease-in-out; - position: absolute; - top: 0; - left: 0; } .btn.btn-md.btn-icon-labeled .icon:before { line-height: 29px; } .btn.btn-md.btn-icon-labeled .icon-label { @@ -8357,7 +8341,6 @@ select { line-height: 42px; } .btn.btn-icon-labeled .icon-label { font-size: 11px; - text-transform: capitalize; text-align: center; margin: 8px 0; display: block; @@ -8370,7 +8353,7 @@ select { text-overflow: ellipsis; white-space: nowrap; padding: 0 0px; - font-weight: bold; } + font-weight: 300; } .btn.btn-icon-labeled.hover .letter, .btn.btn-icon-labeled.hover .number, .btn.btn-icon-labeled.hover .icon:before { line-height: 60px; } .btn.btn-icon-labeled.hover .letter, .btn.btn-icon-labeled.hover .number, .btn.btn-icon-labeled.hover .icon:before { @@ -8858,7 +8841,6 @@ select { font-size: 0px; vertical-align: middle; white-space: nowrap; - border: 1px solid #222; border-radius: 5px; } .btn-group.dark { border-radius: 3px; @@ -9000,7 +8982,7 @@ select { transform: translateY(1%); } .contained-dropdown .overflow-y-scroll ul li span { text-align: center; - font-size: 12pt; + font-size: 20px; line-height: 1.5em; } .contained-dropdown.hover:hover, .contained-dropdown.open { background-color: #f5f5f5; } @@ -9062,6 +9044,8 @@ select { display: inline-block; position: relative; vertical-align: middle; } + .dropdown a { + text-decoration: none; } .dropdown.dropdown-block { display: block; } .dropdown.dropdown-block .dropdown-toggle { @@ -9300,30 +9284,24 @@ select { border-top-right-radius: 9px; border-bottom-right-radius: 9px; } +.dialog-account { + width: 600px; + margin: auto; + margin-top: 100px; } + .dialog { - font-size: 13px; - min-width: 200px; - -webkit-backface-visibility: hidden; - -moz-backface-visibility: hidden; - backface-visibility: hidden; - white-space: normal; - z-index: 1000; position: absolute; + font-size: 15px; + border: 1px solid black; + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border-radius: 5px; + white-space: normal; opacity: 0; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; -webkit-transition: all 0.125s ease-in-out; transition: all 0.125s ease-in-out; pointer-events: none; background-color: #f5f5f5; - color: #222; - border-radius: 9px; - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.05), 0 2px 7px rgba(0, 0, 0, 0.1); } - .dialog ol, .dialog ul, .dialog p { - font-size: inherit; } + color: #222; } .dialog > .btn-block:last-child { border-top-left-radius: 0px; border-top-right-radius: 0px; @@ -9347,10 +9325,9 @@ select { .dialog .dialog-tabs .dialog-tab:hover span { color: #222; } .dialog .dialog-tabs .dialog-tab.open span { - background-color: #f5f5f5; + background-color: white; color: #222; opacity: 1; - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.05), 0 2px 7px rgba(0, 0, 0, 0.1) !important; border-bottom-right-radius: 0px !important; border-bottom-left-radius: 0px !important; border-top-left-radius: 9px; @@ -9398,6 +9375,12 @@ select { height: 200px; } .dialog h4 .icon { height: 38px; } + .dialog.dialog-freestanding { + margin: auto; + position: relative; + top: 150px; + border: none; + width: 800px; } .overflow-hidden { overflow: hidden; } @@ -9777,12 +9760,8 @@ button.close { text-indent: 4px; text-align: center; } -.modal-footer:before, .modal-footer:after { - content: " "; - display: table; } - -.modal-footer:after { - clear: both; } +.modal-footer { + margin-top: 20px; } #search-dialog:after { margin-left: -160px; } @@ -9868,37 +9847,20 @@ button.close { max-height: 120px; border-radius: 3px; } -.white .select-list li.checked:before { - background-color: #888 !important; } - -.white .select-list li.checked > a, -.white .select-list li.checked > span { - color: #888; } - -.white .select-list li:hover:before { - background-color: #888; } - .white .select-list li:hover > a, .white .select-list li:hover > span { background-color: rgba(0, 0, 0, 0.025) !important; } -.white .select-list li:before { - background-color: #888; } - .white .select-list li > a, .white .select-list li > span { color: #888; } .select-list { - -webkit-mask-image: -webkit-gradient(linear, left top, left 15px, from(rgba(0, 0, 0, 0)), to(rgba(0, 0, 0, 0.5))); background-clip: padding-box; - font-size: 15px; - line-height: 14px; list-style: none; margin: 0px; padding: 15px 0; text-align: left; - color: #888; border-radius: 3px; } .select-list:empty:before { position: absolute; @@ -9935,13 +9897,11 @@ button.close { .select-list li.checked > a, .select-list li.checked > span { color: #222; } - .select-list li:hover:before { - background-color: #888; - display: block; } - .select-list li:hover > a, - .select-list li:hover > span { - color: #888; - color: #222; } + .select-list li:hover { + background-color: black; } + .select-list li:hover > a, + .select-list li:hover > span { + color: white; } .select-list li.select-list-title:before { display: none !important; } .select-list li:before { @@ -9962,9 +9922,8 @@ button.close { display: block; cursor: pointer; white-space: nowrap; - color: #888; margin: 0 25px; - padding: 16px 3px; + padding: 10px 0px; overflow: hidden; text-overflow: ellipsis; max-width: 100%; @@ -10069,11 +10028,14 @@ button.close { .header-left { left: 0; - padding-left: 10px; } + padding-left: 10px; + padding-left: 20px; + padding-top: 20px; } .header-right { right: 0; - padding-right: 20px; } + padding-right: 20px; + padding-top: 20px; } .header-center { width: 100%; @@ -10092,7 +10054,7 @@ button.close { margin-right: 10px; } .header-right > * { - margin-left: 5px; } + margin-left: 10px; } .header-right { font-size: 0; } @@ -10107,7 +10069,7 @@ button.close { margin: 0; height: 60px; line-height: 60px; - font-size: 9pt; + font-size: 15px; font-weight: bold; color: #888; display: inline-block; @@ -10122,19 +10084,6 @@ button.close { .author .author-date { opacity: 0.5; } -.present-mode #space-header { - background-color: transparent !important; } - -#space-siblings { - background-color: rgba(245, 245, 245, 0.95); - padding: 35px; - max-height: 450px; - overflow-y: scroll; - margin-top: 54px; - border-bottom: 1px solid #eee; } - #space-siblings .btn { - margin-bottom: 50px; } - #account-forms { z-index: 2000; width: 100%; @@ -12447,7 +12396,7 @@ button.close { min-height: 0; } #folder-empty > div p { border-radius: 100px; - font-size: 12pt; + font-size: 20px; line-height: 1.5em; display: block; color: #888; } @@ -12554,7 +12503,6 @@ button.close { #folder-grid:after { clear: both; } #folder-grid .item { - box-shadow: 0 0 1pxrgba 0, 0, 0, 0.1; display: inline-block; text-align: left; padding-right: 40px; @@ -12680,7 +12628,8 @@ button.close { /* aspect ratio without spacer image */ background-color: white; border-radius: 6px; - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.025), 0 2px 7px rgba(0, 0, 0, 0.025); + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border: 1px solid black; opacity: 1; filter: alpha(opacity=100); color: #888; @@ -12751,8 +12700,7 @@ button.close { right: 40px; left: 0px; z-index: 100; - width: auto; - background-color: white; } + width: auto; } #folder-grid .item .item-meta:before, #folder-grid .item .item-meta:after { content: " "; display: table; } @@ -12777,38 +12725,6 @@ button.close { text-overflow: ellipsis; color: #222; text-align: left; } - #folder-grid .item .item-meta .item-social { - padding: 8px; - border-right: 2px solid rgba(0, 0, 0, 0.025); - color: #888; } - #folder-grid .item .item-meta .item-social:before, #folder-grid .item .item-meta .item-social:after { - content: " "; - display: table; } - #folder-grid .item .item-meta .item-social:after { - clear: both; } - #folder-grid .item .item-meta .item-social .item-likes, - #folder-grid .item .item-meta .item-social .item-comments, - #folder-grid .item .item-meta .item-social .item-shares { - position: relative; } - #folder-grid .item .item-meta .item-social .item-likes:hover .icon, - #folder-grid .item .item-meta .item-social .item-comments:hover .icon, - #folder-grid .item .item-meta .item-social .item-shares:hover .icon { - opacity: 0; } - #folder-grid .item .item-meta .item-social .item-likes:hover .number, - #folder-grid .item .item-meta .item-social .item-comments:hover .number, - #folder-grid .item .item-meta .item-social .item-shares:hover .number { - opacity: 1; } - #folder-grid .item .item-meta .item-social .item-likes .number, - #folder-grid .item .item-meta .item-social .item-comments .number, - #folder-grid .item .item-meta .item-social .item-shares .number { - position: absolute; - opacity: 0; - top: 0; - left: 0; } - #folder-grid .item .item-meta .item-social .item-likes .icon, - #folder-grid .item .item-meta .item-social .item-comments .icon, - #folder-grid .item .item-meta .item-social .item-shares .icon { - opacity: 0.5; } #folder-grid .item .item-appendix { pointer-events: none; width: auto; @@ -13292,11 +13208,14 @@ button.close { .toolbar { margin: auto; position: fixed; - top: 10px; + top: 20px; z-index: 3000; padding: 0; font-size: 0; line-height: 0; + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border: 1px solid black; + border-radius: 5px; pointer-events: none !important; } .toolbar.toolbar-meta { -webkit-transform: translate3d(0, -100%, 0); @@ -13455,10 +13374,17 @@ button.close { background-color: #ffffff; } .toolbar-elements { - left: 10px; } + left: 20px; } .toolbar-properties { - right: 20px; } + right: 30px; } + +.zoom-bar { + position: absolute; + bottom: 30px; + right: 30px; + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border: 1px solid black; } #color-toggles { background-size: 40px; @@ -14279,7 +14205,6 @@ button.close { right: 0; z-index: 800; pointer-events: none; - opacity: 0.25; display: block; } .column-row { @@ -14681,16 +14606,16 @@ button.close { max-width: 100%; position: relative; width: auto; - margin-left: -12pt; - margin-right: -12pt; - margin-top: -12pt; - margin-bottom: -12pt; } + margin-left: -20px; + margin-right: -20px; + margin-top: -20px; + margin-bottom: -20px; } .table table { width: 100%; table-layout: auto; border-collapse: separate; - border-spacing: 12pt 12pt; } + border-spacing: 20px 20px; } .table tr { border-top: 1px solid rgba(255, 255, 255, 0.125); } @@ -15103,9 +15028,9 @@ button.close { display: block; word-wrap: break-word; line-height: 1.5em; - font-size: 12pt; } + font-size: 20px; } .artifact .text-table .text-cell .text-column.text-editing { - min-height: 12pt; + min-height: 20px; -webkit-user-select: auto; -moz-user-select: auto; user-select: auto; @@ -15373,8 +15298,7 @@ button.close { white-space: normal; font-size: 36px; } .board .artifact.artifact-zone { - border: 1px solid #2ecc71; - background-color: rgba(46, 204, 113, 0.025); + background-color: rgba(0, 0, 0, 0.05); border-radius: 10px; } .board .artifact.artifact-zone:after { display: none; } @@ -16054,193 +15978,37 @@ body:not(.present-mode) #space .artifact.selected { color: #202020; } #landing-header { - background-color: rgba(255, 255, 255, 0.3); + background-color: white; height: 64px; - position: absolute; + position: relative; top: 0; left: 0; right: 0; } -.landing-keyvisual-wrapper { - background-image: url("../images/sd5-keyvisual-compressed.jpg"); - background-size: cover; - background-position: center; - padding-top: 40px; - padding-bottom: 40px; } - -.landing-plans-wrapper { - background-image: url("../images/sd5-hero2-compressed.jpg"); - background-size: cover; - background-position: center; - padding-top: 80px; - padding-bottom: 100px; } - -.landing-box { - width: 800px; - margin: auto; - max-width: 90%; - background-color: white; - padding: 40px; - margin-bottom: 80px; - margin-top: 80px; - position: relative; - box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.2); } - .landing-box h1 { - margin-bottom: 20px; } - .landing-box.black { - background-color: #222; - color: white; - padding: 20px; - text-align: center; } - .landing-box.overlap { - position: absolute; - z-index: 2; - margin-top: -65px; - left: 50%; - top: 0px; - margin-left: -250px; - width: 500px; } - .landing-box.screenshot { - width: 90%; - max-width: 90%; - padding: 20px; - box-shadow: none; - background-color: transparent; } - .landing-box.screenshot img { - width: 100%; - position: absolute; - top: 0px; - left: 0px; - opacity: 0.3; } - .landing-box.landing-box-left { - margin-left: 30px; } - -.lead { - margin-bottom: 20px; } - -.plans-box { - background: linear-gradient(to bottom, #FEFFFF 25%, #D0D8E2 100%); - padding: 40px; - border-radius: 9px; } - -.landing-box.plans-box { - margin-top: 200px; - width: 900px; } - -.plans-table tr { - vertical-align: top; } - -.plans-table th { - font-size: 42px; - padding-top: 40px; - text-align: center; } - -.plans-table th.best-plan { - padding-top: 20px; - font-size: 48px; - padding-bottom: 0px; } - -.plans-table td { - padding: 20px; - width: 30%; } - .plans-table td p, .plans-table td li { - font-size: 18px; } - .plans-table td li { - margin-bottom: 10px; } - -.plans-table td.best-plan { - width: 40%; } - .plans-table td.best-plan p { - font-size: 22px; } - -.plans-table td li { - list-style-type: none; - text-align: center; } - -.plans-table ul { - margin: 0 !important; - padding: 0 !important; } - -.plans-table .upgrade-buttons { - text-align: center; - margin-top: 20px; } - -.logo-row { - position: relative; - padding: 80px; - background-color: white; - text-align: center; - width: 100%; } - .logo-row.blue { - background-color: #3d9ee9; - color: white; } - -.logo-row div { - display: inline-block; - width: 200px; } - -.landing-row { - background-color: white; - padding-bottom: 80px; - padding-top: 40px; } - -#keyvisual { - border-radius: 20px; - box-shadow: 0px 0px 20px #eee; - width: 640px; - height: 420px; - background-size: contain; - background-repeat: no-repeat; - background-position: center; - background-image: url("/images/landing/spacedeck-screenshot1.jpg"); - background-color: white; - margin: auto; - margin-top: 40px; - margin-bottom: 40px; - border: 1px solid #eee; } - -#legal .landing-box { - width: 800px; } +#landing { + margin-top: 100px; } + #landing section { + margin-left: 300px; } + #landing section > * { + max-width: 600px; } .footer { - padding: 40px; - padding-bottom: 80px; - text-align: center; - color: #888; } - .footer a { - margin-right: 20px; } - -@media screen and (min-width: 801px) { - .plans-table-mobile { - display: none; } } - -@media screen and (max-width: 800px) { - ul.lead.lead-xl, p.lead.lead-xl, ol.lead.lead-xl { - font-size: 20px !important; } - .header-right > span:first-child { - display: none; } - .plans-table { - display: none; } - .plans-table-mobile { - display: block; } - .plans-table-mobile tbody { - display: block; - width: 100%; } - .plans-table-mobile tr { - display: block; - width: 100%; } - .plans-table-mobile td, .plans-table-mobile th { - display: block; - width: 100%; } - .plans-table-mobile ul, .plans-table-mobile li { - width: 100%; } } + margin-left: 300px; + margin-top: 100px; + margin-bottom: 100px; } html, body { height: 100%; - background-color: #f5f5f5; + background-color: white; color: #111; } +body { + max-width: 100%; + padding: 0px; + text-rendering: optimizeLegibility; + cursor: default; } + *[contenteditable="true"] { outline: none; } @@ -16251,30 +16019,13 @@ body { -moz-box-sizing: border-box; box-sizing: border-box; } -body { - max-width: 100%; - padding: 0px; - text-rendering: optimizeLegibility; - cursor: default; } - -#home { - background-color: white; } - .img img { max-width: 100%; height: auto; } -#startup { - background-position: center; - background-image: url(/images/diamond.svg); - background-repeat: no-repeat; } - -.layer { - -webkit-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; - -webkit-backface-visibility: hidden; - -moz-backface-visibility: hidden; - backface-visibility: hidden; +/*.layer { + @include transition( all 0.2s ease-in-out); + @include backface-visibility(hidden); position: absolute; width: auto; height: auto; @@ -16284,18 +16035,23 @@ body { bottom: 0; opacity: 0; pointer-events: none; + // @include scale(0.95,0.95); display: none; - z-index: 1000; } - .layer.top-layer { - z-index: 3500; } - .layer.in { + z-index: 1000; + &.top-layer { + z-index: 3500; + } + &.in { display: block; + &.top-layer { + z-index: 3500; + } z-index: 2000; + // @include scale(1,1); pointer-events: auto; - opacity: 1; } - .layer.in.top-layer { - z-index: 3500; } - + opacity: 1; + } +}*/ [draggable] { -moz-user-select: none; -khtml-user-select: none; diff --git a/routes/api/users.js b/routes/api/users.js index 2898beb..77bba45 100644 --- a/routes/api/users.js +++ b/routes/api/users.js @@ -51,12 +51,18 @@ router.post('/', function(req, res) { var nickname = req.body["nickname"]; var password = req.body["password"]; var password_confirmation = req.body["password_confirmation"]; + var invite_code = req.body["invite_code"]; if (password_confirmation != password) { res.status(400).json({"error":"password_confirmation"}); return; } + if (config.invite_code && invite_code != config.invite_code) { + res.status(400).json({"error":"Invalid Invite Code."}); + return; + } + if (!validator.isEmail(email)) { res.status(400).json({"error":"email_invalid"}); return; diff --git a/styles/artifact.scss b/styles/artifact.scss index bfff1c2..5267a07 100644 --- a/styles/artifact.scss +++ b/styles/artifact.scss @@ -472,8 +472,7 @@ font-size: 36px; &.artifact-zone { - border: 1px solid rgba(46,204,113,1); - background-color: rgba(46,204,113,0.025); + background-color: rgba(0,0,0,0.05); border-radius: 10px; &:after {display: none; } .shape {display: none; } diff --git a/styles/button.scss b/styles/button.scss index f9c2c0e..074a0b2 100644 --- a/styles/button.scss +++ b/styles/button.scss @@ -301,7 +301,7 @@ &.btn-dark { background-color: $dark ; - color: $medium; + color: $white; } &.btn-medium { @@ -469,7 +469,6 @@ &.btn-icon { padding: 0px !important; - font-weight: bold; max-width: 60px; &.btn-xl { max-width: 80px; } @@ -496,30 +495,6 @@ } } - &.btn-social { - position: relative; - - &:hover .icon, - .number { - @include scale(0,0); - opacity: 0; - } - - &:hover .number { - @include transition( all 0.1s 0.1s ease-in-out); - @include scale(1,1); - opacity: 1; - } - - .number, - .icon { - @include transition( all 0.1s 0s ease-in-out); - position: absolute; - top: 0; - left: 0; - } - } - &.btn-md.btn-icon-labeled { .icon:before { line-height: 29px; @@ -555,7 +530,6 @@ .icon:before {line-height: 42px; } .icon-label { font-size: 11px; - text-transform: capitalize; text-align: center; margin: 8px 0; display: block; @@ -568,7 +542,7 @@ text-overflow: ellipsis; white-space: nowrap; padding: 0 0px; - font-weight: bold; + font-weight: 300; } &.hover { @@ -977,7 +951,7 @@ vertical-align: middle; white-space: nowrap; - border: 1px solid $dark; + //border: 1px solid $dark; border-radius: 5px; &.dark { diff --git a/styles/dialog.scss b/styles/dialog.scss index 2c2d19c..d501cd8 100644 --- a/styles/dialog.scss +++ b/styles/dialog.scss @@ -96,33 +96,30 @@ border-bottom-right-radius: $radius*3; } +.dialog-account { + width: 600px; + margin: auto; + margin-top: 100px; +} .dialog { - font-size: 13px; - - ol, ul, p { - font-size: inherit; - } - > .btn-block:last-child { border-top-left-radius: 0px; border-top-right-radius: 0px; border-bottom-left-radius: $radius*3; border-bottom-right-radius: $radius*3; } - - min-width: 200px; - @include backface-visibility(hidden); - white-space: normal; - z-index: 1000; position: absolute; - // white-space: normal; + font-size: 15px; + border: 1px solid black; + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border-radius: 5px; + white-space: normal; opacity: 0; - @include user-select(none); - @include transition( all 0.125s ease-in-out); + @include transition(all 0.125s ease-in-out); pointer-events: none; background-color: $light; color: $dark; @@ -130,9 +127,6 @@ background-color: $dark; } - border-radius: $radius*3; - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.05), 0 2px 7px rgba(0, 0, 0, 0.1); - .dialog-tabs-wrapper { overflow: hidden; border-top-left-radius: $radius*3; @@ -152,15 +146,13 @@ &:hover span {color: $dark; } &.open span { - background-color: $light; + background-color: white; color: $dark; opacity: 1; - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.05), 0 2px 7px rgba(0, 0, 0, 0.1) !important; border-bottom-right-radius: 0px !important; border-bottom-left-radius: 0px !important; border-top-left-radius: $radius*3; border-top-right-radius: $radius*3; - } &:first-child span { @@ -202,7 +194,6 @@ text-align: center; } - .dialog-section { &:first-child {border: none !important; } border-top: 2px solid rgba(0,0,0,0.1); @@ -230,4 +221,13 @@ h4 .icon { height: 38px; } + + // account dialog + &.dialog-freestanding { + margin: auto; + position: relative; + top: 150px; + border: none; + width: 800px; + } } diff --git a/styles/dropdown.scss b/styles/dropdown.scss index 9baed27..06d9ae1 100644 --- a/styles/dropdown.scss +++ b/styles/dropdown.scss @@ -118,6 +118,10 @@ $predelay: 0; display: inline-block; position: relative; vertical-align: middle; + + a { + text-decoration: none; + } &.dropdown-block { display: block; diff --git a/styles/folder.scss b/styles/folder.scss index 1d8ae83..511f51f 100644 --- a/styles/folder.scss +++ b/styles/folder.scss @@ -254,7 +254,6 @@ // word-wrap: break-word; .item { - box-shadow: 0 0 1pxrgba(0,0,0,0.1); display: inline-block; text-align: left; padding-right: $folder-gutter*2; @@ -397,7 +396,10 @@ &:active { opacity: 0.95 !important; } - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.025), 0 2px 7px rgba(0, 0, 0, 0.025); + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border: 1px solid black; + + // ??? @include opacity(1); color: $medium; // color: white; @@ -476,7 +478,6 @@ left: 0px; z-index: 100; width: auto; - background-color: rgba(255,255,255,1); .dropdown { position: absolute; @@ -501,30 +502,6 @@ color: $dark; text-align: left; } - - .item-social { - padding: 8px; - border-right: 2px solid rgba(0,0,0,0.025); - @include clearfix; - color: $medium; - - .item-likes, - .item-comments, - .item-shares { - position: relative; - &:hover { - .icon {opacity: 0; } - .number {opacity: 1; } - } - .number { - position: absolute; - opacity: 0; - top: 0; - left: 0; - } - .icon {opacity: 0.5; } - } - } } .item-appendix { diff --git a/styles/form.scss b/styles/form.scss index b0206be..ce39725 100644 --- a/styles/form.scss +++ b/styles/form.scss @@ -23,7 +23,6 @@ input:invalid { top: 0; right: 0; line-height: 1; - font-size: 10px; margin: 12px; color: red; margin-right: 25px; diff --git a/styles/header.scss b/styles/header.scss index 2b9a4ab..a44812a 100644 --- a/styles/header.scss +++ b/styles/header.scss @@ -5,7 +5,6 @@ .header-left, .header-right { position: absolute; - //@include transition( all 0.25s ease-in-out); @include backface-visibility(hidden); z-index: 3000; top: 10px; @@ -27,17 +26,20 @@ .home { margin-top: -20px; margin-left: -20px; - // .icon {color: $dark; } } .header-left { - left: 0; - padding-left: 10px; + left: 0; + padding-left: 10px; + padding-left: 20px; + padding-top: 20px; } .header-right { - right: 0; - padding-right: 20px; + right: 0; + padding-right: 20px; + padding-top: 20px; } + .header-center { width: 100%; left: 0; @@ -53,7 +55,7 @@ } } .header-left > * { margin-right: 10px; } -.header-right > * { margin-left: 5px; } +.header-right > * { margin-left: 10px; } .header-right { font-size: 0;} .title { @@ -87,21 +89,3 @@ opacity: 0.5; } } - -.present-mode #space-header { - background-color: transparent !important; -} - -#space-siblings { - background-color: rgba(245, 245, 245, 0.95); - padding: 35px; - max-height: 450px; - overflow-y: scroll; - margin-top: 54px; - border-bottom: 1px solid #eee; - - .btn { - margin-bottom: 50px; - } -} - diff --git a/styles/icon.scss b/styles/icon.scss index 86d8258..f95799b 100644 --- a/styles/icon.scss +++ b/styles/icon.scss @@ -85,3 +85,12 @@ transform: rotateZ(45deg) translateX(-8px); } +.icon-svg { + background-size: 26px; + background-position: center; + background-repeat: no-repeat; +} + +.icon-sd6 { + background-image: url(/images/sd6-icon-white.svg); +} diff --git a/styles/landing.scss b/styles/landing.scss index b8d7208..5ab7392 100644 --- a/styles/landing.scss +++ b/styles/landing.scss @@ -1,257 +1,29 @@ @import "vars"; #landing-header { - background-color: rgba(255,255,255,0.3); - height: 64px; - position: absolute; - top: 0; - left: 0; - right: 0; + background-color: white; + height: 64px; + position: relative; + top: 0; + left: 0; + right: 0; } -.landing-keyvisual-wrapper { - background-image: url("../images/sd5-keyvisual-compressed.jpg"); - background-size: cover; - background-position: center; - padding-top: 40px; - padding-bottom: 40px; -} - -.landing-plans-wrapper { - background-image: url("../images/sd5-hero2-compressed.jpg"); - background-size: cover; - background-position: center; - padding-top: 80px; - padding-bottom: 100px; -} - -.landing-box { - width: 800px; - margin: auto; - max-width: 90%; - background-color: white; - padding: 40px; - margin-bottom: 80px; - margin-top: 80px; - position: relative; - - box-shadow: 0px 0px 50px rgba(0,0,0,0.2); - - h1 { - margin-bottom: 20px; - } - - &.black { - background-color: #222; - color: white; - padding: 20px; - text-align: center; - } - - &.overlap { - position: absolute; - z-index: 2; - margin-top: -65px; - left: 50%; - top: 0px; - margin-left: -250px; - width: 500px; - } - - &.screenshot { - width: 90%; - max-width: 90%; - padding: 20px; - box-shadow: none; - background-color: transparent; - - img { - width: 100%; - position: absolute; - top: 0px; - left: 0px; - opacity: 0.3; +#landing { + margin-top: 100px; + + section { + margin-left: 300px; + + > * { + max-width: 600px; + } } - } - - &.landing-box-left { - margin-left: 30px; - } -} - -.lead-xxl { -} - -.lead { - margin-bottom: 20px; -} - -.lead-xl { -} - -.plans-box { - background: linear-gradient(to bottom, #FEFFFF 25%,#D0D8E2 100%); - padding: 40px; - border-radius: 9px; -} - -.landing-box.plans-box { - margin-top: 200px; - width: 900px; -} - -.plans-table { - tr { - vertical-align: top; - } - - th { - font-size: 42px; - padding-top: 40px; - text-align: center; - } - - th.best-plan { - padding-top: 20px; - font-size: 48px; - padding-bottom: 0px; - } - - td { - padding: 20px; - width: 30%; - p, li { - font-size: 18px; - } - li { - margin-bottom: 10px; - } - } - - td.best-plan { - width: 40%; - p { - font-size: 22px; - } - } - - td li { - list-style-type: none; - text-align: center; - } - - ul { - margin: 0 !important; - padding: 0 !important; - } - - .upgrade-buttons { - text-align:center; - margin-top:20px; - } -} - -.logo-row { - position: relative; - padding: 80px; - background-color: white; - text-align: center; - width: 100%; - - &.blue { - background-color: $blue; - color: white; - } -} - -.logo-row div { - display: inline-block; - width: 200px; -} - -.landing-row { - background-color: white; - padding-bottom: 80px; - padding-top: 40px; -} - -#keyvisual { - border-radius: 20px; - box-shadow: 0px 0px 20px #eee; - - width: 640px; - height: 420px; - background-size: contain; - background-repeat: no-repeat; - background-position: center; - background-image: url('/images/landing/spacedeck-screenshot1.jpg'); - background-color: white; - margin: auto; - margin-top: 40px; - margin-bottom: 40px; - border: 1px solid #eee; -} - -#legal { - .landing-box { - width: 800px; - } } .footer { - padding: 40px; - padding-bottom: 80px; - text-align: center; - color: $medium; - - a { - margin-right: 20px; - } + margin-left: 300px; + margin-top: 100px; + margin-bottom: 100px; } - -@media screen and (min-width: 801px) { - .plans-table-mobile { - display: none; - } -} - -@media screen and (max-width: 800px) { - - ul.lead.lead-xl, p.lead.lead-xl, ol.lead.lead-xl { - font-size: 20px !important; - } - - .header-right { - > span:first-child { - display: none; - } - } - - .plans-table { - display: none; - } - - .plans-table-mobile { - display: block; - - tbody { - display: block; - width: 100%; - } - - tr { - display: block; - width: 100%; - } - - td, th { - display: block; - width: 100%; - } - - ul, li { - width: 100%; - } - } -} diff --git a/styles/modal.scss b/styles/modal.scss index b02a4c3..cc64883 100644 --- a/styles/modal.scss +++ b/styles/modal.scss @@ -278,25 +278,5 @@ // Footer (for actions) .modal-footer { - // border-bottom-left-radius: $radius; - // border-bottom-right-radius: $radius; - // background-color: $dark !important; - // padding: 40px; - // padding-top: 0px; - // text-align: right; // right align buttons - @include clearfix(); // clear it in case folks use .pull-* classes on buttons - - // Properly space out buttons - // .btn + .btn { - // margin-left: 5px; - // margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs - // } - // // but override that for button groups - // .btn-group .btn + .btn { - // margin-left: -1px; - // } - // // and override it for block buttons as well - // .btn-block + .btn-block { - // margin-left: 0; - // } + margin-top: 20px; } diff --git a/styles/section.scss b/styles/section.scss index 75aa3df..674aa04 100644 --- a/styles/section.scss +++ b/styles/section.scss @@ -27,6 +27,5 @@ right: 0; z-index: 800; pointer-events: none; - opacity: 0.25; display: block; } diff --git a/styles/select-list.scss b/styles/select-list.scss index 1c1a662..59ab08d 100644 --- a/styles/select-list.scss +++ b/styles/select-list.scss @@ -6,22 +6,18 @@ li { &.checked { - &:before {background-color: $medium !important; } > a, > span { - color: $medium; } } &:hover { - &:before {background-color: $medium; } > a, > span { background-color: rgba(0,0,0,0.025) !important; } } - &:before {background-color: $medium; } > a, > span { color: $medium; @@ -30,7 +26,7 @@ } .select-list { - &:empty:before{ + &:empty:before { position: absolute; top: 50%; left: 50%; @@ -45,17 +41,14 @@ opacity: 0.5; } - -webkit-mask-image: -webkit-gradient(linear, left top, left 15px, from(rgba(0,0,0,0)), to(rgba(0,0,0,0.5))); - background-clip: padding-box; - font-size: 15px; - line-height: 14px; + //font-size: 15px; + //line-height: 14px; list-style: none; margin: 0px; padding: 15px 0; text-align: left; // background-color: $dark; - color: $medium; border-radius: $radius; .divider + li span {border: none !important; } @@ -90,15 +83,11 @@ } &:hover { - // background-color: rgba(0,0,0,0.025); - &:before { - background-color: $medium; - display: block; - } + background-color: black; + > a, > span { - color: $medium; - color: $dark; + color: white; } } @@ -126,9 +115,8 @@ display: block; cursor: pointer; white-space: nowrap; - color: $medium; margin: 0 25px; - padding: 16px 3px; + padding: 10px 0px; // line-height: 50px; overflow: hidden; text-overflow: ellipsis; @@ -154,4 +142,4 @@ } } } -} \ No newline at end of file +} diff --git a/styles/style.scss b/styles/style.scss index bff34f4..fefab49 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -65,10 +65,17 @@ html, body { height:100%; - background-color: $light; + background-color: white; color: $black; } +body { + max-width: 100%; + padding: 0px; + text-rendering: optimizeLegibility; + cursor: default; +} + *[contenteditable="true"] { outline: none; } @@ -79,31 +86,12 @@ body { @include box-sizing(border-box); } -body { - max-width: 100%; - padding: 0px; - text-rendering: optimizeLegibility; - //@include user-select(none); - cursor: default; -} - -#home { - background-color: white; -} - .img img { max-width: 100%; height: auto; } -#startup { - background-position: center; - background-image:url(/images/diamond.svg); - background-repeat: no-repeat; -} - - -.layer { +/*.layer { @include transition( all 0.2s ease-in-out); @include backface-visibility(hidden); position: absolute; @@ -131,7 +119,7 @@ body { pointer-events: auto; opacity: 1; } -} +}*/ [draggable] { -moz-user-select: none; diff --git a/styles/toolbar.scss b/styles/toolbar.scss index 778e811..64a819b 100644 --- a/styles/toolbar.scss +++ b/styles/toolbar.scss @@ -20,12 +20,16 @@ margin: auto; position: fixed; - top: 10px; + top: 20px; z-index: 3000; padding: 0; font-size: 0; line-height: 0; + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border: 1px solid black; + border-radius: 5px; + // FIXME questionable? pointer-events: none !important; @@ -201,10 +205,17 @@ } .toolbar-elements { - left: 10px; + left: 20px; } .toolbar-properties { - right: 20px; + right: 30px; } +.zoom-bar { + position: absolute; + bottom: 30px; + right: 30px; + box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15); + border: 1px solid black; +} diff --git a/styles/type.scss b/styles/type.scss index b8fca74..44b12f4 100644 --- a/styles/type.scss +++ b/styles/type.scss @@ -1,6 +1,8 @@ @import "vars"; @import "mixins"; +@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;900&display=swap'); + body { background-color: $light; color: $medium; @@ -25,7 +27,7 @@ hr { h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { color: inherit; font-family: inherit; - font-weight: 500; + font-weight: 900; line-height: 1.3; margin-top: 0px; margin-bottom: 1em; @@ -46,8 +48,7 @@ strong {font-weight: 500; } small {font-size: 75%; } a { - text-decoration: none; - color: $medium; + color: black; } dl { diff --git a/styles/vars.scss b/styles/vars.scss index 4203ebb..4ee0077 100644 --- a/styles/vars.scss +++ b/styles/vars.scss @@ -35,7 +35,7 @@ $sidebar-width: 280px; $main-font: Inter; $sec-font: Inter; -$font-size: 12pt; +$font-size: 20px; $line-height: 1.5em; $gutter-a: 10px; diff --git a/views/index.html b/views/index.html index 7b24422..8aaec58 100644 --- a/views/index.html +++ b/views/index.html @@ -1,62 +1,34 @@ {% extends 'layouts/outer.html' %} -{% block title %}[[ __("welcome") ]]{% endblock %} +{% block title %}Spacedeck{% endblock %} {% block content %}
-
-
-

[[__("landing_title")]]

- -

- [[__("signup")]] -

- -

- [[__("login")]] -

- -

- [[__("landing_claim")]] -

- -

- [[__("landing_example")]] -

- -
    -
  • - [[__("landing_features_1") | safe ]] -
    • - -
  • - [[__("landing_features_2") | safe ]] -
    • - -
  • - [[__("landing_features_3") | safe ]] -
    • - -
  • - [[__("landing_features_4") | safe ]] -
    • - -
  • - [[__("landing_features_5") | safe ]] -
    • - -
  • - [[__("landing_features_6") | safe ]] -
    • - -
  • - [[__("landing_features_7") | safe ]] -
    • -
-
-
- +
+

Work Together, Visually.

+

+ Whenever you need to lay out pictures, text notes, video and audio clips on a blank canvas, + Spacedeck can help you. +

+

+ Spacedeck is the right tool for you if you want to quickly put together a collage of your + idea or concept, either for yourself or to share it with teammembers, clients or students. +

+

+ Spacedeck is not meant for creating polished designs, but it is a good fit for: +

+ +

+ The hosted version of Spacedeck 6.0 is currently in beta and invite only. You can also self-host and participate in the open source development. +

+
{% endblock %} diff --git a/views/layouts/outer.html b/views/layouts/outer.html index e3851d8..43551fa 100644 --- a/views/layouts/outer.html +++ b/views/layouts/outer.html @@ -9,36 +9,25 @@ - - + -
- +
{% if !user %} - - {% if (locale != "de") %}Deutsch{% endif %} - {% if (locale != "en") %}English{% endif %} - {% if (locale != "fr") %}Français{% endif %} - - [[__("login")]] - [[__("signup")]] + [[__("signup")]] {% else %} - [[__("spaces")]] + [[__("spaces")]] [[__("logout")]] - {% endif %}
@@ -49,8 +38,11 @@

- [[ __("contact") ]] - © 2011–2020 The Spacedeck Open Developers https://github.com/spacedeck/spacedeck-open + © 2020 MNT Research GmbH, Fehlerstr. 8, 12161 Berlin, Germany
+ © 2011–2019 Spacedeck GmbH (in liquidation)
+ Source Code: https://github.com/mntmn/spacedeck-open +
+ Font: Inter by rsms

diff --git a/views/partials/account.html b/views/partials/account.html index 7aeaf81..ad6f875 100644 --- a/views/partials/account.html +++ b/views/partials/account.html @@ -1,16 +1,30 @@ -
+
+
+ + + +
Edit Account
+
- +
+ + + +
+ +
+ +
[[__("profile_caption")]]
[[__("language_caption")]]
[[__("notifications_caption")]]
-
[[__("password_caption")]]
+
[[__("password_caption")]]
[[__("terminate_caption")]]
-
+
@@ -64,30 +78,16 @@ v-on:change="user.email_changed=true" placeholder="mail@example.com"> - +
-
-

[[__("confirmation_sent_long")]]

- - [[__("send_again")]] - -

- [[__("confirmation_sent_another")]] -

-
- -
+
@@ -121,7 +121,7 @@
-

Change Password

+

Change Password

@@ -140,13 +140,11 @@
-
-
@@ -156,7 +154,7 @@

[[__("terminate_warning2")]]

-
+
@@ -170,7 +168,7 @@
{{account_remove_error}}
- +
diff --git a/views/partials/folders.html b/views/partials/folders.html index 2106a8e..06e9e83 100644 --- a/views/partials/folders.html +++ b/views/partials/folders.html @@ -1,9 +1,9 @@
- - + + - + @@ -49,7 +49,7 @@
@@ -81,12 +81,12 @@
-
+
@@ -98,10 +98,8 @@
- - {{item.name}} - / - + + {{item.name}}  ▶ {{active_folder.name}} diff --git a/views/partials/login.html b/views/partials/login.html index b2530dc..33b2a3c 100644 --- a/views/partials/login.html +++ b/views/partials/login.html @@ -1,17 +1,11 @@
- +
- - {% if (locale != "de") %}Deutsch{% endif %} - {% if (locale != "en") %}English{% endif %} - {% if (locale != "fr") %}Français{% endif %} - - - [[__("login")]] - [[__("signup")]] + [[__("login")]] + [[__("signup")]]
@@ -23,7 +17,7 @@
-

[[__("login")]]

+

Login

@@ -34,16 +28,15 @@
-
{{login_error}}
-
- [[__("signup")]]  - [[__("reset_password")]] +
@@ -51,7 +44,7 @@
-
+

[[__("signup")]]

@@ -75,19 +68,22 @@
+ +
+ +
-
By signing up you agree to our TOS and Privacy Policy.
-
+ -
{{signup_error}}
- [[__("login")]]
@@ -102,7 +98,7 @@
{{password_reset_error}}
- +
@@ -127,7 +123,7 @@
{{password_reset_confirm_error}}
- +
diff --git a/views/partials/space.html b/views/partials/space.html index 86ef010..22d2a98 100644 --- a/views/partials/space.html +++ b/views/partials/space.html @@ -43,9 +43,8 @@
-

Click anywhere to add content.
- You can also drop images, sounds and video
- or use copy and paste.

+

Use the toolbar to add content.
+ You can also drop images or sound and video files.

@@ -127,7 +126,6 @@ {{a.view.link_caption}} -
@@ -338,7 +336,7 @@
-
+
diff --git a/views/partials/tool/layout.html b/views/partials/tool/layout.html index 8a9d000..a6b10b8 100644 --- a/views/partials/tool/layout.html +++ b/views/partials/tool/layout.html @@ -1,6 +1,6 @@
-
-
+
+
@@ -20,7 +20,7 @@
-
+
diff --git a/views/partials/tool/shapes.html b/views/partials/tool/shapes.html index 6171887..e69ab66 100644 --- a/views/partials/tool/shapes.html +++ b/views/partials/tool/shapes.html @@ -1,69 +1,48 @@

[[__("tool_shape")]]

-
- +
+
+ + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - +
- - diff --git a/views/partials/tool/toolbar-elements.html b/views/partials/tool/toolbar-elements.html index d6080f6..88bbcac 100644 --- a/views/partials/tool/toolbar-elements.html +++ b/views/partials/tool/toolbar-elements.html @@ -8,12 +8,12 @@ - - + @@ -45,7 +45,7 @@
diff --git a/views/partials/tool/toolbar-object.html b/views/partials/tool/toolbar-object.html index 0d57cd9..bfbc241 100644 --- a/views/partials/tool/toolbar-object.html +++ b/views/partials/tool/toolbar-object.html @@ -45,7 +45,7 @@
diff --git a/views/partials/tool/zones.html b/views/partials/tool/zones.html index 57f873f..48714eb 100644 --- a/views/partials/tool/zones.html +++ b/views/partials/tool/zones.html @@ -2,11 +2,11 @@
-

+ - +