From 2b312bf3c12772aa9d9c58ead289068374ed0e33 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Wed, 18 Dec 2013 22:58:13 +0100 Subject: Revert commits Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team. This undoes the changes introduced by the following commits: https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74 --- less/breadcrumbs.less | 2 +- less/buttons.less | 44 ++++++++++++++++++++++---------------------- less/navbar.less | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 5917778f4..a044c4c80 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 b728f332c..68664ea5c 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 621772fbb..dd9d55920 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 { -- cgit v1.2.3 From 3416e87a97d6a70f97c41326afd8c5120acbeb22 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:27:21 -0800 Subject: restore inline block on breadcrumbs and ensure proper code formatting for readibility --- less/breadcrumbs.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index a044c4c80..cb01d503f 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -9,14 +9,17 @@ list-style: none; background-color: @breadcrumb-bg; border-radius: @border-radius-base; + > li { - display: inline; + display: inline-block; + + li:before { content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: @breadcrumb-color; } } + > .active { color: @breadcrumb-active-color; } -- cgit v1.2.3 From ab740f0f0f1780f87cf30c106bb0d8eef983cd10 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:28:03 -0800 Subject: navbars need to use prefixed nav class or they won't work as expected --- less/navbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index dd9d55920..621772fbb 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 { -- cgit v1.2.3 From 324f6ca562d75cf925ae272131b281be6a2f8400 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Dec 2013 14:29:33 -0800 Subject: buttons should be more mixin friendly --- less/buttons.less | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 68664ea5c..b728f332c 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); -} -.btn:focus { - .tab-focus(); -} + &:focus { + .tab-focus(); + } -.btn:hover, -.btn:focus { - color: @btn-default-color; - text-decoration: none; -} + &:hover, + &:focus { + color: @btn-default-color; + text-decoration: none; + } -.btn:active, -.btn.active { - outline: 0; - background-image: none; - .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); -} + &:active, + &.active { + outline: 0; + background-image: none; + .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + } -.btn.disabled, -.btn[disabled], -fieldset[disabled] .btn { - cursor: not-allowed; - pointer-events: none; // Future-proof disabling of clicks - .opacity(.65); - .box-shadow(none); + &.disabled, + &[disabled], + fieldset[disabled] & { + cursor: not-allowed; + pointer-events: none; // Future-proof disabling of clicks + .opacity(.65); + .box-shadow(none); + } } -- cgit v1.2.3