Changeset 834
- Timestamp:
- 10/16/2007 01:40:03 PM (14 months ago)
- Location:
- branches/website/application/views
- Files:
-
- 5 removed
- 2 modified
-
layout.php (modified) (4 diffs)
-
media/css/layout.css (modified) (5 diffs)
-
media/img/body-background.png (deleted)
-
media/img/gradient1.png (deleted)
-
media/img/mainnav-tab-left.png (deleted)
-
media/img/mainnav-tab-right.png (deleted)
-
media/img/sidebar-background.png (deleted)
Legend:
- Unmodified
- Added
- Removed
-
branches/website/application/views/layout.php
r706 r834 17 17 </head> 18 18 <body> 19 <div id="container">20 21 22 19 <!-- Start Developer Menu --> 23 <div id="developer" >20 <div id="developer" class="container clearfix"> 24 21 <span>Developers:</span> 25 22 <ul> … … 34 31 35 32 <!-- Start Header --> 36 <div id="header" class="c learfix">33 <div id="header" class="container clearfix"> 37 34 38 35 <!-- Start Logo --> … … 54 51 55 52 <!-- Start Body --> 56 <div id="body"> 53 <div id="body" class="container"> 54 55 <!-- Start Content --> 56 <div id="content-wrapper"><div id="content"> 57 57 <?php echo $content ?> 58 </div></div> 59 <!-- End Content --> 58 60 59 61 <!-- Start Sidebar --> … … 78 80 <!-- End Body --> 79 81 80 <div id="footer" class="c learfix"><strong>©2007 Kohana Team. All rights reserved.</strong> Powered by Kohana v{kohana_version}. Rendered in {execution_time} seconds.</div>82 <div id="footer" class="container"><strong>©2007 Kohana Team. All rights reserved.</strong> Powered by Kohana v{kohana_version}. Rendered in {execution_time} seconds.</div> 81 83 82 84 </div> -
branches/website/application/views/media/css/layout.css
r707 r834 1 1 /* Defaults */ 2 html { background: #f7fbf1 url(../img/body-background.png) repeat-x 50%0; }3 body { font-family: Arial, Verdana, sans-serif; font-size: 76%; color: #313230;line-height: 1; }2 html { background: #f7fbf1; color: #313230; } 3 body { font-family: Arial, Verdana, sans-serif; font-size: 76%; line-height: 1; } 4 4 a { color: #006; text-decoration: none; } 5 5 a:hover { color: #009; } … … 13 13 14 14 /* Container */ 15 #container { position: relative; width: 960px; margin: 0 auto; padding: 2em; }15 .container { position: relative; clear: both; } 16 16 17 17 /* Developer Menu */ 18 #developer { p osition: absolute; top: 11px; margin-left: 35px; text-transform: uppercase; font-size: 0.9em; color: #2d4565; }18 #developer { padding: 1em 2em; background: #1e2e42; text-transform: uppercase; font-size: 0.9em; color: #2d4565; text-align: right; } 19 19 #developer span { font-weight: bold; } 20 20 #developer ul { display: inline; } … … 25 25 26 26 /* Header */ 27 #header { position: relative; top: 0; height: 229px; background: url(../img/kohana.png) 35px center no-repeat; }27 #header { height: 16em; background: #83c018; border-bottom: solid 0.1em #96a67a; } 28 28 29 29 /* Logo */ … … 31 31 32 32 /* Main Menu */ 33 #menu { position: absolute; bottom: 0; margin -left: 35px; }34 #menu li { display: block; float: left; padding: 3px 3px 0; }35 #menu li.active { margin-right: 8px; background: #f7fbf1; }36 #menu a { display: block; padding: 1 0px 20px 15px; text-transform: uppercase; font-weight: bold; color: #3f5c0b; }33 #menu { position: absolute; bottom: 0; margin: 0 2em; margin-right: 22em; } 34 #menu li { display: block; float: left; margin-right: 0.4em; } 35 #menu li.active { border-right-color: #76b714; } 36 #menu a { display: block; padding: 1em 1.2em 0.6em; margin-bottom: -0.1em; border: solid 0.1em #83c018; border-bottom: 0; text-transform: uppercase; font-weight: bold; color: #3f5c0b; } 37 37 #menu a:hover { background: #76b714; color: #2c360b; } 38 #menu li.active a { margin-bottom: -1px; padding: 10px 24px 20px; background: #f7fbf1; border: solid 1px #d4e9af; border-width: 1px 1px 0; color: #222; }38 #menu li.active a { background: #f7fbf1; border-color: #96a67a; } 39 39 #menu li.active a:hover { background: #f7fbf1; color: #000; } 40 40 41 /* ContentBody */42 #body { clear: both; position: relative; min-width: 40em; min-height: 280px; padding: 1.4em 0; margin-left: 35px; padding-right: 20em; }41 /* Main Body */ 42 #body { position: relative; padding: 1em 4em; } 43 43 #body p { margin-bottom: 1em; } 44 44 #body ul { padding-left: 1.5em; margin-bottom: 1em; list-style: square; line-height: 180%; } 45 #body .intro { width: 22em; margin-bottom: 1em; margin-left: -35px; padding: 1.5em 4em; padding-left: 35px; background: #eaeee5; font-size: 1.6em; line-height: 1.4em; color: #8C9393; }45 #body .intro { margin: 1em; margin-left: -4em; padding: 1em 2em; padding-left: 4em; background: #eaeee5; font-size: 1.6em; line-height: 1.4em; color: #8C9393; } 46 46 #body .intro strong { text-transform: uppercase; font-weight: bold; font-size: 0.76em; color: #7b7d78; letter-spacing: -0.02em; white-space: nowrap; } 47 47 48 /* Content */ 49 #content-wrapper { margin-right: 21em; } 50 #content { float: left; width: 100%; margin-right: -21em; } 51 48 52 /* Sidebar */ 49 #sidebar { position: absolute; top: -180px; right: 0; z-index: 100; width: 20em; }53 #sidebar { float: right; width: 20em; margin-top: -14em; margin-bottom: 2em; } 50 54 #sidebody { padding: 5px; background: #c9e59d; } 51 55 #sidecontent { background: #f7fbf1; padding-bottom: 1px; } … … 61 65 62 66 /* Footer */ 63 #footer { padding: 1em 35px; background: #83c018; text-transform: uppercase; text-align: right; color: #eee; font-size: 0.8em; }67 #footer { padding: 1em 2em; background: #83c018; text-transform: uppercase; text-align: right; color: #eee; font-size: 0.8em; } 64 68 #footer strong { float: left; font-weight: bold; }
