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

1 files changed, 63 insertions, 25 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 8712a41..23d8e60 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -221,7 +221,8 @@ iframe.embed {
 }
 
 .viewMore:hover {
-  text-decoration:underline;
+	background: lightgreen;
+	color: white;
 }
 
 .page .roomName {
@@ -388,7 +389,8 @@ iframe.embed {
   margin-right: 10px;
   color: black;
   font-weight: 100;
-  text-decoration: none
+  text-decoration: none;
+	padding: 50px 0 100px 0;
 }
 .editProfile span {
   vertical-align: middle;
@@ -1356,6 +1358,9 @@ input[type="range"]::-webkit-slider-thumb {
 .settings .setting {
   margin-bottom:10px;
 }
+.settings .setting a {
+	text-decoration:none;
+}
 .setting.subButtons {
   display: inline-block;
   width: 100%;
@@ -1472,6 +1477,7 @@ button:hover {
   table-layout: fixed;
   border-spacing: 0;
   border-collapse: separate;
+	overflow:hidden;
 }
 
 .radio-group__label {
@@ -1481,7 +1487,7 @@ button:hover {
   vertical-align: middle;
   text-align: center;
   position: relative;
-  border: 1px solid #ccc;
+  border: 1px solid #000;
   cursor:pointer;
   border-style: solid none solid solid;
  /* border-radius: 5px 0 0 5px;*/
@@ -1494,19 +1500,19 @@ button:hover {
 }
   
 .radio-group__label + input + .radio-group__label:before {
-  content: " ";
-  display: block;
-  position: absolute;
-  top:-1px;
-  width: 100%;
-  height: 100%;
-  border: 1px solid #000;
-  /*border-radius: 5px 0 0 5px;*/
-  -webkit-transform: translate3d(-103%,0,0);
-  -webkit-transition: all 250ms;
-  transform: translate3d(-103%,0,0);
-  transition: all 250ms;
-  background:;
+	content: " ";
+	display: block;
+	position: absolute;
+	top: 0px;
+	width: 94px;
+	height: 100%;
+	border: 0;
+	/* border-radius: 5px 0 0 5px; */
+	-webkit-transform: translate3d(-103%,0,0);
+	-webkit-transition: all 250ms;
+	transform: translate3d(-103%,0,0);
+	transition: all 250ms;
+	background: rgba(0,0,0,0.1);
 }  
 
 .radio-group__label + input:checked + .radio-group__label:before {
@@ -1531,6 +1537,24 @@ form {
 form div {
 	float:right;
 }
+form div.hidden {
+	height: 0;
+	overflow: hidden;
+}
+form h3.link {
+	content:"?";
+}
+form h3.link:after {
+	content:"?";
+}
+
+form h3.link:hover {
+	color:#017cfe;
+	cursor:pointer;
+}
+
+
+
 form li {
 	font-size: 20px;
 	font-weight: 300;
@@ -1637,18 +1661,25 @@ form li textarea {
 }
 
 .close {
-  font-weight: 100;
-  font-size: 120px;
-  float: right;
-  cursor: pointer;
-  position: fixed;
-  right: 20px;
-  top: 20px;
-  z-index: 20;
+	font-weight: 100;
+	font-size: 70px;
+	float: right;
+	cursor: pointer;
+	position: fixed;
+	right: 20px;
+	top: 20px;
+	z-index: 20;
+	background: #f9f9f9;
+	width: 75px;
+	color: black;
+	border: 1px solid black;
+	box-shadow: -3px 4px black;
+	line-height: 75px;
 }
 
 .close:hover {
-  color:lightgreen;
+  background:lightgreen;
+	color:white;
 }
 
 
@@ -1676,6 +1707,8 @@ form li textarea {
   margin-bottom: 18px;
   font-weight: 500;
   font-size: 12px;
+	border-bottom: 1px solid #444;
+	padding-bottom: 20px;
   letter-spacing: 2px;
 }
 .facebook b {
@@ -1683,6 +1716,11 @@ form li textarea {
   font-size: 50px;
 }
 
+a[data-role="forgot-password"] {
+	font-size:11px;
+	margin-top:10px;
+}
+
 .facebook span {
   vertical-align: bottom;
   padding-right: 14px;