Skip to content

Commit

Permalink
Remove comment out code and simplify what's left for button group tog…
Browse files Browse the repository at this point in the history
…gles
  • Loading branch information
mdo committed Jan 13, 2013
1 parent 1916eb7 commit 76ed6b0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 49 deletions.
25 changes: 2 additions & 23 deletions docs/assets/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -2689,30 +2689,9 @@ fieldset[disabled] .btn-link:hover {
padding-left: 12px;
}

.btn-group.open {
/* .btn.dropdown-toggle {
background-color: @btn-background-highlight;
}
.btn-primary.dropdown-toggle {
background-color: @btn-background-primary-highlight;
}
.btn-warning.dropdown-toggle {
background-color: @btn-background-warning-highlight;
}
.btn-danger.dropdown-toggle {
background-color: @btn-background-danger-highlight;
}
.btn-success.dropdown-toggle {
background-color: @btn-background-success-highlight;
}
*/

}

.btn-group.open .dropdown-toggle {
background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15);
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}

.btn .caret {
Expand Down
31 changes: 5 additions & 26 deletions less/button-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -91,32 +91,11 @@
padding-right: 12px;
}

.btn-group.open {

// The clickable button for toggling the menu
// Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle {
background-image: none;
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}

// Keep the hover's background when dropdown is open
/* .btn.dropdown-toggle {
background-color: @btn-background-highlight;
}
.btn-primary.dropdown-toggle {
background-color: @btn-background-primary-highlight;
}
.btn-warning.dropdown-toggle {
background-color: @btn-background-warning-highlight;
}
.btn-danger.dropdown-toggle {
background-color: @btn-background-danger-highlight;
}
.btn-success.dropdown-toggle {
background-color: @btn-background-success-highlight;
}
*/}
// The clickable button for toggling the menu
// Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle {
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
}


// Reposition the caret
Expand Down

0 comments on commit 76ed6b0

Please sign in to comment.