Skip to content

nav's inside carousel #980

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.

Sign up for GitHub

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

Closed
tuler wants to merge 4 commits into from
Closed

nav's inside carousel #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
095e517
label inside inline-form, horizonta-form and search-form should also …
tuler Jan 13, 2012
939821c
label inside inline-form, horizontal-form and search-form should also…
tuler Jan 13, 2012
22df4ad
Merge branch '2.0-wip' of https://github.com/tuler/bootstrap into 2.0…
tuler Jan 13, 2012
8571b59
restrict carousel navigator style to 'a' element
tuler Jan 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Jan 12 15:28:03 PST 2012
* Date: Sex 13 Jan 2012 00:01:30 BRST
*/
html, body {
margin: 0;
Expand Down Expand Up @@ -946,6 +946,9 @@ input::-webkit-input-placeholder {
.search-form input,
.inline-form input,
.horizontal-form input,
.search-form label,
.inline-form label,
.horizontal-form label,
.search-form textarea,
.inline-form textarea,
.horizontal-form textarea,
Expand Down Expand Up @@ -2819,7 +2822,7 @@ a.thumbnail:hover {
.carousel .active.right {
left: 100%;
}
.carousel .nav {
.carousel a.nav {
width: auto;
-webkit-border-radius: 0;
-moz-border-radius: 0;
Expand All @@ -2836,11 +2839,11 @@ a.thumbnail:hover {
font-weight: 100;
padding: 0 15px;
}
.carousel .nav.right {
.carousel a.nav.right {
right: 5px;
left: auto;
}
.carousel .nav:hover {
.carousel a.nav:hover {
text-decoration: none;
background: rgba(0, 0, 0, 0.8);
}
Expand Down
8 changes: 4 additions & 4 deletions bootstrap.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/base-css.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,9 +989,9 @@ <h3>Search form</h3>
<div class="span4">
<h3>Inline form</h3>
<p>Inputs are block level to start. For <code>.inline-form</code> and <code>.horizontal-form</code>, we use inline-block.</p>
<form class="well search-form">
<input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password">
<form class="well inline-form">
<label>Email</label>
<input type="text" class="input-small" />
<button type="submit" class="btn">Go</button>
</form>
</div>
Expand Down
1 change: 1 addition & 0 deletions lib/forms.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ input::-webkit-input-placeholder {
.inline-form,
.horizontal-form {
input,
label,
textarea,
select,
.uneditable-input {
Expand Down
2 changes: 1 addition & 1 deletion lib/thumbnails.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ a.thumbnail:hover {
.active.left { left: -100% }
.active.right { left: 100% }

.nav {
a.nav {
width: auto;
.border-radius(0);
height: 50px;
Expand Down