From 6bffa6bb3d067a0390446c8220a7746f5e3965ac Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Tue, 17 Dec 2013 23:36:59 -0500 Subject: [PATCH] Flat UI as default theme. Reduced navbar height on Flat UI theme. Reduced image dimensions to 30px of profile image in navbar. --- public/css/styles.less | 7 ++++--- public/css/themes/flatly.less | 4 +++- views/layout.jade | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/css/styles.less b/public/css/styles.less index 292878bef9..0dc1a3c401 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -1,12 +1,13 @@ @import "bootstrap/bootstrap"; +@import "themes/flatly"; body { - padding-top: 70px; + padding-top: 80px; } .navbar-nav img { - width: 40px; - height: 40px; + width: 30px; + height: 30px; margin: -15px 15px -15px 0; } diff --git a/public/css/themes/flatly.less b/public/css/themes/flatly.less index 069a8c71b5..86b5358348 100644 --- a/public/css/themes/flatly.less +++ b/public/css/themes/flatly.less @@ -1,6 +1,7 @@ // Flatly 3.0.3 // Bootswatch // ----------------------------------------------------- +@import url(http://fonts.googleapis.com/css?family=Lato); // Flatly 3.0.3 // Variables @@ -10,6 +11,7 @@ // Global values // -------------------------------------------------- + // Grays // ------------------------- @@ -264,7 +266,7 @@ // ------------------------- // Basics of a navbar -@navbar-height: 60px; +@navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px diff --git a/views/layout.jade b/views/layout.jade index 2d0f67fa85..ccf0066553 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -11,13 +11,12 @@ html link(href='/css/lib/font-awesome.min.css', rel='stylesheet') link(href='/css/styles.css', rel='stylesheet') - script(src='/js/lib/jquery.js') script(src='/js/lib/jquery.dataTables.min.js') script(src='/js/lib/bootstrap.js') script(src='/js/main.js') body - .navbar.navbar-inverse.navbar-fixed-top + .navbar.navbar-default.navbar-fixed-top .container .navbar-header button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')