Skip to content

Commit

Permalink
(less) Merge branch 'master' of github.com:twbs/bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Mar 10, 2014
2 parents b86a13c + 8eafe99 commit 4e8e36c
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 4 deletions.
2 changes: 1 addition & 1 deletion button-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
&:focus {
// Remove focus outline when dropdown JS adds it after closing the menu
outline: none;
outline: 0;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion carousel.less
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
// Hover/focus state
&:hover,
&:focus {
outline: none;
outline: 0;
color: @carousel-control-color;
text-decoration: none;
.opacity(.9);
Expand Down
2 changes: 2 additions & 0 deletions mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,7 @@
// Responsive utilities
//
// More easily include all the states for responsive-utilities.less.
// Note: Deprecated .responsive-visibility() as of v3.2.0
.responsive-visibility() {
display: block !important;
table& { display: table; }
Expand All @@ -782,6 +783,7 @@
td& { display: table-cell !important; }
}

// Note: Deprecated .responsive-invisibility() as of v3.2.0
.responsive-invisibility() {
display: none !important;
}
Expand Down
2 changes: 1 addition & 1 deletion modals.less
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
.box-shadow(0 3px 9px rgba(0,0,0,.5));
background-clip: padding-box;
// Remove focus outline from opened modal
outline: none;
outline: 0;
}

// Modal background
Expand Down
2 changes: 1 addition & 1 deletion navbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
// We remove the `outline` here, but later compensate by attaching `:hover`
// styles to `:focus`.
&:focus {
outline: none;
outline: 0;
}

// Bars
Expand Down
101 changes: 101 additions & 0 deletions responsive-utilities.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,112 @@


// Visibility utilities
// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
.visible-xs,
.visible-sm,
.visible-md,
.visible-lg {
.responsive-invisibility();
}

.visible-xs-block,
.visible-xs-inline,
.visible-xs-inline-block,
.visible-sm-block,
.visible-sm-inline,
.visible-sm-inline-block,
.visible-md-block,
.visible-md-inline,
.visible-md-inline-block,
.visible-lg-block,
.visible-lg-inline,
.visible-lg-inline-block {
display: none !important;
}

.visible-xs {
@media (max-width: @screen-xs-max) {
.responsive-visibility();
}
}
.visible-xs-block {
@media (max-width: @screen-xs-max) {
display: block !important;
}
}
.visible-xs-inline {
@media (max-width: @screen-xs-max) {
display: inline !important;
}
}
.visible-xs-inline-block {
@media (max-width: @screen-xs-max) {
display: inline-block !important;
}
}

.visible-sm {
@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-visibility();
}
}
.visible-sm-block {
@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
display: block !important;
}
}
.visible-sm-inline {
@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
display: inline !important;
}
}
.visible-sm-inline-block {
@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
display: inline-block !important;
}
}

.visible-md {
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-visibility();
}
}
.visible-md-block {
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
display: block !important;
}
}
.visible-md-inline {
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
display: inline !important;
}
}
.visible-md-inline-block {
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
display: inline-block !important;
}
}

.visible-lg {
@media (min-width: @screen-lg-min) {
.responsive-visibility();
}
}
.visible-lg-block {
@media (min-width: @screen-lg-min) {
display: block !important;
}
}
.visible-lg-inline {
@media (min-width: @screen-lg-min) {
display: inline !important;
}
}
.visible-lg-inline-block {
@media (min-width: @screen-lg-min) {
display: inline-block !important;
}
}

.hidden-xs {
@media (max-width: @screen-xs-max) {
Expand Down Expand Up @@ -77,13 +156,35 @@
//
// Media queries are placed on the inside to be mixin-friendly.

// Note: Deprecated .visible-print as of v3.2.0
.visible-print {
.responsive-invisibility();

@media print {
.responsive-visibility();
}
}
.visible-print-block {
display: none !important;

@media print {
display: block !important;
}
}
.visible-print-inline {
display: none !important;

@media print {
display: inline !important;
}
}
.visible-print-inline-block {
display: none !important;

@media print {
display: inline-block !important;
}
}

.hidden-print {
@media print {
Expand Down

0 comments on commit 4e8e36c

Please sign in to comment.