From 7cd5291ff363c0fcd776e1039c2af650b758d70d Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 29 Sep 2014 14:07:29 -0400 Subject: some styles --- views/home.ejs | 3 ++- views/partials/edit-profile.ejs | 5 +++-- views/partials/header.ejs | 2 +- views/partials/sign-in.ejs | 4 ++-- views/profile.ejs | 2 +- views/projects/list-projects.ejs | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) (limited to 'views') diff --git a/views/home.ejs b/views/home.ejs index 8b83a8f..5240ae1 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -16,8 +16,9 @@
+ Create 3D Rooms

- Welcome to VVALLS + Watch video.
diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs index 96e9da4..a39f856 100644 --- a/views/partials/edit-profile.ejs +++ b/views/partials/edit-profile.ejs @@ -61,8 +61,9 @@
  • -

    Change Password

    +

    Change Password

    • +
    • diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 6697aff..a48c5e1 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -14,7 +14,7 @@ Projects [[ if (profile && String(user._id) == String(profile._id)) { ]] - Edit Profile + Settings [[ } else if (! profile) { ]] Profile [[ } ]] diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs index 8268b2a..98f0acc 100644 --- a/views/partials/sign-in.ejs +++ b/views/partials/sign-in.ejs @@ -6,7 +6,7 @@
    - +
  • @@ -39,7 +39,7 @@ - +
  • diff --git a/views/profile.ejs b/views/profile.ejs index 8dd3c6d..ada3d52 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -45,7 +45,7 @@ [[ include projects/list-projects ]] - create project + create project [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index c41ae07..2b6aa1e 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -2,8 +2,9 @@ - + [[ projects.forEach(function(project, i) { ]] + [[ if (i % 4 == 1) { ]] [[ } ]] -- cgit v1.2.3-70-g09d2 From 94533f1023cb58d293242801eda1aa74bd8d19c6 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 29 Sep 2014 15:43:50 -0400 Subject: linking to said api --- views/staff/projects/show.ejs | 1 + 1 file changed, 1 insertion(+) (limited to 'views') diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs index bd23784..687f0c2 100644 --- a/views/staff/projects/show.ejs +++ b/views/staff/projects/show.ejs @@ -19,6 +19,7 @@
    [view] [edit] + [api] [[- project.date ]] -- cgit v1.2.3-70-g09d2 From f80ca0ef62785cf72176598b695a1a291dd38e91 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 29 Sep 2014 16:47:34 -0400 Subject: fix error in color picker --- public/assets/javascripts/ui/editor/LightControl.js | 6 +++--- public/assets/javascripts/ui/site/LayoutsModal.js | 2 +- server/lib/api/rooms.js | 5 ----- views/projects/layouts-modal.ejs | 5 +---- 4 files changed, 5 insertions(+), 13 deletions(-) (limited to 'views') diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js index d975180..96f6942 100644 --- a/public/assets/javascripts/ui/editor/LightControl.js +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -247,11 +247,11 @@ var LabColorPicker = function (parent, w, h) { var var_G = ( RGB[1] / 255 ) // G from 0 to 255 var var_B = ( RGB[2] / 255 ) // B from 0 to 255 - if ( var_R > 0.04045 ) var_R = ( ( var_R + 0.055 ) / 1.055 ) ^ 2.4 + if ( var_R > 0.04045 ) var_R = Math.pow( ( var_R + 0.055 ) / 1.055, 2.4) else var_R = var_R / 12.92 - if ( var_G > 0.04045 ) var_G = ( ( var_G + 0.055 ) / 1.055 ) ^ 2.4 + if ( var_G > 0.04045 ) var_G = Math.pow( ( var_G + 0.055 ) / 1.055, 2.4) else var_G = var_G / 12.92 - if ( var_B > 0.04045 ) var_B = ( ( var_B + 0.055 ) / 1.055 ) ^ 2.4 + if ( var_B > 0.04045 ) var_B = Math.pow( ( var_B + 0.055 ) / 1.055, 2.4) else var_B = var_B / 12.92 var_R = var_R * 100 diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js index f109ec3..bfc3dec 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -57,7 +57,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({ this.$(".templates .active").removeClass("active") var $layout = $(e.currentTarget) $layout.addClass("active") - + // actually do window.location.pathname = "/project/" + $layout.data("slug") + "/edit" }, diff --git a/server/lib/api/rooms.js b/server/lib/api/rooms.js index f0e991d..c044309 100644 --- a/server/lib/api/rooms.js +++ b/server/lib/api/rooms.js @@ -61,12 +61,7 @@ var rooms = module.exports = { }) }) - // Walls.deserialize(doc.walls) -// data.media && Scenery.deserialize(data.media) - res.json(doc) - return - }) } } diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs index 97f1e61..34dc9af 100644 --- a/views/projects/layouts-modal.ejs +++ b/views/projects/layouts-modal.ejs @@ -33,14 +33,11 @@ X
    +

    Choose Room Template

    -

    Choose Room Template

    There are no room layouts available. Please create a new one.
    - - -
    -- cgit v1.2.3-70-g09d2 From a18a6f0d2fa629fc25004b516c960b794de2ec52 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 29 Sep 2014 17:07:22 -0400 Subject: stylez --- public/assets/stylesheets/app.css | 138 ++++++++++++++++++++++---------- 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 ++ views/controls/reader/about-room.ejs | 6 +- views/projects/list-projects.ejs | 2 +- 9 files changed, 116 insertions(+), 56 deletions(-) (limited to 'views') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 23d8e60..a7a3517 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -221,7 +221,7 @@ iframe.embed { } .viewMore:hover { - background: lightgreen; + background: black; color: white; } @@ -306,22 +306,15 @@ iframe.embed { padding:80px; } .subButtons a { - margin: 9px 0; - border: 0; - background: transparent; - font-size: 15px; - font-weight: 300; - width: 33.33333333333%; display: inline-block; float: left; - text-decoration:none; } -.subButtons a:hover { - text-decoration:underline; + +.subButtons a:nth-child(2){ + margin-left:5px; } .subButtons a:nth-child(3){ - color:#FF3A2D; - float: right; + float:right; } .page .questions span{ font-weight:300; @@ -368,8 +361,9 @@ iframe.embed { } .footer { - width: 100%; - margin: 80px 0; + width: 100%; + padding: 80px 0; + background: #f9f9f9; } .footer a, .footer span{ @@ -401,7 +395,7 @@ iframe.embed { position: relative; font-size: 18px; padding: 8px; - margin: 14px; + margin: 4px; -webkit-user-select: none; -moz-user-select: none; user-select: none; @@ -413,11 +407,13 @@ iframe.embed { padding: 8px; color: black; font-weight: 300; + float:right; text-decoration: none; border-bottom:1px solid transparent; } .topLinks a:hover { - border-bottom:1px solid lightgreen; + background: black; + color: white; } .profilepage .bio { text-align: left; @@ -710,8 +706,14 @@ iframe.embed { display: inline-block; background: white; box-shadow: -3px 3px; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} +.vvbox .txt { + padding: 5px; + display: inline-block; } - .edit-video.menu, .edit-image.menu { right: auto; @@ -1007,7 +1009,7 @@ iframe.embed { } .editBtn:hover { - background:lightgreen; + background:black; } .deleteArmed .mediaDrawer h3 { @@ -1218,6 +1220,12 @@ iframe.embed { transform: translateX(400px); transition: -webkit-transform 0.2s ease-in-out; } +h4 { + font-weight: 600; + font-size: 12px; + line-height: 0; + margin-top: 15px; +} .lightcontrol.active { -webkit-transform: translateX(0px); transform: translateX(0px); @@ -1249,12 +1257,12 @@ input[type="range"]::-webkit-slider-thumb { .swatch { width: 20px; height: 20px; - border: 1px solid black; + border: 1px solid #eee; display: inline-block; cursor: pointer; } .swatch.selected { - border-width: 2px; + border: 1px solid #000; } .color-swatches { margin-top: 10px; @@ -1270,7 +1278,7 @@ input[type="range"]::-webkit-slider-thumb { cursor: pointer; } .color-swatches label.selected { - font-weight: 500; + font-weight: 600; } @@ -1358,6 +1366,7 @@ input[type="range"]::-webkit-slider-thumb { .settings .setting { margin-bottom:10px; } +.settings .settings .setting a { text-decoration:none; } @@ -1368,10 +1377,8 @@ input[type="range"]::-webkit-slider-thumb { } .settings .subButtons a { font-size: 12px; - font-weight: 300; - width: 40px; - margin: 0; } + .settings .setting:last-child{ margin-bottom:0px; } @@ -1390,6 +1397,10 @@ input[type="range"]::-webkit-slider-thumb { float: left; position: relative; top: 5px; + font-weight:600; +} +.setting.number label:after { + content:":"; } .setting.number.halflines { height: 30px; @@ -1454,22 +1465,42 @@ input[type="range"]::-webkit-slider-thumb { padding-right: 3px; } +.btn, button { + background:white; + color:black; + padding:3px; + text-decoration:none; + cursor: pointer; + border:1px solid; +} + +.btn:hover, button:hover { + background:black; + color:white; +} + +.warn { + background:red; + display: inline-block; + color:white; + border:1px solid red; + text-align: center; +} + button { padding: 8px; - border: 1px solid; float: right; font-weight: 500; - background: white; - cursor: pointer; width: 100%; + font-size:14px; } -button:hover { - background:black; - color:white; +#builder-units { + width:100%; +} +#mediaEditor .warn { + width:100%; } - - .radio-group { width: 182px; @@ -1581,9 +1612,9 @@ form input[type="submit"] { padding: 10px 0; } form input[type="submit"]:hover { - background:lightgreen; + background:black; color:white; - border:1px solid lightgreen; + border:1px solid black; cursor:pointer; } form p{ @@ -1651,7 +1682,7 @@ form li textarea { } .demo .video span.icon-ios7-play-outline:hover { - color:lightgreen; + color:black; } .box { @@ -1659,6 +1690,12 @@ form li textarea { vertical-align: middle; width: 100%; } +.question { + font-size: 43px; + font-weight: 300; + margin-bottom: 10px; + display: inline-block; +} .close { font-weight: 100; @@ -1678,7 +1715,7 @@ form li textarea { } .close:hover { - background:lightgreen; + background:black; color:white; } @@ -1698,7 +1735,7 @@ form li textarea { } /* .facebook:hover{ - background:lightgreen; + background:black; } */ .box b.signin-tagline { @@ -1738,6 +1775,13 @@ a[data-role="forgot-password"] { border: 1px solid; } +.aboutRoom h1 { + font-size:28px; +} +.txt { + font-size:12px; + padding:5px 0; +} .aboutRoom h1 a{ text-decoration: none; font-style: italic; @@ -1748,14 +1792,26 @@ a[data-role="forgot-password"] { } .aboutRoom .editlink { - color: red; - text-decoration: none; - border-bottom: 1px dotted; + 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 { + background:black; + color:white; } .aboutRoom h2{ font-size: 13px; - margin: 5px 0; + margin: 5px 0 0 0; } .share { 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 -> +
    + diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 2aa244b..60ac46e 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -1,15 +1,15 @@

    - [[- name ]],
    + [[- name ]], [[- author ]]

    + [[- description ]]

    Last modified [[- date ]] [[ if (canEdit) { ]] - · Edit +
    Edit Room [[ } ]]

    - [[- description ]]
    		[[ } else { ]] - + [[ } ]] [[ if (String(user._id) == String(project.user_id)) { ]] -- 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') 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 ffe8d0ab107347f7245d5b2166145e651a1616a9 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 29 Sep 2014 17:52:13 -0400 Subject: new style for front page items --- public/assets/stylesheets/app.css | 61 ++++++++++++++++++++++----------------- views/projects/list-projects.ejs | 19 ++++++------ 2 files changed, 43 insertions(+), 37 deletions(-) (limited to 'views') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index a7a3517..1f1b1fe 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -6,6 +6,9 @@ outline:0; font-family: 'Lato', sans-serif; -webkit-font-smoothing: subpixel-antialiased; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; } *, *:before, *:after { moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; @@ -173,17 +176,11 @@ h5 { border-spacing: 0; clear: both; } -.page table.profilepage tr, -.page table.projectList tr { - height: 400px; -} + .page table.showcase { height:70vh; } -.page table.projectList td.border { - position: relative; - border-right: 1px solid; -} + iframe.embed { width: 100%; height: 100%; @@ -194,35 +191,47 @@ iframe.embed { z-index: -1; pointer-events: none; } -.page table.demo td, -.page table.profilepage td, -.page table.projectList td { +.projectList { + display: inline-block; + float: left; + width: 100%; +} +.projectList .room { width: 33.3333%; - background-size: cover; - background-repeat: no-repeat; - background-position: center; - border-bottom:1px solid black; + height:40vh; + display:table; + position: relative; + float:left; + border-top:1px solid black; } +.projectList .room:nth-child(4n+1){ + width:100%; +} +.page .btn { + clear: both; + padding: 30px 0; + border: 0; +} .page table.showcase td { height: 70vh; background-size: cover; } -.viewMore { - color: #017cfe; +.page .viewMore { text-decoration: none; - font-weight: 300; font-size: 22px; - padding-top: 20px; display: block; - border-bottom: 1px solid black; - padding-bottom: 19px; + border-top: 1px solid black; + border-bottom: 1px solid black; } -.viewMore:hover { - background: black; - color: white; + +.holder { + display: table-cell; + height: 100%; + width: 100%; + vertical-align: middle; } .page .roomName { @@ -396,9 +405,7 @@ iframe.embed { font-size: 18px; padding: 8px; margin: 4px; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + } .topLinks span { font-weight: 300; diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index b001734..3801e30 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -1,32 +1,31 @@ [[ if (projects.length) { ]] - - - +
    + [[ projects.forEach(function(project, i) { ]] [[ if (i % 4 == 1) { ]] -
    + [[ } ]] [[ if (i == 0) { ]] - + + [[ }) ]] - - -
    + [[ } else { ]] - + [[ } ]] [[ if (String(user._id) == String(project.user_id)) { ]]
    edit
     [[ } ]] +
    [[- project.name ]]
    [[- project.date ]]     -
    +
    [[ } ]] -- cgit v1.2.3-70-g09d2 From cc5393678f3acd8ff16af6863a903b1064502895 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 29 Sep 2014 17:55:27 -0400 Subject: fix spinning --- public/assets/javascripts/ui/site/ProjectList.js | 4 ++-- views/projects/list-projects.ejs | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'views') diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js index ee1b89f..993d805 100644 --- a/public/assets/javascripts/ui/site/ProjectList.js +++ b/public/assets/javascripts/ui/site/ProjectList.js @@ -4,8 +4,8 @@ var ProjectList = View.extend({ el: ".projectList", events: { - "mouseenter td.border": 'spinOn', - "mouseleave td.border": 'spinOff', + "mouseenter .room": 'spinOn', + "mouseleave .room": 'spinOff', }, initialize: function(){ diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index 3801e30..537d409 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -4,15 +4,7 @@ [[ projects.forEach(function(project, i) { ]] - [[ if (i % 4 == 1) { ]] - - [[ } ]] - - [[ if (i == 0) { ]] - - [[ } else { ]] - [[ } ]] [[ if (String(user._id) == String(project.user_id)) { ]]
    edit
     -- cgit v1.2.3-70-g09d2 From 2cbaec8ccf0dee45b93d19a60e9cac8d1d7d1336 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 29 Sep 2014 17:58:55 -0400 Subject: dont show description if there isnt one --- views/controls/reader/about-room.ejs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'views') diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 60ac46e..7338f48 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -3,7 +3,9 @@ [[- name ]], [[- author ]] + [[ if (description) { ]] [[- description ]] + [[ } ]]

    Last modified [[- date ]] [[ if (canEdit) { ]] -- 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') 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 @@
    +
    +     +
    +     +
    -
    +     +
    +     +