merge

1 files changed, 21 insertions, 3 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index c2e7119..5922ab5 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -68,6 +68,12 @@ a{
 	z-index: 10;
 	pointer-events: none;
 }
+.floatingSwatch.scissors {
+  background-image: url(/assets/img/scissors.png) !important;
+  background-repeat: no-repeat;
+  border: 0;
+  box-shadow: 0 0 transparent;
+}
 
 .ants {
 	max-width:320px;
@@ -1135,18 +1141,30 @@ iframe.embed {
   border-bottom: 1px solid black;
   min-height: 30px;
 }
-.wallpaperUpload {
+.wallpaper {
   font-size: 14px;
   font-weight: 300;
 }
-.wallpaperUpload label {
+.wallpaper label {
   position: relative;
   top: -6px;
   float: none;
 }
-.wallpaperUpload .icon-ios7-upload-outline {
+.wallpaper form {
+  padding: 2px 0 0 0;
+}
+.wallpaper .icon-ios7-upload-outline {
   font-size: 26px;
 }
+.wallpaper .wallpaperRemove {
+  cursor: pointer;
+  border-top: 1px solid black;
+  padding: 4px 0 0 0;
+}
+.wallpaper .wallpaperRemove img {
+  width: 18px;
+  margin: 0 4px;
+}
 .wallpaperUpload .upload-icon.uploading {
 }
 .wallpaperUpload .upload-icon.uploading:before {