merge

1 files changed, 101 insertions, 37 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index eb3bd87..6e23962 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -9,7 +9,9 @@
 body,textarea,input {
 	font-family: 'Lato', sans-serif;
 }
-
+input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
+	background:white;
+}
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 }
@@ -69,6 +71,27 @@ a{
 	left: 0;
 	z-index: 6;
 }
+#header.black .logo:hover {
+  background: white;
+}
+#header.black .logo:hover path {
+  fill: black;
+}
+#header.black path {
+  fill: white;
+}
+#header.black .topLinks a {
+  color: white;
+}
+#header.black .topLinks a:hover {
+  color: black;
+  background-color: white;
+}
+#header.black a#help-button:hover {
+  background-color: transparent;
+  text-shadow: 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff;
+}
+
 #help-button {
   display: none;
 	border-right:0px!important;
@@ -79,11 +102,11 @@ a{
 .editing #help-button {
   display: inline;
 }
-.topLinks a.icon-help-circled {
+.topLinks a.ion-help-circled {
 	font-size: 24px;
 	padding: 21px 27px 0 8px;
 }
-.topLinks a.icon-help-circled:hover  {
+.topLinks a.ion-help-circled:hover  {
 	background:transparent;
 	color:red;
 }
@@ -468,14 +491,27 @@ iframe.embed {
 
 /* PROFILE PAGE */
 .profilePic {
-	font-size: 148px;
 	background-size: cover;
 	background-position: center;
 	width: 40%;
 	height: 50vh;
 	float: left;
+	display:table;
 }
 
+.profilePic .ion-ios7-person-outline {
+	font-size: 100px;
+}
+
+
+.noPic input {
+	position: absolute;
+	width: 40%;
+	height: 48vh;
+	margin-top: -33vh;
+	margin-left: -20%;
+	opacity: 0;
+}
 .topLinks {
   float: right;
 	z-index: 3;
@@ -894,7 +930,7 @@ iframe.embed {
 }
 
 .menu span.inuse:before {
-	content: "\e736" !important;
+	content: "\f12a" !important;
 }
 
 .menu span:hover:after{
@@ -912,7 +948,7 @@ iframe.embed {
 	font-family:'Lato', sans-serif;
 }
 
-.menu span.icon-ios7-sunny-outline:hover:after {
+.menu span.ion-ios7-sunny-outline:hover:after {
 	width: 130px;
 }
 
@@ -921,7 +957,7 @@ iframe.embed {
   content:"";
   opacity:0;
 }
-.menu span.icon-map.hidden:hover:after{
+.menu span.ion-map.hidden:hover:after{
   content:"show map";
 }
 .fixed {
@@ -1070,7 +1106,7 @@ iframe.embed {
   transform:translateY(0%);
 }
 
-.fileUpload .icon-ios7-upload-outline {
+.fileUpload .ion-ios7-upload-outline {
   font-size:40px;
 }
 .fileUpload .upload-icon.uploading {
@@ -1188,22 +1224,24 @@ iframe.embed {
 }
 
 .deleteArmed .mediaContainer:before {
-  content: "\e68f";
-  font-family: 'ionicons';
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  font-size: 60px;
-  margin-top: -62px;
-  position: absolute;
-  background: #FF3B30;
-  border-radius: 1000px;
-  margin-left: -59px;
-  color: white;
+	content: "\f1eb";
+	font-family: 'ionicons';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	-webkit-font-smoothing: antialiased;
+	font-size: 40px;
+	margin-top: -50px;
+	position: absolute;
+	background: #FF3B30;
+	border-radius: 1000px;
+	margin-left: -50px;
+	color: white;
+	width: 50px;
+	height: 50px;
+	line-height: 50px;
 }
 
 .deleteArmed .mediaContainer.deleted {
@@ -1332,7 +1370,7 @@ iframe.embed {
 	padding-bottom: 6px;
 }
 
-.wallpaperUpload, .wallpaperRemove {
+.toolButton {
 	border: 1px solid;
 	display: inline-block;
 	width: 100%;
@@ -1341,24 +1379,29 @@ iframe.embed {
 	font-weight: 300;
 }
 
-.wallpaper label {
+.toolButton label {
   position: relative;
-  top: -6px;
+  vertical-align: middle;
   float: none;
 }
+.wallpaperUpload:hover {
+	cursor:pointer;
+}
 .wallpaper form {
   position: relative;
   padding: 2px 0 0 0;
   font-size: 14px;
   font-weight: 300;
 }
-.wallpaper form:hover, .wallpaperRemove:hover {
+.toolButton:hover {
 	background:black;
 	color:white;
 	cursor:pointer;
 }
-.wallpaper .icon-ios7-upload-outline {
-  font-size: 26px;
+.toolButton > span, .toolButton form > span{
+	font-size: 26px;
+	margin: 0 7px;
+	vertical-align: middle;
 }
 .wallpaper .wallpaperRemove {
   cursor: pointer;
@@ -1444,6 +1487,18 @@ input[type="range"]::-webkit-slider-thumb {
 	border:3px solid #000;
 }
 
+.wallpaperResizeControls input[type=range] {
+  width: 130px;
+  position: relative;
+  top: -10px;
+}
+.wallpaperResizeControls {
+  font-size: 30px;
+}
+.wallpaperResizeControls span {
+  cursor: pointer;
+}
+
 #color-picker {
   position: relative;
 }
@@ -1475,13 +1530,21 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
-.color-swatches.defaults {
+.presets {
 	margin-top: 10px;
 }
 
-.color-swatches.defaults span{
+.presets span {
 	font-size:12px;
 	font-weight:500;
+	display: inline-block;
+	width: 50%;
+	float:left;
+	cursor:pointer;
+  border-bottom: 1px transparent solid;
+}
+.presets span.active {
+  border-bottom: 1px dotted;
 }
 .color-swatches span {
 	display: inline-block;
@@ -1540,9 +1603,9 @@ input[type="range"]::-webkit-slider-thumb {
   bottom: 10px;
   right: 10px;
   font-size: 12px;
-  -webkit-transform: translateY(450px);
+  -webkit-transform: translateY(500px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
-  transform: translateY(450px);
+  transform: translateY(500px);
   transition: -webkit-transform 0.2s ease-in-out;
 	width: 210px;
 }
@@ -2025,8 +2088,9 @@ form li textarea {
   letter-spacing: 2px;
 }
 .facebook b {
-  float: left;
-  font-size: 50px;
+	float: left;
+	font-size: 50px;
+	margin: 0 0 0 20px;
 }
 
 a[data-role="forgot-password"] {
@@ -2038,7 +2102,7 @@ a[data-role="forgot-password"] {
   vertical-align: bottom;
   padding-right: 14px;
   font-size: 19px;
-  line-height: 16px;
+  line-height: 7px;
 }
 
 .aboutRoom {