diff options
| -rw-r--r-- | app/views/custom/page_templates/public/standard_template.html.erb | 4 | ||||
| -rw-r--r-- | app/views/custom/partials/_article.html.erb | 3 | ||||
| -rw-r--r-- | public/stylesheets/ccc.css | 44 |
3 files changed, 43 insertions, 8 deletions
diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb index d4c80aa..8cd88a6 100644 --- a/app/views/custom/page_templates/public/standard_template.html.erb +++ b/app/views/custom/page_templates/public/standard_template.html.erb | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | <h2><%= @page.title %></h2> | 2 | <h2><%= @page.title %></h2> |
| 3 | <h3><%= date_for_page @page %>, <%= @page.user.try(:login) %></h3> | 3 | <h3><%= date_for_page @page %>, <%= @page.user.try(:login) %></h3> |
| 4 | <hr class="subtitle" /> | 4 | <hr class="subtitle" /> |
| 5 | <p><em><%= sanitize( @page.abstract )%></em></p> | 5 | <div class="abstract"><p><em><%= sanitize( @page.abstract )%></em></p></div> |
| 6 | <div id="headline_image"><%= headline_image %></div> | 6 | <div id="headline_image"><%= headline_image %></div> |
| 7 | <%= aggregate?(@page.body) %> | 7 | <div class="body"><%= aggregate?(@page.body) %></div> |
| 8 | </div> | 8 | </div> |
| 9 | 9 | ||
| 10 | <%= will_paginate(@content_collection) if @content_collection %> \ No newline at end of file | 10 | <%= will_paginate(@content_collection) if @content_collection %> \ No newline at end of file |
diff --git a/app/views/custom/partials/_article.html.erb b/app/views/custom/partials/_article.html.erb index dfad62a..4f772ae 100644 --- a/app/views/custom/partials/_article.html.erb +++ b/app/views/custom/partials/_article.html.erb | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | <div class="article_partial"> | 1 | <div class="article_partial"> |
| 2 | <h2><%= link_to_path page.title, page.node.unique_name %></h2> | 2 | <h2 class="headline"><%= link_to_path page.title, page.node.unique_name %></h2> |
| 3 | <div class="author_and_date"> | 3 | <div class="author_and_date"> |
| 4 | <%= date_for_page page %>, <%= author_for_page page %> | 4 | <%= date_for_page page %>, <%= author_for_page page %> |
| 5 | </div> | 5 | </div> |
| 6 | <p class="excerpt"><%= page.abstract %></p> | 6 | <p class="excerpt"><%= page.abstract %></p> |
| 7 | <div class="teaser_ruler"></div> | ||
| 8 | </div> \ No newline at end of file | 7 | </div> \ No newline at end of file |
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css index 9c6688e..a77a68d 100644 --- a/public/stylesheets/ccc.css +++ b/public/stylesheets/ccc.css | |||
| @@ -3,7 +3,15 @@ body { | |||
| 3 | padding: 0; | 3 | padding: 0; |
| 4 | text-align: center; | 4 | text-align: center; |
| 5 | font-family: Verdana, sans-serif; | 5 | font-family: Verdana, sans-serif; |
| 6 | font-size: 9pt; | 6 | font-size: 11px; |
| 7 | line-height: 16px; | ||
| 8 | color: #535353; | ||
| 9 | } | ||
| 10 | |||
| 11 | h2 { | ||
| 12 | font-size: 16px; | ||
| 13 | line-height: 22px; | ||
| 14 | font-family: Helvetica; | ||
| 7 | } | 15 | } |
| 8 | 16 | ||
| 9 | a { | 17 | a { |
| @@ -54,14 +62,21 @@ div#main_navigation a:hover { | |||
| 54 | 62 | ||
| 55 | div#main_navigation a.active { | 63 | div#main_navigation a.active { |
| 56 | color: #535353; | 64 | color: #535353; |
| 65 | text-transform: uppercase; | ||
| 66 | } | ||
| 67 | |||
| 68 | div#main_navigation a.inactive { | ||
| 69 | color: #535353; | ||
| 70 | text-transform: lowercase; | ||
| 71 | font-size: 14px; | ||
| 57 | } | 72 | } |
| 58 | 73 | ||
| 59 | div#frontpage_calendar { | 74 | div#frontpage_calendar { |
| 60 | } | 75 | } |
| 61 | 76 | ||
| 62 | div#frontpage_calendar h2, div#tags h2, div#featured_articles h2 { | 77 | div#frontpage_calendar h2, div#tags h2, div#featured_articles h2 { |
| 63 | border-top: 2px solid #000000; | 78 | border-top: 2px solid #CCCCCC; |
| 64 | border-bottom: 2px dashed #000000; | 79 | border-bottom: 2px solid #CCCCCC; |
| 65 | font-size: 16px; | 80 | font-size: 16px; |
| 66 | padding-top: 2px; | 81 | padding-top: 2px; |
| 67 | padding-bottom: 2px; | 82 | padding-bottom: 2px; |
| @@ -69,11 +84,15 @@ div#frontpage_calendar h2, div#tags h2, div#featured_articles h2 { | |||
| 69 | 84 | ||
| 70 | div#frontpage_calendar ul, div#tags ul, div#featured_articles ul { | 85 | div#frontpage_calendar ul, div#tags ul, div#featured_articles ul { |
| 71 | padding: 0px; | 86 | padding: 0px; |
| 87 | font-size: 11px; | ||
| 88 | } | ||
| 89 | |||
| 90 | div#frontpage_calendar li { | ||
| 91 | margin-bottom: 20px; | ||
| 72 | } | 92 | } |
| 73 | 93 | ||
| 74 | div#frontpage_calendar li, div#tags li, div#featured_articles li { | 94 | div#frontpage_calendar li, div#tags li, div#featured_articles li { |
| 75 | list-style-type: none; | 95 | list-style-type: none; |
| 76 | margin-bottom: 20px; | ||
| 77 | } | 96 | } |
| 78 | 97 | ||
| 79 | div#frontpage_calendar li a, div#tags li a, div#featured_articles li a { | 98 | div#frontpage_calendar li a, div#tags li a, div#featured_articles li a { |
| @@ -91,6 +110,8 @@ div#featured_articles li a:hover { | |||
| 91 | 110 | ||
| 92 | div.author_and_date { | 111 | div.author_and_date { |
| 93 | font-style: italic; | 112 | font-style: italic; |
| 113 | padding-left: 15px; | ||
| 114 | font-family: Georgia; | ||
| 94 | } | 115 | } |
| 95 | 116 | ||
| 96 | div#left_column { | 117 | div#left_column { |
| @@ -118,6 +139,11 @@ div#center_column { | |||
| 118 | 139 | ||
| 119 | div#center_column h2 a { | 140 | div#center_column h2 a { |
| 120 | font-size: 12pt; | 141 | font-size: 12pt; |
| 142 | color: #535353; | ||
| 143 | } | ||
| 144 | |||
| 145 | div#center_column h2.headline { | ||
| 146 | border-bottom: 2px solid #cccccc; | ||
| 121 | } | 147 | } |
| 122 | 148 | ||
| 123 | div#right_column { | 149 | div#right_column { |
| @@ -136,6 +162,10 @@ div.teaser_ruler { | |||
| 136 | margin-top: 30px; | 162 | margin-top: 30px; |
| 137 | } | 163 | } |
| 138 | 164 | ||
| 165 | div.article_partial { | ||
| 166 | margin-bottom: 30px; | ||
| 167 | } | ||
| 168 | |||
| 139 | div.article_partial h2 a { | 169 | div.article_partial h2 a { |
| 140 | text-decoration: none; | 170 | text-decoration: none; |
| 141 | } | 171 | } |
| @@ -144,6 +174,12 @@ div.article_partial p.excerpt { | |||
| 144 | color: #404040; | 174 | color: #404040; |
| 145 | } | 175 | } |
| 146 | 176 | ||
| 177 | div#center_column div.body, | ||
| 178 | div#center_column div.abstract { | ||
| 179 | font-size: 11px; | ||
| 180 | line-height: 16px; | ||
| 181 | } | ||
| 182 | |||
| 147 | div#search { | 183 | div#search { |
| 148 | position: absolute; | 184 | position: absolute; |
| 149 | top: 145px; | 185 | top: 145px; |
