Skip to content

Commit

Permalink
Merge pull request #796 from munen/embed-live-final-design-touches
Browse files Browse the repository at this point in the history
Embed live final design touches
  • Loading branch information
branch14 authored Mar 17, 2017
2 parents 727cde2 + b601160 commit f1226c9
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
27 changes: 26 additions & 1 deletion app/assets/stylesheets/embed.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ $dark-gray: #3d404d;
max-width: 116px;
max-height: 116px;
background: $vr-yellow;
z-index: 999;
}

.xs .image-box, .xs .live-badge{
Expand Down Expand Up @@ -190,7 +191,8 @@ h4.title:hover {
max-width: 100%;
overflow: hidden;
color: $vr-blue;
white-space: nowrap;
white-space: nowrap;
line-height: 1;
a {
color: $vr-blue;
}
Expand Down Expand Up @@ -258,6 +260,12 @@ white-space: nowrap;
line-height: 21px;
}


.xs .first-slash, .tiny .first-slash {
display: none;
visibility: hidden;
}

.small .info-box {
height: 56px;
max-height: 56px;
Expand Down Expand Up @@ -422,6 +430,8 @@ white-space: nowrap;
-webkit-flex: 0 1 auto;
-ms-flex: 0 1 auto;
flex: 0 1 auto;


}

.jp-controls a {
Expand Down Expand Up @@ -453,6 +463,17 @@ white-space: nowrap;
color: white;
}

.jp-controls {
&.disabled {
cursor: not-allowed;
opacity: .4;
a {
// @include button-disabled;
pointer-events: none;
}
}
}

.jp-state-playing .jp-controls a {
background: $vr-red;
}
Expand Down Expand Up @@ -673,6 +694,10 @@ a.action-btn svg {
background: $dark-gray;
}

.pinboard button svg {
margin: 0 auto;
}

.replay-btn {
display: -webkit-flex;
display: -ms-flexbox;
Expand Down
3 changes: 2 additions & 1 deletion lib/vrng/src/vrng/embeds/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@
[:span (get-in (talk) [:venue :user :name])]]
(if (in-talk-state "archived")
[:span
[:span.date.sm-up " / " (relative-time)]
[:span.date
[:span.first-slash " / "] (relative-time)]
[:span.play-count.sm-up " / " (humanreadable-plays) " Plays"]])]]
[:div.branding-box
[:a {:href (:url (talk)) :target "_blank"}
Expand Down

0 comments on commit f1226c9

Please sign in to comment.