Skip to content

Commit

Permalink
Merge pull request vwall#53 from wyuenho/master
Browse files Browse the repository at this point in the history 
patch for issue vwall#52, and bootstrap 2.0.3 upgrade
  • Loading branch information
@vwall
vwall committed May 8, 2012
2 parents 1aec580 + 1663b88 commit 55cdff7
Show file tree
Hide file tree
Showing 98 changed files with 3,854 additions and 2,398 deletions.
4 changes: 2 additions & 2 deletions stylesheets/_compass_twitter_bootstrap.scss
View file
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.0.0
* Bootstrap v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down Expand Up @@ -56,7 +56,7 @@

// Components: Misc
@import "compass_twitter_bootstrap/thumbnails";
@import "compass_twitter_bootstrap/labels";
@import "compass_twitter_bootstrap/labels-badges";
@import "compass_twitter_bootstrap/progress-bars";
@import "compass_twitter_bootstrap/accordion";
@import "compass_twitter_bootstrap/carousel";
Expand Down
6 changes: 3 additions & 3 deletions stylesheets/_compass_twitter_bootstrap_awesome.scss
View file
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.0.0
/*
* Bootstrap v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down Expand Up @@ -56,7 +56,7 @@

// Components: Misc
@import "compass_twitter_bootstrap/thumbnails";
@import "compass_twitter_bootstrap/labels";
@import "compass_twitter_bootstrap/labels-badges";
@import "compass_twitter_bootstrap/progress-bars";
@import "compass_twitter_bootstrap/accordion";
@import "compass_twitter_bootstrap/carousel";
Expand Down
307 changes: 14 additions & 293 deletions stylesheets/_compass_twitter_bootstrap_responsive.scss
View file
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.0.1
* Bootstrap Responsive v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand All @@ -8,6 +8,7 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/


// Responsive
// For phone and tablet devices
// -------------------------------------------------------------
Expand All @@ -24,304 +25,24 @@
// RESPONSIVE CLASSES
// ------------------

// Hide from screenreaders and browsers
// Credit: HTML5 Boilerplate
.hidden {
display: none;
visibility: hidden;
}



// UP TO LANDSCAPE PHONE
// ---------------------

@media (max-width: 480px) {

// Smooth out the collapsing/expanding nav
.nav-collapse {
-webkit-transform: translate3d(0, 0, 0); // activate the GPU
}

// Block level the page header small tag for readability
.page-header h1 small {
display: block;
line-height: $baseLineHeight;
}

// Make span* classes full width
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
display: block;
width: 100%;
min-height: 28px; /* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box; /* Older Webkit */
-moz-box-sizing: border-box; /* Older FF */
-ms-box-sizing: border-box; /* IE8 */
box-sizing: border-box; /* CSS3 spec*/
}
// But don't let it screw up prepend/append inputs
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}

// Update checkboxes for iOS
input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc;
}

// Remove the horizontal form styles
.form-horizontal .control-group > label {
float: none;
width: auto;
padding-top: 0;
text-align: left;
}
// Move over all input controls and content
.form-horizontal .controls {
margin-left: 0;
}
// Move the options list down to align with labels
.form-horizontal .control-list {
padding-top: 0; // has to be padding because margin collaspes
}
// Move over buttons in .form-actions to align with .controls
.form-horizontal .form-actions {
padding-left: 10px;
padding-right: 10px;
}

// Modals
.modal {
position: absolute;
top: 10px;
left: 10px;
right: 10px;
width: auto;
margin: 0;
&.fade.in { top: auto; }
}
.modal-header .close {
padding: 10px;
margin: -10px;
}

// Carousel
.carousel-caption {
position: static;
}

}



// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
// --------------------------------------------------

@media (max-width: 767px) {
// GRID & CONTAINERS
// -----------------
// Remove width from containers
.container {
width: auto;
padding: 0 20px;
}
// Fluid rows
.row-fluid {
width: 100%;
}
// Undo negative margin on rows
.row {
margin-left: 0;
}
// Make all columns even
.row > [class*="span"],
.row-fluid > [class*="span"] {
float: none;
display: block;
width: auto;
margin: 0;
}
}

@import "compass_twitter_bootstrap/responsive-utilities";


// PORTRAIT TABLET TO DEFAULT DESKTOP
// ----------------------------------

@media (min-width: 768px) and (max-width: 979px) {

// Fixed grid
@include gridSystem-generate(12, 42px, 20px);

// Fluid grid
@include fluidGridSystem-generate(12, 5.801104972%, 2.762430939%);

// Input grid
@include inputGridSystem-generate(12, 42px, 20px);

}



// TABLETS AND BELOW
// -----------------
@media (max-width: 979px) {

// UNFIX THE TOPBAR
// ----------------
// Remove any padding from the body
body {
padding-top: 0;
}
// Unfix the navbar
.navbar-fixed-top {
position: static;
margin-bottom: $baseLineHeight;
}
.navbar-fixed-top .navbar-inner {
padding: 5px;
}
.navbar .container {
width: auto;
padding: 0;
}
// Account for brand name
.navbar .brand {
padding-left: 10px;
padding-right: 10px;
margin: 0 0 0 -5px;
}
// Nav collapse clears brand
.navbar .nav-collapse {
clear: left;
}
// Block-level the nav
.navbar .nav {
float: none;
margin: 0 0 ($baseLineHeight / 2);
}
.navbar .nav > li {
float: none;
}
.navbar .nav > li > a {
margin-bottom: 2px;
}
.navbar .nav > .divider-vertical {
display: none;
}
.navbar .nav .nav-header {
color: $navbarText;
text-shadow: none;
}
// Nav and dropdown links in navbar
.navbar .nav > li > a,
.navbar .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: $navbarLinkColor;
@include border-radius(3px);
}
.navbar .dropdown-menu li + li a {
margin-bottom: 2px;
}
.navbar .nav > li > a:hover,
.navbar .dropdown-menu a:hover {
background-color: $navbarBackground;
}
// Dropdowns in the navbar
.navbar .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;
@include border-radius(0);
@include box-shadow(none);
}
.navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
display: none;
}
.navbar .dropdown-menu .divider {
display: none;
}
// Forms in navbar
.navbar-form,
.navbar-search {
float: none;
padding: ($baseLineHeight / 2) 15px;
margin: ($baseLineHeight / 2) 0;
border-top: 1px solid $navbarBackground;
border-bottom: 1px solid $navbarBackground;
$shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
@include box-shadow($shadow);
}
// Pull right (secondary) nav content
.navbar .nav.pull-right {
float: none;
margin-left: 0;
}
// Static navbar
.navbar-static .navbar-inner {
padding-left: 10px;
padding-right: 10px;
}
// Navbar button
.btn-navbar {
display: block;
}

// Hide everything in the navbar save .brand and toggle button */
.nav-collapse {
overflow: hidden;
height: 0;
}
}



// DEFAULT DESKTOP
// ---------------

@media (min-width: 980px) {
.nav-collapse.collapse {
height: auto !important;
}
}



// LARGE DESKTOP & UP
// MEDIA QUERIES
// ------------------

@media (min-width: 1200px) {
// Phones to portrait tablets and narrow desktops
@import "compass_twitter_bootstrap/responsive-767px-max";

// Fixed grid
@include gridSystem-generate(12, 70px, 30px);
// Tablets to regular desktops
@import "compass_twitter_bootstrap/responsive-768px-979px";

// Fluid grid
@include fluidGridSystem-generate(12, 5.982905983%, 2.564102564%);
// Large desktops
@import "compass_twitter_bootstrap/responsive-1200px-min";

// Input grid
@include inputGridSystem-generate(12, 70px, 30px);

// Thumbnails
.thumbnails {
margin-left: -30px;
}
.thumbnails > li {
margin-left: 30px;
}
// RESPONSIVE NAVBAR
// ------------------

}
// From 979px and below, show a button to toggle navbar contents
@import "compass_twitter_bootstrap/responsive-navbar";
7 changes: 6 additions & 1 deletion stylesheets/compass_twitter_bootstrap/_accordion.scss
View file
Expand Up @@ -11,7 +11,7 @@
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
@include border-radius(4px);
@include bootstrap-border-radius(4px);
}
.accordion-heading {
border-bottom: 0;
Expand All @@ -21,6 +21,11 @@
padding: 8px 15px;
}

// General toggle styles
.accordion-toggle {
cursor: pointer;
}

// Inner needs the styles because you can't animate properly with any styles on the element
.accordion-inner {
padding: 9px 15px;
Expand Down

0 comments on commit 55cdff7

Please sign in to comment.