From c26eb016fb519964366806a907dcb12d34451957 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 26 Aug 2011 23:57:35 -0700 Subject: starting up bootstrap-js... --- lib/patterns.less | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index d0e4cda12..b1be9a18c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -579,6 +579,15 @@ 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; -- cgit v1.2.3 From 24c4ca0391486a555293831e9f1ba93366bd7de3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 27 Aug 2011 00:03:11 -0700 Subject: display none for inactive modals --- lib/patterns.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index b1be9a18c..cf2edf4d7 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -584,6 +584,7 @@ input[type=submit].btn { .transition(opacity .15s linear); opacity: 0; &.open { + display: block; opacity: 1; } } @@ -598,6 +599,7 @@ input[type=submit].btn { z-index: 1000; } .modal { + display: none; position: fixed; top: 50%; left: 50%; -- cgit v1.2.3 From 1cbda504a0a4bb4a34a43722a0f65d2a0bc8abb7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 27 Aug 2011 00:28:58 -0700 Subject: clean up show logic --- lib/patterns.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index cf2edf4d7..b1be9a18c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -584,7 +584,6 @@ input[type=submit].btn { .transition(opacity .15s linear); opacity: 0; &.open { - display: block; opacity: 1; } } @@ -599,7 +598,6 @@ input[type=submit].btn { z-index: 1000; } .modal { - display: none; position: fixed; top: 50%; left: 50%; -- cgit v1.2.3 From 11721f376d9bdb019f31d3bbb273160d45ff1266 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 27 Aug 2011 13:03:06 -0700 Subject: add boostrap-twipsy and bootstrap-alerts --- lib/patterns.less | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'lib/patterns.less') 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 -- cgit v1.2.3 From 2ee7c206924ac616eeb9ae3d6eb6811a818af015 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 27 Aug 2011 17:22:49 -0700 Subject: adds popover js --- lib/patterns.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index d722f6c98..398fc37a1 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -755,6 +755,7 @@ input[type=submit].btn { .modal-backdrop, .modal, .twipsy, +.popover, .alert-message { .transition(opacity .15s linear); opacity: 0; -- cgit v1.2.3 From e05d39d4ccaadb750d251a268adbeef681472029 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 27 Aug 2011 18:03:01 -0700 Subject: make generic fade animation css class --- lib/patterns.less | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index 398fc37a1..a34900d04 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -752,14 +752,10 @@ input[type=submit].btn { // Pattern Animations // ------------------ -.modal-backdrop, -.modal, -.twipsy, -.popover, -.alert-message { +.fade { .transition(opacity .15s linear); opacity: 0; - &.show { + &.in { opacity: 1; } } \ No newline at end of file -- cgit v1.2.3 From 0b1d2cc03cddff8ef9e5385bc0d77d4d22d2d7ff Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 14:06:37 -0700 Subject: change backdrop for ie --- lib/patterns.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index a34900d04..8fd41e551 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -578,7 +578,8 @@ input[type=submit].btn { // ------ .modal-backdrop { - background-color: rgba(0,0,0,.5); + background-color: #000; + .opacity(50); position: fixed; top: 0; left: 0; -- cgit v1.2.3 From 1a5f8205ff2f87c8f6277afa0a6616599390b7b1 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 16:23:57 -0700 Subject: alpha for ie --- lib/patterns.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index 8fd41e551..57bd02621 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -578,8 +578,8 @@ input[type=submit].btn { // ------ .modal-backdrop { - background-color: #000; - .opacity(50); + background-color: rgba(0,0,0,.5); + filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#aa000000', endColorstr='#aa000000')"; position: fixed; top: 0; left: 0; -- cgit v1.2.3 From a0cb72f9ae27ded4cf3516e0d3edd042293d9e39 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 16:36:44 -0700 Subject: change window to 'body' --- lib/patterns.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index 57bd02621..b64b1d312 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -579,7 +579,7 @@ input[type=submit].btn { .modal-backdrop { background-color: rgba(0,0,0,.5); - filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#aa000000', endColorstr='#aa000000')"; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000')); position: fixed; top: 0; left: 0; -- cgit v1.2.3 From 9059a72bf87cc7ac868d7d16333757445c28c31d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 17:40:25 -0700 Subject: try using tricker opacity thingy --- lib/patterns.less | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index b64b1d312..4733a3837 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -578,8 +578,12 @@ input[type=submit].btn { // ------ .modal-backdrop { - background-color: rgba(0,0,0,.5); - filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000')); +/* background-color: rgba(0,0,0,.5); + filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000'));*/ + background-color:#000; + &.fade.in { + opacity: .5; + } position: fixed; top: 0; left: 0; -- cgit v1.2.3 From ebff55443076a95f171bffc80ccdbc3bb985792e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 17:42:09 -0700 Subject: remake with opacity thin --- lib/patterns.less | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index 4733a3837..e3d4ba106 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -581,8 +581,12 @@ input[type=submit].btn { /* background-color: rgba(0,0,0,.5); filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000'));*/ background-color:#000; - &.fade.in { - opacity: .5; + opacity: .5; + &.fade { + opacity: 0; + &.in { + opacity: .5; + } } position: fixed; top: 0; -- cgit v1.2.3 From 484ed088fc51666ac0f319e9cb66a567722e7113 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 17:45:57 -0700 Subject: blah --- lib/patterns.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index e3d4ba106..0b286d626 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -581,12 +581,8 @@ input[type=submit].btn { /* background-color: rgba(0,0,0,.5); filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000'));*/ background-color:#000; - opacity: .5; &.fade { opacity: 0; - &.in { - opacity: .5; - } } position: fixed; top: 0; @@ -595,6 +591,10 @@ input[type=submit].btn { bottom: 0; z-index: 1000; } +.modal-backdrop, .modal-backdrop.fade.in { + .opacity(50); +} + .modal { position: fixed; top: 50%; -- cgit v1.2.3 From 58cc70531ad1b5231386d8d3037891e25963801b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 28 Aug 2011 17:50:14 -0700 Subject: drop top position a bit --- lib/patterns.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/patterns.less') diff --git a/lib/patterns.less b/lib/patterns.less index 0b286d626..1a3f4a1f0 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -578,8 +578,6 @@ input[type=submit].btn { // ------ .modal-backdrop { -/* background-color: rgba(0,0,0,.5); - filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000'));*/ background-color:#000; &.fade { opacity: 0; @@ -591,6 +589,7 @@ input[type=submit].btn { bottom: 0; z-index: 1000; } + .modal-backdrop, .modal-backdrop.fade.in { .opacity(50); } @@ -601,7 +600,7 @@ input[type=submit].btn { left: 50%; z-index: 2000; width: 560px; - margin: -280px 0 0 -250px; + margin: -250px 0 0 -250px; background-color: @white; border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); -- cgit v1.2.3