rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #11927 from twbs/revert_commits

Browse Source 
Revert commits
This commit is contained in:
Mark Otto 2013-12-18 14:21:35 -08:00
commit 8598c700f5
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -131,7 +131,7 @@ Keep track of development and community news.
## Versioning ## Versioning
For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
Releases will be numbered with the following format: Releases will be numbered with the following format:
@ -139,9 +139,9 @@ Releases will be numbered with the following format:
And constructed with the following guidelines: And constructed with the following guidelines:
* Breaking backward compatibility bumps the major (and resets the minor and patch) * Breaking backwards compatibility bumps the major
* New additions without breaking backward compatibility bumps the minor (and resets the patch) * New additions without breaking backwards compatibility bumps the minor
* Bug fixes and misc changes bumps the patch * Bug fixes and misc changes bump the patch
For more information on SemVer, please visit <http://semver.org/>. For more information on SemVer, please visit <http://semver.org/>.

2
less/breadcrumbs.less
View File

@ -10,7 +10,7 @@
background-color: @breadcrumb-bg; background-color: @breadcrumb-bg;
border-radius: @border-radius-base; border-radius: @border-radius-base;
> li { > li {
display: inline-block; display: inline;
+ li:before { + li:before {
content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px; padding: 0 5px;

44
less/buttons.less
View File

@ -18,32 +18,32 @@
white-space: nowrap; white-space: nowrap;
.button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base); .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
.user-select(none); .user-select(none);
}
&:focus { .btn:focus {
.tab-focus(); .tab-focus();
} }
&:hover, .btn:hover,
&:focus { .btn:focus {
color: @btn-default-color; color: @btn-default-color;
text-decoration: none; text-decoration: none;
} }
&:active, .btn:active,
&.active { .btn.active {
outline: 0; outline: 0;
background-image: none; background-image: none;
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
&.disabled, .btn.disabled,
&[disabled], .btn[disabled],
fieldset[disabled] & { fieldset[disabled] .btn {
cursor: not-allowed; cursor: not-allowed;
pointer-events: none; // Future-proof disabling of clicks pointer-events: none; // Future-proof disabling of clicks
.opacity(.65); .opacity(.65);
.box-shadow(none); .box-shadow(none);
}
} }

2
less/navbar.less
View File

@ -215,7 +215,7 @@
// Builds on top of the `.nav` components with its own modifier class to make // Builds on top of the `.nav` components with its own modifier class to make
// the nav the full height of the horizontal nav (above 768px). // the nav the full height of the horizontal nav (above 768px).
.navbar-nav { .navbar .nav {
margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal; margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
> li > a { > li > a {