Skip to content

Fixed #3 and #5 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DennisKehrig wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed #3 and #5 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7324ee2
fixes #5 (https://github.com/blup/bootstrap.stylus/issues/5)
May 2, 2012
2efa7e5
Fixes #3 (https://github.com/blup/bootstrap.stylus/issues/3)
May 2, 2012
b572268
Changed bootstrap image paths to be easier to swallow with different …
May 3, 2012
e8b3a4d
Boldly allowing node versions after 0.4
May 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var path = require('path');

module.exports = function(){
return function(style){
style.include(__dirname + '/../styl/bootstrap.styl');
style.include(__dirname + '/../styl');
style.use(nib());
}
};
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
, "stylus": "0.24.0"
}
, "main": "index"
, "engines": { "node": "0.4.x" }
, "engines": { "node": ">=0.4.0" }
}
0 styl/accordion.styl → styl/bootstrap/accordion.styl
View file
Open in desktop
File renamed without changes.
0 styl/alerts.styl → styl/bootstrap/alerts.styl
View file
Open in desktop
File renamed without changes.
0 styl/breadcrumbs.styl → styl/bootstrap/breadcrumbs.styl
View file
Open in desktop
File renamed without changes.
0 styl/button-groups.styl → styl/bootstrap/button-groups.styl
View file
Open in desktop
File renamed without changes.
0 styl/buttons.styl → styl/bootstrap/buttons.styl
View file
Open in desktop
File renamed without changes.
0 styl/carousel.styl → styl/bootstrap/carousel.styl
View file
Open in desktop
File renamed without changes.
0 styl/close.styl → styl/bootstrap/close.styl
View file
Open in desktop
File renamed without changes.
0 styl/code.styl → styl/bootstrap/code.styl
View file
Open in desktop
File renamed without changes.
0 styl/component-animations.styl → styl/bootstrap/component-animations.styl
View file
Open in desktop
File renamed without changes.
0 styl/dropdowns.styl → styl/bootstrap/dropdowns.styl
View file
Open in desktop
File renamed without changes.
0 styl/forms.styl → styl/bootstrap/forms.styl
View file
Open in desktop
File renamed without changes.
0 styl/grid.styl → styl/bootstrap/grid.styl
View file
Open in desktop
File renamed without changes.
0 styl/hero-unit.styl → styl/bootstrap/hero-unit.styl
View file
Open in desktop
File renamed without changes.
0 styl/bootstrap.styl → styl/bootstrap/index.styl
View file
Open in desktop
File renamed without changes.
0 styl/labels.styl → styl/bootstrap/labels.styl
View file
Open in desktop
File renamed without changes.
0 styl/layouts.styl → styl/bootstrap/layouts.styl
View file
Open in desktop
File renamed without changes.
0 styl/mixins.styl → styl/bootstrap/mixins.styl
View file
Open in desktop
File renamed without changes.
0 styl/modals.styl → styl/bootstrap/modals.styl
View file
Open in desktop
File renamed without changes.
0 styl/navbar.styl → styl/bootstrap/navbar.styl
View file
Open in desktop
File renamed without changes.
0 styl/navs.styl → styl/bootstrap/navs.styl
View file
Open in desktop
File renamed without changes.
0 styl/pager.styl → styl/bootstrap/pager.styl
View file
Open in desktop
File renamed without changes.
0 styl/pagination.styl → styl/bootstrap/pagination.styl
View file
Open in desktop
File renamed without changes.
0 styl/popovers.styl → styl/bootstrap/popovers.styl
View file
Open in desktop
File renamed without changes.
0 styl/progress-bars.styl → styl/bootstrap/progress-bars.styl
View file
Open in desktop
File renamed without changes.
0 styl/reset.styl → styl/bootstrap/reset.styl
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions styl/responsive.styl → styl/bootstrap/responsive.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
// UP TO LANDSCAPE PHONE
// ---------------------

$media (max-width: 480px)
@media (max-width: 480px)

// Smooth out the collapsing/expanding nav
.nav-collapse
Expand Down Expand Up @@ -124,7 +124,7 @@ $media (max-width: 480px)
// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
// --------------------------------------------------

$media (max-width: 767px)
@media (max-width: 767px)
// GRID & CONTAINERS
// -----------------
// Remove width from containers
Expand Down Expand Up @@ -155,7 +155,7 @@ $media (max-width: 767px)
// PORTRAIT TABLET TO DEFAULT DESKTOP
// ----------------------------------

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

// Fixed grid
$gridSystem-generate(12, 42px, 20px)
Expand All @@ -172,7 +172,7 @@ $media (min-width: 768px) and (max-width: 979px)

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

// UNFIX THE TOPBAR
// ----------------
Expand Down Expand Up @@ -295,7 +295,7 @@ $media (max-width: 979px)
// DEFAULT DESKTOP
// ---------------

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

Expand All @@ -306,7 +306,7 @@ $media (min-width: 980px)
// LARGE DESKTOP & UP
// ------------------

$media (min-width: 1200px)
@media (min-width: 1200px)

// Fixed grid
$gridSystem-generate(12, 70px, 30px)
Expand Down
0 styl/scaffolding.styl → styl/bootstrap/scaffolding.styl
View file
Open in desktop
File renamed without changes.
0 styl/sprites.styl → styl/bootstrap/sprites.styl
View file
Open in desktop
File renamed without changes.
0 styl/tables.styl → styl/bootstrap/tables.styl
View file
Open in desktop
File renamed without changes.
0 styl/thumbnails.styl → styl/bootstrap/thumbnails.styl
View file
Open in desktop
File renamed without changes.
0 styl/tooltip.styl → styl/bootstrap/tooltip.styl
View file
Open in desktop
File renamed without changes.
0 styl/type.styl → styl/bootstrap/type.styl
View file
Open in desktop
File renamed without changes.
0 styl/utilities.styl → styl/bootstrap/utilities.styl
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions styl/variables.styl → styl/bootstrap/variables.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ $zindexModalBackdrop = 1040
$zindexModal = 1050

// Sprite icons path
$iconSpritePath = "../img/glyphicons-halflings.png"
$iconWhiteSpritePath = "../img/glyphicons-halflings-white.png"
$iconSpritePath = "glyphicons-halflings.png"
$iconWhiteSpritePath = "glyphicons-halflings-white.png"

// Input placeholder text color
$placeholderText = $grayLight
Expand Down
0 styl/wells.styl → styl/bootstrap/wells.styl
View file
Open in desktop
File renamed without changes.