summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@alfadeo.de>2011-08-22 10:07:03 +0200
committergebele <gebele@alfadeo.de>2011-08-22 10:07:03 +0200
commitfbddcd77266e57e1f81a452f0a3d03683d78df20 (patch)
treeb7c2680441033d797f558dc39ba5705ca838f401
parentccf721a645cfe1049d0f54ea7ef0612d3068a375 (diff)
changing layout
-rw-r--r--views/layout.haml1
-rw-r--r--views/style.sass35
2 files changed, 15 insertions, 21 deletions
diff --git a/views/layout.haml b/views/layout.haml
index 1a9a049..9cf4131 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -27,7 +27,6 @@
-#= link_to "Login", "/login"
-#%li{:class => ("selected" if /help/ =~ request.path )}
-#= link_to "Documentation", "/help"
- %hr
.content
.login_info
diff --git a/views/style.sass b/views/style.sass
index b93fb28..4b1cb38 100644
--- a/views/style.sass
+++ b/views/style.sass
@@ -1,6 +1,6 @@
$bg_color: #b9dcff
$bg_color2: #e5e7eb
-$li_color: #ff8
+//$li_color: #ff8
$fg_color: #424345
$ot_purple: #5d308a
$body_color: white
@@ -17,8 +17,8 @@ body
text-align: left
a
text-decoration: none
- //font-weight: bold
- //color: $ot_purple
+ font-weight: bold
+ color: $ot_purple
a:hover
color: black
a[rel="external"]
@@ -34,8 +34,8 @@ body
padding-right: 2%
.index
- //clear: both
- margin: 2%
+ clear: both
+ //margin: 2%
ul
margin: 0 0 2px 0
@@ -54,36 +54,31 @@ body
font-weight: bold
a
text-decoration: none
- color: lightgrey
+ //color: lightgrey
+ color: $bg_color
&:hover
- color: $li_color
+ //color: $li_color
+ color: $body_color
li.selected
font-weight: bold
+ background-color: $bg_color
a
- color: $li_color
- hr
- height: 2px
- color: #333
- background-color: #333
- margin-top: 5px
- border:
- top: 0
- bottom: 0
- color: #555
-
+ //color: $li_color
+ color: $text_color
+
.content
clear: both
background-color: $bg_color
padding: 1em
margin: 4% 2% 0%
- border: 1px solid #555555
+ //border: 1px solid #555555
h2
margin: 20px 3px 2px 3px
.notice
//clear: both
//margin-top: 1em
padding: 0.5em 1em
- background-color: $body_color
+ background-color: $bg_color
border: 1px solid
border-color: $notice_border
.login_info