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

change position of var in dropdown + cleanup makefile vars

Browse Source
This commit is contained in:
Jacob Thornton 2012-04-14 22:43:36 -07:00
parent ce94442104
commit c7dc4cc573
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,8 +2,6 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr`
# #
# BUILD DOCS # BUILD DOCS

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

6
docs/assets/js/bootstrap-dropdown.js vendored
View File

@ -40,10 +40,14 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, selector = $this.attr('data-target')
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return
selector = $this.attr('data-target')
if (!selector) { if (!selector) {
selector = $this.attr('href') selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7

2
js/bootstrap-dropdown.js vendored
View File

@ -40,8 +40,8 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, selector
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return