1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00

Merge branch 'master' into bootstrap-update

Conflicts:
	assets/css/app.css
This commit is contained in:
Kevan Ahlquist 2014-11-29 00:12:51 -06:00
commit 012c8ed145

View file

@ -35,6 +35,15 @@ body {
margin-top: 28px;
}
.navbar .navbar-inner {
padding: 0;
}
.navbar .nav {
margin: 0;
width: 100%;
}
.navbar .nav li {
display: table-cell;
width: 1%;