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

1 files changed, 61 insertions, 5 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d37884e..8b5e011 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2572,23 +2572,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;
@@ -2623,7 +2635,7 @@ a[data-role="forgot-password"] {
   background-color: black;
   border-color: black;
 }
-.collaborators p {
+.mediaDrawer .rap p {
 	margin: 10px 0 20px;
 	font-weight: 300;
 }
@@ -2631,7 +2643,7 @@ a[data-role="forgot-password"] {
   font-size: 16px;
   width: 300px;
 }
-.collaborators h2 {
+.mediaDrawer .rap h2 {
   margin: 20px auto 0;
 }
 #collaborator-list {
@@ -2667,6 +2679,50 @@ 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 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;
+}
+.embedView {
+  font-weight: 300;
+}
 
 /* MARCHING ANTS ANIMATION */