mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-15 15:29:22 +01:00
change position of var in dropdown + cleanup makefile vars
This commit is contained in:
parent
ce94442104
commit
c7dc4cc573
2
Makefile
2
Makefile
@ -2,8 +2,6 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css
|
||||
BOOTSTRAP_LESS = ./less/bootstrap.less
|
||||
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
|
||||
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
|
||||
LESS_COMPRESSOR ?= `which lessc`
|
||||
WATCHR ?= `which watchr`
|
||||
|
||||
#
|
||||
# BUILD DOCS
|
||||
|
Binary file not shown.
6
docs/assets/js/bootstrap-dropdown.js
vendored
6
docs/assets/js/bootstrap-dropdown.js
vendored
@ -40,10 +40,14 @@
|
||||
|
||||
, toggle: function (e) {
|
||||
var $this = $(this)
|
||||
, selector = $this.attr('data-target')
|
||||
, $parent
|
||||
, selector
|
||||
, isActive
|
||||
|
||||
if ($this.is('.disabled, :disabled')) return
|
||||
|
||||
selector = $this.attr('data-target')
|
||||
|
||||
if (!selector) {
|
||||
selector = $this.attr('href')
|
||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
||||
|
2
js/bootstrap-dropdown.js
vendored
2
js/bootstrap-dropdown.js
vendored
@ -40,8 +40,8 @@
|
||||
|
||||
, toggle: function (e) {
|
||||
var $this = $(this)
|
||||
, selector
|
||||
, $parent
|
||||
, selector
|
||||
, isActive
|
||||
|
||||
if ($this.is('.disabled, :disabled')) return
|
||||
|
Loading…
x
Reference in New Issue
Block a user