aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-08-27 13:03:06 -0700
committerJacob Thornton <[email protected]>2011-08-27 13:03:06 -0700
commit11721f376d9bdb019f31d3bbb273160d45ff1266 (patch)
tree1fc3606c8148217a98a3c75f233ea2b6289ba4df /lib
parentb68b53dca27d44525c07a39499a53ffb54780e7c (diff)
downloadbootstrap-11721f376d9bdb019f31d3bbb273160d45ff1266.tar.xz
bootstrap-11721f376d9bdb019f31d3bbb273160d45ff1266.zip
add boostrap-twipsy and bootstrap-alerts
Diffstat (limited to 'lib')
-rw-r--r--lib/patterns.less26
-rw-r--r--lib/scaffolding.less95
2 files changed, 23 insertions, 98 deletions
diff --git a/lib/patterns.less b/lib/patterns.less
index b1be9a18c..d722f6c98 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -291,7 +291,6 @@ footer {
// BUTTON STYLES
// -------------
-
// Base .btn styles
.btn {
// Button Base
@@ -422,7 +421,6 @@ input[type=submit].btn {
padding: 14px;
border-color: #fceec1;
.box-shadow(none);
-
p {
margin-right: 30px;
}
@@ -579,15 +577,6 @@ input[type=submit].btn {
// MODALS
// ------
-.modal-backdrop,
-.modal {
- .transition(opacity .15s linear);
- opacity: 0;
- &.open {
- opacity: 1;
- }
-}
-
.modal-backdrop {
background-color: rgba(0,0,0,.5);
position: fixed;
@@ -758,3 +747,18 @@ input[type=submit].btn {
}
}
}
+
+
+// Pattern Animations
+// ------------------
+
+.modal-backdrop,
+.modal,
+.twipsy,
+.alert-message {
+ .transition(opacity .15s linear);
+ opacity: 0;
+ &.show {
+ opacity: 1;
+ }
+} \ No newline at end of file
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index ded9a1e5f..ab87567a0 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -101,6 +101,13 @@ body {
}
}
+.hide {
+ display: none;
+}
+
+.show {
+ display: block;
+}
// BASE STYLES
// -----------
@@ -115,90 +122,4 @@ a {
color: @linkColorHover;
text-decoration: underline;
}
-}
-
-// Buttons
-.btn {
- display: inline-block;
- #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
- padding: 4px 14px;
- text-shadow: 0 1px 1px rgba(255,255,255,.75);
- color: #333;
- font-size: 13px;
- line-height: @baseline;
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
- .border-radius(4px);
- @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
- .box-shadow(@shadow);
- &:hover {
- background-position: 0 -15px;
- color: #333;
- text-decoration: none;
- }
-}
-.primary {
- #gradient > .vertical(#049CDB, #0064CD);
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
- border: 1px solid darken(#0064CD, 10%);
- border-bottom-color: darken(#0064CD, 15%);
- &:hover {
- color: #fff;
- }
-}
-
-.btn {
- //.button(#1174C6);
- .transition(.1s linear all);
- &.primary {
- //#gradient > .vertical(@blue, @blueDark);
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
- border-color: @blueDark @blueDark darken(@blueDark, 15%);
- border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
- &:hover {
- color: #fff;
- }
- }
- &.large {
- font-size: 16px;
- line-height: 28px;
- .border-radius(6px);
- }
- &.small {
- padding-right: 9px;
- padding-left: 9px;
- font-size: 11px;
- }
- &.disabled {
- background-image: none;
- .opacity(65);
- cursor: default;
- .box-shadow(none);
- }
-
- // this can't be included with the .disabled def because IE8 and below will drop it ;_;
- &:disabled {
- background-image: none;
- .opacity(65);
- cursor: default;
- .box-shadow(none);
- &.primary {
- color: #fff;
- }
- }
- &:active {
- @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
- .box-shadow(@shadow);
- }
-}
-
-// Help Firefox not be a jerk about adding extra padding to buttons
-button.btn,
-input[type=submit].btn {
- &::-moz-focus-inner {
- padding: 0;
- border: 0;
- }
-}
+} \ No newline at end of file