Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename sidebar to nav. Get rid of reset CSS, as that's taken care of …
…by Bootstrap
  • Loading branch information
akavlie committed Mar 6, 2012
1 parent d7bd65e commit 4eae665
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 30 deletions.
29 changes: 0 additions & 29 deletions public/stylesheets/style.css
@@ -1,23 +1,3 @@
/* Resets
------ */

html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6,
p, blockquote, pre, a, abbr, address, cite, code, del, dfn, em,
img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, hr,
dl, dt, dd, ol, ul, li, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, figure, figcaption, hgroup,
menu, footer, header, nav, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
}

article, aside, canvas, figure, figure img, figcaption, hgroup,
footer, header, nav, section, audio, video {
display: block;
}

body {
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
color:#4b4b4b;
Expand Down Expand Up @@ -46,10 +26,6 @@ a {
float:right;
}

.fl {
float:left;
}

.oh {
overflow:hidden;
}
Expand All @@ -62,11 +38,6 @@ a {
min-height:300px;
}

.sidebar {
margin: 0 30px;
width:200px;
}

ul.lnav {
padding:0;
list-style:none;
Expand Down
2 changes: 1 addition & 1 deletion views/layout.jade
Expand Up @@ -22,7 +22,7 @@ html
#content_wrapper
- if(is_logged)
.sidebar.fl
!= partial("sidebar")
!= partial("nav")
.content
!= body
.cl
Expand Down
File renamed without changes.

0 comments on commit 4eae665

Please sign in to comment.