summaryrefslogtreecommitdiff
path: root/site/public
diff options
context:
space:
mode:
authorjulie lala <jules@okfoc.us>2015-04-27 17:08:25 -0400
committerjulie lala <jules@okfoc.us>2015-04-27 17:08:25 -0400
commit1451d6a1262e394dd8505ac6523d0eaea5dfd57c (patch)
tree2ab626558332fa5ed0ee6d3faa5ff76c53eba070 /site/public
parentc78f208f3e6bd1199f0d6c88d2431609b58bd303 (diff)
parent934a8ac8afdaa2afc2061542abbf3f4864a476b1 (diff)
Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers
Diffstat (limited to 'site/public')
-rw-r--r--site/public/assets/javascripts/_env.js8
-rw-r--r--site/public/assets/style.css29
2 files changed, 30 insertions, 7 deletions
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index 8c1270f..aae60b9 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -446,16 +446,14 @@ function build_gallery () {
// load_video($el)
}
else {
- next()
+ gallery.next()
}
})
- // $next.on("click", next)
- function next(){
- gallery.next()
- }
gallery.loader.on("progress", function(imagesLoaded, loadingImage){
$(loadingImage.img).addClass('loaded')
})
+ $(".nextbutton").click(function(){ gallery.next() })
+ $(".prevbutton").click(function(){ gallery.previous() })
}
function resize_gallery () {
if (! gallery) return;
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index f018d8d..8c7594d 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -405,7 +405,7 @@ nav .sub.active a {
height:auto;
position:relative;
width:100%;
- max-height:40px;
+ max-height:50px;
padding: 3px 0 5px 20px;
opacity:1;
-webkit-transform:translateY(0)scale(1)skew(0deg);
@@ -444,10 +444,35 @@ nav .sub.active a {
.postname {
border-bottom: 1px solid #999;
padding: 20px 0px 0.6em 2px;
- margin-bottom: 1em;
+ margin-bottom: 0.7em;
font-size: 1em;
+ text-transform: uppercase;
+}
+
+
+.galnav {
+ display: inline-block;
+ width: 100%;
+ float: left;
+ clear: both;
}
+.galnav span{
+ width: 50%;
+ background: #999;
+ color: white;
+ padding: 2px;
+ font-size: 11px;
+ transition:0.2s background;
+}
+.galnav .nextbutton{
+ text-align: right;
+ background: #888;
+ cursor:pointer;
+}
+.galnav span:hover {
+ background:black;
+}
.credit {
margin: 4em 0px 0px 0px;