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

1 files changed, 85 insertions, 30 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index b09b8a5..42f0058 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -138,10 +138,12 @@ a{
 	display: none;
 	z-index: 10;
 	pointer-events: none;
+	background-size: cover;
 }
 .floatingSwatch.scissors {
   background-image: url(/assets/img/scissors.png) !important;
   background-repeat: no-repeat;
+  background-size: auto;
   border: 0;
   box-shadow: 0 0 transparent;
 }
@@ -414,6 +416,17 @@ iframe.embed {
 	border-top: 1px solid black;
 }
 
+.mediaDrawer .viewMore {
+	clear: both;
+	float: none;
+	text-decoration: none;
+	font-size: 22px;
+	display: block;
+	text-align: center;
+	padding: 40px;
+	border: 0;
+	border-top: 1px solid black;
+}
 
 .holder {
 	display: table-cell;
@@ -1473,6 +1486,23 @@ border-left: 1px solid black;
 	padding-bottom: 6px;
 }
 
+#presets .colors {
+	margin-bottom: 5px;
+}
+#presets .colors span {
+	display: inline-block;
+	font-size: 0;
+	width: 20px;
+	height: 20px;
+	border: 1px solid #ddd;
+	margin: 0px 2px 0 0;
+	cursor: pointer;
+	transition: transform 0.2s;
+}
+#presets .colors span:hover {
+	transform: translateX(3px) translateY(-3px);
+}
+
 .toolButton {
 	border: 1px solid;
 	display: inline-block;
@@ -1648,7 +1678,7 @@ input[type="range"]::-webkit-slider-thumb {
 	padding: 5px;
 }
 .presets span.active {
-  border-bottom: 1px dotted;
+	text-decoration: underline;
 }
 .color-swatches span {
 	display: inline-block;
@@ -1723,7 +1753,7 @@ input[type="range"]::-webkit-slider-thumb {
 .modalLink {
   text-decoration: none;
 }
-.modalLink:hover {
+.modalLink:hover span {
   text-decoration: underline;
 }
 
@@ -1737,30 +1767,41 @@ input[type="range"]::-webkit-slider-thumb {
     opacity:0.6;
   }
 }
-#startpoint.active #moveText{
+
+#moveText,
+#confirmText {
+  display: none;
+}
+#startpoint.active #moveText {
+  display:inline-block;
   -webkit-animation:fade 0.5s infinite;
   animation:fade 0.5s infinite;
 }
-#moveText{
-  display:none;
+#startpoint #goText,
+#startpoint.active #startText,
+#startpoint.active #goText,
+#startpoint.confirmed #startText {
+  display: none;
 }
-#moveText.show {
-  display:inline-block;
+#startpoint.confirmed #confirmText {
+  display: inline-block;
 }
-#startText.hide {
-  display:none;
+#startpoint.confirmed #goText {
+  display: inline-block;
 }
-#startpoint.active:after {
+#moveText .done {
   content: "done";
   background: black;
   color: white;
   padding: 2px;
   font-weight: 900;
   margin-left: 5px;
+  text-decoration: none !important;
 }
 #startpoint.active:hover {
   text-decoration:none;
 }
+
 .settings input[type="text"] {
   border: 1px solid #000;
   font-size: 15px;
@@ -2159,13 +2200,27 @@ form li textarea {
 	right: 20px;
 	top: 20px;
 	z-index: 20;
-	background: #f9f9f9;
+	background: white;
 	width: 75px;
 	color: black;
 	border: 1px solid black;
 	box-shadow: -3px 4px black;
 	line-height: 75px;
-
+	text-align: center;
+}
+#fixed_close {
+	display: none;
+	transform: translateY(-200px) translateZ(0);
+}
+#fixed_close.active {
+	animation: visibility 0.2s;
+	animation-fill-mode: forwards;
+	display: block;
+}
+@keyframes visibility {
+	100% {
+		transform: translateY(0px) translateZ(0);
+	}
 }
 
 
@@ -2518,22 +2573,22 @@ a[data-role="forgot-password"] {
 	padding: 50px 0;
 	}
 	.page .viewMore.btn {
-	text-decoration: none;
-	font-size: 18px;
-	padding: 18px 0;
-}
-.footer a, .footer span {
-margin: 9px;
-}
-#keyhint {
-	display:none;
-}
-.projectList .projectItem {
-	width:100%;
-	margin: 20px 0;
-}
-.projectList .room {
-width: 100%;
-height: 260px;
-}
+		text-decoration: none;
+		font-size: 18px;
+		padding: 18px 0;
+	}
+	.footer a, .footer span {
+	margin: 9px;
+	}
+	#keyhint {
+		display:none;
+	}
+	.projectList .projectItem {
+		width:100%;
+		margin: 20px 0;
+	}
+	.projectList .room {
+	width: 100%;
+	height: 260px;
+	}
 }
\ No newline at end of file