Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cosmetics. Uses the Ubuntu fonts now

  • Loading branch information...
commit 038836ed82a7cee1fabcbf6e55ebd72d1d2704b7 1 parent 65d637f
@claudioc authored
View
2  jingo
@@ -14,7 +14,7 @@ var express = require('express')
, yaml = require("yaml")
, program = require('commander');
-program.version('0.2.3')
+program.version('0.2.4')
.option('-c, --config <path>', 'Specify the config file')
.option('-s, --sample-config', 'Dumps a config file template and exits')
.parse(process.argv);
View
2  package.json
@@ -1,6 +1,6 @@
{
"name": "jingo",
- "version": "0.2.3",
+ "version": "0.2.4",
"description": "A nodejs based wiki engine (sort of Gollum port)",
"author": "Claudio Cicali <claudio.cicali@gmail.com>",
"main": "jingo",
View
1  public/css/shCoreDefault.css
@@ -49,6 +49,7 @@
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
}
/* Override Bootstrap */
View
25 public/css/style.css
@@ -1,11 +1,29 @@
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+ font-family: "Ubuntu";
+ background-color: #f2f2f2;
+}
+a {
+ color: #4183c4;
}
-
p.user {
float: right;
color: white;
padding: 10px 0 0;
+ margin-bottom: 10px;
+}
+
+#main {
+ overflow: auto;
+ margin-top: -3.5em;
+}
+
+#content {
+ padding-top: 1em;
+}
+
+p {
+ margin-bottom: 20px;
}
hr {
@@ -19,6 +37,7 @@ dl.search-results dd {
h2,
h1 {
border-bottom: 1px solid #ddd;
+ font-family:"Ubuntu Condensed"
}
h1 {
@@ -34,7 +53,7 @@ h3 {
}
code {
- color: gray;
+ color: #666;
}
hr {
@@ -132,7 +151,9 @@ ul.doc-list > li {
.page-actions {
padding: 5px;
background-color: #f2f2f2;
+ /*
margin-top: -3.5em;
+ */
border-bottom-left-radius: 5px;
}
View
4 public/js/app.js
@@ -11,13 +11,13 @@
var $pah = $("<li class=\"page-actions-handle\">Tools</li>");
var pahTo;
$pah.on("mouseover", function() {
- $pah.parent().animate({"margin-top": "-1em"})
+ $("#main").animate({"margin-top": "-1em"})
});
$(".page-actions").on("mouseenter", function() {
clearTimeout(pahTo);
}).on("mouseleave", function() {
pahTo = setTimeout(function() {
- $pah.parent().animate({"margin-top": "-3.5em"})
+ $("#main").animate({"margin-top": "-3.5em"})
}, 2000);
});
$(".page-actions:not(.pull-right)").append($pah);
View
3  views/layout.jade
@@ -4,6 +4,7 @@ html
title= title
link(rel="stylesheet", href="/vendor/bootstrap/css/bootstrap.min.css")
link(rel="stylesheet", href="/vendor/bootstrap/css/bootstrap-responsive.min.css")
+ link(rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu|Ubuntu+Condensed")
link(rel="stylesheet", href="/css/style.css")
link(rel="stylesheet", href="/css/shCoreDefault.css")
block styles
@@ -33,7 +34,7 @@ html
if hasSidebar()
.span2 !{_sidebar}
- .span8
+ #main.span8
block content
if hasFooter()
Please sign in to comment.
Something went wrong with that request. Please try again.