diff options
| -rw-r--r-- | app/views/layouts/application.html.erb | 14 | ||||
| -rw-r--r-- | public/stylesheets/ccc.css | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2b66dbb..627aa14 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -36,8 +36,14 @@ | |||
| 36 | </div> | 36 | </div> |
| 37 | <div id="center_column"> | 37 | <div id="center_column"> |
| 38 | <%= yield :layout %> | 38 | <%= yield :layout %> |
| 39 | </div> | ||
| 40 | <div id="right_column"> | ||
| 41 | <%= tags %> | ||
| 42 | <%= featured_articles %> | ||
| 43 | </div> | ||
| 44 | </div> | ||
| 39 | 45 | ||
| 40 | <div id="footer"> | 46 | <div id="footer"> |
| 41 | <br /> | 47 | <br /> |
| 42 | <br /> | 48 | <br /> |
| 43 | <p style="text-align: center"> | 49 | <p style="text-align: center"> |
| @@ -49,11 +55,5 @@ | |||
| 49 | Benjamin Franklin | 55 | Benjamin Franklin |
| 50 | </p> | 56 | </p> |
| 51 | </div> | 57 | </div> |
| 52 | </div> | ||
| 53 | <div id="right_column"> | ||
| 54 | <%= tags %> | ||
| 55 | <%= featured_articles %> | ||
| 56 | </div> | ||
| 57 | </div> | ||
| 58 | </body> | 58 | </body> |
| 59 | </html> \ No newline at end of file | 59 | </html> \ No newline at end of file |
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css index 19cb662..fcb45d6 100644 --- a/public/stylesheets/ccc.css +++ b/public/stylesheets/ccc.css | |||
| @@ -23,6 +23,7 @@ div#wrapper { | |||
| 23 | width: 909px; | 23 | width: 909px; |
| 24 | margin-left: 90px; | 24 | margin-left: 90px; |
| 25 | text-align: left; | 25 | text-align: left; |
| 26 | min-height: 600px; | ||
| 26 | } | 27 | } |
| 27 | 28 | ||
| 28 | pre { | 29 | pre { |
| @@ -260,7 +261,6 @@ div#footer { | |||
| 260 | position: relative; | 261 | position: relative; |
| 261 | width: 1024px; | 262 | width: 1024px; |
| 262 | height: 240px; | 263 | height: 240px; |
| 263 | margin-left: -304px; | ||
| 264 | background-image: url(/images/footer.png); | 264 | background-image: url(/images/footer.png); |
| 265 | background-repeat: no-repeat; | 265 | background-repeat: no-repeat; |
| 266 | } | 266 | } |
