summaryrefslogtreecommitdiffstats
path: root/web/css
diff options
context:
space:
mode:
authorAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>2012-07-10 19:51:16 +0000
committerAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>2012-07-10 19:51:16 +0000
commitcf7ed2625456a5e619f68408f8ebfe78f443a672 (patch)
treeae6787275ea9b9b8bd29e320c55bb3dbcbb62d30 /web/css
parent5e54ba7aa27b95d1e0568693915e735ab8058ff7 (diff)
downloadlabitrack-cf7ed2625456a5e619f68408f8ebfe78f443a672.tar.gz
labitrack-cf7ed2625456a5e619f68408f8ebfe78f443a672.tar.xz
labitrack-cf7ed2625456a5e619f68408f8ebfe78f443a672.zip
upgrade to bootstrap 2
Signed-off-by: Asbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Diffstat (limited to 'web/css')
-rw-r--r--web/css/labitrack.d/01-basic.css17
1 files changed, 9 insertions, 8 deletions
diff --git a/web/css/labitrack.d/01-basic.css b/web/css/labitrack.d/01-basic.css
index 0de66b8..3f62a62 100644
--- a/web/css/labitrack.d/01-basic.css
+++ b/web/css/labitrack.d/01-basic.css
@@ -1,15 +1,18 @@
+html {
+ overflow-y: scroll;
+}
/* Override some defaults */
html, body {
- background-color: #eee;
+ background-color: #eee !important;
}
body {
padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
}
-.container > footer p {
+.container footer p {
text-align: center; /* center align it with the container */
}
-.container {
- width: 560px; /* 10 columns */
+body > .container {
+ width: 560px !important; /* 10 columns */
}
/* The white background content wrapper */
@@ -26,9 +29,7 @@ body {
}
/* Page header tweaks */
-.page-header {
- background-color: #f5f5f5;
- padding: 20px 20px 10px;
+.navbar-inner {
margin: -20px -20px 20px;
}
@@ -44,6 +45,6 @@ body {
border-left: 1px solid #eee;
}
-.topbar .btn {
+.navbar .btn {
border: 0;
}