summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-10 16:48:26 -0400
committerJules Laplace <jules@okfoc.us>2014-10-10 16:48:26 -0400
commit211da757666a6f9ee89160472e363bcf4732d1c9 (patch)
tree7043cb60019c039e1cd5bdd76c123db5a9630f43 /public
parent8990307ff8f90007b59cf778d2b3da0372dedf14 (diff)
show max 6 projects at a time
Diffstat (limited to 'public')
-rw-r--r--public/assets/javascripts/ui/editor/MediaUpload.js1
-rwxr-xr-xpublic/assets/stylesheets/app.css6
2 files changed, 6 insertions, 1 deletions
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;