Permalink
Browse files

fluid, some css, flexslider

  • Loading branch information...
Edwin Knuth
Edwin Knuth committed May 4, 2012
1 parent 0cc845c commit 3831cb1549316be1eb51921b6c9198f0e93f363f
@@ -14,8 +14,10 @@
<!-- Le styles -->
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.css" rel="stylesheet">
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="{{ ASSET_PATH }}/css/font-awesome.css" rel="stylesheet" type="text/css" media="all">
+ <link href="assets/css/flexslider.css" rel="stylesheet" type="text/css" media="all">
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
+ <script src="assets/bootstrap/js/jquery.js"></script>
+ <script src="assets/js/jquery.flexslider.js"></script>
<!-- Le fav and touch icons -->
<!-- Update these with your own images
@@ -27,13 +29,12 @@
</head>
<body>
- <div class="container">
-
+ <div class="container-fluid">
<div class="content">
{{ content }}
</div>
<footer>
- <div class="row">
+ <div class="row-fluid">
<div class="span3">
<a href="http://www.ecotrust.org"><img class="ecotrust-logo" src="assets/img/ecotrust_logo08.png"/></a>
<ul class="unstyled">
@@ -59,16 +60,16 @@ <h3>What is Madrona?</h3>
</div>
<div class="span3">
<h3>Developer Community</h3>
- <div class="row">
- <div class="span2">
+ <div class="row-fluid">
+ <div class="span6">
<ul class="unstyled">
<li><a href="#">github</a></li>
<li><a href="#">download</a></li>
<li><a href="#">documentation</a></li>
<li><a href="#">issue tracker</a></li>
</ul>
</div>
- <div class="span1">
+ <div class="span6">
<ul class="unstyled">
<li><a href="#">wiki</a></li>
<li><a href="#">road map</a></li>
@@ -82,6 +83,7 @@ <h3>Developer Community</h3>
{% include JB/analytics %}
</body>
</html>
+
<!-- Place this render call where appropriate -->
<script type="text/javascript">
(function() {
@@ -1,17 +1,20 @@
-<div class="row">
- <div class="span7">
+<div class="row-fluid logo-bar">
+ <div class="span2">
<img class="madrona-logo" src="assets/img/madrona-logo.png"/>
</div>
- <div class="span5 navbar">
+ <div class="span10 navbar">
+ <img class="ecotrust-logo" src="assets/img/ecotrust_logo08.png"/>
<div class="pull-right">
- <button class="btn btn-large">install</button>
- <button class="btn btn-large">case studies</button>
- <button class="btn btn-large">services</button>
- <button class="btn btn-large">help</button>
+ <div class="primary-nav">
+ <button class="btn btn-large">install</button>
+ <button class="btn btn-large">case studies</button>
+ <button class="btn btn-large">services</button>
+ <button class="btn btn-large">help</button>
+ </div>
</div>
</div>
</div>
-<div class="row">
+<div class="row-fluid">
<div class="span12">
{{ content }}
View
@@ -0,0 +1,64 @@
+/*
+ * jQuery FlexSlider v1.8
+ * http://www.woothemes.com/flexslider/
+ *
+ * Copyright 2012 WooThemes
+ * Free to use under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+
+/* Browser Resets */
+.flex-container a:active,
+.flexslider a:active,
+.flex-container a:focus,
+.flexslider a:focus {outline: none;}
+.slides,
+.flex-control-nav,
+.flex-direction-nav {margin: 0; padding: 0; list-style: none;}
+
+/* FlexSlider Necessary Styles
+*********************************/
+.flexslider {margin: 0; padding: 0;}
+.flexslider .slides > li {display: none; -webkit-backface-visibility: hidden;} /* Hide the slides before the JS is loaded. Avoids image jumping */
+.flexslider .slides img {max-width: 100%; display: block;}
+.flex-pauseplay span {text-transform: capitalize;}
+
+/* Clearfix for the .slides element */
+.slides:after {content: "."; display: block; clear: both; visibility: hidden; line-height: 0; height: 0;}
+html[xmlns] .slides {display: block;}
+* html .slides {height: 1%;}
+
+/* No JavaScript Fallback */
+/* If you are not using another script, such as Modernizr, make sure you
+ * include js that eliminates this class on page load */
+.no-js .slides > li:first-child {display: block;}
+
+
+/* FlexSlider Default Theme
+*********************************/
+.flexslider {background: #fff; border: 4px solid #fff; position: relative; -webkit-border-radius: 5px; -moz-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; zoom: 1;}
+.flexslider .slides {zoom: 1;}
+.flexslider .slides > li {position: relative;}
+/* Suggested container for "Slide" animation setups. Can replace this with your own, if you wish */
+.flex-container {zoom: 1; position: relative;}
+
+/* Caption style */
+/* IE rgba() hack */
+.flex-caption {background:none; -ms-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4C000000,endColorstr=#4C000000);
+filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4C000000,endColorstr=#4C000000); zoom: 1;}
+.flex-caption {width: 96%; padding: 2%; margin: 0; position: absolute; left: 0; bottom: 0; background: rgba(0,0,0,.3); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.3); font-size: 14px; line-height: 18px;}
+
+/* Direction Nav */
+.flex-direction-nav { height: 0; }
+.flex-direction-nav li a {width: 52px; height: 52px; margin: -13px 0 0; display: block; background: url(theme/bg_direction_nav.png) no-repeat; position: absolute; top: 50%; cursor: pointer; text-indent: -999em;}
+.flex-direction-nav li .next {background-position: -52px 0; right: -21px;}
+.flex-direction-nav li .prev {left: -20px;}
+.flex-direction-nav li .disabled {opacity: .3; filter:alpha(opacity=30); cursor: default;}
+
+/* Control Nav */
+.flex-control-nav {width: 100%; position: absolute; bottom: -30px; text-align: center;}
+.flex-control-nav li {margin: 0 0 0 5px; display: inline-block; zoom: 1; *display: inline;}
+.flex-control-nav li:first-child {margin: 0;}
+.flex-control-nav li a {width: 13px; height: 13px; display: block; background: url(theme/bg_control_nav.png) no-repeat; cursor: pointer; text-indent: -999em;}
+.flex-control-nav li a:hover {background-position: 0 -13px;}
+.flex-control-nav li a.active {background-position: 0 -26px; cursor: default;}
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 3831cb1

Please sign in to comment.