From 7324ee24e335432b7a6e0294f9b57c70288e20c9 Mon Sep 17 00:00:00 2001 From: Dennis Kehrig Date: Wed, 2 May 2012 19:01:45 +0200 Subject: [PATCH 1/4] fixes #5 (https://github.com/blup/bootstrap.stylus/issues/5) --- styl/responsive.styl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/styl/responsive.styl b/styl/responsive.styl index d7517476..ceedf216 100644 --- a/styl/responsive.styl +++ b/styl/responsive.styl @@ -36,7 +36,7 @@ // UP TO LANDSCAPE PHONE // --------------------- -$media (max-width: 480px) +@media (max-width: 480px) // Smooth out the collapsing/expanding nav .nav-collapse @@ -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 @@ -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) @@ -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 // ---------------- @@ -295,7 +295,7 @@ $media (max-width: 979px) // DEFAULT DESKTOP // --------------- -$media (min-width: 980px) +@media (min-width: 980px) .nav-collapse.collapse height: auto !important @@ -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) From 2efa7e57853821f11ac7aa0d154f054c17da9710 Mon Sep 17 00:00:00 2001 From: Dennis Kehrig Date: Wed, 2 May 2012 19:09:53 +0200 Subject: [PATCH 2/4] Fixes #3 (https://github.com/blup/bootstrap.stylus/issues/3) "unable to import select libs" --- js/bootstrap.js | 2 +- styl/{ => bootstrap}/accordion.styl | 0 styl/{ => bootstrap}/alerts.styl | 0 styl/{ => bootstrap}/breadcrumbs.styl | 0 styl/{ => bootstrap}/button-groups.styl | 0 styl/{ => bootstrap}/buttons.styl | 0 styl/{ => bootstrap}/carousel.styl | 0 styl/{ => bootstrap}/close.styl | 0 styl/{ => bootstrap}/code.styl | 0 styl/{ => bootstrap}/component-animations.styl | 0 styl/{ => bootstrap}/dropdowns.styl | 0 styl/{ => bootstrap}/forms.styl | 0 styl/{ => bootstrap}/grid.styl | 0 styl/{ => bootstrap}/hero-unit.styl | 0 styl/{bootstrap.styl => bootstrap/index.styl} | 0 styl/{ => bootstrap}/labels.styl | 0 styl/{ => bootstrap}/layouts.styl | 0 styl/{ => bootstrap}/mixins.styl | 0 styl/{ => bootstrap}/modals.styl | 0 styl/{ => bootstrap}/navbar.styl | 0 styl/{ => bootstrap}/navs.styl | 0 styl/{ => bootstrap}/pager.styl | 0 styl/{ => bootstrap}/pagination.styl | 0 styl/{ => bootstrap}/popovers.styl | 0 styl/{ => bootstrap}/progress-bars.styl | 0 styl/{ => bootstrap}/reset.styl | 0 styl/{ => bootstrap}/responsive.styl | 0 styl/{ => bootstrap}/scaffolding.styl | 0 styl/{ => bootstrap}/sprites.styl | 0 styl/{ => bootstrap}/tables.styl | 0 styl/{ => bootstrap}/thumbnails.styl | 0 styl/{ => bootstrap}/tooltip.styl | 0 styl/{ => bootstrap}/type.styl | 0 styl/{ => bootstrap}/utilities.styl | 0 styl/{ => bootstrap}/variables.styl | 0 styl/{ => bootstrap}/wells.styl | 0 36 files changed, 1 insertion(+), 1 deletion(-) rename styl/{ => bootstrap}/accordion.styl (100%) rename styl/{ => bootstrap}/alerts.styl (100%) rename styl/{ => bootstrap}/breadcrumbs.styl (100%) rename styl/{ => bootstrap}/button-groups.styl (100%) rename styl/{ => bootstrap}/buttons.styl (100%) rename styl/{ => bootstrap}/carousel.styl (100%) rename styl/{ => bootstrap}/close.styl (100%) rename styl/{ => bootstrap}/code.styl (100%) rename styl/{ => bootstrap}/component-animations.styl (100%) rename styl/{ => bootstrap}/dropdowns.styl (100%) rename styl/{ => bootstrap}/forms.styl (100%) rename styl/{ => bootstrap}/grid.styl (100%) rename styl/{ => bootstrap}/hero-unit.styl (100%) rename styl/{bootstrap.styl => bootstrap/index.styl} (100%) rename styl/{ => bootstrap}/labels.styl (100%) rename styl/{ => bootstrap}/layouts.styl (100%) rename styl/{ => bootstrap}/mixins.styl (100%) rename styl/{ => bootstrap}/modals.styl (100%) rename styl/{ => bootstrap}/navbar.styl (100%) rename styl/{ => bootstrap}/navs.styl (100%) rename styl/{ => bootstrap}/pager.styl (100%) rename styl/{ => bootstrap}/pagination.styl (100%) rename styl/{ => bootstrap}/popovers.styl (100%) rename styl/{ => bootstrap}/progress-bars.styl (100%) rename styl/{ => bootstrap}/reset.styl (100%) rename styl/{ => bootstrap}/responsive.styl (100%) rename styl/{ => bootstrap}/scaffolding.styl (100%) rename styl/{ => bootstrap}/sprites.styl (100%) rename styl/{ => bootstrap}/tables.styl (100%) rename styl/{ => bootstrap}/thumbnails.styl (100%) rename styl/{ => bootstrap}/tooltip.styl (100%) rename styl/{ => bootstrap}/type.styl (100%) rename styl/{ => bootstrap}/utilities.styl (100%) rename styl/{ => bootstrap}/variables.styl (100%) rename styl/{ => bootstrap}/wells.styl (100%) diff --git a/js/bootstrap.js b/js/bootstrap.js index c587aa10..c788d787 100644 --- a/js/bootstrap.js +++ b/js/bootstrap.js @@ -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()); } }; diff --git a/styl/accordion.styl b/styl/bootstrap/accordion.styl similarity index 100% rename from styl/accordion.styl rename to styl/bootstrap/accordion.styl diff --git a/styl/alerts.styl b/styl/bootstrap/alerts.styl similarity index 100% rename from styl/alerts.styl rename to styl/bootstrap/alerts.styl diff --git a/styl/breadcrumbs.styl b/styl/bootstrap/breadcrumbs.styl similarity index 100% rename from styl/breadcrumbs.styl rename to styl/bootstrap/breadcrumbs.styl diff --git a/styl/button-groups.styl b/styl/bootstrap/button-groups.styl similarity index 100% rename from styl/button-groups.styl rename to styl/bootstrap/button-groups.styl diff --git a/styl/buttons.styl b/styl/bootstrap/buttons.styl similarity index 100% rename from styl/buttons.styl rename to styl/bootstrap/buttons.styl diff --git a/styl/carousel.styl b/styl/bootstrap/carousel.styl similarity index 100% rename from styl/carousel.styl rename to styl/bootstrap/carousel.styl diff --git a/styl/close.styl b/styl/bootstrap/close.styl similarity index 100% rename from styl/close.styl rename to styl/bootstrap/close.styl diff --git a/styl/code.styl b/styl/bootstrap/code.styl similarity index 100% rename from styl/code.styl rename to styl/bootstrap/code.styl diff --git a/styl/component-animations.styl b/styl/bootstrap/component-animations.styl similarity index 100% rename from styl/component-animations.styl rename to styl/bootstrap/component-animations.styl diff --git a/styl/dropdowns.styl b/styl/bootstrap/dropdowns.styl similarity index 100% rename from styl/dropdowns.styl rename to styl/bootstrap/dropdowns.styl diff --git a/styl/forms.styl b/styl/bootstrap/forms.styl similarity index 100% rename from styl/forms.styl rename to styl/bootstrap/forms.styl diff --git a/styl/grid.styl b/styl/bootstrap/grid.styl similarity index 100% rename from styl/grid.styl rename to styl/bootstrap/grid.styl diff --git a/styl/hero-unit.styl b/styl/bootstrap/hero-unit.styl similarity index 100% rename from styl/hero-unit.styl rename to styl/bootstrap/hero-unit.styl diff --git a/styl/bootstrap.styl b/styl/bootstrap/index.styl similarity index 100% rename from styl/bootstrap.styl rename to styl/bootstrap/index.styl diff --git a/styl/labels.styl b/styl/bootstrap/labels.styl similarity index 100% rename from styl/labels.styl rename to styl/bootstrap/labels.styl diff --git a/styl/layouts.styl b/styl/bootstrap/layouts.styl similarity index 100% rename from styl/layouts.styl rename to styl/bootstrap/layouts.styl diff --git a/styl/mixins.styl b/styl/bootstrap/mixins.styl similarity index 100% rename from styl/mixins.styl rename to styl/bootstrap/mixins.styl diff --git a/styl/modals.styl b/styl/bootstrap/modals.styl similarity index 100% rename from styl/modals.styl rename to styl/bootstrap/modals.styl diff --git a/styl/navbar.styl b/styl/bootstrap/navbar.styl similarity index 100% rename from styl/navbar.styl rename to styl/bootstrap/navbar.styl diff --git a/styl/navs.styl b/styl/bootstrap/navs.styl similarity index 100% rename from styl/navs.styl rename to styl/bootstrap/navs.styl diff --git a/styl/pager.styl b/styl/bootstrap/pager.styl similarity index 100% rename from styl/pager.styl rename to styl/bootstrap/pager.styl diff --git a/styl/pagination.styl b/styl/bootstrap/pagination.styl similarity index 100% rename from styl/pagination.styl rename to styl/bootstrap/pagination.styl diff --git a/styl/popovers.styl b/styl/bootstrap/popovers.styl similarity index 100% rename from styl/popovers.styl rename to styl/bootstrap/popovers.styl diff --git a/styl/progress-bars.styl b/styl/bootstrap/progress-bars.styl similarity index 100% rename from styl/progress-bars.styl rename to styl/bootstrap/progress-bars.styl diff --git a/styl/reset.styl b/styl/bootstrap/reset.styl similarity index 100% rename from styl/reset.styl rename to styl/bootstrap/reset.styl diff --git a/styl/responsive.styl b/styl/bootstrap/responsive.styl similarity index 100% rename from styl/responsive.styl rename to styl/bootstrap/responsive.styl diff --git a/styl/scaffolding.styl b/styl/bootstrap/scaffolding.styl similarity index 100% rename from styl/scaffolding.styl rename to styl/bootstrap/scaffolding.styl diff --git a/styl/sprites.styl b/styl/bootstrap/sprites.styl similarity index 100% rename from styl/sprites.styl rename to styl/bootstrap/sprites.styl diff --git a/styl/tables.styl b/styl/bootstrap/tables.styl similarity index 100% rename from styl/tables.styl rename to styl/bootstrap/tables.styl diff --git a/styl/thumbnails.styl b/styl/bootstrap/thumbnails.styl similarity index 100% rename from styl/thumbnails.styl rename to styl/bootstrap/thumbnails.styl diff --git a/styl/tooltip.styl b/styl/bootstrap/tooltip.styl similarity index 100% rename from styl/tooltip.styl rename to styl/bootstrap/tooltip.styl diff --git a/styl/type.styl b/styl/bootstrap/type.styl similarity index 100% rename from styl/type.styl rename to styl/bootstrap/type.styl diff --git a/styl/utilities.styl b/styl/bootstrap/utilities.styl similarity index 100% rename from styl/utilities.styl rename to styl/bootstrap/utilities.styl diff --git a/styl/variables.styl b/styl/bootstrap/variables.styl similarity index 100% rename from styl/variables.styl rename to styl/bootstrap/variables.styl diff --git a/styl/wells.styl b/styl/bootstrap/wells.styl similarity index 100% rename from styl/wells.styl rename to styl/bootstrap/wells.styl From b5722687134b9caebc29b920f111a8b6f4b2e870 Mon Sep 17 00:00:00 2001 From: Dennis Kehrig Date: Thu, 3 May 2012 22:41:40 +0200 Subject: [PATCH 3/4] Changed bootstrap image paths to be easier to swallow with different file structures --- styl/bootstrap/variables.styl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styl/bootstrap/variables.styl b/styl/bootstrap/variables.styl index 4a842f34..ec9bc7e5 100644 --- a/styl/bootstrap/variables.styl +++ b/styl/bootstrap/variables.styl @@ -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 From e8b3a4d30fca879aa919152e966a52e60c747b20 Mon Sep 17 00:00:00 2001 From: Dennis Kehrig Date: Mon, 14 May 2012 22:18:24 +0200 Subject: [PATCH 4/4] Boldly allowing node versions after 0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 016e60d0..7cec0e54 100644 --- a/package.json +++ b/package.json @@ -12,5 +12,5 @@ , "stylus": "0.24.0" } , "main": "index" - , "engines": { "node": "0.4.x" } + , "engines": { "node": ">=0.4.0" } }