From a18a6f0d2fa629fc25004b516c960b794de2ec52 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 29 Sep 2014 17:07:22 -0400 Subject: stylez --- views/controls/editor/light-control.ejs | 3 +-- views/controls/editor/media-drawer.ejs | 2 +- views/controls/editor/media-editor.ejs | 4 ++-- views/controls/editor/settings.ejs | 10 +++++----- views/controls/editor/toolbar.ejs | 2 +- views/controls/editor/wallpaper.ejs | 5 +++++ 6 files changed, 15 insertions(+), 11 deletions(-) (limited to 'views/controls/editor') diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index a67df34..1ed6ef6 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -1,8 +1,7 @@
-
+

Brightness Control

-

Brightness

diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 456699c..241164f 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -17,7 +17,7 @@
X

Your Media – Found Media


-

delete media

+

delete media?

diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 7f8f299..000e8db 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -50,7 +50,7 @@
-
- Delete +
+ delete this media
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index e4ec7ee..ed587fa 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -27,11 +27,11 @@
@@ -39,8 +39,8 @@
- Clear - Clone - Delete + Clear + Clone + Delete Room
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index e073df4..4abf780 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -17,7 +17,7 @@ class="icon-ios7-keypad-outline"> + + + Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> +
+ -- cgit v1.2.3-70-g09d2 From c8bfd290434ab06cd6b8b1536b9c317eba7e6630 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 29 Sep 2014 17:33:18 -0400 Subject: if no media, dont show “delete media” button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/javascripts/ui/editor/EditorSettings.js | 7 ++-- public/assets/javascripts/ui/editor/MediaViewer.js | 37 +++++++++++++++++----- .../javascripts/ui/editor/WallpaperPicker.js | 1 - views/controls/editor/media-drawer.ejs | 2 +- 4 files changed, 34 insertions(+), 13 deletions(-) (limited to 'views/controls/editor') diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index de47be4..f74b535 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -17,8 +17,8 @@ var EditorSettings = FormView.extend({ }, initialize: function(opt){ - this.parent = opt.parent - this.__super__.initialize.call(this) + this.parent = opt.parent + this.__super__.initialize.call(this) this.$id = this.$("[name=_id]") this.$csrf = this.$("[name=_csrf]") @@ -110,7 +110,6 @@ var EditorSettings = FormView.extend({ var state = typeof state == 'boolean' ? state : ! this.$el.hasClass("active") this.$el.toggleClass("active", state) - $(".inuse").removeClass("inuse") $("[data-role='toggle-project-settings']").toggleClass("inuse", state) }, @@ -183,6 +182,8 @@ var EditorSettings = FormView.extend({ window.history.pushState(null, document.title, "/project/" + data.slug + "/edit") this.parent.data = data + + this.toggle(false) }, }) diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index 7cfa863..436c0cb 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -6,23 +6,33 @@ var MediaViewer = ModalView.extend({ events: { 'click .foundToggle': "foundToggle", - 'click .yourMedia': "userToggle", + 'click .userToggle': "userToggle", 'click #deleteMedia': "deleteArmed", 'click .mediaContainer': "pick", }, + initialize: function(opt){ + this.__super__.initialize.call(this) + this.parent = opt.parent + this.$foundMedia = this.$(".foundMedia") + this.$myMedia = this.$(".myMedia") + this.$foundToggle = this.$(".foundToggle") + this.$userToggle = this.$(".userToggle") + this.$deleteMedia = this.$("#deleteMedia") + }, + foundToggle: function(){ - this.$(".foundMedia").addClass("active"); - this.$(".myMedia").addClass("inactive"); + this.foundMedia.addClass("active"); + this.myMedia.addClass("inactive"); this.$("a").removeClass("active"); - this.$(".foundToggle").addClass("active"); + this.foundToggle.addClass("active"); }, userToggle: function(){ - this.$(".foundMedia").removeClass("active"); - this.$(".myMedia").removeClass("inactive"); + this.foundMedia.removeClass("active"); + this.myMedia.removeClass("inactive"); this.$("a").removeClass("active"); - this.$(".yourMedia").addClass("active"); + this.userToggle.addClass("active"); }, show: function(){ @@ -46,7 +56,12 @@ var MediaViewer = ModalView.extend({ populate: function(data){ this.loaded = true - data && data.forEach(this.add.bind(this)) + if (data && data.length) { + data.forEach(this.add.bind(this)) + } + else { + this.$deleteMedia.hide() + } this.__super__.show.call(this) }, @@ -78,6 +93,7 @@ var MediaViewer = ModalView.extend({ $span.append(image) this.$(".myMedia").prepend($span) + this.$deleteMedia.show() }, deleteIsArmed: false, @@ -112,6 +128,11 @@ var MediaViewer = ModalView.extend({ if (this.deleteIsArmed) { this.destroy(media._id) $target.remove() + + if ($(".myMedia .mediaContainer").length == 0) { + this.$deleteMedia.hide() + this.deleteArmed(false) + } return } diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js index 8048288..0dd2921 100644 --- a/public/assets/javascripts/ui/editor/WallpaperPicker.js +++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js @@ -36,7 +36,6 @@ var WallpaperPicker = UploadView.extend({ }, populate: function(data){ - console.log(data) this.loaded = true if (data && data.length) { data.forEach(this.add.bind(this)) diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 241164f..d73a3ef 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -16,7 +16,7 @@
X -

Your Media – Found Media


+

Your Media – Found Media


delete media?

-- cgit v1.2.3-70-g09d2 From 22ab941f4630f545cc7d0475611d056372fcad10 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 29 Sep 2014 18:18:44 -0400 Subject: color picker UI --- public/assets/stylesheets/app.css | 59 ++++++++++++++++++++++----------- views/controls/editor/light-control.ejs | 10 +++++- views/controls/reader/about-room.ejs | 2 +- 3 files changed, 50 insertions(+), 21 deletions(-) (limited to 'views/controls/editor') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 3f3b8f7..f2ade63 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -729,10 +729,7 @@ iframe.embed { -moz-user-select: none; user-select: none; } -.vvbox .txt { - padding: 5px; - display: inline-block; -} + .edit-video.menu, .edit-image.menu { right: auto; @@ -1239,7 +1236,7 @@ iframe.embed { transform: translateX(400px); transition: -webkit-transform 0.2s ease-in-out; } -h4 { +.lightcontrol h4 { font-weight: 600; font-size: 12px; line-height: 0; @@ -1273,12 +1270,17 @@ input[type="range"]::-webkit-slider-thumb { .colorPicker { cursor: crosshair; } + .swatch { width: 20px; height: 20px; border: 1px solid #eee; display: inline-block; cursor: pointer; + float:left; +} +.swatch:hover { + border: 1px solid red; } .swatch.selected { border: 1px solid #000; @@ -1286,17 +1288,36 @@ input[type="range"]::-webkit-slider-thumb { .color-swatches { margin-top: 10px; } +.color-swatches span { + display: inline-block; + width: 50%; + float:left; + cursor:pointer; +} +.color-swatches span.active{ + background:black; + color:white; +} +.color-swatches span:nth-child(3){ + clear:left; +} +.color-swatches span:hover { + background:#eee; +} + +.color-swatches span.active:hover { + background:#000; +} .color-swatches label { - font-size: 11px; - font-weight: 300; - position: relative; - top: -6px; - padding-left: 5px; - display: inline-block; - min-width: 35px; - cursor: pointer; + font-size: 14px; + font-weight: 300; + position: relative; + padding-left: 5px; + display: inline-block; + cursor: pointer; + top: -2px; } -.color-swatches label.selected { +.color-swatches span.active label { font-weight: 600; } @@ -1497,11 +1518,14 @@ input[type="range"]::-webkit-slider-thumb { background:black; color:white; } - +.btn.marg { + margin-top:10px; +} .warn { background:red; display: inline-block; color:white; + text-decoration:none; border:1px solid red; text-align: center; } @@ -1800,6 +1824,7 @@ a[data-role="forgot-password"] { .txt { font-size:12px; padding:5px 0; + display: inline-block; } .aboutRoom h1 a{ text-decoration: none; @@ -1811,16 +1836,12 @@ a[data-role="forgot-password"] { } .aboutRoom .editlink { - color: black; - text-decoration: none; border-bottom: 0; - background: white; padding: 6px; display: inline-block; margin-top: 10px; width: 100%; text-align: center; - border:1px solid black; } .aboutRoom .editlink:hover { diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 1ed6ef6..65a602f 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -5,11 +5,19 @@
+
+ +
+ +
-
+ +
+ +