Skip to content
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.

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

Fix some typos, update from upstream, simple test #3

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
@@ -1,3 +1,5 @@
thumbs.db
*~
node_modules
.DS_Store
thumbs.db
test/bootstrap.css.gen
16 changes: 8 additions & 8 deletions lib/bootstrap.styl
Expand Up @@ -12,17 +12,17 @@
*/

// CSS Reset
@import "reset.styl";
@import "reset";

// Core variables and mixins
@import "variables.styl"; // Modify this for custom colors, font-sizes, etc
@import "mixins.styl";
@import "variables";
@import "mixins";

// Grid system and page structure
@import "scaffolding.styl";
@import "scaffolding";

// Styled patterns and elements
@import "type.styl";
@import "forms.styl";
@import "tables.styl";
@import "patterns.styl";
@import "type";
@import "forms";
@import "tables";
@import "patterns";
5 changes: 2 additions & 3 deletions lib/mixins.styl
Expand Up @@ -66,7 +66,7 @@ font-monospace($weight = normal, $size = 12px, $lineHeight = 20px)

// Grid System
fixed-container()
width: s('%spx', $siteWidth)
width: $siteWidth
margin-left: auto
margin-right: auto
clearfix()
Expand Down Expand Up @@ -102,7 +102,6 @@ box-shadow($shadow = 0 1px 3px rgba(0,0,0,.25))

// Transitions
transition($transition)
-webkit-transform-style: s('%s', preserve-3d)
-webkit-transition: $transition
-moz-transition: $transition
-ms-transition: $transition
Expand Down Expand Up @@ -187,7 +186,7 @@ gradient-vertical-three-colors($startColor = #00b3ee, $midColor = #7a43b6, $colo

// Reset filters for IE
reset-filter()
filter: s('%s', "progid:DXImageTransform.Microsoft.gradient(enabled = false)")
filter: s("progid:DXImageTransform.Microsoft.gradient(enabled = false)")

// Opacity
opacity($opacity = 100)
Expand Down
22 changes: 13 additions & 9 deletions lib/patterns.styl
Expand Up @@ -358,11 +358,10 @@ a.menu:after,
float: none

// Tabbable areas
.tab-content,
.pill-content

.tab-content > .tab-pane,
.pill-content > .pill-pane
.pill-content > .pill-pane,
.tab-content > div,
.pill-content > div
display: none

.tab-content > .active,
Expand Down Expand Up @@ -513,8 +512,9 @@ footer

// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
:root .alert-message,
:root .btn
/* border-radius: 0 \0*/
:root .btn
border-radius: s("0 \0")



// Help Firefox not be a jerk about adding extra padding to buttons
Expand Down Expand Up @@ -689,6 +689,8 @@ input[type=submit].btn
top: 50%
left: 50%
z-index: 11000
max-height: 500px
overflow: auto
width: 560px
margin: -250px 0 0 -280px
background-color: $white
Expand All @@ -698,7 +700,8 @@ input[type=submit].btn
border-radius(6px)
box-shadow(0 3px 7px rgba(0,0,0,0.3))
background-clip(padding-box)
.close margin-top: 7px
.close
margin-top: 7px
&.fade
transitions = opacity .3s linear, top .3s ease-out
transition(transitions)
Expand Down Expand Up @@ -851,9 +854,9 @@ popoverArrow-right(arrowWidth = 5px)

.fade
transition(opacity .15s linear)
opacity: 0
opacity(0)
&.in
opacity: 1
opacity(100)

// LABELS
// ------
Expand All @@ -867,6 +870,7 @@ popoverArrow-right(arrowWidth = 5px)
white-space: nowrap
background-color: $grayLight
border-radius(3px)
text-shadow: none
&.important
background-color: #c43c35
&.warning
Expand Down
2 changes: 1 addition & 1 deletion lib/reset.styl
Expand Up @@ -137,7 +137,7 @@ sub, sup
font-size: 75%
line-height: 0
position: relative
vertical-align: $baseline
vertical-align: baseline

sup
top: -0.5em
Expand Down
6 changes: 3 additions & 3 deletions lib/scaffolding.styl
Expand Up @@ -131,7 +131,7 @@ a
offset(1)
& > .offset2
offset(2)
& > .offsett
& > .offset3
offset(3)
& > .offset4
offset(4)
Expand All @@ -157,7 +157,7 @@ a
width: 300px
.span-two-thirds
width: 620px
.offset-one-third
.row > .offset-one-third
margin-left: 340px
.offset-two-thirds
.row > .offset-two-thirds
margin-left: 660px
3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -9,6 +9,9 @@
},
"author": "Michael Prasuhn <mike@mikeyp.net>",
"main" : "./lib",
"scripts" : {
"test" : "node test/test.js"
},
"directories": {
"lib": "."
},
Expand Down