merge

1 files changed, 128 insertions, 12 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 90454be..5d67f50 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -375,7 +375,7 @@ h5 {
 
 .projectList.about .item span h3{
 	font-weight: 500;
-	font-size: 30px;
+	font-size: 25px;
 	margin-bottom: 8px;
 }
 
@@ -803,6 +803,38 @@ iframe.embed {
 	background-attachment: fixed;
 	
 }
+
+.projectList.about.gopro {
+	padding:6% 0;
+}
+.about.gopro h3 {
+	font-weight:500;
+	text-align:center;
+	margin-bottom:20px;
+}
+.gopro span{
+	font-size: 24px;
+	font-weight: 300;
+	width: 740px;
+	display: block;
+	margin: 0 auto;
+	line-height: 50px;
+}
+.gopro span a{
+	width: 100%;
+	display: inline-block;
+	text-align: center;
+	margin-top: 40px;
+	background: limegreen;
+	color: white;
+	padding: 10px 0;
+	-webkit-transition:0.2s background;
+	-moz-transition:0.2s background;
+	transition:0.2s background;
+}
+.gopro span a:hover{
+	background:black;
+}
 .profilepage .about h2 .btn {
   float: none;
 	border: 1px solid;
@@ -2358,9 +2390,6 @@ form li textarea {
 	z-index: 5;
 }
 
-.loading .hero .circle {
-	opacity:0;
-}
 
 .desktop .hero .circle:hover {
 	background:black;
@@ -2544,23 +2573,35 @@ a[data-role="forgot-password"] {
   text-decoration: none;
   font-size: 12px;
   font-weight: 600;
+  cursor: pointer;
 }
-.share a:nth-child(3){
+.share a:nth-child(3), .share a:nth-child(4) {
 	margin-left:4px;
 }
 .share a:hover{
   text-decoration:underline;
 }
+.vvbox.share {
+  width: 300px
+}
+.vvbox.share #share_link {
+  width: 100%;
+  margin-top: 4px;
+  padding: 3px;
+  font-weight: 300;
+  font-size: 11px;
+}
+
 
 /* COLLABORATORS */
 
-.collaborators .rap {
+.mediaDrawer .rap {
 	display: table;
 	width: 100%;
 	height: 100%;
 }
 
-.collaborators .rap .holder .inner {
+.mediaDrawer .rap .holder .inner {
   width: 480px;
   margin: 0 auto;
   text-align: left;
@@ -2595,7 +2636,7 @@ a[data-role="forgot-password"] {
   background-color: black;
   border-color: black;
 }
-.collaborators p {
+.mediaDrawer .rap p {
 	margin: 10px 0 20px;
 	font-weight: 300;
 }
@@ -2603,7 +2644,7 @@ a[data-role="forgot-password"] {
   font-size: 16px;
   width: 300px;
 }
-.collaborators h2 {
+.mediaDrawer .rap h2 {
   margin: 20px auto 0;
 }
 #collaborator-list {
@@ -2639,6 +2680,62 @@ a[data-role="forgot-password"] {
   font-weight: 300;
   font-style: italic;
 }
+#collaborator-url-rapper {
+  display: none;
+  background: #fff;
+  border: 1px solid;
+  box-shadow: -3px 3px 0;
+  padding: 10px;
+  font-weight: 300;
+  font-size: 14px;
+  margin: 10px 0;
+}
+#collaborator-url {
+  font-size: 16px;
+  width: 500px;
+  border: 1px solid;
+  font-size: 14px;
+  padding: 5px;
+  font-weight: 300;
+  margin-top: 5px;
+  display: block;
+}
+
+/* EMBED CODE GENERATOR */
+
+.embedView {
+  font-weight: 300;
+}
+.embedView textarea {
+  border: 1px solid black;
+  width: 100%;
+  height: 100px;
+  font-family: 'Menlo', 'Monaco', 'Lucida Sans Console', monospace;
+  padding: 5px;
+  line-height: 15px;
+}
+.embedView input[type=text] {
+  border: 1px solid black;
+  width: 40px;
+  padding: 2px;
+  font-size: 14px;
+  margin: 5px;
+}
+.embedView label {
+  font-size: 14px;
+  padding: 0 3px;
+}
+#testEmbed {
+  cursor: pointer;
+  float: right;
+  font-size: 11px;
+  margin-top: 11px;
+  font-weight: 100;
+  color: #888;
+}
+#testEmbed:hover {
+  text-decoration: underline;
+}
 
 /* MARCHING ANTS ANIMATION */
 
@@ -2826,8 +2923,17 @@ a[data-role="forgot-password"] {
 		padding:50px 0 120px 0;
 	}
 	.videoModal .ion-ios7-close-empty {
-	right: 10px;
-	top: 20px;
+		right: 10px;
+		top: 20px;
+	}
+	.gopro span {
+		font-size: 16px;
+		width: 93%;
+		line-height: 22px;
+		text-align: justify;
+	}
+	.gopro span a{
+		margin-top: 20px;
 	}
 }
 
@@ -2850,6 +2956,7 @@ a[data-role="forgot-password"] {
 			left: 10px;
 			border: 1px solid;
 		}
+
 }
 
 @media screen and (orientation:landscape) {
@@ -2860,4 +2967,13 @@ a[data-role="forgot-password"] {
 		bottom: -3px;
 		right: -3px;
 	}
-}
\ No newline at end of file
+
+}
+@media screen and (orientation:landscape) and (max-width: 680px){
+	.projectList.about .item span:nth-child(1) {
+		height: 180px;
+	}
+	.projectList .projectItem {
+		width: 55%;
+	}
+}