Skip to content
This repository has been archived by the owner on Feb 10, 2020. It is now read-only.

Commit

Permalink
Added submodules back and Fixed #6
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleKing committed May 11, 2015
1 parent b9ef84e commit 8470285
Show file tree
Hide file tree
Showing 11 changed files with 267 additions and 248 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "tests/Bootstrap TLDR/packages/bootstrap-less-data/bootstrap"]
path = tests/Bootstrap TLDR/packages/bootstrap-less-data/bootstrap
url = https://KyleKing@github.com/twbs/bootstrap
[submodule "tests/Bootstrap TLDR/packages/customizable-bootstrap-stylus-data/bootstrap"]
path = tests/Bootstrap TLDR/packages/customizable-bootstrap-stylus-data/bootstrap
url = https://KyleKing@github.com/maxmx/bootstrap-stylus
4 changes: 2 additions & 2 deletions tests/Bootstrap TLDR/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ id-map@1.0.3
insecure@1.0.3
jquery@1.11.3_2
json@1.0.3
kyleking:bootstrap-stylus@0.0.0
kyleking:bootstrap-stylus-data@4.0.4
kyleking:customizable-bootstrap-stylus@3.3.4_2
kyleking:customizable-bootstrap-stylus-data@4.0.4
launch-screen@1.0.2
livedata@1.0.13
logging@1.0.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// However: you should @import "custom.bootstrap.import.styl" instead of this


// @import "bootstrap/bootstrap-stylus/bootstrap/mixins.styl"
// @import "bootstrap/bootstrap/mixins.styl"
// Mixins
// --------------------------------------------------
vendors ?= official
Expand All @@ -19,7 +19,7 @@ percentage($n)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/hide-text.styl"
// @import "bootstrap/bootstrap/mixins/hide-text.styl"
// CSS image replacement
//
// Heads up! v3 launched with with only `hide-text()`, but per our pattern for
Expand All @@ -42,7 +42,7 @@ text-hide()



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/opacity.styl"
// @import "bootstrap/bootstrap/mixins/opacity.styl"
// Opacity
opacity-ie($opacity)
opacity $opacity
Expand All @@ -52,7 +52,7 @@ opacity-ie($opacity)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/image.styl"
// @import "bootstrap/bootstrap/mixins/image.styl"
// Image Mixins
// - Responsive image
// - Retina image
Expand Down Expand Up @@ -86,7 +86,7 @@ img-retina($file-1x, $file-2x, $width-1x, $height-1x)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/labels.styl"
// @import "bootstrap/bootstrap/mixins/labels.styl"
// Labels
label-variant($color)
background-color $color
Expand All @@ -98,7 +98,7 @@ label-variant($color)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/reset-filter.styl"
// @import "bootstrap/bootstrap/mixins/reset-filter.styl"
// Reset filters for IE
//
// When you need to remove a gradient background, do not forget to use this to reset
Expand All @@ -108,15 +108,15 @@ reset-filter()



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/resize.styl"
// @import "bootstrap/bootstrap/mixins/resize.styl"
// Resize anything
resizable($direction)
resize $direction // Options horizontal, vertical, both
overflow auto // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/responsive-visibility.styl"
// @import "bootstrap/bootstrap/mixins/responsive-visibility.styl"
// Responsive utilities

//
Expand All @@ -139,7 +139,7 @@ responsive-invisibility()



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/size.styl"
// @import "bootstrap/bootstrap/mixins/size.styl"
// Sizing shortcuts
size($width, $height)
width $width
Expand All @@ -150,7 +150,7 @@ square($size)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/tab-focus.styl"
// @import "bootstrap/bootstrap/mixins/tab-focus.styl"
// WebKit-style focus
tab-focus()
// Default
Expand All @@ -161,7 +161,7 @@ tab-focus()



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/text-emphasis.styl"
// @import "bootstrap/bootstrap/mixins/text-emphasis.styl"
// Typography
text-emphasis-variant($color)
color $color
Expand All @@ -171,7 +171,7 @@ text-emphasis-variant($color)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/text-overflow.styl"
// @import "bootstrap/bootstrap/mixins/text-overflow.styl"
// Text overflow
// Requires inline-block or block for proper styling
text-overflow(type=ellipsis)
Expand All @@ -182,7 +182,7 @@ text-overflow(type=ellipsis)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/vendor-prefixes.styl"
// @import "bootstrap/bootstrap/mixins/vendor-prefixes.styl"
// Vendor Prefixes
//
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
Expand Down Expand Up @@ -376,7 +376,7 @@ transition-transform($transition)
// Components


// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/alerts.styl"
// @import "bootstrap/bootstrap/mixins/alerts.styl"
// Alerts
alert-variant($background, $border, $text-color)
background-color $background
Expand All @@ -391,7 +391,7 @@ alert-variant($background, $border, $text-color)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/buttons.styl"
// @import "bootstrap/bootstrap/mixins/buttons.styl"
// Button variants
//
// Easily pump out default styles, as well as :hover, :focus, :active,
Expand Down Expand Up @@ -441,7 +441,7 @@ button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $b



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/panels.styl"
// @import "bootstrap/bootstrap/mixins/panels.styl"
// Panels
panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border)
border-color $border
Expand All @@ -464,7 +464,7 @@ panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/pagination.styl"
// @import "bootstrap/bootstrap/mixins/pagination.styl"
// Pagination
pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius)
> li
Expand All @@ -485,7 +485,7 @@ pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radi



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/list-group.styl"
// @import "bootstrap/bootstrap/mixins/list-group.styl"
// List Groups
list-group-item-variant($state, $background, $color)
.list-group-item-{$state}
Expand All @@ -512,7 +512,7 @@ list-group-item-variant($state, $background, $color)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/nav-divider.styl"
// @import "bootstrap/bootstrap/mixins/nav-divider.styl"
// Horizontal dividers
//
// Dividers (basically an hr) within dropdowns and nav lists
Expand All @@ -524,7 +524,7 @@ nav-divider($color = #e5e5e5)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/forms.styl"
// @import "bootstrap/bootstrap/mixins/forms.styl"
// Form validation states
//
// Used in forms to generate the form validation CSS for warnings, errors,
Expand Down Expand Up @@ -606,7 +606,7 @@ input-size($input-height, $padding-vertical, $padding-horizontal, $font-size, $l



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/progress-bar.styl"
// @import "bootstrap/bootstrap/mixins/progress-bar.styl"
// Progress bars
progress-bar-variant($color)
background-color $color
Expand All @@ -617,7 +617,7 @@ progress-bar-variant($color)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/table-row.styl"
// @import "bootstrap/bootstrap/mixins/table-row.styl"
// Tables
table-row-variant($state, $background)
// Exact selectors below required to override `.table-striped` and prevent
Expand Down Expand Up @@ -645,7 +645,7 @@ table-row-variant($state, $background)
// Skins


// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/background-variant.styl"
// @import "bootstrap/bootstrap/mixins/background-variant.styl"
// Contextual backgrounds
bg-variant($color)
background-color $color
Expand All @@ -655,7 +655,7 @@ bg-variant($color)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/border-radius.styl"
// @import "bootstrap/bootstrap/mixins/border-radius.styl"
// Single side border-radius
border-top-radius($radius)
border-top-right-radius $radius
Expand All @@ -675,7 +675,7 @@ border-left-radius($radius)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/gradients.styl"
// @import "bootstrap/bootstrap/mixins/gradients.styl"
// Gradients
hex(num)
return base-convert(round(num), 16)
Expand Down Expand Up @@ -743,7 +743,7 @@ gradient-striped($color = rgba(255, 255, 255, .15), $angle = 45deg)
// Layout


// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/clearfix.styl"
// @import "bootstrap/bootstrap/mixins/clearfix.styl"
// Clearfix
//
// For modern browsers
Expand All @@ -766,7 +766,7 @@ clearfix()



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/center-block.styl"
// @import "bootstrap/bootstrap/mixins/center-block.styl"
// Center-align a block level element
center-block()
display block
Expand All @@ -775,7 +775,7 @@ center-block()



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/nav-vertical-align.styl"
// @import "bootstrap/bootstrap/mixins/nav-vertical-align.styl"
// Navbar vertical align
//
// Vertically center elements in the navbar.
Expand All @@ -786,7 +786,7 @@ navbar-vertical-align($element-height)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/grid-framework.styl"
// @import "bootstrap/bootstrap/mixins/grid-framework.styl"
// Framework grid generation
//
// Used only by Bootstrap to generate the correct number of grid $classes given
Expand Down Expand Up @@ -850,7 +850,7 @@ make-grid($class)



// @import "bootstrap/bootstrap-stylus/bootstrap/mixins/grid.styl"
// @import "bootstrap/bootstrap/mixins/grid.styl"
// Grid system
//
// Generate semantic grid columns with these mixins.
Expand Down
Loading

0 comments on commit 8470285

Please sign in to comment.