Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 30 insertions, 19 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 115321f..1446c60 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -729,8 +729,8 @@ iframe.embed {
 }
 
 .menu {
-  right: 10px;
-  top: 70px;
+	right: 9px;
+	top: 63px;
   z-index:3;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -923,7 +923,7 @@ iframe.embed {
   padding: 26px 20px;
   margin-left: -200px;
   background: rgba(255,255,255,0.9);
-  z-index: 4;
+  z-index: 7;
   -webkit-transform: translateY(-1000%);
   -webkit-transition: -webkit-transform 0.6s ease-in-out;
   transform: translateY(-1000%);
@@ -1009,10 +1009,16 @@ iframe.embed {
   display: inline-block;
   position:relative;
   z-index:4;
+	font-weight: 300;
+}
+
+.mediaDrawer.mediaViewer h2 {
+	margin-top:28px;
+	font-size:18px;
 }
 
 .mediaDrawer h3{
-  margin-top: 28px;
+  margin-top: 18px;
   position: relative;
   z-index: 4;
 }
@@ -1074,21 +1080,21 @@ iframe.embed {
   color: #555;
   text-decoration:none;
   padding:5px;
-  border:3px solid white;
+  border:1px solid white;
 }
 
 .mediaDrawer h2 a.active{
   cursor:default;
-  border:3px solid black;
+  border:1px solid black;
   color:black;
 }
 
 .mediaDrawer h2 a:hover {
-  border:3px solid #ccc;
+  border:1px solid #ccc;
 }
 
 .mediaDrawer h2 a.active{
-  border:3px solid black;
+  border:1px solid black;
 }
 
 
@@ -1156,7 +1162,6 @@ iframe.embed {
   right: 80px;
   margin-top: 77px;
   width: 162px;
-  z-index: 1;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
@@ -1189,8 +1194,13 @@ iframe.embed {
   min-height: 30px;
 }
 
-.wallpaperUpload {
+.wallpaperUpload, .wallpaperRemove {
 	border: 1px solid;
+	display: inline-block;
+	width: 100%;
+	margin-top: 5px;
+	font-size: 14px;
+	font-weight: 300;
 }
 
 .wallpaper label {
@@ -1203,9 +1213,10 @@ iframe.embed {
   font-size: 14px;
   font-weight: 300;
 }
-.wallpaper form:hover {
+.wallpaper form:hover, .wallpaperRemove:hover {
 	background:black;
 	color:white;
+	cursor:pointer;
 }
 .wallpaper .icon-ios7-upload-outline {
   font-size: 26px;
@@ -1240,14 +1251,13 @@ iframe.embed {
   border: 1px solid #000;
 }
 .wallpaperUpload input[type="file"]{
-  position: absolute;
-  margin-left: -134px;
-  background: blue;
-  height: 28px;
-  width: 100%;
-  margin-top: 0px;
-  opacity: 0;
-  cursor:pointer;
+	position: absolute;
+	margin-top: -30px;
+	background: blue;
+	height: 28px;
+	width: 100%;
+	opacity: 0;
+	cursor: pointer;
 }
 
 
@@ -1582,6 +1592,7 @@ button {
 }
 #mediaEditor .warn {
 	width:100%;
+	padding:5px 0;
 }
 
 .radio-group {