diff options
| author | hukl <contact@smyck.org> | 2009-03-04 23:13:30 +0100 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-03-04 23:13:30 +0100 |
| commit | 98f6f775d27e3a5dadfbecdcbe6dec02f88367eb (patch) | |
| tree | d3e613748dad1cf31beb2449b6c6524629d84a73 | |
| parent | 7b5048c0f124e453e4179a7c54858eb5d48fcec2 (diff) | |
links in menu, edit button when logged in and css fixes
| -rw-r--r-- | app/views/layouts/application.html.erb | 12 | ||||
| -rwxr-xr-x | public/stylesheets/styled.css | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c546347..7007f6d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -20,31 +20,33 @@ | |||
| 20 | <div id="yellow"> | 20 | <div id="yellow"> |
| 21 | </div> | 21 | </div> |
| 22 | <div id="title"> | 22 | <div id="title"> |
| 23 | <h1>Chaos Computer Club</h1> | 23 | <h1><a href="/">Chaos Computer Club</a></h1> |
| 24 | </div> | 24 | </div> |
| 25 | <div id="topnav"> | 25 | <div id="topnav"> |
| 26 | <ul id="navlist"> | 26 | <ul id="navlist"> |
| 27 | <li> | 27 | <li> |
| 28 | <a href="#">CCC</a> | 28 | <a href="/club">Kennenlernen</a> |
| 29 | </li> | 29 | </li> |
| 30 | <li> | 30 | <li> |
| 31 | • | 31 | • |
| 32 | </li> | 32 | </li> |
| 33 | <li> | 33 | <li> |
| 34 | <a href="#">Themen</a> | 34 | <a href="/support">Unterstützen</a> |
| 35 | </li> | 35 | </li> |
| 36 | <li> | 36 | <li> |
| 37 | • | 37 | • |
| 38 | </li> | 38 | </li> |
| 39 | <li> | 39 | <li> |
| 40 | <a href="#">Termine</a> | 40 | <a href="/contact">Erreichen</a> |
| 41 | </li> | 41 | </li> |
| 42 | <% if current_user %> | ||
| 42 | <li> | 43 | <li> |
| 43 | • | 44 | • |
| 44 | </li> | 45 | </li> |
| 45 | <li> | 46 | <li> |
| 46 | <a href="#">Projekte</a> | 47 | <%= link_to 'Edit', edit_node_path(@page.node) %> |
| 47 | </li> | 48 | </li> |
| 49 | <% end %> | ||
| 48 | </ul> | 50 | </ul> |
| 49 | </div> | 51 | </div> |
| 50 | </div> | 52 | </div> |
diff --git a/public/stylesheets/styled.css b/public/stylesheets/styled.css index 0c131f3..4502529 100755 --- a/public/stylesheets/styled.css +++ b/public/stylesheets/styled.css | |||
| @@ -194,14 +194,15 @@ hr.subtitle { | |||
| 194 | #content a { | 194 | #content a { |
| 195 | padding: 1em; | 195 | padding: 1em; |
| 196 | margin: -1em; | 196 | margin: -1em; |
| 197 | color: #eab407; | 197 | color: #4d4d4d; |
| 198 | font-family: Verdana; | 198 | font-family: Verdana; |
| 199 | text-decoration: none; | 199 | text-decoration: underline; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | #content a:hover { | 202 | #content a:hover { |
| 203 | padding: 1em; | 203 | padding: 1em; |
| 204 | text-decoration: underline; | 204 | text-decoration: underline; |
| 205 | color: #eab407; | ||
| 205 | } | 206 | } |
| 206 | 207 | ||
| 207 | div.teaserruler { | 208 | div.teaserruler { |
| @@ -473,7 +474,7 @@ img { | |||
| 473 | 474 | ||
| 474 | h2 { | 475 | h2 { |
| 475 | font-family: Georgia; | 476 | font-family: Georgia; |
| 476 | font-size: 1.64em; | 477 | font-size: 1.84em; |
| 477 | font-weight: normal; | 478 | font-weight: normal; |
| 478 | } | 479 | } |
| 479 | 480 | ||
