diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | less/breadcrumbs.less | 2 | ||||
| -rw-r--r-- | less/buttons.less | 44 | ||||
| -rw-r--r-- | less/navbar.less | 2 |
4 files changed, 28 insertions, 28 deletions
@@ -131,7 +131,7 @@ Keep track of development and community news. ## 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: @@ -139,9 +139,9 @@ Releases will be numbered with the following format: And constructed with the following guidelines: -* Breaking backward compatibility bumps the major (and resets the minor and patch) -* New additions without breaking backward compatibility bumps the minor (and resets the patch) -* Bug fixes and misc changes bumps the patch +* Breaking backwards compatibility bumps the major +* New additions without breaking backwards compatibility bumps the minor +* Bug fixes and misc changes bump the patch For more information on SemVer, please visit <http://semver.org/>. diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 5917778f4f..a044c4c80a 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -10,7 +10,7 @@ background-color: @breadcrumb-bg; border-radius: @border-radius-base; > li { - display: inline-block; + display: inline; + li:before { content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; diff --git a/less/buttons.less b/less/buttons.less index b728f332c1..68664ea5ca 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -18,32 +18,32 @@ white-space: nowrap; .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base); .user-select(none); +} - &:focus { - .tab-focus(); - } +.btn:focus { + .tab-focus(); +} - &:hover, - &:focus { - color: @btn-default-color; - text-decoration: none; - } +.btn:hover, +.btn:focus { + color: @btn-default-color; + text-decoration: none; +} - &:active, - &.active { - outline: 0; - background-image: none; - .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); - } +.btn:active, +.btn.active { + outline: 0; + background-image: none; + .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); +} - &.disabled, - &[disabled], - fieldset[disabled] & { - cursor: not-allowed; - pointer-events: none; // Future-proof disabling of clicks - .opacity(.65); - .box-shadow(none); - } +.btn.disabled, +.btn[disabled], +fieldset[disabled] .btn { + cursor: not-allowed; + pointer-events: none; // Future-proof disabling of clicks + .opacity(.65); + .box-shadow(none); } diff --git a/less/navbar.less b/less/navbar.less index 621772fbbf..dd9d559206 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -215,7 +215,7 @@ // 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). -.navbar-nav { +.navbar .nav { margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal; > li > a { |