summaryrefslogtreecommitdiff
path: root/site/public
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-05-01 19:24:02 -0400
committerJules Laplace <jules@okfoc.us>2015-05-01 19:24:02 -0400
commit54287ebd1ffc4fe00d1481ad8b4d14b3f23b1ffc (patch)
tree9337aa84c1016c9375c4b2a13af999c6273636f8 /site/public
parente75bc9e99c672d774e1e935b37c73970d7b6d2c8 (diff)
contact section in column, looks terrible
Diffstat (limited to 'site/public')
-rw-r--r--site/public/assets/javascripts/_env.js4
-rw-r--r--site/public/assets/style.css18
2 files changed, 17 insertions, 5 deletions
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index 3a72e13..2857069 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -70,6 +70,7 @@ environment.ready = function(){
display_entry($loader.children()[0])
})
})
+/*
$("nav .contact").click(function(e){
e.preventDefault()
@@ -85,6 +86,7 @@ environment.ready = function(){
display_entry($loader.children()[0])
})
})
+*/
$("nav .index").click(function (e){
e && e.preventDefault()
if (done_loading && window.location.hash == "#/index") return
@@ -153,7 +155,7 @@ environment.ready = function(){
$(this).data("hash", page)
})
hashes['/about'] = $("nav .about")
- hashes['/contact'] = $("nav .contact")
+ // hashes['/contact'] = $("nav .contact")
// hashes['/index'] = $("nav .index")
if (current_hash in hashes) {
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 6316159..27e3158 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -285,9 +285,9 @@ nav .middle {
}
nav .bottom {
- height: 20%;
+ height: 22%;
width: 100%;
- background: #bbb;
+ background: #ddd;
}
nav a {
text-decoration:none;
@@ -295,7 +295,18 @@ nav a {
width:100%;
color:black;
}
+.contact {
+ line-height: 22px;
+ padding-left: 10px;
+ padding-right: 10px;
+}
+.contact a {
+ display: inline;
+}
+
+
+.desktop nav .cat.about,
.desktop nav .cat.hover,
.desktop nav .cat:hover {
cursor:pointer;
@@ -428,7 +439,7 @@ nav .sub.active a {
display: inline-block;
width: 80%;
width: calc(87% - 80px);
- margin-left: 160px;
+ margin-left: 180px;
}
.entry.all {
width: 90%;
@@ -907,7 +918,6 @@ nav .sub.active a {
}
-
@media (max-width:1200px) {
.entry span div.content {
-webkit-column-count: 2;