Merge pull request #7 from INN/aschweigert

Aschweigert
WPBuddy · Jul 19, 2012 · 804ca87 · 804ca87
2 parents f7bf945 + cd70969
commit 804ca87
Show file tree

Hide file tree

Showing 8 changed files with 2,585 additions and 2,601 deletions.
diff --git a/css/style.css b/css/style.css
diff --git a/header.php b/header.php
@@ -122,8 +122,9 @@
  </div>
  </form>
  </div>
-
- <a href="http://investigativenewsnetwork.org/" target="_blank"><img class="org-logo" src="<?php bloginfo( 'template_directory' ); ?>/img/inn-logo-80-50.jpg" height="50" alt="INN logo" /></a>
+ <div class="org-logo">
+ <a href="http://investigativenewsnetwork.org/" target="_blank"><img src="<?php bloginfo( 'template_directory' ); ?>/img/inn-logo-80-50.jpg" height="50" alt="INN logo" /></a>
+ </div>
  </div>
  </nav>
  </div> <!-- /.global-nav -->

diff --git a/less/grid.less b/less/grid.less
diff --git a/less/header.less b/less/header.less
@@ -61,8 +61,10 @@
 }
 #header-search {
  float:left;
- margin-right:10px;
- margin-top:2px;
+ margin:2px 10px 0 0;
+ form {
+ margin:0;
+ }
  input {
  font-size: @baseFontSize - 3;
  line-height:1.8;

diff --git a/less/navbar.less b/less/navbar.less
@@ -91,15 +91,12 @@ li.home-link {
  color: @navbarLinkColor;
  text-decoration: none;
  text-shadow: 0 -1px 0 rgba(0,0,0,.8);
- &:hover {
- #gradient > .vertical(@navbarBackground, @navbarBackgroundHighlight);
- color:@grayLighter;
- }
 }
 .navbar .nav > li.dropdown > a {
  padding-right:0;
 }
-.navbar .open > a {
+.navbar .open > a,
+.navbar li > a:hover {
  #gradient > .vertical(@navbarBackground, @navbarBackgroundHighlight);
  color:@grayLighter;
 }
@@ -432,6 +429,146 @@ li.home-link {
  top: 31%;
  left: -8px;
 }
+
+// TABLETS AND BELOW
+// -----------------
+@media (max-width: 979px) {
+
+ .navbar .container {
+ width: auto;
+ padding: 0;
+ }
+
+ // COLLAPSIBLE NAVBAR
+ // ------------------
+ // Nav collapse clears brand
+ .nav-collapse {
+ clear: both;
+ }
+ // Block-level the nav
+ .nav-collapse .nav {
+ float: none;
+ margin: 0 0 (@baseLineHeight / 2);
+ }
+ .nav-collapse .nav > li {
+ float: none;
+ }
+ .nav-collapse .nav > li > a {
+ margin-bottom: 2px;
+ }
+ .nav-collapse .nav > .divider-vertical {
+ display: none;
+ }
+ .nav-collapse .nav .nav-header {
+ color: @navbarText;
+ text-shadow: none;
+ }
+ // Nav and dropdown links in navbar
+ .nav-collapse .nav > li > a,
+ .nav-collapse .nav > span > li > a,
+ .nav-collapse .dropdown-menu a {
+ padding: 6px 15px;
+ font-weight: bold;
+ color: @navbarLinkColor;
+ .border-radius(3px);
+ }
+ .nav-collapse .divider {
+ height: 1px;
+ width: 94%;
+ margin: 5px 3%;
+ overflow: hidden;
+ background-color: @navbarBackground;
+ border-bottom: 1px solid @navbarBackgroundHighlight;
+ }
+ // Buttons
+ .nav-collapse .btn {
+ padding: 4px 10px 4px;
+ font-weight: normal;
+ .border-radius(4px);
+ }
+ .nav-collapse .dropdown-menu li + li a {
+ margin-bottom: 2px;
+ }
+ .nav-collapse .nav > li > a:hover,
+ .nav-collapse .dropdown-menu a:hover {
+ background-color: @navbarBackground;
+ }
+ // Buttons in the navbar
+ .nav-collapse.in .btn-group {
+ margin-top: 5px;
+ padding: 0;
+ }
+ // Dropdowns in the navbar
+ .nav-collapse .dropdown-menu {
+ position: static;
+ top: auto;
+ left: auto;
+ float: none;
+ display: block;
+ max-width: none;
+ margin: 0 15px;
+ padding: 0;
+ background-color: transparent;
+ border: none;
+ .border-radius(0);
+ .box-shadow(none);
+ }
+ .nav-collapse .dropdown-menu:before,
+ .nav-collapse .dropdown-menu:after {
+ display: none;
+ }
+ .nav-collapse .dropdown-menu .divider {
+ display: none;
+ }
+ // Forms in navbar
+ .nav-collapse .navbar-form,
+ .nav-collapse .navbar-search {
+ float: none;
+ padding: (@baseLineHeight / 2) 15px;
+ margin: (@baseLineHeight / 2) 0;
+ border-top: 1px solid @navbarBackground;
+ border-bottom: 1px solid @navbarBackground;
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
+ }
+ // Pull right (secondary) nav content
+ .navbar .nav-collapse .nav.pull-right {
+ float: none;
+ margin-left: 0;
+ }
+ // Hide everything in the navbar save .brand and toggle button */
+ .nav-collapse,
+ .nav-collapse.collapse {
+ overflow: hidden;
+ height: 0;
+ }
+ // Navbar button
+ .navbar .btn-navbar {
+ display: block;
+ }
+
+ // STATIC NAVBAR
+ // -------------
+ .navbar-static .navbar-inner {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+}
+
+
+// DEFAULT DESKTOP
+// ---------------
+
+// Required to make the collapsing navbar work on regular desktops
+@media (min-width: 980px) {
+ .nav-collapse.collapse {
+ height: auto !important;
+ overflow: visible !important;
+ }
+}
+
+// The "Don't Miss" Secondary Nav
+// ---------------
+
 #secondary-nav {
  .clearfix();
  margin-bottom:@baseline;

diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
@@ -44,7 +44,6 @@
  }
 }
 
-
 // UP TO LANDSCAPE PHONE
 // ---------------------
 @media (max-width: 480px) {

diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
diff --git a/less/style.less b/less/style.less
@@ -15,29 +15,23 @@ License: GNU General Public License
 @import "reset.less";
 @import "variables.less";
 @import "mixins.less";
+@import "typography.less";
+@import "forms.less";
+@import "buttons.less";
+@import "tables.less";
+@import "sprites.less";
 
 // --------------------------------------------
 // Layout and page styles
 // --------------------------------------------
 
 @import "layout.less";
-@import "typography.less";
 @import "header.less";
 @import "navbar.less";
 @import "post-page-styles.less";
 @import "comments.less";
 @import "footer.less";
 
-// --------------------------------------------
-// Some help from Bootstrap
-// --------------------------------------------
-
-@import "responsive-navbar.less";
-@import "sprites.less";
-@import "forms.less";
-@import "buttons.less";
-@import "tables.less";
-
 // --------------------------------------------
 // Responsive design components
 // --------------------------------------------