From 2d092dfeea969d82bc55a153c6a597a3e87a0a03 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 16:04:01 -0800 Subject: start playing with carousel stuff --- lib/modals.less | 2 ++ lib/thumbnails.less | 8 ++++++++ 2 files changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/modals.less b/lib/modals.less index 53d6cd408..ec1607c51 100644 --- a/lib/modals.less +++ b/lib/modals.less @@ -22,6 +22,8 @@ top: 50%; left: 50%; z-index: 11000; + max-height: 500px; + overflow: auto; width: 560px; margin: -250px 0 0 -250px; background-color: @white; diff --git a/lib/thumbnails.less b/lib/thumbnails.less index 9e25f5027..ae2e6c94e 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -32,3 +32,11 @@ a.thumbnail:hover { .thumbnail .caption { padding: 9px; } + +.carousel .item { + display: none; +} + +.carousel .active { + display: block; +} \ No newline at end of file -- cgit v1.2.3 From 0c3bf7275cfe0757c876be6ba6f01cad31375923 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 16:05:14 -0800 Subject: add quotes to courier new --- lib/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mixins.less b/lib/mixins.less index 83a3a31f9..32d3a83ac 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -60,7 +60,7 @@ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .monospace() { - font-family: Menlo, Monaco, Courier New, monospace; + font-family: Menlo, Monaco, "Courier New", monospace; } } .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { -- cgit v1.2.3 From 8b58a1c3d9fea740c89f48c1771a6c7dd44e1f41 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 19:13:02 -0800 Subject: placeholder design for carousel --- lib/thumbnails.less | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/thumbnails.less b/lib/thumbnails.less index ae2e6c94e..181cca681 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -33,10 +33,26 @@ a.thumbnail:hover { padding: 9px; } -.carousel .item { - display: none; -} +// carousel +.carousel { + position: relative; -.carousel .active { - display: block; + .item { display: none; } + .active { display: block; } + + .nav { + height: 50px; + position: absolute; + top: 50%; + margin: -25px 0 0; + cursor: pointer; + background: rgba(0, 0, 0, 0.7); + color: white; + font-size: 42px; + left: 5px; + font-weight: 100; + padding: 0 15px; + &.right { right: 5px; left: auto; } + &:hover { text-decoration: none; background: rgba(0, 0, 0, 0.8); } + } } \ No newline at end of file -- cgit v1.2.3 From 3fb6f6ee8670acff0c681c621b87a06a087f94be Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 22:30:57 -0800 Subject: basic carousel implementation --- lib/thumbnails.less | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/thumbnails.less b/lib/thumbnails.less index 181cca681..114d0f0c8 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -33,14 +33,40 @@ a.thumbnail:hover { padding: 9px; } -// carousel .carousel { + position: relative; - .item { display: none; } - .active { display: block; } + .carousel-inner { + overflow: hidden; + width: 100%; + position: relative; + } + + .item { + display: none; + position: relative; + .transition(.25s linear left); + } + + .active, .next, .prev { display: block; } + + .next, .prev { + position: absolute; + top: 0; + width: 100%; + } + + .next { left: 100%; } + .prev { left: -100%; } + .next.left, .prev.right { left: 0% } + + .active.left { left: -100% } + .active.right { left: 100% } .nav { + width: auto; + .border-radius(0); height: 50px; position: absolute; top: 50%; -- cgit v1.2.3 From f5bcfaec2c13eb3102ffc2890a69a7c2b725ff36 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 2 Jan 2012 22:33:49 -0800 Subject: ease-in-out slide transition --- lib/thumbnails.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/thumbnails.less b/lib/thumbnails.less index 114d0f0c8..6ac3cb51f 100644 --- a/lib/thumbnails.less +++ b/lib/thumbnails.less @@ -46,7 +46,7 @@ a.thumbnail:hover { .item { display: none; position: relative; - .transition(.25s linear left); + .transition(.6s ease-in-out left); } .active, .next, .prev { display: block; } -- cgit v1.2.3