css stuff

This commit is contained in:
pg 2015-03-28 23:11:45 +00:00
parent f7c0d086d3
commit d333ecb21e
9 changed files with 48 additions and 14 deletions

6
db.js
View File

@ -53,7 +53,6 @@ function fullPath(files) {
// Load a file, parse the title and generate the HTML // Load a file, parse the title and generate the HTML
exports.loadPage = function (name, callback) { exports.loadPage = function (name, callback) {
var path = pathFromNameMd(name); var path = pathFromNameMd(name);
console.log("..."+name)
// if (name != "home"){ // if (name != "home"){
// return callback(null,{exists: false}) // return callback(null,{exists: false})
@ -85,7 +84,6 @@ exports.loadPage = function (name, callback) {
exports.editPage = function (name, callback) { exports.editPage = function (name, callback) {
var path = pathFromNameMd(name); var path = pathFromNameMd(name);
console.log(path)
FS.readFile(path, 'utf8', function (err, markdown) { FS.readFile(path, 'utf8', function (err, markdown) {
@ -120,7 +118,7 @@ exports.editPage = function (name, callback) {
name: name, name: name,
title: null, title: null,
exists: exists, exists: exists,
markdown: markdown, markdown: unescape(markdown),
html: html, html: html,
}); });
@ -131,8 +129,6 @@ exports.editPage = function (name, callback) {
// Saving is simple. Just put the markdown in the file // Saving is simple. Just put the markdown in the file
exports.savePage = function (name, value, callback) { exports.savePage = function (name, value, callback) {
var path = pathFromNameMd(name); var path = pathFromNameMd(name);
console.log(path)
console.log(value)
FS.writeFile(path, value, callback); FS.writeFile(path, value, callback);
}; };

View File

@ -1,3 +1,6 @@
p(#title_text)=. [THSF] 2015@Toulouse:/less/is/more
h3. Hello THSF h3. Hello THSF
p(bla). this is a simple and stupid wiki :) p(bla). this is a simple and stupid wiki :)

View File

@ -0,0 +1,6 @@
# 04 programm
|_. horaire |_. intitulé |_. où |
| 8h00 | table | row 1 |
| 9h00 | table | row 2 |
| 10h00 | ma grand mere fait du ski| dans les highlands |

BIN
public/images/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -7,7 +7,7 @@ jQuery(function($){
var tx_input = $('#tx_input'); var tx_input = $('#tx_input');
var input = tx_input[0]; var input = tx_input[0];
input.value = input.innerHTML; input.value = input.textContent;
tx_input.val(input.value) tx_input.val(input.value)
var text_preview = $('#text_preview')[0]; var text_preview = $('#text_preview')[0];
var html_output = $('#html_output')[0]; var html_output = $('#html_output')[0];

View File

@ -7,19 +7,47 @@ body {
background-color: #000000; background-color: #000000;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
color: #ffffff; color: #ffffff;
margin-left: auto;
margin-right: auto;
} }
a { a {
color: #00B7FF; color: #00B7FF;
} }
#title_text{
font-family: "andale mono", "lucida console", monospace;
font-size:30px;
}
#home { #home {
display:block; display:block;
} }
#markdown-editor { table {
margin-top:50px; margin-left: auto;
min-width:500px; margin-right: auto;
min-height:300px; border-collapse : collapse;
color: #000000 }
table th,
table td {
padding : 4px 8px;
border : 1px solid #aaa;
}
ul {
padding-left: 2em;
}
#logo {
display: block;
margin-top: 50px;
margin-bottom: 70px;
margin-left: auto;
margin-right: auto;
width:30%;
padding: 20%;
background-image: url(../images/logo.png);
background-size: contain;
background-repeat: no-repeat;
} }

Binary file not shown.

View File

@ -14,11 +14,11 @@ html
nav.navbar.navbar-default.navbar-fixed-top nav.navbar.navbar-default.navbar-fixed-top
ul.nav.navbar-nav ul.nav.navbar-nav
li(role="presentation" ) li(role="presentation" )
a(href="#home") THSF a(href="#logo") THSF
li(role="presentation") li(role="presentation")
a(href="#presentation") presentation a(href="#home") presentation
li(role="presentation" ) li(role="presentation" )
a(href="#programme") preogramme a(href="#programm") programme
block body block body

View File

@ -1,5 +1,6 @@
include ./layout.jade include ./layout.jade
.container-fluid .container-fluid
#logo
each item in torender each item in torender
div(id= item.divId)!= item.html div(id= item.divId)!= item.html
if isAuth if isAuth