Browse files

Ok, well, it's looking a little better.

Active tabs still currently aren't highlighted (the sass is in place to do this, but the controller code is not). Manually entereing nonexistent pages redirects to the home page.

TODO: make the tabs pretty, implement active tab highlighting.
  • Loading branch information...
1 parent a0eb0e6 commit 8d03a5af3c6fafce8fb617780356c5c4e0d1b298 Chad Ostrowski committed Apr 7, 2010
Showing with 55 additions and 48 deletions.
  1. +2 −2 views/layout.haml
  2. +2 −1 views/layout.haml~
  3. +26 −22 views/styles.sass
  4. +25 −23 views/styles.sass~
View
4 views/layout.haml
@@ -9,8 +9,8 @@
%h1#blog-title Lisli
%p#description
All about a certain Lisa
- /
- #nav
+
+ #nav
%ul
%li
%a{:title => "Wonderings and Wanderings", :href => "/"}
View
3 views/layout.haml~
@@ -9,7 +9,8 @@
%h1#blog-title Lisli
%p#description
All about a certain Lisa
- #nav
+ /
+ #nav
%ul
%li
%a{:title => "Wonderings and Wanderings", :href => "/"}
View
48 views/styles.sass
@@ -23,18 +23,22 @@
text-transform: uppercase
=tab_borders
- -moz-border-radius-topright= !tab_radius
- -moz-border-radius-topleft= !tab_radius
- -webkit-border-top-right-radius= !tab_radius
- -webkit-border-top-left-radius= !tab_radius
- border-top-right-radius= !tab_radius
- border-top-left-radius= !tab_radius
- border= !simple_border
- border-bottom: 0
+ -moz-border-radius-bottomright= !tab_radius
+ -moz-border-radius-bottomleft= !tab_radius
+ -webkit-border-bottom-right-radius= !tab_radius
+ -webkit-border-bottom-left-radius= !tab_radius
+ border-bottom-right-radius= !tab_radius
+ border-bottom-left-radius= !tab_radius
+ border= 1px solid #ccc
+ border-top: 0
&:active
border: 0
&:hover
- border= 1px "solid" (!grey - #222)
+ border: 1px solid #888
+ border-top: 0
+ &.current, &.current:hover
+ border: 1px solid #000
+ border-top: 0
/*
reset
@@ -79,7 +83,7 @@ iframe
#header
border: 1px solid #ccc
- margin: 0px auto 10px
+ margin: 0px auto
width: 660px
div
@@ -119,7 +123,7 @@ p
text-transform: uppercase
#content
- margin: 0 auto
+ margin: 30px auto 0
padding: 0
text-align: left
width: 660px
@@ -193,7 +197,7 @@ dt
+sans-heading-font
letter-spacing: 0.1em
margin: 0
- dd
+ strong
display: none
.profile-textblock
@@ -211,42 +215,42 @@ dt
#nav
ul
- float: right
+ width: 660px
display: block
clear: both
list-style: none
- margin: 0 !important
+ margin: -5px auto 0
height: 30px
- border-bottom= 1px "solid" !grey
li
float: left
text-indent: 0
padding: 0
- margin: 0 !important
+ margin: 0 5px 0 0
list-style-image: none !important
+ &:last-child
+ margin: 0 !important
a
background-color: #fff
+tab_borders
display: block
height: 30px
line-height: 30px
- width: 111px
+ width: 210px
text-align: center
text-decoration: none
- color= !grey
- +fancy_fonts
+ color: #ccc
padding: 0
margin: 0
position: relative
top: 5px
&:active
outline: none
&:hover
- background-color= #f0f0f0
+ color: #888
&.current, &.current:hover
- background-color= !grey + #555
+ height: 32px
cursor: default !important
- color: #000 !important
+ color: #000
/*
typography
View
48 views/styles.sass~
@@ -23,18 +23,22 @@
text-transform: uppercase
=tab_borders
- -moz-border-radius-topright= !tab_radius
- -moz-border-radius-topleft= !tab_radius
- -webkit-border-top-right-radius= !tab_radius
- -webkit-border-top-left-radius= !tab_radius
- border-top-right-radius= !tab_radius
- border-top-left-radius= !tab_radius
- border= !simple_border
- border-bottom: 0
+ -moz-border-radius-bottomright= !tab_radius
+ -moz-border-radius-bottomleft= !tab_radius
+ -webkit-border-bottom-right-radius= !tab_radius
+ -webkit-border-bottom-left-radius= !tab_radius
+ border-bottom-right-radius= !tab_radius
+ border-bottom-left-radius= !tab_radius
+ border= 1px solid #ccc
+ border-top: 0
&:active
border: 0
&:hover
- border= 1px "solid" (!grey - #222)
+ border: 1px solid #888
+ border-top: 0
+ &.current, &.current:hover
+ border: 1px solid #000
+ border-top: 0
/*
reset
@@ -79,9 +83,8 @@ iframe
#header
border: 1px solid #ccc
- margin: 0px auto 10px
+ margin: 0px auto
width: 660px
- text-align: center
div
display: block
@@ -120,7 +123,7 @@ p
text-transform: uppercase
#content
- margin: 0 auto
+ margin: 30px auto 0
padding: 0
text-align: left
width: 660px
@@ -209,46 +212,45 @@ dt
clear: both
margin: 0 auto
width: 660px
- text-align: center
#nav
ul
- float: right
+ width: 660px
display: block
clear: both
list-style: none
- margin: 0 !important
+ margin: -5px auto 0
height: 30px
- border-bottom= 1px "solid" !grey
li
float: left
text-indent: 0
padding: 0
- margin: 0 !important
+ margin: 0 5px 0 0
list-style-image: none !important
+ &:last-child
+ margin: 0 !important
a
background-color: #fff
+tab_borders
display: block
height: 30px
line-height: 30px
- width: 111px
+ width: 210px
text-align: center
text-decoration: none
- color= !grey
- +fancy_fonts
+ color: #ccc
padding: 0
margin: 0
position: relative
top: 5px
&:active
outline: none
&:hover
- background-color= #f0f0f0
+ color: #888
&.current, &.current:hover
- background-color= !grey + #555
+ height: 32px
cursor: default !important
- color: #000 !important
+ color: #000
/*
typography

0 comments on commit 8d03a5a

Please sign in to comment.