Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

deps: update all bower deps adjust style to new boostrap defaults

Browse source
This commit is contained in:
Matthew Scragg 2016-04-24 19:23:41 -05:00
parent 49e5280edf
commit 5735c1deb5
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bower.json
View file

@ -2,20 +2,20 @@
"name": "realms", "name": "realms",
"version": "0.1.2", "version": "0.1.2",
"dependencies": { "dependencies": {
"components-bootstrap": "~3.2.0", "components-bootstrap": "~3.3.6",
"components-font-awesome": "~4.2.0", "components-font-awesome": "~4.5.0",
"jquery": "~1.11.1", "jquery": "~2.2.3",
"highlightjs": "~8.0.0", "highlightjs": "~9.2.0",
"handlebars": "~2.0.0", "handlebars": "~4.0.5",
"keymaster": "madrobby/keymaster", "keymaster": "madrobby/keymaster",
"ace-builds": "~1.1.6", "ace-builds": "~1.2.3",
"parsleyjs": "~2.0.3", "parsleyjs": "~2.3.10",
"marked": "~0.3.2", "marked": "~0.3.2",
"js-yaml": "~3.2.1", "js-yaml": "~3.6.0",
"store-js": "~1.3.16", "store-js": "~1.3.16",
"bootswatch-dist": "3.2.0-flatly", "bootswatch-dist": "3.3.6-flatly",
"bootbox": "4.3.0", "bootbox": "4.4.0",
"datatables": "1.10.7", "datatables": "1.10.11",
"datatables-plugins": "latest" "datatables-plugins": "latest"
} }
} }

9
realms/static/css/style.css
View file

@ -1,9 +1,15 @@
body {
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 15px;
}
.navbar { .navbar {
height: 50px !important; height: 50px !important;
min-height: 49px !important; min-height: 49px !important;
font-size: 0.85em; font-size: 0.85em;
background: #242628; background: #242628;
margin-bottom: 10px; margin-bottom: 10px;
border: 0;
} }
.navbar-collapse { .navbar-collapse {
@ -45,6 +51,9 @@
.navbar-brand { .navbar-brand {
color: white; color: white;
float: left;
font-size: 19px;
line-height: 21px;
} }
.navbar { .navbar {