From 0341f8f691d79b025adead4489e90ddb03cdb644 Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Mon, 6 Jan 2014 16:12:14 -0300 Subject: [PATCH] bootstrap ready! --- .bowerrc | 3 ++ .gitignore | 1 + app/views/includes/foot.jade | 6 +++ app/views/includes/head.jade | 5 ++- app/views/includes/navbar.jade | 17 ++++++++ app/views/index.jade | 3 +- app/views/layouts/default.jade | 3 +- bower.json | 7 ++++ package.json | 74 ++++++++++++++++++---------------- public/css/common.css | 45 +++++++++++++++++++++ public/img/.gitignore | 0 11 files changed, 126 insertions(+), 38 deletions(-) create mode 100644 .bowerrc create mode 100644 app/views/includes/navbar.jade create mode 100644 bower.json create mode 100644 public/css/common.css create mode 100755 public/img/.gitignore diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..47ad667 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "public/lib" +} diff --git a/.gitignore b/.gitignore index 9ad72e0..bb726e2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ npm-debug.log node_modules .DS_Store +public/lib/* diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index e69de29..b2a61b6 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -0,0 +1,6 @@ +#footer + .container + p.text-muted Place sticky footer content here. + +script(type='text/javascript', src='/lib/jquery/jquery.min.js') +script(type='text/javascript', src='/lib/bootstrap/dist/js/bootstrap.min.js') diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade index 08e4f44..939021f 100755 --- a/app/views/includes/head.jade +++ b/app/views/includes/head.jade @@ -1,7 +1,7 @@ head meta(charset='utf-8') meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1') - meta(name='viewport', content='width=device-width,initial-scale=1') + meta(name='viewport', content='width=device-width,initial-scale=1.0') title BitPay meta(http-equiv='Content-type', content='text/html;charset=UTF-8') @@ -10,3 +10,6 @@ head link(href='/img/icons/favicon.ico', rel='shortcut icon', type='image/x-icon') + link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css') + link(rel='stylesheet', href='/css/common.css') + \ No newline at end of file diff --git a/app/views/includes/navbar.jade b/app/views/includes/navbar.jade new file mode 100644 index 0000000..eabfbb9 --- /dev/null +++ b/app/views/includes/navbar.jade @@ -0,0 +1,17 @@ +.navbar.navbar-default.navbar-fixed-top(role='navigation') + .container + .navbar-header + button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse') + span.sr-only Toggle navigation + span.icon-bar + span.icon-bar + span.icon-bar + a.navbar-brand(href='#') Mystery + .collapse.navbar-collapse + ul.nav.navbar-nav + li.active + a(href='#') Home + li + a(href='#about') About + li + a(href='#contact') Contact diff --git a/app/views/index.jade b/app/views/index.jade index 874b042..53ad530 100755 --- a/app/views/index.jade +++ b/app/views/index.jade @@ -1,4 +1,5 @@ extends layouts/default block content - h1 Hello BitPay! + .page-header + h1 Hello BitPay! diff --git a/app/views/layouts/default.jade b/app/views/layouts/default.jade index 3c47dc2..186b81c 100755 --- a/app/views/layouts/default.jade +++ b/app/views/layouts/default.jade @@ -2,7 +2,8 @@ doctype html html(lang='en', xmlns='http://www.w3.org/1999/xhtml') include ../includes/head body - section.content + #wrap + include ../includes/navbar section.container block content include ../includes/foot diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..62688af --- /dev/null +++ b/bower.json @@ -0,0 +1,7 @@ +{ + "name": "Mystery", + "version": "0.0.1", + "dependencies": { + "bootstrap": "3.0.3" + } +} \ No newline at end of file diff --git a/package.json b/package.json index d44870a..6a3cbc6 100644 --- a/package.json +++ b/package.json @@ -1,37 +1,41 @@ { - "name": "mystery", - "version": "0.0.1", - "private": true, - "author": { - "name": "Ryan X Charles", - "email": "ryan@bitpay.com" - }, - "repository": "git://github.com/bitpay/mystery.git", - "contributors": [{ - "name": "Matias Alejo Garcia", - "email": "ematiu@gmail.com" - }], - "bugs": { - "url": "https://github.com/bitpay/mystery/issues" - }, - "homepage": "https://github.com/bitpay/mystery", - "license": "MIT", - "keywords": [ - "mystery", - "secret", - "enigma", - "riddle", - "mystification", - "puzzle", - "conundrum" - ], - "engines": { - "node": "*" - }, - "dependencies": { - "express": "~3.4.7", - "jade": "~1.0.2", - "mongoose": "~3.8.3", - "lodash": "~2.4.1" - } + "name": "mystery", + "version": "0.0.1", + "private": true, + "author": { + "name": "Ryan X Charles", + "email": "ryan@bitpay.com" + }, + "repository": "git://github.com/bitpay/mystery.git", + "contributors": [{ + "name": "Matias Alejo Garcia", + "email": "ematiu@gmail.com" + }], + "bugs": { + "url": "https://github.com/bitpay/mystery/issues" + }, + "homepage": "https://github.com/bitpay/mystery", + "license": "MIT", + "keywords": [ + "mystery", + "secret", + "enigma", + "riddle", + "mystification", + "puzzle", + "conundrum" + ], + "engines": { + "node": "*" + }, + "scripts": { + "postinstall": "node node_modules/bower/bin/bower install" + }, + "dependencies": { + "express": "~3.4.7", + "jade": "~1.0.2", + "mongoose": "~3.8.3", + "lodash": "~2.4.1", + "bower": "~1.2.8" + } } diff --git a/public/css/common.css b/public/css/common.css new file mode 100644 index 0000000..7ca093a --- /dev/null +++ b/public/css/common.css @@ -0,0 +1,45 @@ +/* Sticky footer styles +-------------------------------------------------- */ + +html, +body { + height: 100%; + /* The html and body elements cannot have any padding or margin. */ +} + +/* Wrapper for page content to push down footer */ +#wrap { + min-height: 100%; + height: auto; + /* Negative indent footer by its height */ + margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; +} + +/* Set the fixed height of the footer here */ +#footer { + height: 60px; + background-color: #f5f5f5; +} + + +/* Custom page CSS +-------------------------------------------------- */ +/* Not required for template or sticky footer method. */ + +#wrap > .container { + padding: 60px 15px 0; +} +.container .text-muted { + margin: 20px 0; +} + +#footer > .container { + padding-left: 15px; + padding-right: 15px; +} + +code { + font-size: 80%; +} diff --git a/public/img/.gitignore b/public/img/.gitignore new file mode 100755 index 0000000..e69de29