Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:jarmo/hackersays

Conflicts:
	public/hackersays.js
  • Loading branch information...
commit 4beb6b9a6c33dac884012caaebf7e85c00517796 2 parents 342efa9 + cf481a5
@jarmo authored
View
5 public/hackersays.js
@@ -33,14 +33,13 @@ $(function() {
$("#toolbar .play").click(function(ev) {
ev.preventDefault();
- if ($(this).toggleClass("paused").hasClass("pause"))
+ if ($(this).toggleClass("paused").hasClass("paused"))
clearTimeout(readingTimer);
else
slider.goToNextSlide();
});
- if (quotesEl.hasClass("via-link"))
- $("#toolbar .play").click();
+ if (quotesEl.hasClass("via-link")) $("#toolbar .play").click();
function slideChange(index, total, slide) {
slide = $(slide);
View
11 public/themes/base.scss
@@ -11,6 +11,7 @@ strong { font-weight: bolder; }
#themes {
position: absolute; top: 90px; right: 40px;
+ z-index: 42;
opacity: 0.7;
&, ul { @include single-transition(opacity, 300ms, ease-in-out); }
@@ -46,23 +47,23 @@ strong { font-weight: bolder; }
overflow: hidden;
height: 60px;
width: $w;
- position: absolute; bottom: 10px; left: 50%; margin-left: -$w / 2;
+ position: absolute; bottom: 15px; left: 50%; margin-left: -$w / 2;
line-height: 60px;
text-align: center;
a {
@include border-radius(50px);
- border: 1px solid lighten(#e8e3d1, 10%);
+ border: 1px solid white;
width: 50px; height: 50px;
display: inline-block;
- background-color: #d2ccb5;
+ background-color: rgba(black, .1);
background-position: center;
background-repeat: no-repeat;
}
a.play {
width: 60px; height: 60px;
- background-image: inline-image("control-play.png");
- &.paused { background-image: inline-image("control-pause.png"); }
+ background-image: inline-image("control-pause.png");
+ &.paused { background-image: inline-image("control-play.png"); }
}
.bx-prev {
View
BIN  public/themes/control-next.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/themes/control-pause.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/themes/control-play.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/themes/control-prev.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 public/themes/macos/macos.scss
@@ -139,4 +139,10 @@ body[data-theme=macos] {
}
#share { @include share-in-center; }
+
+ #toolbar a {
+ @include border-radius(5px);
+ border-color: transparent;
+ background-color: white;
+ }
}
View
5 public/themes/sepia/sepia.scss
@@ -81,4 +81,9 @@ body[data-theme=sepia] {
}
#share { @include share-in-center; }
+
+ #toolbar a {
+ border-color: lighten(#e8e3d1, 10%);
+ background-color: #d2ccb5;
+ }
}
View
5 public/themes/vim/vim.scss
@@ -102,4 +102,9 @@ body[data-theme=vim] {
}
#share { @include share-in-center; }
+
+ #toolbar a {
+ border-color: darken($light, 20%);
+ background-color: rgba($light, 0.2)
+ }
}
Please sign in to comment.
Something went wrong with that request. Please try again.