Permalink
Browse files

Made sure to support bootstrap2

  • Loading branch information...
1 parent 7febf3e commit fadb2a3060c4eb0c4b4c8599bdb1358ca1fbf739 @DavyLandman committed Feb 14, 2012
Showing with 27 additions and 32 deletions.
  1. +8 −9 public/stylesheets/style.css
  2. +8 −12 public/stylesheets/style.styl
  3. +11 −11 views/layout.jade
@@ -5,32 +5,31 @@ body {
body {
padding-top: 40px;
}
-.container > .content {
+.container > .row {
background-color: #fff;
padding: 20px;
margin: 0 -20px;
/* negative indent the amount of the
padding to maintain the grid system */
- -webkit-border-radius: 0 0 6px 6px;
- -moz-border-radius: 0 0 6px 6px;
- border-radius: 0 0 6px 6px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.15);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.15);
box-shadow: 0 1px 2px rgba(0,0,0,0.15);
}
+.container > .row:last-child {
+ -webkit-border-radius: 0 0 6px 6px;
+ -moz-border-radius: 0 0 6px 6px;
+ border-radius: 0 0 6px 6px;
+}
.container > footer p {
text-align: center;
}
-.page-header {
+.pageheader {
background-color: #f5f5f5;
padding: 20px 20px 10px;
- margin: -20px -20px 20px;
+ margin: -20px -20px -20px;
}
.content .span4 {
margin-left: 0;
padding-left: 19px;
border-left: 1px solid #eee;
}
-.topbar .btn {
- border: 0;
-}
@@ -3,38 +3,34 @@ body
background-color:#EEE
body
- padding-top: 40px
+ padding-top: 40px
.container
- > .content
+ > .row
background-color: #fff
padding: 20px
margin: 0 -20px /* negative indent the amount of the
padding to maintain the grid system */
- -webkit-border-radius: 0 0 6px 6px
- -moz-border-radius: 0 0 6px 6px
- border-radius: 0 0 6px 6px
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15)
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15)
box-shadow: 0 1px 2px rgba(0,0,0,.15)
+ > .row:last-child
+ -webkit-border-radius: 0 0 6px 6px
+ -moz-border-radius: 0 0 6px 6px
+ border-radius: 0 0 6px 6px
> footer
p
text-align: center
-.page-header
+.pageheader
background-color: #f5f5f5
padding: 20px 20px 10px
- margin: -20px -20px 20px
+ margin: -20px -20px -20px
.content
.span4
margin-left: 0
padding-left: 19px
border-left: 1px solid #eee
-
-.topbar
- .btn
- border: 0
-
View
@@ -3,11 +3,13 @@ html
head
title= title
link(rel='stylesheet', href='/stylesheets/bootstrap.min.css')
+ link(rel='stylesheet', href='/stylesheets/bootstrap-responsive.min.css')
link(rel='stylesheet', href='/stylesheets/style.css')
- script(src='/javascripts/modernizr.custom.81317.js')
+ script(src='/javascripts/bootstrap.min.js')
+ //script(src='/javascripts/modernizr.custom.81317.js')
body
- .topbar
- .fill
+ .navbar.navbar-fixed-top
+ .navbar-inner
.container
a(href='/').brand ArdMostat
ul.nav
@@ -17,15 +19,13 @@ html
a(href='/Schedule') Schedule
.container
- .content
- .pageheader
+ .row
+ .span12.pageheader
h1=title
- .row
- .span10!= body
- .span4
- p stuff?
- footer
- p cheers
+ .row
+ .span10!= body
+ .span2
+ p stuff?
script(src='/javascripts/jquery-1.7.1.min.js')
- if (typeof(pagescript) != 'undefined' && typeof(pagescript) === 'string')

0 comments on commit fadb2a3

Please sign in to comment.