From 5735c1deb589d850ef650ed7e1a6e0ae6f96e853 Mon Sep 17 00:00:00 2001 From: Matthew Scragg Date: Sun, 24 Apr 2016 19:23:41 -0500 Subject: [PATCH] deps: update all bower deps adjust style to new boostrap defaults --- bower.json | 24 ++++++++++++------------ realms/static/css/style.css | 9 +++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/bower.json b/bower.json index 0f18b29..5cc6524 100644 --- a/bower.json +++ b/bower.json @@ -2,20 +2,20 @@ "name": "realms", "version": "0.1.2", "dependencies": { - "components-bootstrap": "~3.2.0", - "components-font-awesome": "~4.2.0", - "jquery": "~1.11.1", - "highlightjs": "~8.0.0", - "handlebars": "~2.0.0", + "components-bootstrap": "~3.3.6", + "components-font-awesome": "~4.5.0", + "jquery": "~2.2.3", + "highlightjs": "~9.2.0", + "handlebars": "~4.0.5", "keymaster": "madrobby/keymaster", - "ace-builds": "~1.1.6", - "parsleyjs": "~2.0.3", + "ace-builds": "~1.2.3", + "parsleyjs": "~2.3.10", "marked": "~0.3.2", - "js-yaml": "~3.2.1", + "js-yaml": "~3.6.0", "store-js": "~1.3.16", - "bootswatch-dist": "3.2.0-flatly", - "bootbox": "4.3.0", - "datatables": "1.10.7", + "bootswatch-dist": "3.3.6-flatly", + "bootbox": "4.4.0", + "datatables": "1.10.11", "datatables-plugins": "latest" } -} \ No newline at end of file +} diff --git a/realms/static/css/style.css b/realms/static/css/style.css index f4dc59e..7787044 100644 --- a/realms/static/css/style.css +++ b/realms/static/css/style.css @@ -1,9 +1,15 @@ +body { + font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 15px; +} + .navbar { height: 50px !important; min-height: 49px !important; font-size: 0.85em; background: #242628; margin-bottom: 10px; + border: 0; } .navbar-collapse { @@ -45,6 +51,9 @@ .navbar-brand { color: white; + float: left; + font-size: 19px; + line-height: 21px; } .navbar {