From beab17b9e8802aab871dfc9cf0b21129ffcb1277 Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Thu, 12 Dec 2013 20:56:33 -0500 Subject: [PATCH] Using default bootstrap --- public/css/styles.less | 4 ++-- views/layout.jade | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/css/styles.less b/public/css/styles.less index 984b931c2a..e575274bcc 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -1,8 +1,8 @@ -//@import "bootstrap/bootstrap"; +@import "bootstrap/bootstrap"; //@import "themes/ios7"; body { - padding-top: 80px; + padding-top: 70px; } .navbar-nav img { diff --git a/views/layout.jade b/views/layout.jade index b572db0c5c..670c6274ad 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -12,8 +12,8 @@ html link(href='/css/lib/animate.css', rel='stylesheet') link(href='/css/lib/jasny-bootstrap.css', rel='stylesheet') link(href='/css/lib/font-awesome.min.css', rel='stylesheet') - link(href='/css/lib/bootstrap.min.css', rel='stylesheet') - link(href='/css/themes/flat-ui.min.css', rel='stylesheet') + //link(href='/css/lib/bootstrap.min.css', rel='stylesheet') + //link(href='/css/themes/flat-ui.min.css', rel='stylesheet') link(href='/css/styles.css', rel='stylesheet') script(src='/js/lib/jquery.js') @@ -22,7 +22,7 @@ html script(src='/js/lib/bootstrap.js') script(src='/js/main.js') body - .navbar.navbar-default.navbar-fixed-top + .navbar.navbar-inverse.navbar-fixed-top .container .navbar-header button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')