diff options
| author | ryderr <r@okfoc.us> | 2014-10-08 16:14:59 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-08 16:14:59 -0400 |
| commit | 19aa51eb1283c53917f5942ff3e146501bdcfc06 (patch) | |
| tree | b66282dd23513874aeb48fcdb8e14c879fc68f96 | |
| parent | 8f5f06dc360d4446a3d2eb628acb591718590a49 (diff) | |
| parent | 2b658ce6a00dc4f20ea77a50b8cca61f56629a71 (diff) | |
merge
| -rw-r--r-- | public/assets/javascripts/ui/site/LayoutsModal.js | 3 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 8 | ||||
| -rw-r--r-- | views/projects/layouts-modal.ejs | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js index ef6a36c..24b65e3 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -3,6 +3,7 @@ var LayoutsIndex = View.extend({ initialize: function(){ this.$templates = this.$(".templates") + this.$templatesList = this.$(".templates-list") this.$noTemplates = this.$(".no-templates") this.$form = this.$("form") }, @@ -19,7 +20,7 @@ var LayoutsIndex = View.extend({ this.$form.hide() this.$noTemplates.show() } - this.$templates.children("span").remove() + this.$templatesList.empty() data.forEach(function(room){ var $span = $("<span>") $span.data("slug", room.slug) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index b8702f6..aeb05a1 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -373,12 +373,12 @@ iframe.embed { .room .images[data-mediacount='1'] img:nth-child(1) { left: 20%; top: 20%; } -.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 30%; } -.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 0%; width: auto; height: 30%; } +.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 40%; } +.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 50%; width: auto; height: 40%; } .room .images[data-mediacount='3'] img:nth-child(1) { right: 51%; bottom: 41%; } -.room .images[data-mediacount='3'] img:nth-child(2) { left: 51%; bottom: 0%; width:auto; height:30%;} -.room .images[data-mediacount='3'] img:nth-child(3) { right: 51%; top: 61%; } +.room .images[data-mediacount='3'] img:nth-child(2) { right: 51%; top: 61%; } +.room .images[data-mediacount='3'] img:nth-child(3) { left: 51%; bottom: 0%; width:auto; height:30%;} .room .images[data-mediacount='4'] img:nth-child(1) { right: 51%; bottom: 41%; } .room .images[data-mediacount='4'] img:nth-child(2) { left: 51%; bottom: 61%; } diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs index ee48217..8754617 100644 --- a/views/projects/layouts-modal.ejs +++ b/views/projects/layouts-modal.ejs @@ -3,7 +3,9 @@ <div class="box"> <div class="templates"> - <h3>Edit Room Layouts</h3> + <h1>Edit Room Layouts</h1> + <div class="templates-list"> + </div> </div> <div class="no-templates"> There are no room layouts available. Please <a href="/layout/new">create a new one.</a> @@ -20,6 +22,8 @@ <div class="templates"> <h1>Your Projects</h1> + <div class="templates-list"> + </div> </div> <div class="no-templates"> </div> @@ -35,6 +39,8 @@ <h2>Choose Room Template</h2> <div class="templates"> + <div class="templates-list"> + </div> </div> <div class="no-templates"> There are no room layouts available. Please <a href="/layout/new">create a new one.</a> |