Comparar commits

...

2312 Commits

Autor SHA1 Mensagem Data
Mark Otto 9c63ffa00f update links to point to download links 2013-07-27 01:06:59 -07:00
Mark Otto d78c85c82a unfuck broke links in docs 2013-07-27 00:47:08 -07:00
Mark Otto 80123fc039 mo links, fix ads and analytics in gh pages 2013-07-27 00:35:26 -07:00
Mark Otto 94df8090a7 fixes for hella broken links on account of jekyll and twbs.github.com links 2013-07-27 00:28:23 -07:00
Mark Otto 0f2b22a210 herpy derpy shit for urls 2013-07-27 00:18:12 -07:00
Mark Otto 295a87ab0f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:28:20 -07:00
Mark Otto c884e51bfc 2.3.2 not 2.3.3 2013-07-26 23:24:02 -07:00
fat ec42ddf1f4 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:14:48 -07:00
fat b1e01a1b04 update js title 2013-07-26 23:14:21 -07:00
Mark Otto 40d398bcd0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 23:04:12 -07:00
Mark Otto c8883647ae add cname 2013-07-26 23:04:03 -07:00
fat d0cafdd3a8 rebuild + use serif arrows 2013-07-26 22:59:21 -07:00
fat 4f4e74be78 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 22:41:34 -07:00
fat 0da0b321ab small copy change 2013-07-26 22:36:23 -07:00
Mark Otto 45f6f1629b ignore the gruntfile from jekyll 2013-07-26 22:31:14 -07:00
fat 7b9a949a18 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 22:25:11 -07:00
fat cfa4ab90f3 fix scrollspy for window *and* children 2013-07-26 22:24:51 -07:00
Mark Otto 88dd20e6ac Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-26 22:18:16 -07:00
Mark Otto bed8e959b3 responsive tables all up in js docs 2013-07-26 22:17:53 -07:00
Mark Otto bf5434dbec Fix up dropdowns being incorrectly positioned on nav pills 2013-07-26 22:11:58 -07:00
fat 2cf1851d9f use transforms to make the dialog smooooth 2013-07-26 22:09:31 -07:00
Mark Otto 4e27740916 Fix broke ass navbar example docs stuff 2013-07-26 22:09:05 -07:00
Mark Otto 44a4e71215 Fix clipped dropdowns in input groups section of docs 2013-07-26 22:03:52 -07:00
Mark Otto 5bed9f4635 simpler forms docs structure 2013-07-26 21:52:23 -07:00
Mark Otto 88887f8c00 Undo changes from #8582 because it made links uneven on desktop
/cc @salman-javed-confiz
2013-07-26 21:49:35 -07:00
Mark Otto 85591d82dd derp 2013-07-26 21:40:58 -07:00
Mark Otto 2967cc1d60 mo tables mo responsive or whatever the hell that means 2013-07-26 21:35:56 -07:00
Mark Otto 572174652e another responsivey table 2013-07-26 21:31:00 -07:00
Mark Otto 70fa8ef4b0 Responsivey docs table for grid section 2013-07-26 21:28:44 -07:00
Mark Otto 8349236f8c Twerk lead font-size for mobile devices 2013-07-26 21:12:48 -07:00
Mark Otto ad235f5f51 Broser meta tag docs layout change 2013-07-26 21:12:35 -07:00
fat fff2854c5e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 21:01:50 -07:00
fat f83995684c fixes #6937 2013-07-26 21:01:14 -07:00
Mark Otto 27a656f72e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 20:53:26 -07:00
fat 93eeb8578d Merge branch '3.0.0-docs-js' of git://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-js
Conflicts:
	javascript.html
2013-07-26 20:50:51 -07:00
fat 38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
Mark Otto 425ec58ea9 Contrast on old docs callout 2013-07-26 20:36:02 -07:00
fat 6fdb18b641 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 20:34:59 -07:00
fat e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
Mark Otto ae3a1ddd14 Color change to sidenav 2013-07-26 20:20:21 -07:00
Mark Otto 46a332049f Mo betta side nav colors 2013-07-26 19:58:46 -07:00
Mark Otto d16396f44a Fix broke ass popovers direction example 2013-07-26 19:50:02 -07:00
Mark Otto 20040868c1 Unfuck JS docs spacing and closing divs 2013-07-26 19:46:42 -07:00
Mark Otto b2c618c212 Update IDs on customize page 2013-07-26 19:38:12 -07:00
Mark Otto 22fda2f54d Upate IDs on components page 2013-07-26 19:37:31 -07:00
Mark Otto d89c3b9d23 Update IDs on css page 2013-07-26 19:35:24 -07:00
Mark Otto e2d497c385 Update IDs on getting started page 2013-07-26 19:32:15 -07:00
Mark Otto e3b8081b7e Better spacing of le docs sections 2013-07-26 19:32:05 -07:00
Mark Otto e647d54f25 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 19:26:58 -07:00
fat 178d8e98de update docs nav targets 2013-07-26 19:25:45 -07:00
Mark Otto 71acb0c42b Tweak getting started section 2013-07-26 19:25:13 -07:00
Mark Otto 259ff8b6a4 More vars work 2013-07-26 19:24:59 -07:00
Mark Otto 305455a9b3 Use some vars for key urls for easier updating 2013-07-26 19:05:43 -07:00
Mark Otto a285a3db3f more space in sidenav 2013-07-26 18:52:05 -07:00
Mark Otto bdac42ea40 Merge pull request #8631 from jamescostian/patch-1
Fix ID of buttons section on javascript page
2013-07-26 18:47:08 -07:00
James Costian 2c58fab318 Fix ID of buttons section on javascript page
The old ID caused the link on affix to not work.
2013-07-26 19:15:11 -05:00
Mark Otto e4159b53f6 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 16:53:00 -07:00
Mark Otto 75f5a70f7d Fixes #8293: sub nav links in JS docs 2013-07-26 16:52:09 -07:00
Mark Otto e686464ad8 Simpler horizontal form button placement 2013-07-26 16:01:34 -07:00
Mark Otto 6585c723f8 Ignore less dir in Jekyll 2013-07-26 16:01:24 -07:00
Mark Otto 01c6617f79 Update inline and horizontal forms
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
2013-07-26 15:51:25 -07:00
Mark Otto 68827689e8 Use .form-control in input sizing CSS 2013-07-26 15:41:16 -07:00
Mark Otto 73427f717d Tweak side nav styles 2013-07-26 15:34:50 -07:00
Chris Rebert 7b4c40ddb5 Merge pull request #8630 from caouecs/patch-1
Fix example of textarea in css.html
2013-07-26 15:14:08 -07:00
Mark Otto c75f3748e8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 15:13:41 -07:00
Mark Otto b513cd9add grunt on previous commits 2013-07-26 15:13:03 -07:00
Chris Rebert 6aa051b000 README: update stray "2.3.2" to "2.3.3" 2013-07-26 15:12:32 -07:00
Fred Delrieu 4ca3e3677a Example of textarea 2013-07-27 00:09:27 +02:00
Mark Otto 1cf0a07f17 Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Conflicts:
	css.html
2013-07-26 15:08:45 -07:00
Mark Otto 444973e54d Fixes #8605: use .form-control in .input-group instead of HTML tags 2013-07-26 14:31:24 -07:00
Mark Otto 5dd2bff38c more readme clarity and reorg--think this makes more sense now 2013-07-26 14:15:48 -07:00
Mark Otto fd6f7dcce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 14:09:45 -07:00
Mark Otto b82692b2bf more readme love 2013-07-26 14:09:12 -07:00
Chris Rebert 0168ebade2 tweak terminology to be pedantically correct & add link 2013-07-26 14:04:35 -07:00
Mark Otto 953e0e445c update 2.3.x version mention and link in readme 2013-07-26 13:59:56 -07:00
Mark Otto bc1ba8f08b update readme per comments in pr 2013-07-26 13:58:18 -07:00
Mark Otto 1ad3e1e8a7 Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip 2013-07-26 13:51:27 -07:00
Mark Otto ded4ebfa7e Make customize layout match default layout 2013-07-26 13:50:55 -07:00
Mark Otto 52e8aedb8e More customizer changes, and revert to placeholder layout 2013-07-26 11:17:48 -07:00
Mark Otto e3af87967a Fix broken indentation
Not sure when or how this happened, but I just noticed it—4 spaces were
used instead of 2.
2013-07-26 11:11:09 -07:00
Mark Otto 9e98b733f1 Vars update
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
2013-07-26 11:08:27 -07:00
Mark Otto e62e992b88 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-26 10:44:46 -07:00
Mark Otto d28b7913f6 Merge pull request #8619 from jholl/patch-2
align dropdown menu with .pull-right for .input-group-btn when btn on ri...
2013-07-26 10:35:20 -07:00
Mark Otto caa5b4b718 Merge pull request #8624 from jholl/patch-2
Update typo css.html move double class .form-control from label in examp...
2013-07-26 10:31:20 -07:00
Mark Otto 099e970953 Merge pull request #8625 from liuyl/fixbtnbg
Fix #8623
2013-07-26 10:30:41 -07:00
Chris Rebert 2d91e91b85 Merge pull request #8626 from cowboy/3.0.0-wip
It's Grunt, not GruntJS :)
2013-07-26 09:17:59 -07:00
Ben Alman 102fad4ebd It's Grunt, not GruntJS :) 2013-07-26 12:00:45 -04:00
Yulong Liu e4300fa1bf fix background of btn-link 2013-07-26 22:27:55 +08:00
Yulong Liu a2f120a7aa remove background:none 2013-07-26 21:59:50 +08:00
James Holland 0e7aad8b8d Update typo css.html move double class .form-control from label in example mark up to input
missed the double class in label in recent commit #8621
2013-07-26 09:43:05 -04:00
James Holland 2e7593a40d Update forms.less to remove .form-horizontal .row + .row
use .form-group to apply consistent vertical spacing on form rows
2013-07-26 09:04:39 -04:00
James Holland 6115f01adb Update css.html in .form-horizontal
to use .row.form-group for horizontal spacing instead of .form-horizontal .row + .row
2013-07-26 08:58:47 -04:00
syed 1b8ba0d159 move things around :)
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
James Holland f7a376569a align dropdown menu with .pull-right for .input-group-btn when btn on right of input 2013-07-26 07:52:40 -04:00
Jordan Hess cd23ae00dd Added windows hint to jekyll documentation instructions. 2013-07-26 03:25:12 -06:00
Jordan Hess fe095d17a2 Changed old reference to "grunt bootstrap" to "grunt dist" 2013-07-26 03:16:27 -06:00
Mark Otto 2a51ebf671 readme /cc @zdroid 2013-07-26 01:46:30 -07:00
Mark Otto 5b2b46fe28 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 01:43:53 -07:00
Mark Otto 5d766d9e2f Mo betta placement of old docs callouts 2013-07-26 01:43:43 -07:00
Chris Rebert 2910e3cb5a Merge pull request #8614 from cvrebert/grunt
Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1
2013-07-26 01:34:58 -07:00
Chris Rebert 2d58534519 Merge pull request #8616 from caouecs/patch-1
Small typo in less/mixins.less
2013-07-26 01:20:10 -07:00
Chris Rebert a317f67c1c re-integrate #8560 using @fat's code from the comment on #8614 2013-07-26 01:15:41 -07:00
Fred Delrieu 06980ae5a1 Small typo 2013-07-26 10:10:35 +02:00
Chris Rebert 292d8d6819 specify explicit ordering for grunt concat step 2013-07-26 01:07:56 -07:00
John-Philip Johansson 0d33455ef4 Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat 995add132e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 00:22:48 -07:00
fat 91b6a43ed9 fix makefile error thing 2013-07-26 00:22:20 -07:00
Mark Otto 210ee63693 Fixes #8586: add addional color text classes to apply all of branch colors easily 2013-07-26 00:18:18 -07:00
Mark Otto d604052aa5 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 00:04:24 -07:00
Mark Otto c23ba4d50b Fuck a color purple 2013-07-26 00:04:15 -07:00
Mark Otto b4f023f809 Make it so back to top link ain't broked no mo 2013-07-26 00:02:20 -07:00
fat 5588e14867 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 23:57:37 -07:00
fat 778f3a3df7 update docs a bit more for affix 2013-07-25 23:57:21 -07:00
fat 7ae8db8b7e update the affix docs a bit 2013-07-25 23:53:34 -07:00
Mark Otto 1659ac6473 Fix up navbar forms 2013-07-25 23:32:12 -07:00
fat f58827f24d Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 23:30:29 -07:00
fat f5f04ae4a0 fix affix… 2013-07-25 23:30:13 -07:00
Mark Otto ed4674a09a Disable the customizer for rc1 for now 2013-07-25 23:29:43 -07:00
Mark Otto 8a7553aeda Bump version of old docs in callout 2013-07-25 21:52:21 -07:00
Mark Otto 94202b2b29 Update docs to better indicate v3 RC1 2013-07-25 21:51:45 -07:00
Mark Otto f79740b48a Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 21:49:50 -07:00
fat 124d7e6279 fixes #8560 2013-07-25 21:49:19 -07:00
fat 0190128ebc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 21:34:02 -07:00
fat 15d9c82fc5 fix collapse event #8596 2013-07-25 21:33:26 -07:00
Jacob f1ddf7681c Merge pull request #8419 from hollensteiner/3.0.0-wip
Replace position() with offset() in scrollspy.js
2013-07-25 21:19:57 -07:00
Mark Otto 56404bc89b Add .panel-title to panel component to mirror modals
/cc @leeaston
2013-07-25 21:16:43 -07:00
Mark Otto ac4e7db17f single include for old ads callout 2013-07-25 20:56:44 -07:00
Mark Otto 2a4a6fe0f0 Merge pull request #8611 from twitter/bs3_form_classes
Updated BS3 form classes
2013-07-25 20:31:11 -07:00
Mark Otto 35aad07456 Add comment about opacity mixin not being used 2013-07-25 19:56:04 -07:00
Mark Otto 27cedf71d5 Update form validation states
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
2013-07-25 19:45:14 -07:00
Mark Otto 71d3d2c3f6 Spacing 2013-07-25 18:55:00 -07:00
Mark Otto 13bc74b636 Refactor forms styles
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
2013-07-25 18:29:51 -07:00
Mark Otto d242d536c4 Merge pull request #8603 from cvrebert/twbs
twbs ALL the links
2013-07-25 13:42:51 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto bc93a429a8 update docs to use buttons for tooltips 2013-07-25 11:55:12 -07:00
Mark Otto c7995cf964 move some thing around 2013-07-25 10:50:59 -07:00
Mark Otto 0d2d65c8f1 run make on prev commits 2013-07-25 10:12:51 -07:00
Mark Otto f94d9ce096 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip 2013-07-25 10:11:30 -07:00
Mark Otto 768e7edabf fixes #8571 completely: add better th support for table classes 2013-07-25 10:01:42 -07:00
Mark Otto d4cd7efce6 make on prev commits 2013-07-25 09:58:28 -07:00
Mark Otto 4d42100a3e Merge branch '3.0.0-wip' of https://github.com/tagliala/bootstrap into tagliala-3.0.0-wip 2013-07-25 09:57:49 -07:00
Mark Otto f3aaba0be2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 09:57:40 -07:00
Mark Otto 72237acf52 fix #8584: add readme callout for npm and node 2013-07-25 09:57:33 -07:00
Geremia Taglialatela 0017f7fca4 Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height
When using navbar heights higher that default, the navbar-toggle button is not centered.

Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/


Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
2013-07-25 17:09:12 +02:00
syed a06afd8320 Moved navs inline properties to variables.less and customize.html & nav-customize.html 2013-07-25 12:43:14 +05:00
syed f8d5a974bc Moving navbar inline properties to variables.less and customize.html 2013-07-25 11:58:25 +05:00
Jacob Thornton e9c83647af fixes #8568 -- account for margins in offset 2013-07-24 20:57:26 -07:00
Jacob Thornton aad910465c fixes #8569 2013-07-24 20:21:23 -07:00
Jacob Thornton a282dba58f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-24 20:10:51 -07:00
Jacob Thornton eaefed517a fixes #8399 w/ tests 2013-07-24 20:10:16 -07:00
Mark Otto 1f40da9676 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-24 16:53:34 -07:00
Mark Otto 51de38e5b9 make again 2013-07-24 16:52:47 -07:00
Mark Otto 61ac20ebb5 Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip 2013-07-24 16:42:13 -07:00
Mark Otto a36f444c25 Merge pull request #8583 from liuyl/disabled
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto 3080104642 make footer border color use header border color in modals 2013-07-24 16:31:17 -07:00
Mark Otto c63489def3 run make on prev commits 2013-07-24 16:28:34 -07:00
syed 2e6fcefc5c Moved modals inline properties to variables.less
In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.
2013-07-24 18:43:21 +05:00
liuyl 7e9532dabe set cursor to not-allowed for disabled elements 2013-07-24 17:10:27 +08:00
Salman Javed 0caab585f5 issues fixed for nav-justified on pills on android default browser. 2013-07-24 13:39:16 +05:00
Julian Thilo 7936f14780 Fix #8428 - Document tooltip/popover events 2013-07-24 09:08:19 +02:00
Jacob Thornton 930c75e5dd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 23:51:18 -07:00
Jacob Thornton 217eb988b8 add placement auto for tooltips + tests… kinda sad about this doe 2013-07-23 23:50:23 -07:00
Mark Otto 8540515eeb Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 23:48:32 -07:00
Mark Otto 18157e9f39 Run make on prev commits 2013-07-23 23:48:17 -07:00
Mark Otto 9029b4c06c Update forms vars
* Reorganize layout
* Add input group var
* Add legend border var
2013-07-23 23:25:46 -07:00
Mark Otto a049cdd46e Reorganize dropdown vars section 2013-07-23 23:22:13 -07:00
Mark Otto 398038c798 Update dropdown vars
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00
Mark Otto cdf6019e11 Update code vars
* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`
2013-07-23 23:13:15 -07:00
Mark Otto ba954db159 Update close vars
* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer
2013-07-23 23:09:06 -07:00
Mark Otto a5cc1300f6 Update carousel vars
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
2013-07-23 23:03:57 -07:00
Jacob Thornton 3cfa1c8a30 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/js/bootstrap.min.js
2013-07-23 22:59:33 -07:00
Jacob Thornton 6841c50968 fixes #7814 2013-07-23 22:59:09 -07:00
Mark Otto b0dd2f902d Update and add @btn-hover-color to Customize page 2013-07-23 22:53:30 -07:00
Mark Otto 1803b2f09e Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-23 22:49:13 -07:00
Mark Otto 1d1bd62598 Fixes #8571: allow table classes in thead and tfoot 2013-07-23 22:27:49 -07:00
Mark Otto a346ea2a1a make on prev commit 2013-07-23 21:23:13 -07:00
Mark Otto 2447f03758 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 21:22:52 -07:00
Jacob Thornton faba6808b7 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-23 20:53:32 -07:00
Jacob Thornton 72d2661ff0 fixes #8232 2013-07-23 20:53:12 -07:00
Mark Otto 00976ff09a Merge pull request #8576 from sfaxon/3.0.0-wip
update carousel js docs to reflect leading .glyphicon
2013-07-23 20:17:40 -07:00
Mark Otto ced204c774 Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software" 2013-07-23 20:16:02 -07:00
Mark Otto 984a0d1c78 Update link to blog 2013-07-23 19:52:44 -07:00
Seth Faxon 13f2a68a23 update carousel js docs to reflect leading .glyphicon
https://github.com/twitter/bootstrap/pull/6342 icons section
  mentions the change to using glyphicon base class
  this adds it to the docs
2013-07-23 19:38:23 -07:00
Jacob Thornton faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton 68e87183a0 fixes #8134 2013-07-23 18:54:00 -07:00
Jacob Thornton f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton 43e5e90a6d shown.bs.modal fix 2013-07-23 17:32:20 -07:00
Jacob Thornton 7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
Mark Otto e87508854e Merge pull request #8572 from mohnish/patch-1
Use input type `password` for the password field in the CSS documentatio...
2013-07-23 14:23:17 -07:00
Mark Otto 29b4caf1d5 Merge pull request #8573 from cvrebert/patch-2
getting-started.html: add <code> around mention of `placeholder`
2013-07-23 14:22:59 -07:00
Chris Rebert d8583a1064 getting-started.html: add <code> around mention of placeholder 2013-07-23 13:00:28 -07:00
Mohnish Thallavajhula 4629bed2c4 Use input type password for the password field in the CSS documentation. 2013-07-23 11:50:01 -07:00
Mark Otto 4cec956e0c Drop rounded corners on .table-bordered
* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
2013-07-23 10:48:30 -07:00
Mark Otto b5f2482a58 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-23 10:19:04 -07:00
Mark Otto 8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Mark Otto e7b0f4e81f Merge pull request #8564 from frabrunelle/3.0.0-wip
@badge-bg should be @gray-light not #f5f5f5
2013-07-23 10:05:49 -07:00
Francis Brunelle 4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto 0b1ddeb353 fixes #8559 2013-07-22 14:44:36 -07:00
Mark Otto 98ce40d0f6 Merge pull request #8549 from ggam/patch-2
Updated readme.md to reflect the latest changes in directory structure
2013-07-21 16:07:55 -07:00
Guillermo González de Agüero abb1013f25 Updated readme.md to reflect the latest changes in directory structure 2013-07-21 21:57:41 +02:00
Mark Otto 12468c6103 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-21 08:52:25 -07:00
Mark Otto 582e9986a8 Merge pull request #8546 from jeroenvisser101/patch-1
Fixed typo
2013-07-21 08:50:12 -07:00
Mark Otto e78ba0ff82 Merge pull request #8545 from liuyl/refactor-btngroups
refactor button-groups.less
2013-07-21 08:49:52 -07:00
Mark Otto 832fdf9a36 Merge pull request #8544 from liuyl/removeuseless
remove useless display:inline-block
2013-07-21 08:49:34 -07:00
Jeroen Visser c926309371 Fixed typo 2013-07-21 14:20:21 +02:00
liuyl f5fc6254c7 refactor button-groups.less 2013-07-21 20:03:59 +08:00
liuyl be2693369d remove useless display:inline-block 2013-07-21 19:44:30 +08:00
Mark Otto a63db4d2f9 Update file input to remove height and line-height
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
2013-07-20 21:09:03 -07:00
Mark Otto df851b40d1 Update docs on responsive images and elaborate on IE8 support using Respond.js 2013-07-20 20:58:23 -07:00
Mark Otto d651c01e10 Update forms example to show sequential form inputs for later testing 2013-07-20 20:11:53 -07:00
Mark Otto 51dfa21009 Remove more commented out CSS from forms 2013-07-20 19:32:21 -07:00
Mark Otto 732e4196fb Remove commented out CSS 2013-07-20 19:31:56 -07:00
Mark Otto 6952d655f4 Merge pull request #8538 from brentmulligan/3.0.0-wip
Update Normalize.css URL to new Github.io domain
2013-07-20 16:58:00 -07:00
Mark Otto 3d5e9f0318 Merge pull request #8536 from ggam/patch-1
Fixed breadcrumbs link in customize
2013-07-20 16:57:30 -07:00
Brent Mulligan 23015bc7c1 Update Normalize.css URL to new Github.io domain 2013-07-20 15:38:38 -04:00
Guillermo González de Agüero faa9a22f74 Fixed breadcrumbs link 2013-07-20 14:38:10 +02:00
syed 330f40c864 moving forms, labels and list-group to variables.less 2013-07-20 13:38:27 +05:00
syed 1683e6767a moving code and dropdowns to variables.less 2013-07-20 13:17:56 +05:00
syed c2e37414d8 Move inline properties to variables.less
moved buttons.less, carousel.less & close.less in this commit
2013-07-20 12:56:20 +05:00
Mark Otto 453346262f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-20 00:11:02 -07:00
Mark Otto e347fffb14 update headings and nav 2013-07-20 00:10:51 -07:00
Mark Otto a1065a1ef8 undo change to config exclude 2013-07-20 00:07:04 -07:00
Mark Otto 4b7f63a3a2 Update vars for badges, breadcrumbs; update customize page 2013-07-20 00:03:08 -07:00
Mark Otto 72d913baeb Move var in customize layout 2013-07-19 23:43:17 -07:00
Mark Otto c2d3dad15b Merge pull request #8533 from frabrunelle/bower-link
update links to bower
2013-07-19 21:42:30 -07:00
Francis Brunelle 0f8d6e3112 update links to bower 2013-07-19 21:28:21 -04:00
Mark Otto 7c5f7a4e82 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-19 17:36:16 -07:00
Mark Otto b6238c5f20 Fixes #8385: update carousel captions
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
2013-07-19 17:36:03 -07:00
Mark Otto 8ab77191ce Twerk callouts and fix an unstyled one 2013-07-19 17:17:52 -07:00
Mark Otto 6cce56061f Better code snippets on mobile in docs 2013-07-19 17:09:39 -07:00
Mark Otto dd3eefc0f9 Merge pull request #8530 from codeodor/3.0.0-wip
ignore .files for bower packaging
2013-07-19 16:54:22 -07:00
Mark Otto 95b9f44190 Fixes #8278: fix on print 2013-07-19 16:49:38 -07:00
Mark Otto f25d8c0080 hacky way of not showing ads or analytics in local dev 2013-07-19 14:08:16 -07:00
Mark Otto 4b0fa356f3 Variables reorganization and breadcrumbs update
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
2013-07-19 11:44:35 -07:00
Mark Otto b1819755b8 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-19 11:29:21 -07:00
Sammy Larbi b8348416b0 ignore .files for bower packaging 2013-07-19 13:23:17 -05:00
syed 65ee36a7bf Improved and followed pattern suggestions 2013-07-19 23:14:13 +05:00
Mark Otto 416fd9d19b Merge pull request #8528 from dtmax/3.0.0-wip
typo fixed: highligted source code of second radio button was missing
2013-07-19 09:34:20 -07:00
syed 5e898fa2a1 move breadcrumb.less inline properties and also added @color-2 missed in last commit 2013-07-19 18:39:51 +05:00
syed b37127e2fc move badges inline properties to variables.less 2013-07-19 18:29:19 +05:00
syed 95be924926 Move accordion inline properties to variables.les 2013-07-19 18:18:01 +05:00
Max 6f9ed7efeb typo fixed: highligted source code of second radio button was missing in css.html -> checkboxes & radios -> default section 2013-07-19 13:28:26 +03:00
Mark Otto 710dbb5260 Merge pull request #8524 from jholl/patch-1
fix typo / doc components.html responsive menu dropdowns now have ref to...
2013-07-18 21:07:34 -07:00
James Holland bbe0d0d874 fix typo / doc components.html responsive menu dropdowns now have ref to .dropdown-header instead of .nav-header 2013-07-19 00:04:58 -04:00
Mark Otto 49f2f7fad9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 19:53:53 -07:00
Mark Otto e440ff4b3f <input> and <select> sizing update
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
2013-07-18 19:53:32 -07:00
Mark Otto e160b14223 Merge pull request #8521 from epicyclist/3.0.0-wip
Documentation updates.
2013-07-18 19:36:16 -07:00
Christopher Canipe 896d159987 Remove Mustache comment regarding contribution: it's going away. 2013-07-18 20:09:33 -06:00
Christopher Canipe 3e8b3a246a Clean up tooltip's trigger description in the docs. 2013-07-18 19:41:42 -06:00
Mark Otto 0a3722112c Add minified CSS to dist folder 2013-07-18 18:33:20 -07:00
Mark Otto f771bf140d Merge branch 'bs3_rc1' into 3.0.0-wip 2013-07-18 18:16:50 -07:00
Mark Otto 7bb8817947 finish flattening repo structure; add dist folder of compiled css/js 2013-07-18 18:14:49 -07:00
Mark Otto a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
Mark Otto 820558916f Fixes #8516: correct input-small and input-large on select elements 2013-07-18 15:36:41 -07:00
Mark Otto 7d9fb1dda7 Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067) 2013-07-18 15:28:38 -07:00
Mark Otto 1f48e83700 Merge pull request #8517 from cvrebert/gloss-unicode
add comments to gloss Unicode codepoint hex
2013-07-18 14:43:38 -07:00
Mark Otto 36188d0884 change download button label 2013-07-18 14:08:40 -07:00
Mark Otto 63f070096b copy change to css page subheading 2013-07-18 14:06:13 -07:00
Mark Otto 5cb0d64686 relative url 2013-07-18 13:51:08 -07:00
Mark Otto 3abfe029ea vertically center ad 2013-07-18 13:35:55 -07:00
Mark Otto a34470ac5d Merge branch 'bs3_old_docs_callout' into bs3_rc1 2013-07-18 13:07:49 -07:00
Mark Otto 9425382376 Merge branch 'bs3_add_ads' into bs3_rc1 2013-07-18 13:07:17 -07:00
Mark Otto cc63096118 clarify IE support and rearrange getting started docs a bit 2013-07-18 13:05:53 -07:00
Chris Rebert 86efc140e2 add comments to gloss Unicode codepoint hex 2013-07-18 11:49:39 -07:00
Mark Otto b372661a17 fixes #8206: Use navbar height var to compute vertical padding on navbar-brand 2013-07-18 02:23:38 -07:00
Mark Otto 64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto 3ed05f60fd Quick pass at new touch and favicons 2013-07-18 02:05:41 -07:00
Mark Otto 898ee8f13b twerk comment 2013-07-18 01:46:31 -07:00
Mark Otto 6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat 6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-18 01:08:19 -07:00
fat 4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
Mark Otto 181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto d87431a29e spacing and local var rename 2013-07-18 00:56:36 -07:00
Mark Otto 0c45458fcc Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1 2013-07-18 00:55:36 -07:00
Mark Otto f757cf4cf3 run make on mixin changes from #8380 2013-07-18 00:50:57 -07:00
Mark Otto 02bddac091 Merge pull request #8380 from joeybaker/patch-1
Remove unneeded prefixes from some mixins
2013-07-18 00:50:15 -07:00
Mark Otto 8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto 1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto e7bc9e1c3d Vurrriables and shit 2013-07-18 00:23:35 -07:00
Mark Otto 79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto 87adbf7aa4 make on collapse changes 2013-07-17 23:56:38 -07:00
Mark Otto e6906040de Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:56:27 -07:00
Mark Otto e5bfd8c00b Fixes #8441: remove @font-size-mini 2013-07-17 23:56:20 -07:00
Mark Otto bc79f8a399 Bump tooltips to use @font-size-small (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto e57758cbb4 Drop .nav-header for .dropdown-header
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
fat 2a4a0f70ef Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:52:55 -07:00
fat b13eecaeec fixes #7880 2013-07-17 23:52:29 -07:00
Mark Otto 3604b86806 fixes #8477: use var for rounded image border-radius 2013-07-17 23:41:05 -07:00
Mark Otto 4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 23:34:31 -07:00
Mark Otto d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto ba0c6cd57c make on prev js changes 2013-07-17 23:33:34 -07:00
fat 59f847e8ee fixes #7777 2013-07-17 23:30:05 -07:00
fat 8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
Mark Otto d7d1c2a767 add ads to v3 docs 2013-07-17 23:22:28 -07:00
fat 451acb42db fixes #7755 2013-07-17 23:15:50 -07:00
fat 5cb8bfd7da Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:02:15 -07:00
fat 57768d7ea9 fix #7660 2013-07-17 23:01:33 -07:00
Mark Otto 3ad0cf9e94 add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post 2013-07-17 22:58:49 -07:00
Mark Otto 9efba239b6 Merge pull request #8511 from twitter/bs3_remove_examples
BS3: Move examples to @twbs/bootstrap-examples
2013-07-17 22:17:30 -07:00
fat 6387d8d5cc versioning perhaps for jquery i don't even know man 2013-07-17 21:38:52 -07:00
fat 18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat 2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat a7a9a14379 fix @muan's unit test ;) 2013-07-17 21:17:39 -07:00
fat 102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat bf38241f0d remove duh ugly 2013-07-17 21:10:33 -07:00
fat eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
Mark Otto 0df791d1ac fix link to grid example 2013-07-17 21:04:27 -07:00
Mark Otto 6be1f9d00f remove colophon include because there's only one layout using it now 2013-07-17 21:02:50 -07:00
Mark Otto 97cdb4215a link order 2013-07-17 20:44:55 -07:00
Mark Otto f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
2013-07-17 20:44:27 -07:00
fat 0f64c21049 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:30:09 -07:00
fat 392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
Mark Otto bfebf0e490 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:18:03 -07:00
Mark Otto 7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -07:00
fat 5396c40877 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 19:33:49 -07:00
Mark Otto 542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
2013-07-17 19:33:30 -07:00
fat f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
fat 13cad5061d maybe fix this old ass issue #5973 2013-07-17 19:28:43 -07:00
Mark Otto 06d47b0082 Fixes #8360: Add mention of IE compatibility mode to docs 2013-07-17 19:26:37 -07:00
Mark Otto f4b9938d8c Move license FAQs to the docs, add link to side nav 2013-07-17 19:20:08 -07:00
Mark Otto aa49c919c6 Fixes #8356: Move browser compatibility from wiki into real docs 2013-07-17 19:08:08 -07:00
Mark Otto e7be60fd4d Update readme to point previous releases to GitHub project releases (fixes #8508) 2013-07-17 17:21:11 -07:00
Mark Otto 8a79590d05 Remove changelog in favor of GitHub releases 2013-07-17 17:20:47 -07:00
Mark Otto cb9cc972ed Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-16 13:36:02 -07:00
Mark Otto 5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto 7dbcce30c1 Merge pull request #8498 from cvrebert/patch-1
Add missing backtick in comment
2013-07-16 11:27:33 -07:00
Mark Otto 522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
Chris Rebert 76063ea739 Add missing backtick in comment 2013-07-16 10:49:59 -07:00
Mark Otto ced641b107 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-15 12:00:10 -07:00
Mark Otto 6aec8f36fc fix broken scrollspy example 2013-07-15 12:00:01 -07:00
Mark Otto fb75ffca55 Merge pull request #8478 from juthilo/3.0.0-customizer
Update customizer
2013-07-14 16:56:56 -07:00
Julian Thilo aab4c95cd2 Update customizer
Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`
2013-07-14 12:50:14 +02:00
Mark Otto 89555cb61c Merge pull request #8453 from cvrebert/retina-rename
rename .retina-image => .img-retina
2013-07-11 14:17:11 -07:00
Mark Otto cb117c62eb Merge pull request #8454 from bassjobsen/patch-2
Update forms.less
2013-07-11 14:16:58 -07:00
Mark Otto 9efab70c93 Merge pull request #8455 from cvrebert/control-group-dead
rm .control-group from docs since it's no longer in the LESS
2013-07-11 14:16:29 -07:00
Chris Rebert 5d9f51d496 rm .control-group from docs since it's no longer in the LESS 2013-07-11 12:57:44 -07:00
Bass Jobsen 3a17578a94 Update forms.less
All variables should be set in variables.less?
2013-07-11 21:24:06 +02:00
Chris Rebert a41fd16da2 rename .retina-image => .img-retina 2013-07-11 12:07:35 -07:00
Mark Otto 606d6e81d4 Merge pull request #8426 from liuyl/simplify-type
simplify type.less
2013-07-09 12:43:15 -07:00
Mark Otto b2fa51521f Merge pull request #8430 from juthilo/3.0.0-docs-fixes
Dustin the docs again
2013-07-09 12:41:07 -07:00
Julian Thilo 88d76e386f Dustin the docs again
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
2013-07-09 15:32:28 +02:00
liuyl 0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto 1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup
code.less: cleanup styles that get immediately overriden later in the file
2013-07-08 06:57:37 -07:00
Mark Otto f69afc1b23 Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting
use LESS nesting more in dropdowns.less
2013-07-08 06:56:57 -07:00
Mark Otto b2b09f679a Merge pull request #8413 from cvrebert/misc-less-refactoring
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
2013-07-08 06:56:35 -07:00
Mark Otto e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting
use nesting more in pagination.less
2013-07-08 06:55:50 -07:00
Mark Otto 46378c7ba3 Merge pull request #8411 from cvrebert/navbar-LESS-nesting
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Mark Otto b13417525c Merge pull request #8410 from cvrebert/buttons-nesting
more nesting in buttons.less
2013-07-08 06:54:39 -07:00
ClausH 0a72530429 Replace position with offset 2013-07-08 12:02:31 +02:00
Chris Rebert e40aee9c9e code.less: cleanup styles that get immediately overriden later in the file 2013-07-07 20:03:52 -07:00
Chris Rebert 7e154740f3 use LESS nesting more in dropdowns.less 2013-07-07 19:54:07 -07:00
Chris Rebert dcf1b60f2b refactor {badges,jumbotron,media,popover,print}.less (mostly nesting) 2013-07-07 19:46:20 -07:00
Chris Rebert 6bda16f6be use nesting more in pagination.less 2013-07-07 19:30:51 -07:00
Chris Rebert d9cd5e4e0c more nesting in navbar.less 2013-07-07 19:22:18 -07:00
Chris Rebert 6e03639af2 more nesting in buttons.less 2013-07-07 19:16:38 -07:00
Mark Otto 084291aac7 Merge pull request #8408 from cvrebert/progress-bar-variant-mixin
extract .progress-bar-variant mix-in
2013-07-07 18:27:43 -07:00
Mark Otto 906d04a4aa Merge pull request #8407 from cvrebert/label-variant-mixin
extract .label-variant mix-in
2013-07-07 18:26:54 -07:00
Mark Otto 65141338df Merge pull request #8406 from cvrebert/navs-nesting
more nesting in navs.less
2013-07-07 18:26:26 -07:00
Mark Otto 03becfb9e3 Merge pull request #8405 from cvrebert/button-groups-nesting
more nesting in button-groups.less
2013-07-07 18:25:48 -07:00
Mark Otto 400e9b2a88 Merge pull request #8404 from cvrebert/alert-variant
extract .alert-variant mix-in
2013-07-07 18:25:17 -07:00
Chris Rebert d2fb35d546 extract .progress-bar-variant mix-in 2013-07-07 15:44:18 -07:00
Chris Rebert a7dd1088d2 extract .label-variant mix-in 2013-07-07 15:38:43 -07:00
Chris Rebert 15bd6eadf3 more nesting in navs.less 2013-07-07 15:31:18 -07:00
Chris Rebert f12d6401f2 more nesting in button-groups.less 2013-07-07 15:27:06 -07:00
Chris Rebert e757ddd60f extract .alert-variant mix-in 2013-07-07 15:21:40 -07:00
Maurice Wahba 8a84da6341 Carousel no longer dependent on glyphicons
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto 95655e7275 Remove more Glyphicons 2013-07-05 14:27:54 -05:00
Mark Otto fffb37ecea Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:24:40 -05:00
Mark Otto 3279181f42 Merge pull request #8378 from liuyl/aftertosibling
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto 30c138c4bf Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:22:46 -05:00
Mark Otto dd691b5c36 Merge pull request #8390 from liuyl/typeahead
delete typeahead style
2013-07-05 12:21:49 -07:00
Mark Otto 4f922d6e3f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:21:33 -05:00
Mark Otto 61823dbff1 Move hr to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto bc3c69e4e8 Merge pull request #8392 from liuyl/refactpagination
refactor pagination.less
2013-07-05 12:19:31 -07:00
Mark Otto 88a266b800 Add tfoot back (addresses more than #8387) 2013-07-05 14:15:00 -05:00
Mark Otto 14056409c3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:13:24 -05:00
Mark Otto 817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
liuyl 969529c80e refactor pagination 2013-07-05 20:18:57 +08:00
liuyl 3bd42511f4 refactor pagination 2013-07-05 20:17:20 +08:00
liuyl e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
Mark Otto d483e77553 Merge pull request #8370 from cvrebert/tables-nesting
refactor tables.less to use nesting more
2013-07-03 19:39:29 -07:00
Joey Baker 2d56997c61 Remove unneeded prefixes
Per caniuse, prefixes for transitions and transforms can be reduced to just `-webkit` and `-ms`. http://caniuse.com/#search=transform
http://caniuse.com/#search=transition
2013-07-03 08:11:28 -07:00
liuyl 5b69d34053 use sibling selector instead of pseudo selector 2013-07-03 20:37:36 +08:00
Chris Rebert da072fff21 refactor tables.less to use nesting more 2013-07-02 11:42:37 -07:00
Mark Otto 749dc35328 comma for the guardian angel /cc @cvrebert 2013-07-01 20:18:44 -07:00
Mark Otto a049dcb7f6 Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
Conflicts:
	less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto 9ed9fba460 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 19:49:49 -07:00
Mark Otto 5b2d933524 Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick 2013-07-01 19:49:29 -07:00
Mark Otto 526d1399c5 Merge pull request #8348 from Rowno/compiled-font-shorthand
Prevent the font shorthand from getting compiled as division
2013-07-01 19:43:15 -07:00
Mark Otto 08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto f8eb9136eb Merge pull request #8352 from liuyl/simplifytable
simplify tables.less
2013-07-01 18:23:17 -07:00
Mark Otto 9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00
Mark Otto c9df1db502 fixes #7367: slightly larger carousel indicators 2013-07-01 18:16:59 -07:00
Mark Otto 7ad9fbef8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 17:32:14 -07:00
Mark Otto a27ecfccf3 Make more components mixin-friendly 2013-07-01 17:32:07 -07:00
Julian Thilo fea69df80c Fix responsive utilities for table elements
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
liuyl e5e9d5916a simplify tables.less 2013-07-01 20:29:41 +08:00
Roland Warmerdam 2e8752b26f Prevent the font shorthand from getting compiled as division 2013-07-01 10:51:08 +12:00
Mark Otto 534eac5242 Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
Docs: Fix broken links to navbar component in examples pages
2013-06-29 17:29:19 -07:00
Mark Otto eeaa70ab4a Merge pull request #8341 from Quy/3.0.0-wip
Remove references to fonts
2013-06-29 17:29:01 -07:00
Mark Otto 3b5f4ed054 Merge pull request #8343 from frabrunelle/reset-left-padding
reset left padding for .media-list, .pagination and .pager
2013-06-29 17:28:06 -07:00
Francis Brunelle 6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04:00
Quy Ton 02351c0589 Remove references to fonts 2013-06-29 07:37:53 -07:00
John O'Nolan 4252dff850 Fixes broken links to navbar component in docs. 2013-06-29 13:21:16 +02:00
Mark Otto 2d2828d36c Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-28 09:25:02 -07:00
Mark Otto 0a92efce0c Nuke hella things
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Mark Otto 8ef3002153 Merge pull request #8336 from guilbep/3.0.0-wip
removing bootstrap-fonts rule in Makefile for bootstrap rule
2013-06-28 09:20:02 -07:00
Pierre Guilbert 37e4fbf9ca removing useless space 2013-06-28 14:19:46 +02:00
Pierre Guilbert a85c11eb45 removing bootstrap-fonts rule in Makefile for bootstrap rule 2013-06-28 14:09:46 +02:00
Mu-An Chiou 55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Mark Otto 09cdee2f03 Overall responsive img styles
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
2013-06-28 00:09:10 -07:00
Mark Otto 1a09eada35 Run make on JS 2013-06-28 00:08:19 -07:00
Mark Otto 8e6d5be8e4 update close button example display 2013-06-27 23:26:04 -07:00
Jacob d23800c828 Merge pull request #7424 from sody/3.0.0-wip
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
2013-06-27 22:36:33 -07:00
Mark Otto 88ece4fc59 fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly 2013-06-27 20:50:21 -07:00
Mark Otto bf3c5e070e remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s 2013-06-27 20:49:29 -07:00
Mark Otto 89117ec6b2 run make on last commit 2013-06-27 20:18:16 -07:00
Mark Otto 0682068929 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 20:17:59 -07:00
Mark Otto 69b7c5a2af Merge pull request #7995 from hrach/patch-3
Fixed mixin btn-pseudo-state background for [disabled] buttons
2013-06-27 20:17:48 -07:00
Mark Otto d9a662ed1d fixes #7977: prevent some table bullshit on input groups 2013-06-27 20:15:44 -07:00
Mark Otto 5156234c23 update grid col mixin to use latest css from grid cols 2013-06-27 19:54:30 -07:00
Mark Otto ca8ca2177f fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR 2013-06-27 19:36:56 -07:00
Mark Otto 6a2858f7bf make on js i guess? /cc @fat 2013-06-27 19:36:35 -07:00
Mark Otto 81b5e74057 remove glyphicons from compiled css 2013-06-27 19:36:09 -07:00
Mark Otto 416cc6b2ee fix broke js markup 2013-06-27 19:33:26 -07:00
Mark Otto 51093fde18 fix makefile 2013-06-27 19:27:44 -07:00
Mark Otto 2af67238a4 Merge pull request #8332 from twitter/bs3_remove_icons
BS3: Remove Glyphicons
2013-06-27 19:23:55 -07:00
Mark Otto 8cd5d0be71 add docs callout for glyphicons on homepage and CSS page 2013-06-27 19:22:11 -07:00
fat b06ec345ce Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 19:19:57 -07:00
fat b0da97588e fixes #6982 2013-06-27 19:19:22 -07:00
Mark Otto 2981f0089f remove glyphicons from demo component 2013-06-27 18:51:06 -07:00
Mark Otto 879d517cb3 delete icons in assets 2013-06-27 18:49:59 -07:00
Mark Otto e5a9a1f5ff remove icons from sidenav 2013-06-27 18:49:37 -07:00
Mark Otto 62f76ad33f Merge branch '3.0.0-wip' into bs3_remove_icons
Conflicts:
	docs/components.html
2013-06-27 18:49:05 -07:00
fat 94761c2216 use collapse in dropdown js example 2013-06-27 18:47:35 -07:00
Mark Otto cb483b6758 Add parens so sublime picks up on syntax highlighting 2013-06-27 18:45:08 -07:00
Mark Otto 7636577681 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 18:43:54 -07:00
Mark Otto c9ccbd2cf0 Fixes #8329: add !important to .hidden 2013-06-27 18:43:29 -07:00
Mark Otto cb29ed0751 Merge pull request #8307 from cvrebert/8287-docs-patch
Fix #8287
2013-06-27 18:38:34 -07:00
Mark Otto 5e29c42211 remove custom url in jekyll 2013-06-27 18:38:00 -07:00
Mark Otto 296b9d7293 Merge pull request #8313 from jholl/patch-1
typo: match doc text and example
2013-06-26 11:42:04 -07:00
Mark Otto 68792fc1f9 Merge pull request #8306 from cvrebert/styling-n-typo
Docs: fix 1 typo; use <code> in 1 place
2013-06-26 11:20:14 -07:00
Mark Otto cd4f131c49 Merge pull request #8305 from cvrebert/copyedit
copyedit JS docs
2013-06-26 11:19:43 -07:00
Julian Thilo b4e0e4fee6 Adjust info callout, add callouts to docs
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
James Holland 2471b9d725 typo: match doc text and example 2013-06-26 08:27:12 -04:00
Chris Rebert 242d92e09c Fix #8287 2013-06-25 20:18:30 -07:00
Chris Rebert 274a342657 Docs: fix 1 typo; use <code> in 1 place 2013-06-25 19:50:37 -07:00
Chris Rebert 694c650f8e copyedit JS docs 2013-06-25 19:32:17 -07:00
Mark Otto cc43ba35d7 Merge pull request #8301 from cvrebert/patch-3
Fix spelling in comment
2013-06-25 17:11:31 -07:00
Mark Otto 0f371d409f Merge pull request #8300 from cvrebert/patch-2
Fix typo in comment
2013-06-25 17:11:20 -07:00
Mark Otto 2da485d6bb Merge pull request #8299 from cvrebert/patch-1
Spelling in comment
2013-06-25 17:10:59 -07:00
Mark Otto 5c9bd469ae Merge pull request #8303 from cvrebert/patch-4
Fix 2 typos
2013-06-25 17:10:34 -07:00
Mark Otto ae9fde5cab Merge pull request #8304 from cvrebert/patch-5
rm :invalid styling from docs
2013-06-25 17:09:52 -07:00
Chris Rebert 266bdfcaaa rm :invalid styling from docs
It was removed from the code in 90d4343f66  :-/
2013-06-25 16:31:12 -07:00
Chris Rebert d82941265c Fix 2 typos 2013-06-25 17:07:51 -06:00
Bass Jobsen 321190535f Update mixins.less
Add a the function .make-small-column. See also http://stackoverflow.com/a/17308128/1596547
2013-06-26 01:05:45 +02:00
Chris Rebert 8ee0e39ef9 Fix spelling in comment 2013-06-25 17:05:26 -06:00
Chris Rebert d2b5f4e45c Fix typo in comment 2013-06-25 17:03:57 -06:00
Chris Rebert 64a01f01cb Spelling in comment 2013-06-25 17:01:46 -06:00
Mark Otto ac90fbf4d8 Merge pull request #8297 from cvrebert/patch-1
rm pre{white-space:pre-wrap;} since redundant to Normalize
2013-06-25 14:57:41 -07:00
Mark Otto 73ec8e031b Merge pull request #8298 from cvrebert/patch-2
rm fallback white-space for <code>
2013-06-25 14:57:17 -07:00
Chris Rebert 1bb159aa6f rm fallback white-space for <code>
If my analysis is right, this should be unnecessary.
2013-06-25 15:53:48 -06:00
Chris Rebert 9b97d63188 rm pre{white-space:pre-wrap;} since redundant to Normalize.css 2013-06-25 14:48:57 -07:00
Julian Thilo f00c885d4c Docs: create new callout classes 2013-06-25 23:12:36 +02:00
Mark Otto 211d6831fc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-25 13:35:49 -07:00
Mark Otto 6ac063430f Merge pull request #8290 from juthilo/3.0.0-docs-nothird
Add new callouts to docs
2013-06-25 13:34:03 -07:00
Mark Otto 534ba060be Merge pull request #8292 from cvrebert/patch-1
fix "Data attributes" link in JS docs sidenav
2013-06-25 13:32:41 -07:00
Mark Otto 327a951ca3 Move mixin to mixins.less 2013-06-25 13:32:21 -07:00
Mark Otto 03e67e44f9 Merge pull request #8291 from cvrebert/refactor
refactor responsive-utilities slightly
2013-06-25 13:28:34 -07:00
Mark Otto 08ab44708d Merge pull request #8294 from cvrebert/patch-2
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 13:26:14 -07:00
Julian Thilo fe25ebc2af Recess welcome 2013-06-25 22:22:23 +02:00
Chris Rebert e46e63463a fix ID of Normalize heading in docs so that the sidenav can find it 2013-06-25 14:16:39 -06:00
Chris Rebert 4be21c422a fix "Data attributes" link in JS docs sidenav
`#js-data-attributes` => `#js-data-attrs`
2013-06-25 14:09:24 -06:00
Julian Thilo a87ea9345b Add IDs, adjust text 2013-06-25 21:59:34 +02:00
Chris Rebert 83c4073ec7 refactor responsive-utilities slightly 2013-06-25 12:23:56 -07:00
Julian Thilo 0f0e7fc376 Add a link to the mailing list for JS help 2013-06-25 21:19:19 +02:00
Julian Thilo 30e5e89fac Add callout to docs: LESS compiler support 2013-06-25 21:01:13 +02:00
Julian Thilo abb112173e Add callout to docs: 3rd-party libs not supported 2013-06-25 20:52:49 +02:00
Mark Otto e9951385b0 Merge pull request #8283 from luishdez/hotfix/add-on-breaks
Fix line breaks on add-ons with spaces
2013-06-25 09:37:56 -07:00
Luis Hdez 9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02:00
Mark Otto 5fe3de1cb3 Merge pull request #8270 from kylase/3.0.0-wip
Replaced <i> with <span> for glyphicon
2013-06-23 21:26:56 -07:00
Kyle c455d92f9e Replaced <i> with <span> for glyphicon 2013-06-24 11:27:05 +08:00
Mark Otto 55120d124c Merge pull request #8268 from luishdez/hotfix/sidebar-overlap
Fix overlap sidebar for Tablets and up in docs
2013-06-23 15:16:25 -07:00
Mark Otto 573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto 164e88781b Make on previous commits 2013-06-23 15:05:58 -07:00
Mark Otto b76d98eee3 Fixes #8211: restore proper table grid class behavior
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
2013-06-23 15:05:50 -07:00
Luis Hdez 5af22ab89f Fix overlap sidebar for Tablets and up in docs 2013-06-23 23:15:32 +02:00
Mark Otto 2a47037ab0 Fixes #8266: remove unnecessary strong and em styles 2013-06-23 10:24:50 -07:00
Mark Otto 976322b2a6 run make on previous merge 2013-06-22 18:56:55 -07:00
Mark Otto bd2295014d Merge pull request #8261 from frabrunelle/patch-1
Reset left padding for .carousel-indicators
2013-06-22 18:56:20 -07:00
Francis Brunelle 7fd121fecb Reset left padding for .carousel-indicators 2013-06-22 21:38:02 -03:00
Mark Otto 42f101d746 Merge pull request #8258 from aristath/navbar-fixes
Navbar fixes
2013-06-22 15:07:49 -07:00
Aristeides Stathopoulos 72183d9a45 Update variables.less 2013-06-22 18:45:25 +03:00
Aristeides Stathopoulos aad76f21f6 Update navbar.less 2013-06-22 18:44:04 +03:00
Aristeides Stathopoulos b51e1e0d8c Update navbar.less 2013-06-22 14:41:31 +03:00
Aristeides Stathopoulos 2ba3b47dc6 Update navbar.less
navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.
2013-06-22 14:34:17 +03:00
Aristeides Stathopoulos 9360a25abf Merge pull request #10 from twitter/3.0.0-wip
3.0.0 wip
2013-06-22 04:26:09 -07:00
Mark Otto b0e943399d Improve alignment of navbar brand and fix up left padding on list groups 2013-06-21 17:21:44 -07:00
Mark Otto eba9b4de6c Reset padding on homepage links 2013-06-21 11:56:47 -07:00
Mark Otto 356100e74e Merge pull request #8251 from acmetech/3.0.0-wip
Remove offcanvas from footer and change placeholder in css.html
2013-06-21 09:11:54 -07:00
Tom Pietschker 9d43fbb57e Remove the offcanvas js from the footer
This was moved inline in 65ad52060e
2013-06-21 10:03:28 -04:00
Tom Pietschker 8ef3df418f Rename class name in placeholder
applies 2535e060a4 to css.html. Wasn't
docs.html removed a while ago?
2013-06-21 09:59:34 -04:00
Mark Otto 2535e060a4 Merge pull request #8244 from Quy/3.0.0-wip
Rename class name in placeholder
2013-06-20 22:55:11 -07:00
Quy Ton ac1058e435 Rename class name in placeholder 2013-06-20 18:44:19 -07:00
Mark Otto ef8e5853cb Fixes #8154: enforce full width .navbar-nav.pull-right in mobile
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
2013-06-20 17:15:09 -07:00
Mark Otto 82f9de9459 Fixes #8159: Be more specific about disabled inputs to avoid iOS bug
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
2013-06-20 17:02:10 -07:00
Mark Otto 90d4343f66 Fixes #8093: Removes invalid focus styles on inputs 2013-06-20 16:42:05 -07:00
Mark Otto 4db90244c4 run make on previous commit 2013-06-20 16:27:39 -07:00
Mark Otto 2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto 2fccf927c5 Run make on last commit 2013-06-20 16:02:05 -07:00
Mark Otto eee719f608 Merge pull request #8193 from mediafreakch/3.0.0-wip
Fixes broken layout for .input-group-addons within .input-large. Follows...
2013-06-20 15:44:08 -07:00
Mark Otto f64fe29003 Move Glyphicons into their own repo
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Mark Otto 1b89a63a48 Use @font-family-base for headings font-family variable 2013-06-20 15:38:18 -07:00
Mark Otto 3c60645ec0 Merge pull request #8237 from luishdez/feature/var-heading-family
Add heading font family variable
2013-06-20 15:36:49 -07:00
Mark Otto c5fb401a62 Move examples out of the main repo to twbs/bootstrap-examples
While examples are phenomenally useful and awesome for folks getting
started with Bootstrap, they don't really shine as well being buried in
the main docs. Moreover, having anything that's not core HTML, CSS, JS,
or documentation in the main repo seems to just get in the way.
Therefore, examples gets its own repo.

Specifically, we're doing the following:

* Deletes all example screenshots
* Deletes example layout
* Deletes example files
* Updates Getting Started docs to include only the template and a link
to the new examples project

All the examples and their history will be preserved in the switch.
2013-06-20 12:36:27 -07:00
Mark Otto 8383209521 run make on @nextgenthemes last commit 2013-06-20 09:58:21 -07:00
Mark Otto 175e4676dd Merge pull request #8241 from nextgenthemes/3.0.0-wip
rename '.navbar .nav' to '.navbar-nav'
2013-06-20 09:57:18 -07:00
nextgenthemes 110fc88601 rename '.navbar .nav' to '.navbar-nav' 2013-06-20 19:40:30 +03:00
Luis Hdez cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02:00
Mark Otto 65ad52060e Offcanvas example update
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto b0bece66f2 Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example 2013-06-19 19:13:38 -07:00
Mark Otto 5fcdf1229d Fixes #8001: add IDs for example inputs 2013-06-19 19:02:29 -07:00
Mark Otto badececcdf Merge pull request #8233 from zurt/patch-1
Add missing property to form-horizontal docs
2013-06-19 18:02:47 -07:00
Kurt MacDonald 98a8eaffc0 Add missing property to form-horizontal docs 2013-06-19 17:08:14 -06:00
Mark Otto 546d40a143 Add support for tr, th, and td to responsive utilities 2013-06-18 19:16:50 -07:00
Mark Otto 112dabb3c2 run make on last commit 2013-06-18 19:16:50 -07:00
Mark Otto 986c22a5c6 Merge pull request #8210 from cvrebert/backticks
docs/javascript.html: backticks -> <code>
2013-06-18 14:40:13 -07:00
Chris Rebert 7b60d04f0c docs/javascript.html: backticks -> <code> 2013-06-18 14:35:37 -07:00
Edgar Schnueriger 6a79f53899 Use correct font-size to calculate input-heights 2013-06-18 21:43:34 +02:00
Mark Otto 4b4079b224 Addresses #8199: darker default button 2013-06-18 11:16:43 -07:00
Mark Otto c6c3009dd0 Add note about Jekyll version per #8195 2013-06-17 21:36:03 -07:00
Mark Otto 4130a1093d Merge pull request #8182 from karelvuong/3.0.0-wip
3.0.0-wip - Fixed 'Running Doc. Locally" Link
2013-06-17 21:34:31 -07:00
Mark Otto bcc3af4b2a Fixes #7599: Improved print styles for a few key components
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto 37f4a25be4 Better clearing on .dl-horizontal for empty dd elements
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto 4436e727ed Properly unstyle the .list-unstyled class by switching from margin to padding
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto 84c0dc13ba Remove explicit, unncessary line-height on li elements 2013-06-17 14:21:16 -07:00
Mark Otto 731cbb302e Better base ul and ol styles
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Edgar Schnueriger b0d202455d Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed 2013-06-17 18:56:17 +02:00
Mark Otto 5f3f73c620 Merge pull request #8184 from FLOKER/3.0.0-wip
redundant lines removed
2013-06-16 20:48:27 -07:00
Mark Otto abfcde4de2 Merge pull request #8189 from cvrebert/patch-2
components docs: backticks ==> <code>
2013-06-16 20:45:20 -07:00
Chris Rebert 5c63883062 components docs: backticks ==> <code> 2013-06-16 21:40:50 -06:00
Mark Otto 1555992e35 Merge pull request #8187 from imsky/3.0.0-wip
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 20:39:11 -07:00
Mark Otto ce17746302 Merge pull request #8188 from cvrebert/patch-1
CSS docs page: backticks ==> <code>
2013-06-16 20:38:31 -07:00
Chris Rebert 50df5de14f CSS docs page: backticks ==> <code> 2013-06-16 21:36:56 -06:00
Ivan Malopinsky c1655e6cbd upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers 2013-06-16 23:16:56 -04:00
FLOKER 125e472d6f redundant lines removed 2013-06-16 22:18:46 +02:00
Mark Otto ac3521fef4 Remove WebKit overflow scrolling for now 2013-06-16 10:56:30 -07:00
Karel Vuong 0b7b40e281 Fixed link. 2013-06-15 22:23:09 -04:00
Mark Otto 6ce154c7ed Fixes #8175: Update input min-height vars to fix FF21 input rendering 2013-06-15 11:46:13 -07:00
Mark Otto 258e1d62fb Fix up broken input group example layouts 2013-06-15 11:37:59 -07:00
Mark Otto ecf9b020dd Merge pull request #8168 from marsuboss/patch-2
Duplicate ID navbar-example
2013-06-13 13:41:23 -07:00
Mark Otto ab162fe64e Merge pull request #8166 from liuyl/package
change version of recess to 1.1.7
2013-06-13 13:41:04 -07:00
Mark Otto c14f23192a Merge pull request #8167 from marsuboss/patch-1
Duplicate ID drop5
2013-06-13 13:40:40 -07:00
Mark Otto d363d96f4b Merge pull request #8169 from marsuboss/patch-4
Fix
2013-06-13 13:39:11 -07:00
marsuboss 1421a0e9bb Fix 2013-06-13 15:50:06 +03:00
marsuboss 436cffdaaf Duplicate ID navbar-example 2013-06-13 15:36:52 +03:00
marsuboss c6f51d0919 Duplicate ID drop5 2013-06-13 14:29:34 +02:00
liuyl 2c00a2fe2f change version of recess to 1.1.7 2013-06-13 19:27:26 +08:00
Mark Otto 949c7cca00 Merge pull request #8156 from baer/toggle-button-fix
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto 47f8ba98f3 Merge pull request #8158 from baer/download-button-fix-proper
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer 6771be1ced Docs Customize "Customize and Download" button not working properly 2013-06-12 14:01:59 -06:00
Eric Baer 7f8703ef86 Docs Customize toggle button used incorrect selectors 2013-06-12 12:51:10 -06:00
Mark Otto 40751305f8 Merge pull request #8124 from eins78/3.0.0-wip-fix-json
fix JSON syntax error in composer.json
2013-06-10 16:37:29 -07:00
Max F. Albrecht 3a02d07aca fix JSON syntax error in composer.json 2013-06-10 14:59:42 +02:00
Ivan Khalopik e138b0df3a Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 2013-06-10 10:31:51 +03:00
Mark Otto d74a9634b0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-09 23:45:23 -07:00
Mark Otto 9fac2c0467 Update docs JS to prevent clicks on links with hash hrefs 2013-06-09 23:45:14 -07:00
Mark Otto 9ba11ba60a No more need for grid column highlighting, so nuke that 2013-06-09 23:44:14 -07:00
Mark Otto 0a18d33d2c Redo grid documentation
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto 8b136f5b66 Merge pull request #8080 from mladenplavsic/patch-2
Update css.html
2013-06-08 20:53:37 -07:00
Mark Otto 254eba37b2 Merge pull request #8097 from burnsra/3.0.0-wip-addons
Set validation states also for addons
2013-06-08 20:15:30 -07:00
Mark Otto eb21410cc8 add new grid subnav link 2013-06-08 18:36:29 -02:30
Mark Otto 441bbe1998 Another grid update
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
William Ghelfi df5ddeb7cc Set validation states also for addons 2013-06-06 21:00:32 -04:00
Mladen Plavsic 232c03dc2f Update css.html
Missing word "in" in "Someone famous in Source Title"
2013-06-05 13:59:13 +03:00
Mark Otto b1cc11cd98 reverse order of grid column examples for dual grid section 2013-06-04 21:55:59 -07:00
Mark Otto 567b8b5631 fix docs highlighting of grid 2013-06-03 21:58:58 -07:00
Mark Otto 245ebda651 nuke the .col 2013-06-03 21:57:51 -07:00
Mark Otto 45c5b4e45c restore .col-*-12 classes for now 2013-06-03 21:51:35 -07:00
Mark Otto 286955167a prep for less 1.4 with double parens in functions 2013-06-03 21:48:52 -07:00
Mark Otto a05f6d4cea fixes #8066: add missing % functions to grid less code 2013-06-03 11:58:38 -07:00
Mark Otto e5bdb2497e fixes #8062: correct link to editorconfig website 2013-06-03 11:55:55 -07:00
Mark Otto 1b8cd2d8eb Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 15:51:35 -07:00
Mark Otto 2f70477621 fixes #8059: update navbar responsive break variable 2013-06-02 15:51:28 -07:00
Mark Otto 21441f1292 Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up 2013-06-02 15:33:42 -07:00
Mark Otto e787e5fc68 Merge pull request #8058 from burnsra/3.0.0-wip-navbar-toggle
Fix navbar toggles
2013-06-02 15:30:28 -07:00
Mark Otto 4e4e75d4ac homepage url change to go with it for v3 2013-06-02 15:26:10 -07:00
Mark Otto 05be4de8b8 fixes #7915: add issues link to composer 2013-06-02 15:25:19 -07:00
Mark Otto 56d6fea45e fixes #7018: authors, not author, in composer 2013-06-02 15:22:53 -07:00
Robert Burns 97e6e5f150 Fix navbar toggles 2013-06-02 17:51:36 -04:00
Mark Otto 4fa1e729f0 Merge pull request #8050 from sindresorhus/patch-1
Rename component.json to bower.json
2013-06-02 14:40:42 -07:00
Mark Otto bd170e8366 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 14:08:50 -07:00
Mark Otto ddf95c91db Merge pull request #8057 from burnsra/3.0.0-wip-getting-started
Fix layout for examples in getting-started
2013-06-02 14:08:21 -07:00
Mark Otto b5095d3e8a Merge pull request #8046 from burnsra/3.0.0-wip-carousel
Fix for carousel indicators
2013-06-02 13:48:18 -07:00
Mark Otto 19d0726609 Grid updates
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Robert Burns 19ce707a00 Fix layout for examples in getting-started 2013-06-02 15:52:51 -04:00
Mark Otto b62fa23d9a Merge pull request #8006 from aristath/3.0.0-wip
using screen-size variables for grids
2013-06-02 11:58:30 -07:00
Mark Otto 75db70a6c2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 11:57:28 -07:00
Sindre Sorhus ab6dd6e76e Rename component.json to bower.json
That's the new name of the Bower metafile.
2013-06-01 22:59:13 +02:00
Robert Burns cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04:00
Mark Otto a4c1248ca0 Merge pull request #8022 from ecentinela/3.0.0-wip
Remove form-actions-bg
2013-05-30 13:49:53 -07:00
Javier Martinez Fernandez c89a6edf09 Remove form-actions-bg
If form-actions has been removed, this variable is no needed anymore.
2013-05-29 22:09:33 +03:00
fat f5ce66177b fix event binding in modal.js 2013-05-29 11:24:00 -04:00
Mark Otto 8899c30f16 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-27 19:23:17 -07:00
Aristeides Stathopoulos 6fda25b4c1 Adding variables for container sizes 2013-05-27 23:00:39 +03:00
fat a7a87c8e8c rebuild 2013-05-27 12:48:16 -07:00
fat 9257bdc097 fixes #7163 2013-05-27 12:45:13 -07:00
Aristeides Stathopoulos 2b088ef44e using screen-size variables for grids 2013-05-27 19:33:14 +03:00
Ivan Khalopik 3285f4c306 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
	js/bootstrap-collapse.js
2013-05-27 11:06:31 +03:00
Jan Škrášek 33b5c32c8c Fixed mixin btn-pseudo-state background for [disabled] buttons 2013-05-26 18:14:25 +02:00
Mark Otto 60575dfb46 Gradients refactor
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
Jacob Thornton 7cbb1c0452 add data-ride=carousel support for starting carousel on load 2013-05-25 00:16:52 -07:00
Jacob Thornton e424b3879c fixes #4781 2013-05-24 23:53:44 -07:00
Jacob Thornton f3e45c3778 add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things 2013-05-24 23:15:04 -07:00
Mark Otto 5ea070bdf6 Merge branch '3.0.0-wip' of https://github.com/hppycoder/bootstrap into hppycoder-3.0.0-wip 2013-05-24 21:18:07 -07:00
Mark Otto f820de4b32 Merge pull request #7980 from burnsra/3.0.0-wip
Use base padding for input-group-addon class
2013-05-24 20:55:58 -07:00
Robert Burns 79666385f7 Use base padding for input-group-addon class 2013-05-24 08:14:11 -04:00
Mark Otto 3160bd872e rearrange customizer content 2013-05-23 21:34:32 -07:00
Mark Otto 371d14e217 Remove commented out code and properly nest CSS again for .collapse 2013-05-23 21:06:02 -07:00
Mark Otto a3cba92edd rejigger the customizer layout 2013-05-22 23:45:12 -07:00
Mark Otto acc0875259 fix up customizer js and classes; turn buttons into real buttons 2013-05-22 23:34:28 -07:00
Mark Otto 432d417ade fixes #6898: typo in modal test 2013-05-22 23:17:39 -07:00
Mark Otto 9868d9403c Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-22 21:51:54 -07:00
Mark Otto cdcc3e8768 delete customize layout since it's no longer in use 2013-05-22 21:50:25 -07:00
Mark Otto 41d2b707ed Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into 3.0.0-wip 2013-05-22 21:48:35 -07:00
Julian Thilo 52a348aa3f Bring the customizer up to speed
I reworked the customizer to match the new docs layout and include all
newly added variables, etc.
Would be glad to keep an eye on Customize and update it as v3 changes.
Help blocks in my new version need some more work, too, so this is just
a basis.
2013-05-23 02:30:58 +02:00
fat e7b4fedee8 remove 3rd arg from $.each call 2013-05-22 15:18:30 -07:00
Mark Otto bb9d867cf8 remove make gh-pages command 2013-05-21 19:56:25 -07:00
Jacob Thornton 7cbec6e89a remove jszip files 2013-05-21 19:33:57 -07:00
Jacob Thornton ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
Mark Otto 59010184cb Merge pull request #7945 from AJ-Acevedo/fix
Fixed broken Customizer link for docs
2013-05-21 14:44:29 -07:00
Mark Otto ddbfe4af7a Fixes #7943: typo in makefile 2013-05-21 14:43:12 -07:00
Chad Smith c47d9932cb Found editor spacing issues with tabs instead of spaces, formatting to fit the entrance criteria 2013-05-21 16:29:35 -04:00
Chad Smith 230d6de88a Vertical gradients now can have percentages passed in as arguments to allow finer control over the backgrounds it produces 2013-05-21 16:25:59 -04:00
AJ Acevedo 9a2218dd38 Fixed broken Customizer link for docs 2013-05-21 02:23:19 -04:00
Mark Otto 930913e0a0 Back to getbootstrap.dev for jekyll 2013-05-20 10:45:01 -07:00
Mark Otto 554c24d9ae Update contributing file
* Remove notes on repo section
* Update hirearchy of coding standards sections
2013-05-20 00:33:08 -07:00
Mark Otto 13a4fb678b Refactor readme to include directions on running jekyll locally 2013-05-20 00:25:41 -07:00
Mark Otto 0c167a1d9d Fixes #7474: Use @input-height-base in .navbar-vertical-align() for .navbar-form 2013-05-19 22:12:48 -07:00
Mark Otto 35573db810 Fixes #7611: fix optgroup formatting for Firefox 2013-05-19 22:06:10 -07:00
Mark Otto 5f7352a6fe Better grid template; link color change in docs navbar 2013-05-16 22:11:31 -07:00
Mark Otto 5fbb9e9f5d More row change ups:
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Mark Otto e94e5e8b40 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:54:14 -07:00
Mark Otto c0f5a0775d Run make on latest JS 2013-05-16 20:54:06 -07:00
Mark Otto 9762f95bde Change up link alerts
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00
fat abc49c729b update js docs 2013-05-16 20:42:31 -07:00
Mark Otto 0f4b4acce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:32:37 -07:00
Mark Otto 8a3e982305 Fix broke dropdown navbar example 2013-05-16 20:29:50 -07:00
fat 2433a076ac Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 20:20:27 -07:00
fat 140ef2320b change namespace back to dot notation and someother js shizzle 2013-05-16 20:19:51 -07:00
Mark Otto 5dd6dbd624 Nuke rem font-size mixin 2013-05-16 20:18:03 -07:00
Mark Otto 1983ca03ec Form validation and horizontal row update
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
2013-05-16 20:17:42 -07:00
Mark Otto 55a1416789 remove prettyprint js mention 2013-05-16 20:07:48 -07:00
Mark Otto af0b9cb41a Simple responsive utilities test css 2013-05-16 20:07:41 -07:00
Mark Otto e5d6a40a77 Redo the responsive utilities stuff
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
2013-05-16 19:13:58 -07:00
Mark Otto bdd5022833 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 18:46:19 -07:00
Mark Otto c73588b313 Drop .form-actions 2013-05-16 18:46:12 -07:00
fat 5ab72f7687 fix tooltip defaults 2013-05-16 18:45:53 -07:00
Mark Otto d2b588b10e nuke unfinished readme section 2013-05-16 18:38:09 -07:00
Mark Otto 94dec1bbd2 Update readme link to Bower per #7790 2013-05-16 18:37:00 -07:00
fat e74110bf4a Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-16 18:35:18 -07:00
fat c072b6b2fc remove dumb assets update makefile wassup 2013-05-16 18:34:51 -07:00
Mark Otto d8b749a4d3 Fix z-index of carousel indicators 2013-05-16 18:29:53 -07:00
fat b239542a5e carousel bug with data 2013-05-16 18:21:42 -07:00
fat f37b351288 only overlay dropdowns for mobile 2013-05-16 18:15:34 -07:00
fat a72d0d6e3a fix tests 2013-05-16 17:44:50 -07:00
fat 19de2e8603 add bs- prefix to tooltip 2013-05-16 17:19:23 -07:00
fat 149ecd21bf straight trash wang 2013-05-16 17:18:15 -07:00
Mark Otto 53bc93282f nuke that docs _site folder 2013-05-16 13:46:12 -07:00
fat 92245e8bc7 change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click 2013-05-16 12:50:06 -07:00
fat bdbd268cb9 update collapse js style 2013-05-16 11:20:18 -07:00
fat a4c16155a2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html
2013-05-16 11:08:46 -07:00
fat 14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00
Mark Otto f3d8577734 Run make on previous commit; twerk box shadow back to commented out version 2013-05-15 10:16:11 -07:00
Mark Otto bae9d8adf0 Merge pull request #7897 from voodoom/outline-fix
#7896: Outline fix
2013-05-15 10:14:21 -07:00
Mark Otto 6307dc40d7 Fixes #7898: ensure button type
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
m.seegmüller 6289e24f66 Fixed ugly outline in select fields
Removes .tab-focus() on select-fields
2013-05-15 16:14:44 +02:00
m.seegmüller 7780133c1c Fixed ugly outline
Removes outline (especially on select-elements in firefox)
2013-05-15 15:44:28 +02:00
Mark Otto 31dcb91189 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00
Mark Otto 57856e6cfb Merge pull request #7877 from burnsra/3.0.0-wip-form-inline
Cleanup form-inline examples in docs
2013-05-14 23:26:35 -07:00
Mark Otto fcb7c9da6f Fixes #7878: .col-span-* mentions to .col-lg-* 2013-05-14 23:24:29 -07:00
Mark Otto 28a081cb20 Overhaul form control and button sizing, and some type styles
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto a41d566d5e margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop) 2013-05-14 22:08:56 -07:00
Mark Otto e56c809492 refined navbar styles in docs 2013-05-14 22:08:32 -07:00
Mark Otto 7e674efa22 outdent the file list 2013-05-14 22:00:08 -07:00
Mark Otto 0ac1af13d3 Merge pull request #7882 from juthilo/3.0.0-wip
Cleaning the navbar docs
2013-05-14 19:43:59 -07:00
Mark Otto e23f661f3f Fixes #7885 and #7886: only right align horizontal form labels when above 768px 2013-05-14 18:59:13 -07:00
Mark Otto 1d8ff36afa Add .panel-footer 2013-05-14 18:55:37 -07:00
Julian Thilo cd2d7b5d17 add detail to navbar component alignment section
* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
2013-05-14 22:42:06 +02:00
Julian Thilo 9af88380c4 .navbar docs: update -fixed-* callouts, fix -link
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
2013-05-14 22:31:15 +02:00
Robert Burns 45f62f9589 Cleanup form-inline examples in docs 2013-05-14 08:33:49 -04:00
Mark Otto 8544ef8734 Merge pull request #7874 from burnsra/3.0.0-wip-form-examples
Fix glyphicon in "Dropdown in a button group" example
2013-05-13 19:15:05 -07:00
Robert Burns da9cf1009b Fix glyphicon in "Dropdown in a button group" example 2013-05-13 21:40:48 -04:00
Mark Otto 5ebd6a4966 Merge pull request #7872 from burnsra/3.0.0-wip-caret
Fix caret position
2013-05-13 17:21:05 -07:00
Robert Burns a38a3429fc Fix caret position 2013-05-13 20:03:53 -04:00
Mark Otto 8ae6256262 Merge pull request #7866 from marsuboss/patch-3
Fix
2013-05-13 12:02:32 -07:00
marsuboss 4eeebe7e06 Fix 2013-05-13 15:50:02 +03:00
Mark Otto 37898d5e19 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-13 00:09:35 -07:00
Mark Otto 2c6e854eea fix broken responsive utilities table 2013-05-12 23:54:10 -07:00
Mark Otto dd7bb71554 spacing 2013-05-12 21:00:37 -07:00
Mark Otto 2093635de1 Merge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3.0.0-wip 2013-05-12 20:57:07 -07:00
Mark Otto e9f42ecfda Merge pull request #7861 from burnsra/3.0.0-wip
Couple of fixes for docs and examples
2013-05-12 19:20:55 -07:00
Robert Burns d4546cbcc2 Fix buttons within examples 2013-05-12 22:04:22 -04:00
Robert Burns 046d82f0ef Fix invalid input within docs 2013-05-12 22:04:01 -04:00
Mark Otto 79a4269430 Fix navbar button docs 2013-05-12 16:34:12 -07:00
Mark Otto 41a76e8e7a Less specific dropdown styles, change up navbar dropdown styles 2013-05-12 16:30:54 -07:00
Mark Otto 09098a7923 run make on last commit 2013-05-12 16:13:51 -07:00
Mark Otto da4e7ab15c fix broke example 2013-05-12 16:13:39 -07:00
Mark Otto 37c1122ded Consolidate active dropdown toggle styles and comment out the rest 2013-05-12 16:12:13 -07:00
Mark Otto 2d10d61fde Restore commented out dropdown styles, get open dropdown state working again 2013-05-12 16:03:56 -07:00
Mark Otto 92adcfabb5 Start some nav and dropdown cleanup
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place  on all
* Use  on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
2013-05-12 15:47:18 -07:00
Vinay Raghu ca5685c1f8 Timestamp correction 2 2013-05-12 12:25:56 +05:30
Vinay Raghu 3b6b9b3fa6 Timestamp correction 2013-05-12 12:25:47 +05:30
Vinay Raghu 23b32fec65 Recompiled using makefile recess 2013-12-05 01:36:19 +05:30
Mark Otto 184018837b Merge pull request #7851 from blakeembrey/input-group-btn-radius
[v3] Fix the selectors for the .input-group-btn class
2013-05-11 12:25:46 -07:00
Blake Embrey 60c24ddd97 Fix the selectors for the .input-group-btn selector. 2013-05-11 09:38:48 -07:00
Vinay Raghu 9880f7c803 Changed Responsive utilities section in docs/css.html 2013-05-11 19:34:59 +05:30
Vinay Raghu 5e13f57870 Changed Screen Notations on responsive-utilities.less and recompiled the stylesheet 2013-05-11 19:28:59 +05:30
Mark Otto 8051695c87 Merge pull request #7838 from blakeembrey/btn-group-radius
Remove the overrides and resets from button groups
2013-05-10 16:35:25 -07:00
Mark Otto 76ecfdfdc1 Font-size and line-height tweaks
* Use 1.428 for line-height instead of 1.5
* Use  function for full pixel values instead of decimals
2013-05-10 10:33:35 -07:00
Mark Otto 8261866ff2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-10 10:31:52 -07:00
Mark Otto 758cb9d186 twerk nested nav links 2013-05-10 10:29:54 -07:00
Mark Otto 6dee7d5abe Merge pull request #7845 from aricketson/3.0.0-wip
Fix component margin and padding values to use @line-height-computed
2013-05-10 10:05:58 -07:00
Mark Otto 231318e757 Merge pull request #7843 from burnsra/3.0.0-wip
Fix link to examples
2013-05-10 10:04:32 -07:00
Aaron 94cc333553 Fix component margin and padding values to use @line-height-computed 2013-05-10 09:21:27 -06:00
Robert Burns 3af1dd1dc8 Fix link to examples 2013-05-10 07:37:14 -04:00
Mark Otto e34abd02cc redo docs footer a bit 2013-05-09 17:36:02 -07:00
Mark Otto 562483b907 more nav twerks for getting started page 2013-05-09 17:32:39 -07:00
Mark Otto dbbd48f7bc remove duplicate text scaling 2013-05-09 17:29:07 -07:00
Mark Otto 90e4ff73d2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/forms.less
2013-05-09 17:22:48 -07:00
Mark Otto a19fda699d update reference to value of base line-height 2013-05-09 17:21:18 -07:00
Mark Otto 6fba68eb8b Unitless line-height
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
2013-05-09 17:20:46 -07:00
Blake Embrey 579d566299 Update button groups to use not selector and remove redundant CSS. 2013-05-09 16:53:28 -07:00
Mark Otto 7b6352d2cf Fix up navbar forms by using inline form as a mixin; fix docs for those 2013-05-09 16:41:35 -07:00
Mark Otto 3c72b1e9a0 remove the input from an example 2013-05-09 16:31:10 -07:00
Mark Otto 1fdfee8de0 Merge pull request #7837 from blakeembrey/input-group-radius
Remove input-group border radius resets
2013-05-09 16:30:48 -07:00
Mark Otto 293a3baca3 More forms overhaul
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
2013-05-09 15:05:06 -07:00
Blake Embrey 9716b73f67 Make the border-radius on input-groups to be overrides instead of resets on every size. 2013-05-09 14:48:27 -07:00
Mark Otto 7a7971d6db subnav for icons section 2013-05-09 14:08:06 -07:00
Mark Otto 8f9cc5ae81 Merge pull request #7836 from blakeembrey/icon-antialias
Make icons antialiased on Webkit browsers
2013-05-09 13:59:18 -07:00
Blake Embrey 4a03d45651 Make icons antialiased on Webkit browsers. 2013-05-09 13:48:02 -07:00
Mark Otto d5e6bbba27 fix some broke buttons on the js page 2013-05-09 13:28:05 -07:00
Mark Otto ec39bed94f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-09 13:19:38 -07:00
Mark Otto 1d6971dc2b Merge pull request #7835 from blakeembrey/progress-bars
Remove backface-visibility from progress bars
2013-05-09 13:18:39 -07:00
Mark Otto 88a4712540 fix broken buttons on css docs 2013-05-09 13:12:40 -07:00
Blake Embrey cc5e6619b4 Remove backface-visibility from progress bars. 2013-05-09 13:09:33 -07:00
Mark Otto 7fa6ae578b Update getting started page 2013-05-09 11:40:39 -07:00
Mark Otto 25b6df9944 rename welcome to getting started 2013-05-09 11:20:15 -07:00
Mark Otto 7c94f5ef64 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-09 09:22:58 -07:00
Mark Otto 751eb0bdcc Fixes #7823: add mention of container to CSS page; build out CSS overview subnav 2013-05-09 09:22:49 -07:00
Mark Otto 217ac7b7b7 Merge pull request #7824 from burnsra/3.0.0-wip-examples
Fix form in navbar
2013-05-09 09:14:31 -07:00
Mark Otto d731690352 remove lingering typeahead reference in makefile 2013-05-09 09:09:44 -07:00
Robert Burns 3a539abbd2 Fix form in navbar 2013-05-09 07:21:22 -04:00
Mark Otto 766be659c1 .bs-docs-sidenote to .bs-callout 2013-05-08 22:58:54 -07:00
Mark Otto 526dfb7735 .bs-docs-tooltip-examples to .bs-example-tooltips 2013-05-08 22:57:42 -07:00
Mark Otto 09c3a4b3bc .bs-docs-example to .bs-example 2013-05-08 22:56:29 -07:00
Mark Otto ac28ad81d0 .bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer 2013-05-08 22:55:17 -07:00
Mark Otto 705063c73a .bs-docs-social-* to .bs-social-* 2013-05-08 22:54:25 -07:00
Mark Otto 22f212379f nuke stuff from customizer 2013-05-08 22:53:31 -07:00
Mark Otto 3c3e56ca50 .bs-docs-top to .bs-top 2013-05-08 22:52:48 -07:00
Mark Otto e5e5f6616c .bs-docs-header to .bs-header 2013-05-08 22:51:44 -07:00
Mark Otto 67b7a2fc34 docs css reorg 2013-05-08 22:50:41 -07:00
Mark Otto d7acf4e82d more work on the sidenav, including small css refactor and new classes 2013-05-08 22:42:42 -07:00
Mark Otto f09b07dc2a more navbar and header tweaks 2013-05-08 22:31:49 -07:00
Mark Otto fa4d4e8d88 new docs page headers 2013-05-08 22:29:53 -07:00
Mark Otto 241d342363 red navbar for docs 2013-05-08 22:24:07 -07:00
Mark Otto 65289bb1ea make restored top navbar collapsable 2013-05-08 22:17:26 -07:00
Mark Otto feeaaa6feb refactor homepage jumbotron masthead doodad 2013-05-08 22:13:56 -07:00
Mark Otto 07aed1abc3 move social buttons to separate include 2013-05-08 22:07:28 -07:00
Mark Otto edb733ebc7 Super massive docs overhaul
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto 88dd9de9ba Drop typeahead.js--instead try Twitter's typeahead plugin 2013-05-08 20:04:54 -07:00
Mark Otto 54561f1121 hide entire navbar in print views 2013-05-08 19:57:42 -07:00
Mark Otto 1cb880b4f1 Fixes #7816: revert negative margin on .navbar-nav 2013-05-08 19:55:20 -07:00
Mark Otto 509f2244da Merge pull request #7809 from twitter/bs3_adding_btn_default
BS3: Require .btn-default for all standard buttons
2013-05-08 11:47:43 -07:00
William Ghelfi 7090eb0061 Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example 2013-05-08 14:26:55 +02:00
William Ghelfi 9013ff002a add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
Mark Otto f03d337151 indentation fix 2013-05-07 23:43:51 -07:00
Mark Otto c459c657f8 Update forms
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
2013-05-07 21:56:55 -07:00
Mark Otto c0e23ad27b nuke the unused navbar that was leftover 2013-05-07 20:48:37 -07:00
Mark Otto 86598cac6b Fixes #7796: change @list-group-active-text to @list-group-active-color 2013-05-07 20:01:57 -07:00
Mark Otto d7f84d1220 Require .btn-default for regular buttons
* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
2013-05-07 18:07:06 -07:00
Mark Otto ad5f88e1c5 Update config after updating to jekyll 1.0.1 2013-05-07 18:03:32 -07:00
Mark Otto 79dac4b77a Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-07 10:33:49 -07:00
Mark Otto f06294d80f Outdent nav links a bit more so they line up in navbar 2013-05-07 10:33:41 -07:00
Mark Otto bb307243de Merge pull request #7806 from koenpunt/patch-1
Updated URL for jekyll installation
2013-05-07 09:13:48 -07:00
Koen Punt 739ef39050 Updated URL for jekyll installation 2013-05-07 15:20:28 +03:00
Ivan Khalopik 3c7a43a1f3 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
	js/tests/unit/bootstrap-collapse.js
2013-05-07 15:16:45 +03:00
Mark Otto b352f98f32 Merge pull request #7798 from mediafreakch/3.0.0-wip
fixed not working example code for modals
2013-05-06 23:44:12 -07:00
William Ghelfi 01d0cf22ab add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-06 15:58:18 +02:00
Edgar Schnueriger 240305321f fixed not working example code for modals 2013-05-06 09:48:05 +02:00
Mark Otto 716c869b89 correct right nav in navbar examples 2013-05-04 15:00:59 -07:00
Mark Otto 49da7d8020 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-04 13:11:31 -07:00
Mark Otto dcf7cc084d Fixes #7783: nuke bottom margin on fixed-bottom-navbar 2013-05-04 13:11:20 -07:00
Mark Otto d0e79a36d5 Merge pull request #7782 from cvrebert/patch-1
use @screen-small var in grid.less
2013-05-04 13:09:53 -07:00
Chris Rebert e0b9b86d32 use @screen-small var in grid.less
Per comment by @nextgenthemes on/in cd06c5baac
2013-05-03 17:38:58 -07:00
Mark Otto c3b9ac4676 Merge pull request #7621 from jeremydenoun/patch-1
Fix flickering on progress bar width update
2013-05-03 17:32:54 -07:00
Mark Otto 7d41a38769 Fixes #7511: add support for nested button groups so you can use dropdowns in your button groups 2013-05-03 16:16:26 -07:00
Mark Otto ee0789ff8f Fixes #7721: change @navbar-text to @navbar-color, along with inverse options 2013-05-03 15:29:32 -07:00
Mark Otto a6f7f96a93 recompile after last justified nav tweaks 2013-05-03 15:29:10 -07:00
Mark Otto 4357ed72e0 Update justified nav CSS for proper selectors 2013-05-03 15:18:27 -07:00
Mark Otto 747e108e0b Merge pull request #7670 from DarDar/3.0.0-wip
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-03 15:05:29 -07:00
Mark Otto af4a33f8c0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:57:07 -07:00
Mark Otto e1d947f53e Scope .table-bordered styles to immediate children only 2013-05-03 14:56:57 -07:00
Mark Otto 9d9fd5e0d1 remove .fade from static modal example, but include in code snippet 2013-05-03 14:46:09 -07:00
Mark Otto 0959a78ff1 Merge pull request #7769 from holic/3.0.0-sticky-footer
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Mark Otto 7cceaa6956 Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
Conflicts:
	docs/docs.html
2013-05-03 14:13:06 -07:00
Mark Otto 14861e9cc3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:11:23 -07:00
Mark Otto b5d68f59c2 Add cursor: pointer; to .checkbox and .radio and their inline counterparts 2013-05-03 11:56:00 -07:00
Mark Otto b0bd5899c5 Merge pull request #7762 from sethlilly/3.0.0-wip
Corrected typo in carousel.html
2013-05-03 11:21:13 -07:00
Mark Otto 77102dd2e4 Merge pull request #7770 from holic/3.0.0-input-border-transition
Fix input border flicker in Chrome
2013-05-03 10:59:52 -07:00
Mark Otto 1587b8948f run make on previous commits 2013-05-03 10:53:26 -07:00
Mark Otto e1c67b149f More navbar CSS and docs cleanup
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
2013-05-02 23:13:43 -07:00
Mark Otto 94792b9dae Improve buttons in navbars
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
2013-05-02 23:05:09 -07:00
Mark Otto 23ae6405f5 delete lingering navbar dividers code since we nuked that awhile back 2013-05-02 22:58:30 -07:00
Mark Otto bec8c90fd7 Cleanup .navbar-form styles
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
Mark Otto a4f2c9e156 add customizer link to docs homepage 2013-05-02 22:44:43 -07:00
Kevin Ingersoll 08fea3304a Fix input border flicker in Chrome from @garoevans, closes #7689 2013-05-03 15:33:12 +12:00
Kevin Ingersoll 07117f97b6 Use padding instead of #push with box-sizing: border-box 2013-05-03 15:23:10 +12:00
Seth Lilly a62e97091c Corrected typo in carousel.html
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
DarDar 9cd3a92713 Use @font-size-... variables instead of hardcoded font-size in px 2013-05-02 08:05:00 +02:00
Mark Otto c63b793a0d Merge pull request #7750 from hppycoder/3.0.0-wip
Updating the README.md to fix the link to Bower
2013-05-01 11:50:29 -07:00
Chad Smith 9237b25300 Updating the README.md to fix the link to Bower 2013-05-01 13:47:52 -04:00
Mark Otto f8fd524def add the fade class to the default modal docs 2013-04-30 19:55:02 -07:00
Mark Otto 47155e8aa3 outdent the rows for tablets and above 2013-04-30 19:35:52 -07:00
Mark Otto 0780faad45 make that left/right padding, not top/bottom on navbar 2013-04-30 19:20:41 -07:00
Mark Otto 69f5447afa add back bottom margin to navbars 2013-04-30 19:12:48 -07:00
Mark Otto e8b7318646 no need for zero padding on navbar top/bottom; better comment 2013-04-30 19:07:28 -07:00
Mark Otto 6dd4cbd20b no units on 0 values 2013-04-30 19:06:30 -07:00
Mark Otto 0f17f9b7f7 Fixes #7744: update grid mixin to use latest grid styles 2013-04-30 13:03:10 -07:00
Mark Otto e67d3818ed nuke line numbers 2013-04-30 11:32:11 -07:00
Mark Otto 26bc36107e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 22:46:10 -07:00
Mark Otto e13d05317e single colon pseudo element for ie8 2013-04-28 22:45:56 -07:00
Mark Otto 0cb1188a9c Merge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs
Cleanup breadcrumb divider last item
2013-04-28 20:14:26 -07:00
Mark Otto 57564cf64c Merge pull request #7719 from burnsra/3.0.0-wip-grid-examples
Update examples after grid changes
2013-04-28 20:05:15 -07:00
Robert Burns 62afdd0176 Update examples after grid changes 2013-04-28 22:22:33 -04:00
Robert Burns 447be1b326 Cleanup breadcrumb divider last item
Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion
2013-04-28 21:51:02 -04:00
Mark Otto cd06c5baac Merge pull request #7704 from twitter/bs3_moar_grid_changes
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Mark Otto 781692ffa2 Merge pull request #7716 from burnsra/3.0.0-wip-navbar
Fix navbar-toggle after commit bbee78b30b
2013-04-28 18:42:20 -07:00
Robert Burns c087e383ed Fix navbar-toggle after commit bbee78b30b
The following commit introduced an issue with the navbar toggle placement:
https://github.com/twitter/bootstrap/commit/bbee78b30b40ff0b1473a06ea7ecf5a42d51b614
2013-04-28 20:45:42 -04:00
Mark Otto 5edfdc02f2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 14:27:58 -07:00
Mark Otto bbee78b30b derp on navbar toggle and docs positions 2013-04-28 14:27:48 -07:00
Mark Otto 227c4639e4 Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 14:26:10 -07:00
Mark Otto 1a28d50b33 Merge pull request #7712 from burnsra/3.0.0-wip-navs
Update examples after navbar overhaul
2013-04-28 14:24:49 -07:00
Robert Burns 3326e1b21e Fix navbar on phone/tablet devices after navbar overhaul 2013-04-28 10:09:57 -04:00
Robert Burns ddc0e98716 Update examples after overhaul of navbar navs 2013-04-28 09:10:01 -04:00
Mark Otto 8b3a1702d4 Overhaul navbar navs
* Switch from  to  to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Mark Otto 2ffa0e4409 Add maximum bounds variables for so our responsive utilities don't overlap 2013-04-27 11:55:45 -07:00
Kevin 9ce7f22e99 Adding media queries breakpoints variables 2013-04-27 18:47:47 +02:00
Mark Otto efd3b0c171 Back to two grid classes, .col and .col-lg-* 2013-04-26 23:59:51 -07:00
Mark Otto 8ae9c6ab34 Fixes #7688: move font-weight for glyphicons to before pseudo element 2013-04-26 23:14:06 -07:00
Mark Otto aa146582d6 Redo the getting started section to mention BootstrapCDN 2013-04-26 20:51:48 -07:00
Mark Otto 57ba494409 running make 2013-04-26 10:44:44 -07:00
Mark Otto 1fc0d2c0f1 Merge pull request #7641 from Fowowski/3.0.0-wip
more nested less rules - labels component
2013-04-25 14:51:41 -07:00
Artur Kwiatkowski 270db6f55e - changed comments
- added hover and focus state for [href] color variations
2013-04-24 14:38:53 +02:00
Stephen Edgar 8311ad513f 'docs' folder .editorconfig code guide updates 2013-04-24 14:38:51 +02:00
Stephen Edgar f40ea21a6c 'js' folder .editorconfig code guide updates 2013-04-24 14:38:50 +02:00
Stephen Edgar 22a1a7273a 'less' folder .editorconfig code guide updates 2013-04-24 14:38:49 +02:00
Stephen Edgar 75ccaadae0 'root' folder .editorconfig code guide updates 2013-04-24 14:38:49 +02:00
Mark Otto 8a3b212043 shoutout to editorconfig in readme 2013-04-24 14:38:48 +02:00
Mark Otto da4a08754a explicit callout in readme for building static assets; fixes #7632 2013-04-24 14:38:47 +02:00
Chris Rebert 159105dad3 Fixes #7661 2013-04-24 14:38:46 +02:00
Stephen Edgar ec7f2cf2b6 'root' repo end 'insert_final_newline = true' 2013-04-24 14:38:46 +02:00
Stephen Edgar 67fdb27518 Use* global rules with exceptions as needed 2013-04-24 14:38:44 +02:00
Stephen Edgar dd7249c0f1 Refined .editorconfig 2013-04-24 14:38:44 +02:00
Stephen Edgar 2eb9053d4a Include .editorconfig
http://editorconfig.org/
2013-04-24 14:38:43 +02:00
Mark Otto 3e02d127b3 Merge pull request #7664 from ntwb/editorconfig-3.0.0-wip
Editor Config (.editorconfig) Code Guide Update
2013-04-23 08:58:23 -07:00
Stephen Edgar 1a6dbc371e 'docs' folder .editorconfig code guide updates 2013-04-23 17:40:41 +10:00
Stephen Edgar 1b132ddcb4 'js' folder .editorconfig code guide updates 2013-04-23 17:34:27 +10:00
Stephen Edgar 7ebfc17028 'less' folder .editorconfig code guide updates 2013-04-23 17:30:22 +10:00
Stephen Edgar 36ed570b7d 'root' folder .editorconfig code guide updates 2013-04-23 17:27:29 +10:00
Mark Otto c81f0b5af2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-22 23:04:24 -07:00
Mark Otto a4f896ef1a shoutout to editorconfig in readme 2013-04-22 23:02:57 -07:00
Mark Otto dea134d6ee explicit callout in readme for building static assets; fixes #7632 2013-04-22 23:01:11 -07:00
Mark Otto 73793637d1 Merge branch 'ntwb-editorconfig' into 3.0.0-wip 2013-04-22 22:58:33 -07:00
Mark Otto 10a1a0af86 Merge pull request #7662 from cvrebert/less-1.4-fixes
Fixes #7661
2013-04-22 20:38:14 -07:00
Chris Rebert 269b8aa761 Fixes #7661 2013-04-22 16:11:11 -07:00
Artur Kwiatkowski 55bbb9ffd7 Nuked local .a() mixins and simplified the nesting 2013-04-22 15:34:23 +02:00
Artur Kwiatkowski b7dcefea83 Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip 2013-04-22 15:21:55 +02:00
Stephen Edgar 08de413608 'root' repo end 'insert_final_newline = true' 2013-04-22 17:19:56 +10:00
Stephen Edgar 4e9c8880f7 Use* global rules with exceptions as needed 2013-04-22 17:10:59 +10:00
Mark Otto e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto 364f8330a1 Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars 2013-04-21 18:29:06 -07:00
Mark Otto af63a4405d typo 2013-04-21 18:25:49 -07:00
Mark Otto 30d6e0530e Fixes #7577: Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly 2013-04-21 14:50:44 -07:00
Stephen Edgar 7c41b31801 Refined .editorconfig 2013-04-21 16:52:32 +10:00
Mark Otto 4b3a43e381 Fixes #7591: add .make-small-column() mixin 2013-04-20 15:54:44 -07:00
Mark Otto 2d5ab9a2de Make alerts use variables better 2013-04-20 15:47:07 -07:00
Mark Otto dc4436dbc9 Only use .danger for alerts, no more .error 2013-04-20 15:36:11 -07:00
Mark Otto 0c9b161bb8 Fixes #7093: more consistent scrollspy docs 2013-04-20 15:32:16 -07:00
Mark Otto 510c9a6ad8 First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic 2013-04-20 12:33:09 -07:00
Mark Otto 04d782efab correct grid class in example code 2013-04-20 12:29:12 -07:00
Mark Otto 70f8d77012 correct grid class mention in docs 2013-04-20 12:28:36 -07:00
Mark Otto a956a3258b Alternate docs mention of breadcrumbs separator, as called out in #7601 2013-04-20 12:23:27 -07:00
Mark Otto e60c07327b Merge branch 'reversefold-master' into 3.0.0-wip
Conflicts:
	README.md
2013-04-20 12:13:05 -07:00
Mark Otto ba7d928c37 Merge pull request #7645 from burnsra/3.0.0-wip-docs
Fix carousel examples within docs
2013-04-20 12:11:35 -07:00
Mark Otto afdab35aca Fixes #7640: only reset margin on last-child p within blockquotes 2013-04-20 12:09:08 -07:00
Mark Otto 90b195872e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-20 12:02:43 -07:00
Robert Burns ce719925af Fix carousel examples within docs 2013-04-20 13:26:18 -04:00
Artur Kwiatkowski 3861e3f5d5 replaced parametric .is() mixin with non-parametric .a() to simplify usage 2013-04-20 15:54:48 +02:00
Stephen Edgar 322fc9a6c4 Include .editorconfig
http://editorconfig.org/
2013-04-20 14:28:50 +10:00
Artur Kwiatkowski 39bb8146f8 more nested labels component 2013-04-19 21:31:55 +02:00
Mark Otto 61ea1ae909 Merge pull request #7598 from wangshishuo/3.0.0-wip
change nav's #tables-hover to #tables-hover-rows
2013-04-18 19:48:17 -07:00
Mark Otto 5c9bd1a221 Merge pull request #7608 from Fowowski/3.0.0-wip
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Mark Otto f47aa08bad Merge pull request #7629 from Boulox/dupe-table-rule
Remove dupe css rule of table element
2013-04-18 19:45:56 -07:00
Fabien 7b5fcc2c9a Remove dupe css rule of table element
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Mark Otto a8391da414 Update mixins to remove Opera prefixes on gradients; reorder rules for consistency 2013-04-18 12:46:31 -07:00
Jeremy Denoun d3e0d4a7ba update docs 2013-04-18 17:05:50 +02:00
jeremydenoun cc15c0e769 Fix flickering on progress bar width update
Issue visible on lastest version of Chrome Browser (if you update progress bar width from 100% to 0%) -> flickering appears

Fixed with addition of .backface-visibility(hidden) mixins
2013-04-18 17:44:46 +03:00
Artur Kwiatkowski 4bd6abaff2 applied @pagination-bg for .disabled state instead of hardcoded color in hex 2013-04-17 19:47:23 +02:00
Artur Kwiatkowski 67a5d8ce74 more nested pager.less 2013-04-17 17:32:48 +02:00
wangshishuo 5892cea207 change nav's #tables-hover to #tables-hover-rows 2013-04-17 12:27:30 +08:00
Justin Patrin 496f1933bb watchr should be lower-case 2013-04-16 13:07:05 -07:00
Mark Otto da35a6b437 Merge pull request #7590 from Fowowski/3.0.0-wip
more nested less rules - navs component
2013-04-16 11:32:53 -07:00
Artur Kwiatkowski dc97a1967b more nested navs 2013-04-16 16:45:51 +02:00
Mark Otto 5b38a1a357 Merge branch 'bs3_homepage' into 3.0.0-wip 2013-04-15 00:16:40 -07:00
Mark Otto 5471ce8ea3 Fixes #5256: Use > selector for better nesting of tables 2013-04-14 20:33:54 -07:00
Mark Otto ab7070bb49 change var from @table-border to @table-border-color 2013-04-14 19:45:32 -07:00
Mark Otto 02eba5e5fc center 2013-04-14 16:31:52 -07:00
Mark Otto 7dca242b5e nuke all the assets 2013-04-14 15:33:48 -07:00
Mark Otto 8d9106f2c5 nuke hidden homepage content 2013-04-14 15:32:52 -07:00
Mark Otto 0b3e9ced54 Merge branch '3.0.0-wip' into bs3_homepage 2013-04-14 13:45:10 -07:00
Mark Otto 526534f337 more copy edits to sidenotes 2013-04-14 13:01:00 -07:00
Mark Otto ccb6ac570f lighter .highlight in sidenotes as well 2013-04-14 13:00:53 -07:00
Mark Otto 0a84a7c43d shorter copy 2013-04-14 12:56:21 -07:00
Mark Otto 32761b3303 use spaces for indenting, not tabs /cc @juthilo 2013-04-14 12:54:56 -07:00
Mark Otto f78945ccc9 More contrast with code snippets in sidenotes 2013-04-14 12:54:02 -07:00
Mark Otto 5f88887c7e redo all the things 2013-04-14 12:49:35 -07:00
Julian Thilo 2b228bae60 More work on the sidenotes
* Convert more inline advices (compatibility, dependencies, ...) to
sidenotes
* Add sidenotes for:
** Note on plugin dependencies in general
** Required padding for navbar-fixed- (incl. code snippet)
* Fixed text for the small tag
2013-04-14 18:36:11 +02:00
Mark Otto f226463b05 Restore on links in dropdowns as they are randomly breaking onto new lines 2013-04-13 23:54:51 -07:00
Mark Otto 86bb3b8126 IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1) 2013-04-13 23:17:39 -07:00
Mark Otto eefddb1eab more indenting 2013-04-13 22:49:21 -07:00
Mark Otto 20259e2350 fixes #7191 and cleans up indenting some 2013-04-13 22:48:44 -07:00
Mark Otto fc8b9fb07d swap all bold p tags in sidenotes for h4s 2013-04-13 22:10:34 -07:00
Mark Otto 382a86f46e Merge branch '3.0.0-docs1' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs1 2013-04-13 21:50:17 -07:00
Mark Otto 5fbe66307f more specific comment, better placement of code 2013-04-13 21:45:21 -07:00
Julian Thilo d7bc89b433 Sidenotes instead of alerts
* I propose: make the docs rely more heavily on the new design language,
replace alerts (not the .alert examples) by sidenotes.
* Remove alert-heading class, which no longer exists in CSS.
2013-04-14 04:04:01 +02:00
Paul Tyng bec5679264 update docs bootstrap.css 2013-04-13 17:13:14 -03:00
Paul Tyng 811a79e16c override normalize.css override 2013-04-13 16:46:17 -03:00
Mark Otto ae98f1803f add modal variables and tweak padding for min-height on modal title 2013-04-12 20:56:19 -07:00
Mark Otto a96dd1bd28 Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip 2013-04-12 20:45:10 -07:00
Mark Otto 96f332578c ignore local ruby version files 2013-04-12 20:43:41 -07:00
Mark Otto 58c8c770d8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-11 20:18:22 -07:00
Mark Otto b3bb89520d add comma; more accurate code snippet 2013-04-11 20:16:20 -07:00
Mark Otto 5b7596a5b3 Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-wip 2013-04-11 20:12:53 -07:00
Mark Otto 991a353a26 Merge pull request #7539 from lucaflisi/3.0.0-wip
Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
2013-04-11 20:10:00 -07:00
Mark Otto 7acadc09db Merge pull request #7546 from CoffeeAndCode/3.0.0-wip
fixed typo in typography documentation
2013-04-11 19:54:17 -07:00
Mark Otto f05befff6d Merge pull request #7537 from ntwb/patch-1
Fix docs.html Table Row Danger CSS Class
2013-04-11 19:45:46 -07:00
Jonathan Knapp 0d70b3c54e fixed typo in typography documentation 2013-04-11 16:02:29 -03:00
lucaflisi 43b0a1287a Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
No more needed in Bootstrap 3
2013-04-11 14:01:23 +02:00
Stephen Edgar 3dc8be74fe Fix docs.html Table Row Danger CSS Class 2013-04-11 20:24:13 +10:00
Mark Otto a35b9b7d0c Merge pull request #7528 from acolchado/3.0.0-wip
[3.0.0-wip] Reordering variables that were being used before they were declared. Fixes compiler crashes.
2013-04-10 22:51:41 -07:00
Julian Thilo 78d64e97e9 Dusting the docs
* Fix some typos, grammar, sentence structure
* Fix left-over error tr class
* Remove uneditable inputs section
* Make compatibility sections stand out as sidenotes
* Make modal example scrollable on big screens, too
* Make some examples more self-explanatory
2013-04-10 19:18:04 +02:00
Agustin Colchado 7fb1c1cb89 Reordering variables that were being used before they were declared. Under some compilers (dotless & sublime 2 package), this would cause the compile to break. Variables in question were:
@dropdown-link-active-bg
@navbar-link-color
@navbar-inverse-link-color
2013-04-10 02:27:11 -07:00
Mark Otto 78df99c8bd Merge pull request #7523 from juthilo/3.0.0-wip
Fully update docs to col-...-* schema
2013-04-09 22:43:30 -07:00
Julian Thilo ece78ff086 cololol
Correct all span, push, pull, offset classes to col- schema
Fix a typo
2013-04-10 00:04:44 +02:00
Mark Otto 24f8d9e137 don't use table for label variatons 2013-04-09 10:43:37 -07:00
Mark Otto 1a546278b9 make back to top and big headings only for tablets and up 2013-04-09 10:20:50 -07:00
Mark Otto dd533aaaf0 better buttons on mobile 2013-04-09 10:16:37 -07:00
Mark Otto 5b04985722 Merge pull request #7504 from acmetech/3.0.0-wip
variable update - fixed
2013-04-08 10:16:15 -07:00
Tom Pietschker 09b97a3b95 hopefully fixed messed up stylesheet... 2013-04-08 08:46:12 -04:00
Tom Pietschker bd789ed158 Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip 2013-04-08 08:39:22 -04:00
Mark Otto c2a35f1ec8 Merge pull request #7148 from retlehs/3.0.0-wip
Remove -webkit-backface-visibility on skew mixin
2013-04-07 23:01:28 -07:00
Mark Otto 92977fb13e fixes #7503: don't do dat 2013-04-07 22:58:16 -07:00
Tom Pietschker a05ff7e507 rename btn bg variables so that they are consistent with the other variables 2013-04-07 17:52:12 -04:00
Tom Pietschker c4d8aa2b0f rename the navbar-inverse-brand variables for consistency 2013-04-07 17:47:53 -04:00
Mark Otto cfea6d295e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-07 11:49:53 -07:00
Mark Otto fedf4c5677 Merge pull request #7500 from JamieKnight/patch-3
Update docs to add warning about accessibility implications of using icons without any text
2013-04-07 11:46:23 -07:00
Mark Otto 7ff40635d4 fixes #7497: use var for jumbotron border radius 2013-04-07 11:44:17 -07:00
Jamie Knight c78c66527d Update docs.html
Added heads up regarding lone icons providing accessibility issues for screen readers.
2013-04-07 16:25:00 +02:00
Mark Otto 647e930e49 Merge pull request #7495 from philfreo/3.0.0-wip
Fix typo in docs
2013-04-06 22:33:44 -07:00
Phil Freo 06a4bb38c0 Fix typo in docs 2013-04-06 21:02:24 -07:00
Garvin 05710e10f7 Added min-height to modal-header for modals with no header text 2013-04-06 21:48:53 -04:00
Mark Otto 330e9b16c2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-05 11:47:12 -07:00
Mark Otto 7a8d071735 use font-size-base var 2013-04-05 11:42:29 -07:00
Mark Otto b99c170ef7 Merge pull request #7469 from apotropaic/3.0.0-wip
updated docs, changed out span* for col-span-*
2013-04-03 11:51:42 -07:00
Andrew Scofied c1ab200985 updated docs, changed out span* for col-span-* 2013-04-03 09:48:39 -07:00
Mark Otto eadfa59d92 Add small grid for phones and tablets 2013-04-02 19:40:43 -07:00
Mark Otto 610eb8fb78 sidenote edit under customization section 2013-04-02 18:02:53 -07:00
Mark Otto c570ae49ef fix that sidenav 2013-04-02 16:22:42 -07:00
Mark Otto 0ac711059b refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first 2013-04-02 16:17:04 -07:00
Mark Otto 0f51a750a8 Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix 2013-04-02 14:49:42 -07:00
Mark Otto 2cd34a1a85 Fixes #7462: add radial-gradient spec to mixin 2013-04-02 14:48:45 -07:00
Mark Otto 54b2a0b541 Merge pull request #7453 from burnsra/3.0.0-wip-nav
Fix responsive view for inverted navbar example
2013-04-02 08:44:25 -07:00
Fabien e56461fbd7 Improve responsiveness for tablet and below of navbar in carousel example
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien 8f99692f56 remove unused img from previous commit 2013-04-02 13:31:15 +02:00
Fabien e0bce6af12 Replace png img by holder.js in carousel example 2013-04-02 13:30:13 +02:00
Fabien aa51a36686 Fix corss link for sticky footer 2013-04-02 13:26:35 +02:00
Fabien 9ecc43d21a Fix link to navbar doc 2013-04-02 13:22:31 +02:00
Robert Burns 3233155bb4 Fix responsive view for inverted navbar example 2013-04-01 22:02:35 -04:00
Mark Otto 7e31bea114 run make 2013-04-01 13:25:51 -07:00
Mark Otto 12f043f1bb Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel 2013-04-01 13:17:31 -07:00
Mark Otto 292734d7f3 Docs examples update
* Remove unused fluid image
* Add image, link, and description for new grid example
* Update sign in example image
2013-04-01 13:14:39 -07:00
Mark Otto eac987c0d2 only negative indent nested grid rows; add new grid example 2013-04-01 12:55:48 -07:00
Mark Otto a0726e605f add type attr 2013-04-01 12:10:53 -07:00
Mark Otto e6d6fcffb0 button for navbar toggle 2013-04-01 12:09:49 -07:00
Mark Otto 93db7c2c74 more link fixing 2013-04-01 11:14:11 -07:00
Mark Otto c231dba7ee updated links on homepage 2013-04-01 11:10:56 -07:00
Robert Burns 89bbeec898 Additional cleanup to responsive navbar 2013-04-01 12:58:40 -04:00
Robert Burns 1816483baa Add carousel indicators to example 2013-04-01 09:29:43 -04:00
Robert Burns e183dd46a2 Update carousel-caption btn styles 2013-04-01 09:27:49 -04:00
Mark Otto 19d5e61668 clearer separation with section headers; simpler customizing copy 2013-04-01 00:34:58 -07:00
Mark Otto 7bee10a5ef oops, restore customizer 2013-04-01 00:11:47 -07:00
Mark Otto 9df6dc81b5 bring in customizing bootstrap section from old gist 2013-04-01 00:02:51 -07:00
Mark Otto d8b3e48e14 add proper markup to list group in panels section 2013-03-31 22:58:01 -07:00
Mark Otto 2f8deea95a add .panel-primary 2013-03-31 22:22:52 -07:00
Mark Otto 0fbfa167e1 fix text class in docs 2013-03-31 19:55:05 -07:00
Mark Otto 3365d4a06a Merge branch '3.0.0-wip-fixes' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-fixes 2013-03-31 19:28:27 -07:00
Mark Otto c69310153e Fixes #7438: remove max-height from justified nav tabs with some CSS wankery 2013-03-31 19:26:40 -07:00
Robert Burns d299ff4fce Fix image paths and carousel controls for carousel example 2013-03-31 21:47:02 -04:00
Mark Otto 4c49458336 remove text-rendering optimizeLegibility from headings 2013-03-31 18:40:07 -07:00
Mark Otto 8e59357bc5 Merge branch 'SBoudrias-patch-1' into 3.0.0-wip
Conflicts:
	less/type.less
2013-03-31 18:39:49 -07:00
Mark Otto db284a97d6 more consistent navbar vars 2013-03-31 17:56:31 -07:00
Mark Otto 4cbefa1179 remove unused responsive navbar vars 2013-03-31 17:37:28 -07:00
Mark Otto 0441bbba42 more consisten dropdown vars 2013-03-31 17:36:23 -07:00
Mark Otto 896ee79473 more consistent forms vars; drop search border radius since no more search form 2013-03-31 17:33:55 -07:00
Mark Otto 8b9d488377 more consistent btn vars 2013-03-31 17:32:45 -07:00
Mark Otto b7fa0d3434 -background to -bg for body and table vars 2013-03-31 17:29:05 -07:00
Mark Otto d6f37f3c56 @link-color-hover to @link-hover-color 2013-03-31 17:27:22 -07:00
Mark Otto 376bd20b3a -background to -bg on wells vars 2013-03-31 17:25:52 -07:00
Mark Otto 52e4148302 better grid var comments 2013-03-31 17:25:27 -07:00
Mark Otto 626189dbfc @state-*-background to @state-*-bg vars 2013-03-31 17:24:06 -07:00
Mark Otto d5fa1d80bb use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg 2013-03-31 17:22:12 -07:00
Mark Otto 996ec4ca69 -background to -bg on pagination vars 2013-03-31 17:20:16 -07:00
Mark Otto f2e5c32936 -background to -bg on jumbotron vars 2013-03-31 17:19:47 -07:00
Mark Otto 6b23a66c29 -background to -bg on tooltip and popover vars 2013-03-31 17:19:12 -07:00
Mark Otto cf843c5cad -background to -bg on labels vars 2013-03-31 17:18:07 -07:00
Mark Otto b56371b145 active item on list group should use @component-active-bg 2013-03-31 17:17:25 -07:00
Mark Otto c5042e050e fix nav divider 2013-03-31 17:17:10 -07:00
Mark Otto 388a4c878d remove lingering rem 2013-03-31 13:20:54 -07:00
Mark Otto 5c601e7ac2 new @component-active-bg variable 2013-03-31 12:16:16 -07:00
Mark Otto 674768b177 restore px unit on @font-size-base 2013-03-31 12:00:04 -07:00
Mark Otto a2145df7c4 run make after that breadcrumbs tweak 2013-03-31 11:58:25 -07:00
Mark Otto 42b6934930 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-31 11:58:08 -07:00
Mark Otto b018513aa5 lingering nav-list use 2013-03-31 11:58:00 -07:00
Mark Otto e62f2901d0 Merge pull request #7431 from burnsra/3.0.0-wip-fixes
Cleanup items for 3.0.0
2013-03-31 11:55:48 -07:00
Mark Otto fc16e37aaa Remove the handful of rem font-sizes 2013-03-31 11:26:13 -07:00
Mark Otto b96ab36d38 add some container padding for examples 2013-03-31 11:24:31 -07:00
Robert Burns 74e06cb279 Add styles for tooltip and popover examples 2013-03-31 09:59:02 -04:00
Robert Burns a1587e2629 Remove breadcrumb divider after last element 2013-03-31 09:12:02 -04:00
Mark Otto 6c1ed5638b actually readd the padding and set it to smaller amount for narrow viewports 2013-03-30 22:54:31 -07:00
Mark Otto 70ba9a880e remove padding form sign in form example 2013-03-30 22:53:35 -07:00
Mark Otto 40f671a531 add basic back to top link via affix 2013-03-30 18:41:26 -07:00
Mark Otto e560c41ed1 simpler nav links 2013-03-30 17:06:59 -07:00
Mark Otto 6edd5f291a not quite #fff on .list-group-item-text 2013-03-30 17:00:11 -07:00
Mark Otto 1683669eaa Remove .nav-list given new .list-group 2013-03-30 16:56:49 -07:00
Mark Otto 2a9604fdd2 add list group component 2013-03-30 16:07:50 -07:00
Mark Otto 731903a175 panels subnav and links 2013-03-30 14:16:30 -07:00
Mark Otto 9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto 8d8f4e0cdd Merge pull request #7375 from thomas-mcdonald/fix-filter-gradient
Fix horizontal-three-colors to a horizontal filter gradient
2013-03-30 13:17:45 -07:00
Mark Otto 62df38586a navbar links in sidenav 2013-03-30 13:16:34 -07:00
Mark Otto 171c7feae2 navs nav links 2013-03-30 13:14:04 -07:00
Mark Otto e9dd1826be fix brok btn-dropdowns links 2013-03-30 13:12:03 -07:00
Mark Otto 9336a827c6 fix submenu docs height given border-box 2013-03-30 13:11:15 -07:00
Mark Otto bd69269426 more component nav updates 2013-03-30 13:09:56 -07:00
Mark Otto 7c3c5ed7cc Merge branch 'pickypg-patch-1' into 3.0.0-wip
Conflicts:
	less/dropdowns.less
2013-03-30 12:54:16 -07:00
Mark Otto 906ff98601 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-30 12:12:28 -07:00
Mark Otto 6ba341b2d5 Merge pull request #7428 from burnsra/3.0.0-wip-fixes
Fix path to examples to account for new layout
2013-03-30 12:11:33 -07:00
Robert Burns 501dfbe8ae Fix path to examples to account for new layout 2013-03-30 10:10:51 -04:00
Mark Otto a4901e2da8 mention responsive image and google maps 2013-03-30 01:55:39 -07:00
Mark Otto 1dcadede36 fix broke grid classes 2013-03-30 01:09:30 -07:00
Mark Otto af470f4c7b more content and nav twerks 2013-03-30 01:06:50 -07:00
Mark Otto 361c776e2b whitespace and taglines for main sections 2013-03-30 00:27:50 -07:00
Mark Otto 49ebf542a2 reorder docs 2013-03-30 00:19:05 -07:00
Mark Otto 601013ca04 drop .muted for .text-muted 2013-03-30 00:11:38 -07:00
Mark Otto 3359b8d5f6 nav change to go with that 2013-03-29 23:37:55 -07:00
Mark Otto 21d6a5933a fix buttons links 2013-03-29 23:37:43 -07:00
Mark Otto 8814125259 Add subnav support to CSS section 2013-03-29 23:33:08 -07:00
Mark Otto 23d7215dbe Modify scrollspy to add .active to all parent li items /cc @fat 2013-03-29 23:32:47 -07:00
Mark Otto 4dfc4e1022 clarify small docs 2013-03-29 22:40:42 -07:00
Mark Otto f367090671 countypo 2013-03-29 22:38:25 -07:00
Mark Otto 4ce9203f2c Merge branch '3.0.0-wip' into bs3_new_nav 2013-03-29 14:21:03 -07:00
Mark Otto 9f59648702 add link to github project on getting started section 2013-03-29 14:04:11 -07:00
Mark Otto 2ebc060795 mo padding on side nav links 2013-03-29 13:43:37 -07:00
Mark Otto d3fe506f04 clearer js instructions on how to include plugins 2013-03-29 13:43:30 -07:00
Mark Otto 3055f09a90 dat red 2013-03-29 10:45:00 -07:00
Ivan Khalopik 41c7825677 Fixes #7213 Collapse plugin does not correctly set the "collapsed" class on accordion heading links 2013-03-29 19:17:03 +03:00
Mark Otto e25ad912e2 correct page title and nuke liquid description 2013-03-28 17:20:17 -07:00
Mark Otto 384926a1d6 remove nonexistant example 2013-03-28 17:19:41 -07:00
Mark Otto b844d5dd2f Merge pull request #7409 from andriijas/3.0.0-wip-formactions
Make sure form actions are properly aligned with form-horizontal
2013-03-28 10:46:23 -07:00
Andreas Cederström 090545ffdf Make sure form actions are properly aligned with form-horizontal 2013-03-28 11:33:18 +01:00
Mark Otto 3278c40631 move nav into partial; rejigger content some more 2013-03-28 03:06:00 -07:00
Mark Otto df35e26142 rejigger some content and start exploring section headings 2013-03-28 01:34:42 -07:00
Mark Otto ba46d859e3 none of that 2013-03-28 01:12:07 -07:00
Mark Otto 4b8b8d2e46 holy crap new docs layout separate from home, no more top navbar 2013-03-28 01:08:14 -07:00
Mark Otto 081c061281 new subnav on all pages 2013-03-28 00:21:21 -07:00
Mark Otto fe414d8566 turn docs navbar into left navbar 2013-03-27 23:33:45 -07:00
Mark Otto 6696ff5d92 clarify docs on unstyled lists 2013-03-27 15:54:17 -07:00
Mark Otto f0f33eb9a3 Refactor .list-inline and .list-unstyled
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
2013-03-27 15:42:11 -07:00
Mark Otto 5b298a2aaf docs fixes with new .bs-docs-container; fixing some lingering grid classes 2013-03-26 23:54:17 -07:00
Mark Otto d5303906bd Remove grid example; update grid classes in examples 2013-03-26 17:17:39 -07:00
Mark Otto ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Mark Otto 1e9be3644c remove .navbar-inner from starter template 2013-03-26 12:31:03 -07:00
Mark Otto 954dcc0dc5 Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html
2013-03-26 12:28:00 -07:00
mo ab09fb25b9 Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle" 2013-03-25 18:13:13 -07:00
mo a9e9d9d544 Fixed all the .brand in navbar to .navbar-brand 2013-03-25 17:46:44 -07:00
Thomas McDonald f8b9e428f0 Give horizontal-three-colors a horizontal filter gradient
Previously the filter had GradientType=0, which would render a vertical
gradient rather than the horizontal one implied by name
2013-03-23 19:21:37 +00:00
Mark Otto 3c82ccaa2b color border in table contextual classes 2013-03-17 17:26:02 -07:00
Simon Boudrias cae90f3010 Remove text-rendering 2013-03-17 17:22:26 -03:00
Mark Otto 3aee2adb4b Fixes #7297: add support for .success, .error, and .warning on td and th elements in tables 2013-03-17 12:10:58 -07:00
Mark Otto 28cdc8dc5f incorporate print utilities classes into responsive docs; rejigger some content 2013-03-17 11:57:00 -07:00
Mark Otto 160ff23c85 Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip 2013-03-17 11:45:21 -07:00
Mark Otto 8d5a9371be update readme to resolve conflict 2013-03-17 11:45:13 -07:00
Mark Otto 4aba489cfd Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable 2013-03-17 11:34:27 -07:00
Mark Otto 6012d8221b Exploring rems as font-size unit
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto 47f69c0d9e mixin, not copypasta 2013-03-17 11:15:04 -07:00
Mark Otto ef4898990f convert to preboot's retina mixin 2013-03-16 17:19:05 -07:00
Mark Otto 71d4b5b6e7 Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip 2013-03-16 17:06:20 -07:00
Mark Otto 68dfd322f4 fixes #7140: hide navbar toggle in print 2013-03-16 16:17:32 -07:00
Mark Otto fe2658ed61 Fixes #7150: colorize links in alerts 2013-03-16 15:31:03 -07:00
Mark Otto 7e933db2dd comment 2013-03-16 15:03:22 -07:00
Mark Otto 070c77a960 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-16 14:59:43 -07:00
Mark Otto 1d94d777c3 Merge pull request #7258 from acconrad/patch-1
Update buttons.less to disable btn pointer events
2013-03-16 14:59:33 -07:00
Mark Otto e0de08c389 typo 2013-03-16 14:49:21 -07:00
Mark Otto 8c9e9e28cf Fix vertical button groups 2013-03-16 13:03:31 -07:00
Mark Otto efbf8373a5 Use form elements in checkbox and radio button groups
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto be8f992c94 remove inner shadow from .highlight 2013-03-16 12:09:26 -07:00
Mark Otto f77dc548a1 update pygments highlighting with customizations from preboot 2013-03-16 12:07:00 -07:00
Mark Otto bb38fa5286 Overhaul the grid system and its docs
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Mark Otto 145eb054d9 begin to rewrite the grid docs 2013-03-15 21:57:16 -07:00
Mark Otto 2a0fb08fad getting started as navbar link label 2013-03-15 21:23:59 -07:00
Mark Otto ecfdecea00 Use translucent box shadow on hr elements; colorize hr elements within alert components 2013-03-14 23:01:23 -07:00
pickypg 812b99263f Fix dropdown (and therefore typeahead) wrap
I have recently been experimenting with a lot of Typeahead controls, and I ran into a situation where my Typeahead was too wide for my screen, particularly on mobile devices, and it was not wrapping as I had expected it to do.

http://jsfiddle.net/Mtxkn/3/

Changing the CSS for `.dropdown-menu > li > a` to `white-space: normal` causes it to wrap in every scenario that I have seen, whereas leaving it as `nowrap` never does what I want when the text is too long for a given row.

It's possible that this has ramifications for other dropdown menus, but honestly I expect that even those would prefer to wrap than to extend the screen horizontally.  If that is not the case, then it would work to change the typeahead version of this only:

```css
.typeahead > li > a {
    white-space: normal;
}
```
2013-03-15 02:54:24 -03:00
Mark Otto 4c0719ea5f fix derpy linenos in pygments for thumbnails component 2013-03-14 22:34:20 -07:00
Mark Otto 7e07c89b8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-14 22:25:53 -07:00
Mark Otto 37d0a30589 Merge pull request #7287 from waynn/patch-1
fix pluralization since "a" is in front for issue #6342
2013-03-14 22:21:06 -07:00
Mark Otto ed7fe0e5ba unfuck misaligned main container 2013-03-14 21:45:31 -07:00
Mark Otto 8f04096205 Merge pull request #7285 from stilliard/patch-1
Additional heading font-size classes
2013-03-14 20:55:43 -07:00
Mark Otto 4247008e23 more readme copy 2013-03-14 20:55:23 -07:00
Mark Otto b375283597 readme copy 2013-03-14 20:54:53 -07:00
Mark Otto 2b9c936a3a start listing other bootstrap powered starter doodads in the readme 2013-03-14 19:19:06 -07:00
Andrew Stilliard 706dd8c045 Additional heading font-size classes
This relates to changes in issue #7284
2013-03-15 02:11:37 +00:00
Mark Otto c9bfcfcfd5 underp license maybe 2013-03-14 19:08:09 -07:00
Mark Otto 45606ae6a0 herp derp, spelling booboo 2013-03-14 19:06:47 -07:00
Mark Otto 8f20a5ac91 Rename license to license.md; point readme to it via link 2013-03-14 19:05:54 -07:00
Mark Otto 85e5d40099 fix example navbar brand 2013-03-14 18:54:43 -07:00
Mark Otto 3cd6d00cc4 use the proper selector 2013-03-14 18:53:46 -07:00
Mark Otto b5eca07be1 modify copy 2013-03-14 18:23:08 -07:00
Mark Otto d8234b38cb Merge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani-3.0.0-wip 2013-03-14 13:34:48 -07:00
Mark Otto 224296f695 Fixes #7281: make tables super specific for hovers and striping to avoid nesting issues 2013-03-14 13:29:43 -07:00
Mark Otto 00169b48bd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/grid.less
2013-03-14 13:25:59 -07:00
Mark Otto 7bff231ea5 Merge pull request #7227 from parndt/patch-1
Fix minor grammatical problem
2013-03-14 13:04:50 -07:00
Addy 0c65a0e1ee Added bower install to download/install options in getting started guide 2013-03-14 10:58:16 +00:00
Adam Conrad e488e709a0 Update buttons.less to disable btn pointer events
Buttons that are disabled are still clickable and can still fire click events (such as hopping up to the top of the page if your anchor href points to "#"). Adding the pointer-events:none property will truly disable the button so situations like this don't happen.
2013-03-12 17:58:41 -03:00
Mark Otto d0e1b56603 Merge pull request #7181 from lukeapage/3.0.0-wip
make less files compile with strict maths in 1.4.0
2013-03-11 01:16:08 -07:00
Mark Otto d344ca4475 Merge pull request #7208 from benilovj/3.0.0-wip
fix grammatical mistakes in carousel docs
2013-03-10 23:32:13 -07:00
Philip Arndt 086e8a5b3c Fix minor grammatical problem
"check out" makes more sense here.
2013-03-11 12:07:52 +13:00
Mark Otto d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05:00
Mark Otto e0a740ca9a Merge pull request #7220 from jooag/patch-1
Fix Typo sucess to success
2013-03-10 10:40:00 -07:00
Ufuk Avcu 33913e4586 Fix Typo sucess to success
Mini typo fix in the docs...
2013-03-09 21:04:09 +01:00
Jake Benilov d5c3307ffa fix grammatical mistakes in carousel docs 2013-03-08 00:13:56 +00:00
Waynn Lue 1c7fe5d887 fix pluralization since "a" is in front 2013-03-06 22:01:21 -08:00
Luke Page 5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Ben Word ee5c7d7ece Remove -webkit-backface-visibility on skew mixin
Ref #5319 - This rule is causing pixelated edges on iOS. Removing
it makes everything smooth across all OS's, browsers, and devices.
2013-03-04 13:03:05 -06:00
Mark Otto 6e8ee02421 tweak icons alignment 2013-03-03 23:41:16 -08:00
Mark Otto bfdc6f8607 Remove support for .uneditable-input 2013-03-03 23:31:09 -08:00
Mark Otto 6239094ca6 Nuke the gallery, punt it to the new http://expo.getbootstrap.com 2013-03-03 19:40:47 -08:00
Mark Otto b83fc82aed fix row change at breakpoint 2013-03-03 18:19:31 -08:00
Mark Otto 6e0815bf4e Merge pull request #6968 from twitter/bs3_makefile_separated_done
More accurate makefile step confirmation
2013-03-01 14:11:24 -08:00
Mark Otto 1f160d4c12 Merge branch '3.0.0-wip' into bs3_makefile_separated_done
Conflicts:
	Makefile
2013-03-01 13:53:21 -08:00
Mark Otto e0647e8273 nuke commented out unused var 2013-03-01 12:37:36 -08:00
Mark Otto a70c50d1f7 Merge branch 'master' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	package.json
2013-03-01 12:37:21 -08:00
Mark Otto 77e8e2aee9 Fix alignment of .navbar-brand 2013-03-01 00:50:08 -08:00
Mark Otto 492c249537 improve navbar toggle and hide code snippets on mobile devices for now 2013-03-01 00:18:10 -08:00
Mark Otto 2e3ba4afe6 redo the buttons examples 2013-03-01 00:04:41 -08:00
Mark Otto ba633949dc customize navbar in docs 2013-02-28 23:36:54 -08:00
Mark Otto 38ba057dee Fixes #6998: disabled background color properly on pagination 2013-02-28 23:23:05 -08:00
Mark Otto 5a30e52aac Fixes #6995: Add disabled navbar nav link support 2013-02-28 23:20:58 -08:00
Mark Otto 4418c82888 Fixes #6954: properly reset grid classes within tables 2013-02-28 22:47:32 -08:00
fat-kun eb24718add Merge pull request #7111 from twitter/2.3.1-wip
2.3.1 wip
2013-02-28 21:24:27 -08:00
Mark Otto bfc4aaf6e8 Holy fucking shit fix that input group with buttons rounded corner noise 2013-02-28 21:19:02 -08:00
fat 6b2a010357 update changelog 2013-02-28 21:16:08 -08:00
fat 839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat 0992a85932 woops that should stay 2.3.0 2013-02-28 21:00:21 -08:00
fat 3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat 2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat a61322c2fb WHOOPS ( >_>) 2013-02-28 20:46:51 -08:00
fat 01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat cf998040ec rebuild 2013-02-28 19:49:08 -08:00
fat ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
Mark Otto b19eb88b5a Fixes #6935: Use standard decimal points for .opacity() mixin 2013-02-28 19:46:49 -08:00
Mark Otto 0dea8b0c74 Fixes #6897: Print styles get own .less file 2013-02-28 19:42:51 -08:00
fat 40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto 9d763e805b Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting 2013-02-28 19:34:02 -08:00
Mark Otto 877d64dd77 remove auto regen 2013-02-28 19:32:39 -08:00
Mark Otto 81a0306cce add new example thumbnails; update links to point to new windows 2013-02-26 00:56:06 -08:00
Mark Otto ea01e8bbc4 nuke remaining less/tests/ files and move grid over to examples dir 2013-02-26 00:49:21 -08:00
Mark Otto e2e5580c0e nuke glyphicons changes in buttons for now because it's whack 2013-02-26 00:44:15 -08:00
Mark Otto 5b3b11c02a moved examples added 2013-02-26 00:42:24 -08:00
Mark Otto 91660a0489 Move navbar examples to /examples directory 2013-02-26 00:37:59 -08:00
Mark Otto e1bb94c383 try out new table-based type example 2013-02-24 01:29:19 -08:00
Mark Otto 16111a5e45 Merge pull request #6967 from twitter/readme_npm_fix
Update readme npm instructions
2013-02-21 13:10:21 -08:00
Mark Otto c6343a9d4a Merge pull request #6990 from acmetech/3.0.0-wip
Additional minor updates to the docs
2013-02-19 16:09:18 -08:00
Tom Pietschker 1780873173 forgot navbar-fixed-bottom in the commit 2013-02-19 14:54:56 -05:00
Tom Pietschker ba7b1e8234 tweak the position of the fixed to top/bottom navbars to remove double border 2013-02-19 14:50:44 -05:00
Tom Pietschker ec9b01e691 remove the search-query class and increase the width 2013-02-19 14:40:05 -05:00
Tom Pietschker 62b54605a7 replace navbar-search with navbar-form 2013-02-19 14:35:48 -05:00
Tom Pietschker 3b7e5214e3 remove navbar-inner 2013-02-19 14:32:28 -05:00
Mark Otto a1913cbe7e Merge pull request #6979 from acmetech/3.0.0-wip
Minor fixes to docs
2013-02-18 18:26:26 -08:00
Tom Pietschker 722ba5f227 added missing slash in the src for Gather Content 2013-02-18 21:03:52 -05:00
Tom Pietschker 4c00f290f2 fix incorrect section id for labels 2013-02-18 20:57:54 -05:00
Mark Otto 023568fe3d Navbar realignment:
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto f51862f158 remove unused include 2013-02-18 01:27:08 -08:00
Mark Otto acdffe696c Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems 2013-02-17 22:20:49 -08:00
Mark Otto f6ec2c5dac Drop the recently added .counter class for .badge 2013-02-17 21:06:20 -08:00
Mark Otto d3cc8f79f4 remove old todo comment 2013-02-17 20:26:44 -08:00
Mark Otto 53091be6d2 remove unnecessary select border reset 2013-02-17 20:26:21 -08:00
Mark Otto e2d829e511 fix inaccurate text classes code 2013-02-17 20:23:31 -08:00
Mark Otto 82d059de87 fix broken marketing section with updated class 2013-02-17 20:18:29 -08:00
Mark Otto 159167041f forgot about those quotes 2013-02-17 19:15:09 -08:00
Mark Otto 56e60d0468 fix the docs include logic 2013-02-17 19:12:30 -08:00
Mark Otto 9b3262cb15 more narrow jumbotron example fixes in the mobile first arena 2013-02-17 19:04:38 -08:00
Mark Otto c6f341bd17 Refactor some common classes from docs css and examples, then prevent examples from using docs.css 2013-02-17 18:58:40 -08:00
Mark Otto dba9eea98d revamp narrow jumbotron to avoid conflicts with docs .masthead 2013-02-17 18:48:00 -08:00
Mark Otto 36aec5e484 decrease top/bottom padding a bit in mobile fixed navbars 2013-02-17 18:47:44 -08:00
Mark Otto ee9a0f4b94 css to go with it 2013-02-17 18:46:49 -08:00
Mark Otto 13ff3aced0 Add class to body for special styles to avoid conflict with examples 2013-02-17 18:46:30 -08:00
Mark Otto c0ea077fb4 Revert the statis navbar in mobile views--they're back to being fixed all the time 2013-02-17 18:33:55 -08:00
Mark Otto 4cbb663d9d Update some links and rename #gridsystem to #grid-system 2013-02-17 18:10:29 -08:00
Mark Otto f59e4fdba3 remove duplicate done text; change label on docs prep step 2013-02-17 16:58:43 -08:00
Mark Otto 9134fa4eda correct version 2013-02-17 16:56:57 -08:00
Mark Otto 6663a35562 Resolve conflicts 2013-02-17 16:56:30 -08:00
Mark Otto e6a6fd2585 Backport v3's readme update on npm install to 2.3 2013-02-17 15:36:24 -08:00
Mark Otto 077b70112f add note to readme about fubared npm installs 2013-02-17 13:54:47 -08:00
Mark Otto e2fabe2317 clarification on readme makefile 2013-02-17 13:42:31 -08:00
Mark Otto 6ccf588a8e Restore submenu support 2013-02-17 13:35:14 -08:00
Mark Otto fdeb7f5743 restore auto regen of docs 2013-02-17 13:35:08 -08:00
Jeff Froom ba8ba1fe72 Added Development > build: "make bootstrap" notes. 2013-02-16 21:37:08 -06:00
Mark Otto 5fecb4a9f4 add visibility note to docs about captions 2013-02-16 02:49:12 -08:00
Mark Otto 6dce3f63d8 Scrach that: carousel caption is always left aligned, but still hidden for mobile views 2013-02-16 02:47:48 -08:00
Mark Otto 6d048471c4 Re-add carousel captions as optional
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto e74fb39080 Nuke the fluid example since it's no longer applicable 2013-02-16 01:43:23 -08:00
Mark Otto 401d4fabd1 Nuke the old_docs.css file 2013-02-16 01:39:09 -08:00
Mark Otto b6ec72a3a2 Nuke @mdo's photos from the repo since we're using holder.js for carousel demo 2013-02-16 01:38:32 -08:00
Mark Otto ce21926704 All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star 2013-02-16 01:26:43 -08:00
Mark Otto d8e2668c1d Overhaul carousel a bit more:
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
2013-02-16 01:22:15 -08:00
Mark Otto b688d8dcd4 More accurate padding for fixed navbars at >768px 2013-02-16 00:20:20 -08:00
Mark Otto f38e50cdf1 Don't affix the fixed navbars in mobile views 2013-02-16 00:19:17 -08:00
Mark Otto d1aae5f82b twerk gallery examples to stay at 400px or less for proper retinafying 2013-02-15 17:27:05 -08:00
Mark Otto 3d041096ba Update gallery examples on homepage; make all gallery entries open in new tabs 2013-02-15 17:21:41 -08:00
Mark Otto 6789a30a3d fix #6950: use var for font-family 2013-02-15 16:51:16 -08:00
Mark Otto 866c8d60e9 restore jekyll-based css.html to docs 2013-02-15 12:22:26 -08:00
Mark Otto 64ae9e5bd8 Merge pull request #6944 from canburak/3.0.0-wip
Fixed typo on JavaScript documentation
2013-02-15 12:17:27 -08:00
Can Burak Cilingir a77cd6cb5d Fix typo on JavaScript documentation 2013-02-15 18:47:34 +08:00
Mark Otto e44f8cc560 Fixes #6941: add alt attribute to images 2013-02-14 23:55:04 -08:00
Mark Otto bcb6dd5ee6 fix spelling as pointed out by @jodytate that got nuked in the merge 2013-02-14 23:51:35 -08:00
Mark Otto 0c25546e1c rearrange readme 2013-02-14 23:48:29 -08:00
Mark Otto 5ac2f304a8 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/examples/sticky-footer-navbar.html
	docs/examples/sticky-footer.html
2013-02-14 23:44:50 -08:00
Mark Otto ae525258af Merge branch 'bs3_jekyll' into 3.0.0-wip
Conflicts:
	docs/css.html
	docs/templates/pages/css.mustache
2013-02-14 23:42:47 -08:00
Mark Otto aa5f090371 Make example pages use Jekyll; add sticky footer navbar image to examples 2013-02-14 23:38:00 -08:00
Mark Otto 41ef649aa3 no need for scrollspy in example template 2013-02-14 23:07:36 -08:00
Mark Otto b1d4c589c5 Update makefile 2013-02-14 22:57:25 -08:00
Mark Otto 979ca4ea7a Convert JS page to pygments; nuke prettify assets 2013-02-14 22:33:26 -08:00
Mark Otto 37becbab8c convert components code examples to pygments 2013-02-14 21:42:33 -08:00
Mark Otto 0ff7fb0d05 pygmentize the rest of the css page 2013-02-14 16:43:50 -08:00
Mark Otto edfee83ac2 Specify new local URL 2013-02-14 16:17:16 -08:00
Mark Otto dc09979b51 Merge pull request #6936 from jodytate/3.0.0-wip
minor update to sticky-footer examples
2013-02-14 13:59:05 -08:00
jody tate f273170f16 Update docs/examples/sticky-footer.html
again, "it's" to "its" for grammar fun!
2013-02-14 13:30:22 -08:00
jody tate 33a529f398 Update docs/examples/sticky-footer-navbar.html
contraction "it's" to possessive "its", aka pedantic grammar fix
2013-02-14 13:26:52 -08:00
Mark Otto 6b14de292a pygmentize grid section; update bs-docs-example corners 2013-02-14 00:43:43 -08:00
Mark Otto 7e6211e244 twerk dat manni pygment style 2013-02-14 00:39:32 -08:00
Mark Otto 5f0ecb740a Start pygmentizing css.html; add new theme for pygments 2013-02-14 00:23:23 -08:00
Mark Otto d709dba284 Start using some includes; test out some pygments highlighting 2013-02-13 23:37:08 -08:00
Mark Otto b12ff91d48 update readme to point to getting started page; twerk link 2013-02-13 22:01:34 -08:00
Mark Otto 0c1142f6fb readme improvements 2013-02-13 20:02:00 -08:00
Mark Otto 2b05b335b0 update readme to reflect jekyll docs and local npm install method 2013-02-13 12:51:25 -08:00
Mark Otto d3c458c7d8 make same css docs fix from upstream 2013-02-13 12:32:29 -08:00
Mark Otto 96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Mark Otto b57c20a057 Restore gallery page, add active nav class jankitude, auto regenerate docs on file save 2013-02-13 11:48:22 -08:00
Mark Otto b1e7010bfc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-02-13 11:28:00 -08:00
Mark Otto e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto 8174705be8 update makefile to work given nuked docs dir 2013-02-12 12:27:18 -08:00
Mark Otto 8b9733b288 nuke what we don't need for jekyll 2013-02-12 12:25:05 -08:00
Mark Otto 5de8557398 convert to jekyll 2013-02-12 12:16:32 -08:00
Mark Otto 1f5f23f869 nuke dat extend docs page 2013-02-11 21:38:44 -08:00
Danny Keane e8dc036d25 Added retina image support mixin 2013-02-11 18:23:21 -08:00
Mark Otto 1dda3c395a Merge pull request #6863 from devknoll/fix-css-docs
Fix the Star glyphicon in the CSS docs
2013-02-08 23:28:18 -08:00
Gerald Monaco 876a412c90 Fix the Star glyphicon in the CSS docs 2013-02-08 19:52:50 -05:00
Mark Otto 63c1377ee7 Fixes #6852: add cursor pointer to carousel indicators 2013-02-08 09:56:04 -08:00
Mark Otto 1b2b049ef8 Fixes #6841: Add new Firefox placeholder, comments 2013-02-08 08:32:29 -08:00
Mark Otto 3eed90c187 Fixes #6837: Enable text alignment utility classes on tables
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
2013-02-08 08:24:10 -08:00
Mark Otto ab1dc25ffc clean up responsive docs and global css styles 2013-02-08 00:13:44 -08:00
Mark Otto 2aa1a4dc70 Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 22:18:53 -08:00
fat 8c7f9c66a7 Merge branch '2.3.0-wip' 2013-02-07 22:13:13 -08:00
Mark Otto c4d47fb1ea Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-07 22:08:13 -08:00
Mark Otto 30fd4be093 add 2.3 changelog section 2013-02-07 22:08:04 -08:00
fat 501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat 366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat 1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto a9729c5fd0 fix js from @fat feedback for modal 2013-02-07 19:38:46 -08:00
Mark Otto 52581839c7 remove modal test file 2013-02-07 19:34:23 -08:00
Mark Otto 9b1520ee60 update example code 2013-02-07 19:34:06 -08:00
Mark Otto cfa1e39510 nuke that whitespace 2013-02-07 19:32:30 -08:00
Mark Otto b04acb37e8 finish modal tweaks 2013-02-07 19:31:12 -08:00
Mark Otto a623b8c10f update docs modals 2013-02-07 19:21:56 -08:00
Mark Otto cdb2147b13 add new modal to docs example 2013-02-07 19:00:48 -08:00
Mark Otto e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08:00
Mark Otto c8874ff285 Merge pull request #6813 from Yohn/patch-12
don't remove title attribute for tooltips for 2.3-wip
2013-02-06 13:19:50 -08:00
Yohn 60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05:00
Mark Otto 8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -08:00
Mark Otto 0b4668368b Merge branch '2.3.0-wip' into 3.0.0-wip 2013-02-05 22:47:00 -08:00
Mark Otto 2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
Mark Otto 421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
2013-02-05 22:42:54 -08:00
fat 3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat 4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto 6d21d86007 port docs fix from 2.3.0-wip to new css page 2013-02-05 22:29:01 -08:00
Mark Otto accfdaafdb Fixes #6808: mention IE lame-itude in docs for invalid inputs 2013-02-05 22:28:18 -08:00
Mark Otto 0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
fat 5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun 6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
fat-kun 042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00
Mark Otto 1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
Mark Otto 4270496e8a add codecademy to gallery 2013-02-05 21:07:30 -08:00
Mark Otto a920697382 Dat compression 2013-02-05 21:05:24 -08:00
Mark Otto fb1db88256 Update homepage examples, add hella new sites to gallery 2013-02-05 21:04:46 -08:00
Mark Otto 37a6879ca5 White navbar brand text for inverted navbar 2013-02-05 20:39:09 -08:00
fat a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat-kun ee91afba63 Merge pull request #6481 from pseidemann/patch-1
don't remove title attribute for tooltips
2013-02-05 20:13:57 -08:00
fat-kun 566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -08:00
fat c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat 45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto 31fdb2e25e Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 19:59:25 -08:00
Mark Otto 28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08:00
Mark Otto 43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto 9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
Mark Otto 15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
2013-02-05 19:39:49 -08:00
fat-kun 31b9240dd0 Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
Fix tooltip positioning for IE8 broken in 2.3.0
2013-02-05 19:22:34 -08:00
Mark Otto e4a74607b0 simplify media docs 2013-02-05 01:12:39 -08:00
Mark Otto b65293dec0 reorganize progress bars docs 2013-02-05 01:11:41 -08:00
Mark Otto 3949623eee simpler alerts docs 2013-02-05 01:07:43 -08:00
Mark Otto 238566b445 mo betta thumbnails docs 2013-02-05 01:01:23 -08:00
Mark Otto 2576e6d1d6 reorder counters docs 2013-02-05 00:59:22 -08:00
Mark Otto cf78f4b010 pagination docs cleanup 2013-02-05 00:54:48 -08:00
Mark Otto 1f673b77bb simpler breadcrumbs docs 2013-02-05 00:51:19 -08:00
Mark Otto 74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto 5c1cc722e7 Forgot to remove base-css.mustache 2013-02-05 00:22:20 -08:00
Mark Otto cb0fed6693 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-04 11:25:46 -08:00
Mark Otto 2c92b5f6a4 Remove base-css.html after recent merges 2013-02-04 11:12:32 -08:00
Mark Otto 0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
2013-02-04 11:12:09 -08:00
Mark Otto 1f6a988190 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:25 -08:00
Mark Otto db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Joseph Price 4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Mark Otto 7ec817ea46 Merge pull request #6638 from GeoffYoung/2.3.0-wip
Update package.json to current Recess version
2013-02-02 19:53:22 -08:00
Mark Otto 9480eb89cb Revamp button mixins and pseudo states
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
2013-02-02 19:16:15 -08:00
Mark Otto 2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -08:00
Mark Otto d6048031ed Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-02 18:58:08 -08:00
Mark Otto b1f1d7871f Add changelog file to repo instead of relying on the wiki 2013-02-02 18:57:24 -08:00
Mark Otto 5638b2559a Verion number in JS makefile 2013-02-02 18:50:13 -08:00
Mark Otto 3d74c670d3 Rearrange forms content 2013-02-02 18:30:52 -08:00
Mark Otto 6993fadf7e Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Mark Otto 04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Joseph Price 1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Mark Otto c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Luke Page 6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto 94e256c016 Refactor navbar dividers
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -08:00
Mark Otto 0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto 8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -08:00
Mark Otto d53af49afe Refactor colors and progress bars
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Mark Otto f328ebbc73 Merge pull request #6776 from ndabas/fix-inline-lists-ie7
Fix inline lists for IE7
2013-02-01 13:04:17 -08:00
Nikhil Dabas b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto 2553d74b54 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto 7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
Mark Otto 725cf7f6ec start to refactor justified nav example 2013-02-01 10:32:08 -08:00
Mark Otto 7528b6e10a button element instead of href-less a tag for navbar button 2013-02-01 10:30:48 -08:00
Gil Barbara 24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Mark Otto 755f1776da Refactor jumbotron-narrow.html example
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto 19b5ebcf24 Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes 2013-01-31 18:25:44 -08:00
Mark Otto dfdf343825 Refactor jumbotron example:
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto 52aa67fa1c only round jumbotron corners at 768px+ 2013-01-31 18:11:45 -08:00
Mark Otto b02a0fe768 Button up navbar form which was adding 2px padding to .navbar 2013-01-31 18:09:49 -08:00
Mark Otto fe5150d5dc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-01-31 18:07:07 -08:00
Mark Otto 061d2849a6 Update starter template to include left/right padding on inner container; also include body padding 2013-01-31 18:06:56 -08:00
Mark Otto 5e5670a1b4 Remove gallery link from navbar; add to homepage examples section instead 2013-01-31 18:00:11 -08:00
Mark Otto 83e5c01856 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
2013-01-31 17:57:31 -08:00
Gil Barbara e69912c163 Update line-height and padding for input sizes 2013-01-31 19:00:22 -02:00
RJ Regenold 2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold 6014e63054 lets see how much i can mess this pull request up. :| 2013-01-31 11:10:41 -06:00
RJ Regenold ed2cf5b3e3 its not dyslexic being easy. 2013-01-31 11:04:12 -06:00
RJ Regenold e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto baadc33c88 make on prev commit 2013-01-30 18:22:20 -08:00
Mark Otto 135e834bf4 Merge branch 'baslr-master' into 2.3.0-wip 2013-01-30 18:22:11 -08:00
Mark Otto 3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Mark Otto dd4ce35ddc add meta tag to second example 2013-01-30 17:46:18 -08:00
Mark Otto a5fc3e0667 make on prev commit 2013-01-30 17:45:02 -08:00
Mark Otto 3b6b8e9f41 Merge branch 'greg-raven-patch-2' into 2.3.0-wip 2013-01-30 17:44:45 -08:00
Mark Otto f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
Mark Otto d44acb7f88 Merge pull request #6750 from nextgenthemes/3.0.0-wip
Update less/carousel.less
2013-01-30 12:44:10 -08:00
nextgenthemes 72da31e028 Update less/carousel.less
lessified .carousel-caption
2013-01-30 18:14:22 +01:00
pseidemann c4eea3abde don't remove title attribute for tooltips
fixes #6445
2013-01-29 22:54:00 +01:00
Guillaume Smet b7764d8a33 Fix tooltip positioning for IE8
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Mark Otto ab0c055bc6 Merge pull request #6728 from fredsa/2.3.0-wip
Fix `form-actions` documentation
2013-01-28 10:35:16 -08:00
Fred Sauer d6e3b6b5a4 Fix form-actions documentation 2013-01-28 10:01:59 -08:00
Guillaume Gautreau ee71fb492f No semicolumns 2013-01-27 10:56:01 +01:00
Guillaume Gautreau 5b0f956a60 Arrow replacement 2013-01-26 21:45:21 +01:00
Guillaume Gautreau d9a0abaa06 works with fixed test 2013-01-26 21:39:49 +01:00
Guillaume Gautreau db9ec13ce4 Test for replacing tooltip when resized 2013-01-26 21:39:05 +01:00
Guillaume Gautreau e5be883bb9 lint + wrong comparison 2013-01-26 14:31:33 +01:00
Guillaume Gautreau 929598784f Unit test for replacing tooltip inside window 2013-01-26 14:06:58 +01:00
Guillaume Gautreau 6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
baslr 6afb1055e3 .icon-folder-close same width as icon-folder-open
.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folder
2013-01-26 01:01:10 +01:00
Francisco arenas 2428904b4b Update less/mixins.less
horizontal three color gradient added
2013-01-24 03:37:52 -02:00
Greg Raven 22f1cc44ca Update docs/templates/pages/getting-started.mustache
Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.
2013-01-22 06:46:53 -08:00
Mark Otto d30f47efb2 Tighten up badges docs; less bottom margin on h3 2013-01-19 18:53:41 -08:00
Mark Otto c21c3f101b Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters 2013-01-19 17:06:40 -08:00
Vickash Mahabir c77a459b35 IE8 compatible fix for disabled button hover 2013-01-19 19:32:55 -04:00
Geoff Young f3268db4b4 Update Recess version 2013-01-19 16:27:10 -05:00
Mark Otto 64bc5dc91f remove .navbar-inner from sticky footer navbar 2013-01-19 09:40:26 -08:00
Mark Otto 1a88367b72 mo betta links between sticky footer examples 2013-01-19 09:39:56 -08:00
Mark Otto d7d5069be1 Add sticky footer navbar example to list; fix docs padding 2013-01-19 09:38:49 -08:00
Mark Otto 7c9295d44b update sticky footer templates 2013-01-19 09:34:08 -08:00
Vickash Mahabir 67ec13a44c Counters example doesn't need to be a table 2013-01-18 18:03:43 -04:00
Vickash Mahabir 964cb77383 Make the counter example more meaningful 2013-01-18 17:50:58 -04:00
Vickash Mahabir 665de0455c Change .badge to .counter, make appearance more OSX-ish, and remove colors 2013-01-18 17:35:23 -04:00
Vickash Mahabir b741c731a2 Fix logic error where a disabled button would change color in an enabled fieldset 2013-01-18 12:12:30 -04:00
Vickash Mahabir 6e96cd1a7c Forgot to add built docs css file 2013-01-18 11:58:12 -04:00
Vickash Mahabir 27ff51dae6 Fix that thing with disabled buttons changing color on hover 2013-01-18 11:55:17 -04:00
Mark Otto 411e6b18cb unified and simplified sign in form example 2013-01-18 01:52:16 -08:00
Mark Otto 82bfa965a7 cleanup more examples 2013-01-18 01:37:31 -08:00
Mark Otto d4cb7077fe mo betta justified nav 2013-01-18 01:33:55 -08:00
Mark Otto 604f76dcf8 overhaul justified nav example 2013-01-17 21:05:23 -08:00
Mark Otto 8111e307b9 Remove docs and prettify css from examples thus far; update narrow page 2013-01-17 20:39:38 -08:00
Mark Otto caed3a9dbb fix up jumbotron example 2013-01-17 20:35:59 -08:00
Mark Otto 6466fe00a1 Rename hero.html to jumbotron.html 2013-01-17 20:32:07 -08:00
Mark Otto 5075f4973b Semibold dat .navbar .brand 2013-01-17 20:30:40 -08:00
Mark Otto ac3c907799 finish updating starter template 2013-01-17 20:30:19 -08:00
Mark Otto 1b128b3431 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
Mark Otto fd89531f6a Update commenting and structure of layout.mustache 2013-01-17 20:26:17 -08:00
Mark Otto d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto f068cdeb63 Combine .thumbnail and .img-thumbnail into simpler selectors 2013-01-17 20:18:03 -08:00
Mark Otto ca74b9882b Change .img-polaroid to .img-thumbnail
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
2013-01-17 20:16:04 -08:00
Mark Otto 89b6477bdc Remove .info from table rows 2013-01-17 20:13:11 -08:00
Mark Otto 5663833bfc Restore .btn-info 2013-01-17 19:51:22 -08:00
Mark Otto b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto 41ecc2a171 derp, numbers 2013-01-17 16:35:30 -08:00
Mark Otto 2523b91dad dat min 2013-01-17 16:11:01 -08:00
Mark Otto 8765df47cd remove global text-shadow from alerts components because it was fucking up buttons in a real way 2013-01-17 15:43:23 -08:00
Mark Otto e304798194 scrollspy example twerks 2013-01-17 15:42:52 -08:00
Mark Otto 3a1e1167d6 restore scrollspy example 2013-01-17 15:40:43 -08:00
Mark Otto 97975c5fcf Readd focused example of inputs to docs; clean up alerts section 2013-01-17 15:36:36 -08:00
Mark Otto 32bcbe5671 cleanup example templates 2013-01-17 15:00:49 -08:00
Mark Otto f6226c9b91 Update Getting Started page to include mention of Respond 2013-01-17 14:49:52 -08:00
Mark Otto 237f5e15d3 Nuke shadows around thumbnails 2013-01-17 14:25:40 -08:00
Mark Otto bb94de7873 Larger homepage headings 2013-01-17 14:22:41 -08:00
Mark Otto 5c76518f7d Add respond.js to main docs pages, but only for IE8 and down 2013-01-17 14:00:03 -08:00
Mark Otto 01b465928e overhaul alerts section of tests 2013-01-17 12:24:16 -08:00
Mark Otto bbb3c0a0e6 Merge branch 'ravage84-patch-2' into 2.3.0-wip 2013-01-17 12:21:34 -08:00
Mark Otto 7c23d889bb Change subheading of alerts page 2013-01-17 12:13:37 -08:00
Mark Otto 26f9f4e3a5 Remove navbar search 2013-01-17 12:02:17 -08:00
Mark Otto 32ebe2efd1 mo betta navbar dropdowns 2013-01-17 11:55:37 -08:00
Mark Otto 597a248d4a Rearrange navbar.less and improve vertical divider support 2013-01-17 11:34:46 -08:00
Mark Otto 360f0c5359 Fix floats in navbar 2013-01-17 11:20:19 -08:00
Mark Otto 01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
ravage84 650c77ddb9 Update less/tests/css-tests.html
Extended css-tests with alerts (alerts and alert-blocks)
2013-01-17 11:34:00 +01:00
Mark Otto 7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto 267d3e7ed7 streamline css docs 2013-01-17 00:50:19 -08:00
Mark Otto 2398245e17 Remove all old responsive styles since we're motherfucking mobile first son 2013-01-17 00:43:58 -08:00
Mark Otto 687d4a3eeb Move grid/container styles to grid.less; update docs; add offsetting back 2013-01-17 00:42:31 -08:00
Mark Otto 255cb87734 update getting started to reflect latest changes; pull list of components because fuck that 2013-01-17 00:27:46 -08:00
Mark Otto a8a60e94e3 padding twerk 2013-01-17 00:24:18 -08:00
Mark Otto 33864b4a3d dat docs messaging (on the homepage) 2013-01-17 00:23:25 -08:00
Mark Otto 9374965b83 docs css cleanup 2013-01-17 00:20:00 -08:00
Mark Otto 630005687d Remove ported navbar css that was already commented out 2013-01-17 00:13:12 -08:00
Mark Otto 4129be6ebd Update sidenav and responsive css 2013-01-17 00:13:04 -08:00
Mark Otto f535201781 improve navbar vars and fix side nav alignment 2013-01-16 23:33:26 -08:00
Mark Otto 6b193dc22d More navbar tweaks, including making fixed navbars work in the docs by adding padding to body 2013-01-16 16:20:29 -08:00
Mark Otto 9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto 960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto ee9403e2d2 flatten the progress bars 2013-01-16 15:19:55 -08:00
Mark Otto baa8c3ec9e restore alerts, and make them suck much less 2013-01-16 15:16:04 -08:00
Mark Otto 0b81dd217f tuck some margins 2013-01-16 15:11:17 -08:00
Mark Otto 1288304e91 Make jumbotron mo responsive 2013-01-16 15:07:57 -08:00
Mark Otto cf693b5632 Add in responsive for 1200px+ layout; increase padding for that viewport size 2013-01-16 14:48:25 -08:00
Mark Otto 13a80f33c8 fix up sidenav and components page 2013-01-16 14:10:33 -08:00
Mark Otto 3e40e7dfbf mo betta sidenav for responsive hotness 2013-01-16 13:20:32 -08:00
Mark Otto beb2c13f4d Prevent grids from collapsing, fix affixed side nav for docs 2013-01-16 13:11:45 -08:00
Mark Otto a7a06a05a4 Remove commented out files; leave responsive stuff commented out for now 2013-01-16 13:08:27 -08:00
Mark Otto 910ca85a70 restore remaining components 2013-01-16 13:07:41 -08:00
Mark Otto bc7fd582ed restore pagination and pager 2013-01-16 13:07:08 -08:00
Mark Otto 2127690e73 restore breadcrumbs 2013-01-16 13:06:15 -08:00
Mark Otto 2407217686 restore wells and close 2013-01-16 13:05:20 -08:00
Mark Otto ab38493e91 Restore button groups 2013-01-16 13:04:29 -08:00
Mark Otto c18b5b9735 restore glyphicons docs styles and then overhaul the shit out of them 2013-01-16 13:02:15 -08:00
Mark Otto a4cc704220 Restore dropdowns.less 2013-01-16 12:44:31 -08:00
Mark Otto eb3cd5d7d2 Restore responsive docs 2013-01-16 12:44:25 -08:00
Mark Otto c76f1cd97e restore glyphicons 2013-01-16 12:30:44 -08:00
Mark Otto 992e0d922a Re-add and update form styles:
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
2013-01-16 12:23:05 -08:00
Mark Otto b6b8633542 twerk docs code examples 2013-01-16 12:02:45 -08:00
Mark Otto cb99c4b63a restore table styles 2013-01-16 11:48:20 -08:00
Mark Otto 6ac6be2a5e more subhead/jumbotron tweaks for docs 2013-01-16 11:45:16 -08:00
Mark Otto 0df7411362 Derp on type styles a bit more; bring back and fix up more more docs styles 2013-01-16 11:38:34 -08:00
Mark Otto 81a22e189a add back docs footer 2013-01-16 11:03:54 -08:00
Mark Otto cb0691d92f mo betta type margins for headings 2013-01-16 10:57:00 -08:00
Mark Otto 8fd26040d8 Port over temp responsive styles to bootstrap.less; readd buttons 2013-01-16 10:52:33 -08:00
Mark Otto 5a3cb0d778 remove extra border-radius props 2013-01-16 10:49:19 -08:00
Mark Otto b80bf2c138 Merge pull request #6600 from Yohn/patch-12
added missing class to doc example
2013-01-16 10:28:02 -08:00
Mark Otto 38c5c13d38 Merge pull request #6591 from Quy/2.3.0-wip
Add text alignment classes info to docs
2013-01-16 10:24:13 -08:00
Yohn 598e9e6f13 Update docs/templates/pages/components.mustache 2013-01-16 07:46:42 -05:00
Yohn 60bb95e611 adding class to example code 2013-01-16 07:45:31 -05:00
Quy Ton 1da1994ba4 Add text alignment classes info to docs 2013-01-15 18:16:44 -08:00
Mark Otto 85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00
Mark Otto 094767fbfe code changes 2013-01-15 14:34:04 -08:00
Mark Otto 267690eb1b docs changes, more type improvements, add grid system basics back 2013-01-15 14:30:00 -08:00
Mark Otto a67c86e40f Fixes #6586: remove top 5px margin from navbar input group button groups 2013-01-15 10:27:30 -08:00
Mark Otto c34ef69100 add text alignment classes from 3.0 2013-01-15 10:15:02 -08:00
Mark Otto 09696143e0 type and stuff 2013-01-15 10:14:12 -08:00
Patrick H. Lauke c55329085e Revert "Leave tabindex=-1 alone"
This reverts commit 370fa45fbe.
2013-01-15 07:22:02 +00:00
Patrick H. Lauke 370fa45fbe Leave tabindex=-1 alone
It seems that, as misguided as I personally think it is, ARIA does
indeed want dropdown menus not to behave as regular keyboard users
expect them, killing TAB/SHIFT+TAB in favor of cursor keys. Fair
enough, the issue I have is then with ARIA, not with bootstrap. I would
sugges thought that if you really do want to follow ARIA consistently,
*any* navigation bar should also become an ARIA menu, further making it
impossible for keyboard users to use TAB/SHIFT+TAB to navigate through
it, and that these changes should be reflected in the bootstrap
examples as well...
2013-01-15 07:16:33 +00:00
Patrick H. Lauke 4503ad7808 Revert "Keyboard accessibility in documentation"
This reverts commit a809daf284.
2013-01-15 07:13:19 +00:00
Mark Otto 25c9b6b59a nuke and flatten and stuff 2013-01-14 22:05:55 -08:00
Nicolas Dudebout 6512c5a5bc Changes some more commands to use the local npm install. 2013-01-14 09:02:25 -05:00
Nicolas Dudebout 915ebf9f30 Allows the user to set different source and destination in Makefile.
A user can use the following command to determine where to copy the resulting css file:

    $ BOOTSTRAP=<my-path> make
2013-01-14 09:01:19 -05:00
Nicolas Dudebout 10a83b1e62 Modifies the Makefile to use local npm install **when available**
The change introduced in 5bd8cdca9 was:

  - partial, as not all the command were translated
  - preventing the use of a global npm installation
2013-01-14 09:01:19 -05:00
Nicolas Dudebout 2a151d9e2f Moves one @printf statement to be more accurate. 2013-01-14 08:58:47 -05:00
Nicolas Dudebout 25803a966b Replaces some @echo recipes by @printf.
The echo command does not understand the -n argument on Mac OS X.
This is due to the fact that:

  - Makefile calls /bin/sh to execute a command
  - in Mac OS X, /bin/sh is a link to bash
  - in Mac OS X, bash is compiled with --enable-strict-posix-default

Therefore, the echo command does not have the -n argument.

printf on the other hand is a builtin function that works well on Mac OS X and Linux.
2013-01-14 08:58:16 -05:00
Nicolas Dudebout 5204f206b9 Splits the progress @echo statements in the Makefile. 2013-01-14 08:57:44 -05:00
Mark Otto 337741fc9a Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-01-14 00:33:16 -08:00
Mark Otto f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto 5ae1df617f Merge pull request #6568 from Yohn/patch-12
Updating docs -> popover to show container option
2013-01-14 00:03:55 -08:00
Yohn a23eb06536 fix typo 2013-01-13 15:32:51 -05:00
Yohn ecc24953a5 fix typo 2013-01-13 15:32:03 -05:00
Yohn 98aeb0acf1 added container options to docs for popover 2013-01-13 15:23:22 -05:00
Yohn fdd1daeae1 added container options to docs for popover 2013-01-13 15:21:31 -05:00
Mark Otto d247f71217 Reset docs jumbotron button to blue defaults 2013-01-13 04:27:51 -08:00
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto 76ed6b0b2c Remove comment out code and simplify what's left for button group toggles 2013-01-13 04:05:34 -08:00
Mark Otto 1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
Mark Otto 0b31cfc90e Fix up .brand in navbar of docs 2013-01-12 20:10:42 -08:00
Mark Otto 01db5db2f6 white text on buttons on hover for links 2013-01-12 20:08:13 -08:00
Mark Otto 4b34f4947a Update Holder.js 1.6 to 1.9 2013-01-12 19:49:15 -08:00
Mark Otto ea1a12593d Nuke shadow on pagination 2013-01-12 19:46:47 -08:00
Mark Otto 8670021935 fixed navbars fixings 2013-01-12 19:44:51 -08:00
Mark Otto 1ea647ce98 Remove shadows from active links in navbar 2013-01-12 19:02:58 -08:00
Mark Otto 7bcd02c167 Tweak button 2013-01-12 19:02:48 -08:00
Mark Otto 583fc4b962 buttons and button group flattening improvements 2013-01-12 18:52:06 -08:00
Mark Otto fb4fc323a2 remove font-sizes from button group btn sizes 2013-01-12 17:54:30 -08:00
Mark Otto a9a66e9c34 finetune buttons flattened colors 2013-01-12 17:51:57 -08:00
Mark Otto ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Mark Otto a33d45f308 Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
Mark Otto 24f7df15e6 Remove mention of Extend page from readme and index page 2013-01-12 13:57:41 -08:00
Mark Otto b1f0a7e62b Remove Extend page from the docs entirely
* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page
2013-01-12 13:46:07 -08:00
Mark Otto 7a3f078fb4 Remove parent div from pagination component
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Mark Otto 6f275c6148 Update extend page to point to readme for compiling.
Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.
2013-01-12 12:41:01 -08:00
Patrick H. Lauke a809daf284 Keyboard accessibility in documentation
Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.
2013-01-12 17:04:51 +00:00
Patrick H. Lauke 77c68e4bc2 Cleaned up dirty CSS
Used recess rather than less
2013-01-12 11:02:13 +00:00
Mark Otto a7231854c9 Address #6459 and add mention of disabled links in dropdowns to le docs 2013-01-12 00:33:12 -08:00
Mark Otto 8a16746542 Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto 3773b99969 Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
update 3.0.0 docs to reflect #5786
2013-01-12 00:29:23 -08:00
Mark Otto e195457728 Merge pull request #6472 from RWOverdijk/patch-1
Update composer.json
2013-01-12 00:21:08 -08:00
Mark Otto aaf80d410a fix username navbar text in fluid example for responsive variations 2013-01-12 00:20:13 -08:00
Mark Otto 19e2ad0eb6 Fixes #6538: Add th support to all the .table-rounded selectors 2013-01-11 23:38:53 -08:00
Mark Otto 6f894c62a5 Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active 2013-01-11 23:35:22 -08:00
Mark Otto 42efd9f730 Address #6545: clarify initialization of tooltips in docs 2013-01-11 20:58:24 -08:00
Mark Otto 4de3a77a64 Fixes #6547: Make blockquotes use multiple of @baseFontSize 2013-01-11 20:55:09 -08:00
Mark Otto 88e816956a Fixes #6552: example fix for button group 2013-01-11 20:52:39 -08:00
Mark Otto b242ff7851 Fixes #6553: example fix for validation states 2013-01-11 20:51:11 -08:00
Mark Otto 767a293b4d Increase input group margin on bottom and vertically center to match inputs 2013-01-11 20:46:21 -08:00
Mark Otto 56a24027c3 Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states 2013-01-11 20:42:44 -08:00
Mark Otto d3b3b4c48f Fixes #6474: remove duplicate .btn border colors to make @btn-border work 2013-01-11 20:40:17 -08:00
Mark Otto d7c93fc647 Fixes #6478: scope table backgrounds to immediate td/th elements 2013-01-11 20:38:14 -08:00
Mark Otto 53f9e25150 Comment fix 2013-01-11 20:30:56 -08:00
Mark Otto 7b3f74311e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-01-11 20:27:00 -08:00
Mark Otto 7626cc629f Remove overflow: auto; from .tab-content 2013-01-11 20:26:48 -08:00
Mark Otto b9b5cd786d Fixes #6555: remove .controls-row from responsive 2013-01-11 20:23:37 -08:00
Mark Otto 0f34666f07 Merge pull request #6550 from Boulox/font-variable-fix
Add glyphicons font path variable
2013-01-11 11:11:32 -08:00
Mark Otto 649d8c985e Remove navbar links from sticky footer navbar example 2013-01-11 11:00:45 -08:00
Mark Otto 839f83c610 Merge branch 'wilfra-patch-2' into 2.3.0-wip 2013-01-11 10:58:17 -08:00
Fabien c91bf424b0 Add glyphicons font path variable 2013-01-11 18:32:00 +01:00
Mark Otto 6e5a2fedaa Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago 2013-01-10 18:51:04 -08:00
William Franceschine cf852c1f62 Update docs/examples/marketing-narrow.html
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine 9fdc9887cf Update docs/examples/marketing-alternate.html
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine edfc0bf8b3 Update docs/examples/hero.html
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine 1eb6a1d8c8 Update docs/examples/carousel.html
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine 5eff3cdd5d Update docs/examples/fluid.html
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto 1d87bcc9f5 Merge branch 'aronwoost-patch-1' into 2.3.0-wip 2013-01-09 21:37:11 -08:00
Mark Otto 976b4ea263 Merge branch 'Justin-John-master' into 2.3.0-wip 2013-01-09 21:35:50 -08:00
Mark Otto ccf4c2fbe3 add sticky footer with navbar 2013-01-09 19:53:42 -08:00
Mark Otto 91dd77939b Add text alignment utility classes 2013-01-09 18:56:08 -08:00
Justin John Mathews 2c2a847e75 Corrected carousel arrows to active.#6494, #6489
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Aron Woost aeb0e85151 replaced tabs with spaces 2013-01-09 10:15:15 +01:00
Kenan Shifflett b5ad50686c Removed touchstart from bootstrap-dropdown.js. 2013-01-07 20:13:28 -05:00
Wesley Overdijk bf3dea668f Update composer.json
target-dir is not needed. All it does, is nest everything another level deeper. It should only be used for completing psr-0 paths.
2013-01-06 16:43:41 +01:00
Chris Rebert 206205a6b2 update docs to reflect #5786 2013-01-05 17:36:20 -08:00
Chris Rebert 684c9d8d05 update docs to reflect #5786 2013-01-05 17:14:22 -08:00
Patrick H. Lauke 848ca6e315 Basic keyboard accessibility CSS tweaks
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto 3d04d9ba75 Super lame typo on my part, sorry @necolas :) 2012-12-28 19:24:13 -06:00
Mark Otto 5a2dc0b897 Improve documentation for new form validation styles 2012-12-28 14:47:55 -06:00
Mark Otto 1c0e4fc7bb Popovers are now flexible width:
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
2012-12-28 14:18:59 -06:00
Mark Otto f69d12af3d Merge pull request #6407 from aurnik/master
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Mark Otto 6f8e315b1d Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
Conflicts:
	docs/assets/img/bootstrap-docs-readme.png
2012-12-28 13:08:49 -06:00
Tunghsiao Liu 3096a377a2 Add transition-duration mixin 2012-12-28 16:19:12 +08:00
Aurnik Islam aa997e274e Fix link to File structure anchor 2012-12-27 01:49:09 -08:00
Mark Otto dc5c6d6be8 Simplify form validation states while enabling them to be applied to one field at a time. 2012-12-26 15:57:52 -06:00
Mark Otto d0baa99aed Remove .text-info and .info form validation states 2012-12-26 14:59:58 -06:00
Mark Otto 2ef4fde09f Drop .input-block-level modifier as inputs are already width: 100%; 2012-12-26 14:19:48 -06:00
Mark Otto 12b738bf30 Add grid column example to form input sizing 2012-12-26 14:13:44 -06:00
Mark Otto 070109abc1 Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required 2012-12-26 14:09:36 -06:00
Mark Otto 0da31ceb51 Cleanup spacing in variables file 2012-12-26 14:06:21 -06:00
Mark Otto c17673dc61 Restore .form-horizontal 2012-12-26 13:59:09 -06:00
Mark Otto 9921d21969 Run make on previous commits 2012-12-26 13:59:01 -06:00
Mark Otto b19fd8e4fa Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-26 10:15:23 -06:00
Mark Otto 330b143b40 Add longer tooltip example to docs, tighten up line-height on tooltip; run make 2012-12-26 09:36:07 -06:00
Mark Otto 9749d6afc2 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-26 09:21:34 -06:00
fat-kun b9c7f29134 Merge pull request #6378 from Yohn/patch-7
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn 340d90138c Update docs/templates/pages/javascript.mustache 2012-12-24 19:03:13 -05:00
Yohn 2a5fde272c Update docs/javascript.html 2012-12-24 19:01:56 -05:00
Yohn 9835549faf made container option be false 2012-12-24 18:59:37 -05:00
Yohn e867ae7b60 removed the length check
updated it to @fat's suggestion
2012-12-24 18:07:41 -05:00
Mark Otto c063f7c9c2 Update docs to reflect latest on .clearfix 2012-12-24 02:08:45 -08:00
Mark Otto d206ec1659 Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger 2012-12-24 02:06:28 -08:00
fat-kun 90cdef8dfe Merge pull request #6380 from Yohn/patch-10
promote using data-toggle instead of rel for tooltip and popover
2012-12-23 19:22:51 -08:00
fat-kun 0a7c840173 Merge pull request #6375 from tkawachi/tooltip-events-2.3.0
Tooltips fires show, shown, hide, hidden events
2012-12-23 19:19:58 -08:00
Yohn dfbac13ad1 data-toggle instead of rel for tooltip and popover 2012-12-23 07:04:24 -05:00
Yohn 5da8b315c0 data-toggle instead of rel for tooltip and popover 2012-12-23 07:00:03 -05:00
Yohn da0217405f data-toggle instead of rel for tooltip and popover 2012-12-23 06:51:46 -05:00
Yohn f152dead92 Update docs/javascript.html 2012-12-23 04:25:27 -05:00
Yohn 68ff08cc91 Update docs/templates/pages/javascript.mustache 2012-12-23 04:23:18 -05:00
Yohn b6960d8cf9 Update js/tests/unit/bootstrap-tooltip.js 2012-12-23 04:21:02 -05:00
Yohn d594d6377a adding container option to tooltips 2012-12-23 04:18:16 -05:00
KAWACHI Takashi defe85bb51 Assign event variables at declarations 2012-12-23 15:17:41 +09:00
KAWACHI Takashi 7a3a88acc6 Tooltips fires show, shown, hide, hidden events
It is re-worked from #3691.
2012-12-23 14:42:13 +09:00
fat-kun 48211ad9f5 Merge pull request #6374 from whyisjake/2.3.0-wip
Update docs/templates/pages/javascript.mustache
2012-12-22 21:18:36 -08:00
Jake Spurlock 0834bd51ec Update docs/templates/pages/javascript.mustache
Adding spaces around the pipes. Makes it consistent with the rest of the docs.
2012-12-22 21:03:58 -08:00
Mark Otto f74990d898 Version bump 2012-12-22 16:10:06 -08:00
fat-kun d09b46fe37 Merge pull request #6349 from Yohn/patch-6
Fixes #5753 with tooltip('toogle')
2012-12-22 14:53:24 -08:00
fat effba9e55c add data-api namespace to dropdown 2012-12-22 14:22:45 -08:00
fat 2c0ed072b0 shifting focus to parent and adding aria menuitem for dropdown 2012-12-22 13:57:57 -08:00
fat 4d195222d4 remake js 2012-12-22 13:48:28 -08:00
fat a9e661a2b5 read data options in constructor for collapse 2012-12-22 13:48:16 -08:00
fat fad0fb683b allow multiple trigger types in tooltip and popover + default tooltip to hover & focus 2012-12-22 13:24:37 -08:00
fat e2434fefbd chnage for #6248 2012-12-21 20:27:53 -08:00
fat-kun 356e47efe1 Merge pull request #6247 from jimwebb/scrollspy-documentation-clarify
change scrollspy documentation to clarify javascript usage
2012-12-21 20:23:44 -08:00
fat f59bf47081 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 20:20:04 -08:00
fat ddd59f22c7 update mustace to reflect changes to data-slide-to 2012-12-21 20:19:33 -08:00
fat 24a36df9f6 add support for [data-slide-to] attr on carousel 2012-12-21 19:45:19 -08:00
Mark Otto 7f7039321d Fixes #6189: Add holder.js to carousel example 2012-12-21 19:10:05 -08:00
Mark Otto a55605ca57 add readme image 2012-12-21 19:04:59 -08:00
Mark Otto 442012f0f5 Smaller image update to readme 2012-12-21 19:02:33 -08:00
Mark Otto 5a2966a2c2 Downsize image 2012-12-21 18:59:51 -08:00
Mark Otto d23006a6bd Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 18:59:14 -08:00
Mark Otto ccafc8a010 Explore adding icon to readme 2012-12-21 18:58:59 -08:00
Mark Otto 558bc52432 Add docs readme icon 2012-12-21 18:54:36 -08:00
fat 818c56f078 rewrite makefile to make a bit more "efficient" + rebuild 2012-12-21 17:42:24 -08:00
fat 82a758344d add direction prop to carousel slide event 2012-12-21 17:31:54 -08:00
fat e194c3e4f4 rebuild 2012-12-21 17:25:31 -08:00
fat 5da30ee5fb Merge branch 'marcelkorpel-master' into 2.3.0-wip 2012-12-21 17:24:45 -08:00
fat d5345f806c Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master 2012-12-21 17:19:36 -08:00
Mark Otto dc32555f5b Fixes #6370: Add comment to docs on typeahead and autocomplete 2012-12-21 15:46:10 -08:00
Mark Otto c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto 704dfb2f1d Merge pull request #6360 from Quy/2.3.0-wip
Miscellaneous changes to docs
2012-12-21 00:28:07 -08:00
Mark Otto 7c04d573d0 update docs regarding normalize and clearfix 2012-12-20 21:44:45 -08:00
Quy Ton a27bf30f0d Miscellaneous changes to docs 2012-12-20 21:38:53 -08:00
Mark Otto 5d4e718446 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-20 20:56:00 -08:00
Mark Otto 5508d3d5b3 Remove reset.less now that Normalize 2 is fully integrated 2012-12-20 20:52:43 -08:00
Mark Otto 7b7581d44a Finish migrating to Normalize 2:
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
2012-12-20 20:52:20 -08:00
Mark Otto c1e82732cf Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto d6d828154a Merge pull request #6354 from cvrebert/3.0.0-wip
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
2012-12-20 15:33:52 -08:00
Mark Otto a24e47b5b8 Update the examples index:
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto 43d130762b Fixes #6352: marketing-alternate broken nav in FF17 2012-12-20 14:40:39 -08:00
Mark Otto 69f6149489 Normalize indentation from 4 to 2 spaces 2012-12-20 14:11:40 -08:00
Mark Otto 1c33b857a6 Convert normalize comments to // style 2012-12-20 14:08:09 -08:00
Mark Otto be74ad7e0d Merge branch '3.0.0-wip' into bs3-normalize
Conflicts:
	less/bootstrap.less
2012-12-20 14:02:54 -08:00
Mark Otto 8eb1549842 remove .hide specificity override from grid classes 2012-12-20 13:57:14 -08:00
Mark Otto 6bd5dc7d9f Add important flag to .show/.hide utility classes; remove .hide requirement from modals 2012-12-20 13:53:38 -08:00
Mark Otto a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
2012-12-20 13:47:36 -08:00
Mark Otto 5e4f663e69 Undo important on hide/show utilties; punt to 3.0 2012-12-20 13:46:07 -08:00
Mark Otto 00ff34b9e6 fix up code snippet 2012-12-20 13:41:45 -08:00
Mark Otto b6575cc72e fix up code snippet 2012-12-20 13:41:08 -08:00
Chris Rebert 30f72e69e3 add comment regarding caveat of #6199 impl per discussion in/of 14844db862 2012-12-20 11:00:47 -08:00
Yohn a6705246d0 Update js/tests/unit/bootstrap-tooltip.js 2012-12-20 04:36:57 -05:00
Yohn e21b6459ad fixes tooltip('toggle') 2012-12-20 04:34:28 -05:00
Mark Otto 30d8eb3ed5 Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip 2012-12-20 01:34:19 -08:00
Mark Otto 0a1434b23b Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors 2012-12-20 01:34:10 -08:00
Mark Otto 3f493f0d0d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-20 01:30:43 -08:00
Mark Otto f706acb11c Fixes #6339: Use important flag on .hide and .show utility classes 2012-12-20 01:30:32 -08:00
Mark Otto cdb25e11ef lighter buttons closer to todays versions 2012-12-20 01:21:09 -08:00
fat 5abe33f5d8 reset carousel in the case that it is reinstantiated twice 2012-12-20 01:13:03 -08:00
fat 6b67a83631 Merge branch '2.2.3' into 2.3.0-wip 2012-12-20 01:05:55 -08:00
fat 2c9f43f685 if carousel element already open, don't reopen it duh bruh bruh 2012-12-20 01:05:07 -08:00
Mark Otto c00f29e4d4 Fixes #6236: Fix popover font-size in input groups 2012-12-20 00:54:58 -08:00
Mark Otto 4e54e7bb35 Remove dropdown submenu docs 2012-12-20 00:27:46 -08:00
Mark Otto cc6974b74e Remove dropdown submenu CSS 2012-12-20 00:27:05 -08:00
Mark Otto acde2dc1ee Nuke third lines form carousel examples 2012-12-20 00:20:00 -08:00
Mark Otto 72f13e2870 Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
Mark Otto 9726fded1c Get on that carousel indicator lifestyle with some new hawtness 2012-12-19 23:52:38 -08:00
Mark Otto 5d776bcfd2 Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3 2012-12-19 23:39:40 -08:00
fat bbe4625672 lol we dont' have affix(refresh) 2012-12-19 23:39:26 -08:00
Mark Otto 14844db862 Holy shit, buttons, button states, and input states updated 2012-12-19 23:37:33 -08:00
fat 7f9ff0ba5b add js support for carousel indicators 2012-12-19 23:25:25 -08:00
Mark Otto 09dde5c84a Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto a27952efd0 Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code 2012-12-19 23:12:38 -08:00
Mark Otto 9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
fat e9eff0cbff wait 100ms before engaging affix (allows for initial browser scroll) 2012-12-19 22:37:41 -08:00
Mark Otto afef81c0d7 remove commented out buttons css, update docs 2012-12-19 22:30:08 -08:00
fat 96e5fa6143 whitespace in tooltip + don't pass empty selector to $() in dropdown.js 2012-12-19 22:26:36 -08:00
Mark Otto c38b7206eb overhaul buttons 2012-12-19 22:25:56 -08:00
Mark Otto a932476f80 Unfuck the fucked homepage 2012-12-19 22:07:11 -08:00
fat 7c456c8554 fix tooltip doc dumbness 2012-12-19 22:05:33 -08:00
fat 219d275ae6 can't extend bounding box thingy 2012-12-19 22:03:57 -08:00
Mark Otto 7449e2e5a1 Remove @black and just use #000 2012-12-19 22:02:57 -08:00
fat dc4e80a655 fix ghetto ass timeout shit 2012-12-19 21:55:23 -08:00
Mark Otto 65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
Mark Otto b6945a2168 Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones 2012-12-19 21:37:16 -08:00
fat 5bd8cdca91 remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install 2012-12-19 21:36:50 -08:00
Mark Otto 2011a0d50f Drop labels from the docs 2012-12-19 21:29:57 -08:00
Mark Otto c6cc1b1a1d Drop .label component. Instead, just use .badge because fuck dupe code and stuff. 2012-12-19 21:18:32 -08:00
Mark Otto 85971ff3e8 Drop .form-search support 2012-12-19 21:12:37 -08:00
Mark Otto ec623c176b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-19 21:03:43 -08:00
Mark Otto 51b1a027da Merge branch 'bs3-input-groups' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto 26b999b76a no need for margin-top on .typeahead, it's set on .dropdown-menu 2012-12-19 19:46:44 -08:00
Mark Otto 19a94d08d6 Remove support for multiple buttons in input groups because fuck that shit. 2012-12-19 19:33:14 -08:00
Mark Otto dc6142751f Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only 2012-12-19 18:47:34 -08:00
Mark Otto 28c928f010 Use normalize as separate file instead of with other resets; still need to punt other styles 2012-12-19 18:43:55 -08:00
Mark Otto 840e47eabd Update clearfix mixin and class per @necolas's feedback 2012-12-19 17:49:20 -08:00
Mark Otto ac20a08281 Use @border-radius-base var for nav tabs 2012-12-17 10:11:33 -08:00
Mark Otto cdff0a0ca8 Merge pull request #6267 from valorin/composer-fix
Removing "target-dir" option to stop extra nesting
2012-12-15 18:45:50 -08:00
Stephen Rees-Carter 2183ab63b7 Removing "target-dir" option to stop extra nesting
There is no valid reason to set this since it causes extra nesting:
    ./vendor/twitter/bootstrap/twitter/bootstrap/
2012-12-14 16:38:09 +11:00
Jim Webb ecfa09decb * modify scrollspy documentation to clarify javascript usage
* add scrollspy 'target' option
2012-12-12 11:48:44 -05:00
Mark Otto 529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto cddca18f12 Fixes #6174: Caret alignment in small and mini buttons 2012-12-10 10:59:57 -08:00
Mark Otto 9d985978a3 Escape HTML of section element 2012-12-10 10:55:42 -08:00
Mark Otto 847b632577 IE10 fix in responsive utilities, not regular utilities 2012-12-10 10:29:16 -08:00
Mark Otto e324a1beb0 Simplify syntax of nesting with inline lists 2012-12-10 10:28:18 -08:00
Mark Otto 83a6a55d2c Move IE10 responsive fix to responsive utilities so Customizer gets it 2012-12-10 10:25:18 -08:00
Mark Otto 165729254b squash new line 2012-12-10 10:13:04 -08:00
Mark Otto ab5d7f863c move reset after vars and mixins 2012-12-10 09:57:23 -08:00
Chris Rebert 8c8a14ab59 document caveat regarding fieldset legend and #6199 2012-12-10 01:46:16 -08:00
Chris Rebert 48759eee94 document fieldset[disabled] styling added in #6199; per @mdo 2012-12-10 01:33:02 -08:00
Mark Otto 9f29785783 Merge pull request #6195 from nathanb/example-carousel-nav-fix
lowered carousel beneath the nav (in carousel example)
2012-12-10 00:21:35 -08:00
Chris Rebert 3b5d4f52a3 fixes #5605: style as disabled all form controls & btns under a disabled fieldset
this is a resubmission of #5875, but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -08:00
Blake Embrey c105906780 Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 2012-12-10 16:42:58 +10:00
Mark Otto 4245e8ebb5 Fix checkbox and radios example 2012-12-09 22:13:40 -08:00
Mark Otto 6e9bbe6232 Nested columns docs tweaks 2012-12-09 22:08:11 -08:00
Mark Otto 4c82dd3645 Refactor input groups
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Nathan Bridgewater 18adc44171 lowered carousel beneath the nav 2012-12-09 22:10:38 -06:00
Mark Otto 6649918c7f Merge conflicts 2012-12-08 22:45:39 -08:00
Mark Otto 070c125cec Restore print styles 2012-12-08 21:05:05 -08:00
Mark Otto 68d1d7fc83 Test removal of print styles for customized builds 2012-12-08 21:02:37 -08:00
Mark Otto b5ceca14db Fix docs typos 2012-12-08 18:46:34 -08:00
Mark Otto bc0b94a3fd Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Mark Otto 9376a7c221 Fixes #5729: Nested striped tables
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -08:00
Mark Otto cacc213762 Nesting tables
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -08:00
Mark Otto b9292ff90c Merge pull request #6165 from Quy/2.2.2-wip
Apply code tag to data attribute on javascript page
2012-12-08 12:17:46 -08:00
Quy Ton 3bd9a26c01 Apply code tag to data attribute on javascript page 2012-12-08 12:06:46 -08:00
fat 820a3b27b6 get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
fat 1747caf19d insert menu of typeahead after input which it suggests on #3529
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat 437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat 10e72e158d Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 17:50:34 -05:00
fat 91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -05:00
billy gates c362e72660 Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat 66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
billy gates 2526c3fdbe Merge pull request #6118 from godric7/master
scrollSpy - add parent scrollTop to offset calculation
2012-12-07 14:11:18 -08:00
fat a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05:00
Mark Otto 1c5b8e967e Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:51:57 -08:00
Mark Otto be45a821bb Fixes #6148: Icons in mini buttons properly aligned 2012-12-07 09:51:01 -08:00
Mark Otto 1413f976ae Merge pull request #6151 from tierra/pre-code-white-space-fix
Fix code block white-space breaks within pre tags.
2012-12-07 09:48:14 -08:00
Mark Otto cc6fda2262 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:43:32 -08:00
Mark Otto 2c7ab23d7a Fixes #6136: Proper scoping of breadcrumbs divider 2012-12-07 09:43:09 -08:00
Mark Otto 2877f84579 Merge pull request #6143 from Quy/2.2.2-wip
Escape &times;
2012-12-07 09:41:17 -08:00
Bryan Petty f4466dd9c7 Fix code block white-space breaks within pre tags. 2012-12-06 11:33:00 -07:00
Quy Ton 81679981c5 Escape &times; 2012-12-05 15:28:14 -08:00
Mark Otto be5f31480b Nuke all i18n tags from .mustache templates 2012-12-05 11:09:02 -08:00
Mark Otto 306c1b4914 Remove commented out old popover CSS 2012-12-05 11:06:16 -08:00
Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto b3019d7aab add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -08:00
Mark Otto ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Mark Otto 12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -08:00
Mark Otto e31c7fb8a5 correct link on index page to grid system 2012-12-04 09:49:18 -08:00
Godric 8b959cacbc Update js/bootstrap-scrollspy.js
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
2012-12-04 01:21:07 +01:00
Mark Otto 0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto 869b69c66c Fixes #6115: scope breadcrumb styles to immediate children only 2012-12-03 13:09:38 -08:00
Mark Otto 06582edb2a Improve rendering of carousel example for IE10 2012-12-03 13:01:27 -08:00
Mark Otto d470fb72da nuke comments 2012-12-03 09:23:02 -08:00
Andreas Cederström 68cbba347b Fixing header color for success, error and info alerts 2012-12-03 14:20:14 +01:00
Mark Otto eca23e9b0f add source attribution for IE10 fix 2012-12-02 21:01:53 -08:00
Mark Otto f514c87d6b Enable responsive features in IE10 when snapped 2012-12-02 20:57:34 -08:00
Mark Otto 30d6a71ccd Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10 2012-12-02 20:40:24 -08:00
Mark Otto 439ff09701 herpderp 2012-12-02 18:15:40 -08:00
Mark Otto c8862d91bc Readme reorg
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -08:00
Marcel Korpel 0dece7a71f Set focus back to input field after clicking an item
Test 'focus is still set' added

Fixes issue #5933
2012-12-02 12:35:33 +01:00
Mark Otto 139f1be49d reset text align in popovers given inline insertion 2012-12-02 02:30:00 -08:00
Mark Otto ea61cdb740 remove overrides on inner html of popover-content 2012-12-02 01:34:58 -08:00
Mark Otto 32d425967a run make on js changes to popover 2012-12-02 01:32:23 -08:00
Mark Otto 85c57c6ba8 Merge branch 'Moveo-master' into 2.2.2-wip 2012-12-02 01:32:13 -08:00
Mark Otto e8b3c36068 run make on modal popover fix 2012-12-02 00:09:45 -08:00
Mark Otto 9c028ea54b follow button width 2012-12-01 18:51:03 -08:00
Mark Otto dbb244cb97 Merge pull request #6097 from blakeembrey/modal-body-relative
Add relative positioning to .modal-body
2012-12-01 17:45:33 -08:00
Blake Embrey fbec803b55 Add relative positioning to .modal-body - Fixes #5991 2012-12-02 09:53:05 +10:00
Mark Otto 19ee7999f4 remove single corner border-radius mixins 2012-12-01 14:25:28 -08:00
Mark Otto dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto 98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08:00
Mark Otto 0947105656 section title change 2012-11-30 17:43:20 -08:00
Mark Otto 51b4de8eec docs content changed 2012-11-30 16:43:31 -08:00
Mark Otto 6961b284b6 remove responsive image from css docs page 2012-11-30 16:42:48 -08:00
Mark Otto ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto 10c14e8955 first pass at nuking scaffolding 2012-11-30 16:29:30 -08:00
Mark Otto 0fabca01db Remove more fluid grid stuff
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto b8b266ca7c popovers and tooltips vars 2012-11-30 15:40:44 -08:00
Mark Otto e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto 0a93bc143d hero unit and pagination vars 2012-11-30 15:36:16 -08:00
Mark Otto 51c418d468 alignment 2012-11-30 15:34:35 -08:00
Mark Otto 62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto a09cea44ae more vars changed 2012-11-30 15:27:13 -08:00
Mark Otto 01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto 12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00
Mark Otto 0ef347706c more vars changing 2012-11-30 15:09:57 -08:00
Mark Otto 9239bfbc7b more vars changed, remove @white var 2012-11-30 15:05:23 -08:00
Mark Otto b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto 7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37:24 -08:00
Mark Otto fe8061b84e more tests for form styles; includes lightening help text 2012-11-30 13:35:20 -08:00
Mark Otto f9a47e3a5f Refine containers and navbars
* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars
2012-11-30 12:42:37 -08:00
Mark Otto 030a058174 Remove .navbar-inner from navbar tests 2012-11-30 12:36:55 -08:00
Mark Otto 7313702cf3 Inputs now 100% width by default
* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab
2012-11-30 00:53:07 -08:00
Mark Otto 8d09e7c24d remove some unhelpful comments 2012-11-30 00:26:02 -08:00
Mark Otto 4fd164d45b consolidate font resets into scaffolding 2012-11-30 00:24:17 -08:00
Mark Otto 71d8bebfbc remove from form styles 2012-11-30 00:21:44 -08:00
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto bca3ff4ed6 Fixes #5853: Maintain 10px margin above help block when following input groups 2012-11-29 23:39:33 -08:00
Mark Otto f087b3428c remove element from selector 2012-11-29 23:33:09 -08:00
Mark Otto fe7b6decb1 Merge pull request #6039 from desheikh/2.2.2-wip
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto 322a56354f run make with nav img fix 2012-11-29 23:27:20 -08:00
Mark Otto 721b568303 update comment 2012-11-29 23:27:09 -08:00
Mark Otto c5173cdb92 Merge branch 'idavemm-patch-1' into 2.2.2-wip 2012-11-29 23:26:22 -08:00
Mark Otto 52e669d619 Merge branch '2.2.2-wip-holder' into 2.2.2-wip 2012-11-29 21:35:57 -08:00
Mark Otto 38c546c785 upgrade to holder 1.6 2012-11-29 21:35:45 -08:00
Mark Otto 12aa060efd Merge branch 'jblotus-patch-1' into 2.2.2-wip 2012-11-29 21:06:20 -08:00
Mark Otto e9c32fdf6d Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1 2012-11-29 21:06:11 -08:00
Mark Otto acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Zulfiqar Ali ddd154481b added compiled css file 2012-11-29 17:40:23 +08:00
Mark Otto fa6a6dbb92 Merge pull request #6057 from ph-One/patch-3
Update Makefile's UglifyJS commands
2012-11-28 18:41:36 -08:00
Mark Otto 78390d12af Fix the carousel after we scoped selectors 2012-11-28 15:40:51 -08:00
Mark Otto cb69aa976f Merge branch 'trsteel88-master' into 2.2.2-wip 2012-11-28 15:35:16 -08:00
Kyle A. Matheny fe8df5022b Update Makefile
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00:00
Mark Otto f1349a2450 Fixes #5533: Remove filter gradient from disabled links on dropdowns 2012-11-28 02:22:37 -08:00
Mark Otto 8fb36cb3dd Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only 2012-11-28 02:21:34 -08:00
Mark Otto 296b838405 Fixes #5616: scope carousel state classes to immediate children only 2012-11-28 02:17:50 -08:00
Mark Otto bf3a5df371 Fixes #5930: redeclare font-size for popoves in btn-groups 2012-11-28 02:10:23 -08:00
Mark Otto 783120dffa Fixes #5927: Scope button group 5px button left margin to immediate children 2012-11-28 01:51:04 -08:00
Mark Otto 014d3cedf5 Fixes #5940: Prevent @headingsColor from changing alert colors 2012-11-28 01:48:34 -08:00
Mark Otto bfc97fdaf6 Fixes #4852: IE8 popover carets fixed
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
2012-11-28 01:38:21 -08:00
Zulfiqar Ali 693fd0db2a help-block margin-top should also apply after a span.uneditable-input 2012-11-28 16:47:59 +08:00
Mark Otto fda5bb135e Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons 2012-11-28 00:46:09 -08:00
Mark Otto 74f51105e9 Fixes #6010: Navbar dropdown caret should match link hover color 2012-11-28 00:42:17 -08:00
Mark Otto 942f9c5df4 Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px 2012-11-28 00:37:55 -08:00
Mark Otto 02097700e8 Fixes #6035: use font-size vars in button groups 2012-11-28 00:31:52 -08:00
Mark Otto dc10e6bbf8 Fixes #5935: Updated vertical gradient mixin 2012-11-28 00:19:35 -08:00
Swaagie e6e4d93d5e leave it to the developer to decide how to use the content of the popover 2012-11-27 15:07:31 +01:00
Zulfiqar Ali 701f871e7d help-block margin-top should also apply after a span.input 2012-11-27 07:30:54 +08:00
Mark Otto 7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto e0d0190803 fix image sizes on homepage 2012-11-22 12:26:54 -08:00
Mark Otto 5d1b4206b1 Fixes #5986: single toggle button html examples 2012-11-22 12:06:36 -08:00
Mark Otto 8df2811d49 Simpler footer for docs
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto 8b417c39e7 Merge pull request #5954 from tony/patch-2
Fix typo in reset.less
2012-11-19 15:31:14 -08:00
Tony Narlock ace6dc0c25 Fix typo in reset.less 2012-11-19 16:49:47 -05:00
Mark Otto a10d68f291 Fixes #5937: Border radius vars in button groups 2012-11-18 12:30:35 -08:00
Mark Otto a367fd4938 Fixes #5925: Adjust top margin of input group in navbar 2012-11-16 01:19:15 -08:00
Mark Otto 88c2497368 Fixes #5912: User correct selector for form field states.
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto 5702e1be6e widths on github buttons 2012-11-16 01:13:52 -08:00
Trent Steel 4d593618e0 add composer.json 2012-11-16 17:01:21 +10:00
Mark Otto fa1c130552 Change important badges/labels to danger 2012-11-15 09:17:11 -08:00
Mark Otto a43bf14ea5 Merge branch '2.2.2-wip' into exploratory 2012-11-15 09:15:37 -08:00
Mark Otto 05655ff4ff fixes #5922: clicking only button should download custom build 2012-11-15 09:14:54 -08:00
Mark Otto 1700e48e7f Fixes #5879: Manual update of Normalize credit 2012-11-14 15:20:38 -08:00
Mark Otto 0df0b5f1f5 run make after latest merges 2012-11-14 15:19:16 -08:00
Mark Otto cd1f72f484 Merge pull request #5894 from amid2887/patch-3
Update less/tables.less ( typing, use variable, add border-radius reset )
2012-11-14 01:20:20 -08:00
Mark Otto 303767350c Merge pull request #5874 from tacomanator/2.2.2-wip
fixes #5873: @navbarInverseBrandColor not used
2012-11-14 01:18:11 -08:00
Paul McLanahan 6ec7c72e5b Fix issue with double move event firing in typeahead.
Fix test to catch issue.
Fix #5806.
2012-11-13 11:00:34 -05:00
amid2887 41889f74d0 Update less/tables.less
Possible typing.

Add @baseBorderRadius as value for some rules.

Add border-radius clearing for first and last td in the last tbody for table with tfoot.
2012-11-13 17:49:33 +07:00
Drew Goodwin c8856eeff3 fixes #5873: @navbarInverseBrandColor not used 2012-11-10 17:58:00 -08:00
Mark Otto 1a4ce9ba18 Merge branch '2.2.2-wip' into exploratory 2012-11-09 10:09:04 -08:00
Mark Otto 54486de88c run make again 2012-11-09 09:21:14 -08:00
Mark Otto f2bbee2075 remove * line-height 2012-11-08 23:56:29 -08:00
Mark Otto ddf5ceccce typo fix 2012-11-08 23:49:04 -08:00
Mark Otto cf7d7a7b5d remove ; from customizer 2012-11-08 23:46:40 -08:00
Mark Otto 57eed7867b merge in latest 2012-11-05 19:00:34 -08:00
Mark Otto 9d1eefa4fb Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-05 18:44:22 -08:00
Mark Otto 23a7ab4b51 icon vertical align in buttons 2012-11-05 18:44:10 -08:00
Mark Otto 33beb93e1b new docs css for new icons 2012-11-05 18:40:00 -08:00
Mark Otto b82bc97023 update docs and all classes 2012-11-05 18:38:59 -08:00
Mark Otto cea2a701f0 adding new fonts and css for glyphicons update 2012-11-05 18:36:16 -08:00
Mark Otto c0bbe1692c Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
2012-11-05 18:27:25 -08:00
Mark Otto 02c0b788cd Merge pull request #5795 from globocom/missing-i18n-customize-and-download
insert missing i18n tag at customize and download string
2012-11-05 17:47:45 -08:00
Alexandre Magno 0a1d296e19 insert missing i18n tag at customize and download string 2012-11-05 18:38:59 -02:00
Mark Otto 79b7017227 version bump 2012-11-05 09:32:48 -08:00
Mark Otto d38bda1480 Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading 2012-11-04 22:50:07 -08:00
Mark Otto 34880e3ef5 Fixes #5596: switch vars in .size mixin 2012-11-04 19:59:50 -08:00
Mark Otto ee93541421 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
2012-11-04 19:59:07 -08:00
Mark Otto 62c78e46f8 more required input tweaks 2012-11-04 19:53:13 -08:00
Mark Otto 91bcccd9a8 simplify invalid input css 2012-11-04 19:43:09 -08:00
Mark Otto ebed09ec01 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-04 19:42:13 -08:00
Mark Otto f3b3814606 Merge pull request #5786 from cvrebert/2.2.2-wip
fixes #5494: style invalid fields as invalid regardless of required-ness
2012-11-04 19:41:59 -08:00
Mark Otto 823b5accd3 start documenting html5 invalid form fields 2012-11-04 19:41:41 -08:00
Mark Otto 7e6cc0bf7e Fixes #5785: allow for segmented button groups in input groups 2012-11-04 19:08:02 -08:00
Chris Rebert 76f9c9128e fixes #5494: style invalid fields as invalid regardless of required-ness 2012-11-04 18:26:25 -08:00
Mark Otto 51f293ba4c Fixes #5662: white-space: nowrap; on code element 2012-11-04 13:30:36 -08:00
Mark Otto 075e320a83 remove unnecessary bg declarations in buttons per #5684 2012-11-04 13:26:03 -08:00
Mark Otto 21957a3d9e set background size for docs jumbotron for retina 2012-11-04 13:24:06 -08:00
Mark Otto 953dc3a6f2 higher res docs illustrations 2012-11-04 13:23:08 -08:00
Mark Otto fb51efcbd4 Fixes #5113: increase .typeahead z-index for proper use with modals 2012-11-04 13:01:31 -08:00
Mark Otto 2320a09898 fix modals display in docs on tablet view 2012-11-04 12:58:57 -08:00
Mark Otto 1af0021014 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
2012-11-04 12:42:00 -08:00
Mark Otto 22d1506d23 remove margin on .inline lists 2012-11-04 12:39:27 -08:00
Mark Otto 508cc1fef4 change up list classes to use .list- prefix 2012-11-04 12:38:35 -08:00
Mark Otto 269be76f4a Merge branch '2.2.2-wip' into exploratory 2012-11-04 12:37:44 -08:00
Mark Otto 28da31218f Refine new inline list option 2012-11-04 12:36:37 -08:00
Mark Otto 68f26d959f Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline 2012-11-04 12:27:30 -08:00
Mark Otto e4866c4b3c clarify unstyled lists docs 2012-11-04 12:27:18 -08:00
Mark Otto 83a3789b5e add justified nav links for tabs and pills 2012-11-04 00:52:10 -07:00
Mark Otto 05a2d37559 run make after removing responsive css file 2012-11-04 00:37:49 -07:00
Mark Otto 25fded1ff4 responsive images, updated shadows on navbars, remove responsive file from docs 2012-11-04 00:31:43 -07:00
Mark Otto 3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto a56de2b84f Merge branch 'glyphicons_font' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
2012-11-03 16:15:54 -07:00
Mark Otto c0eacca0db Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -07:00
Mark Otto a12eb2b9f5 rgba() tooltip bg 2012-11-03 13:44:55 -07:00
Mark Otto a249d1c8ee Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-11-03 13:44:01 -07:00
Mark Otto 5d6cf2ee19 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-03 13:43:23 -07:00
Mark Otto 2c93190283 Fixes #5776: Reside white-space for popovers 2012-11-03 13:42:08 -07:00
Mark Otto a8b9342aea Fixes #5739: Port in HTML5 BP print styles 2012-11-03 13:37:34 -07:00
Mark Otto c9dbd2d601 Fixes #5458: Clarify fluid nesting 2012-11-03 13:28:48 -07:00
Mark Otto 72e2d4bb77 Merge pull request #5766 from bradly/spelling-fixes-in-docs
Fixing various spelling typos in the docs.
2012-11-03 13:20:06 -07:00
Mark Otto 7ea343d570 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-03 13:19:53 -07:00
Mark Otto ead5dbeba5 Fixes #5775: Collapse labels/badges
* When :empty, display: none;
* Add documentation for change in behavior
2012-11-03 13:18:23 -07:00
Mark Otto 2f39f86bd7 Merge pull request #5777 from bradly/change-example-emails-in-docs
Change example email addresses to use RFC 2606 reserved example domain.
2012-11-03 13:12:02 -07:00
Bradly Feeley 381d967ec8 Change example email addresses to use RFC 2606 reserved example domain. 2012-11-03 12:15:01 -06:00
Bradly Feeley 46b5e0cbc6 Fixing various spelling typos in the docs. 2012-11-02 16:34:21 -06:00
Mark Otto fc42ac6a56 fixes #5756: duplicate media CSS in compiled builds 2012-11-02 09:47:42 -07:00
Mark Otto 1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
David 46d38b10b8 Prevent IE8 from misplacing imgs
Fixed imgs in a nav that were misplaced on IE8.
2012-11-02 15:04:34 +01:00
Mark Otto 4b3fb30877 tweaks to icons defaults and in buttons improve vertical align 2012-11-02 01:39:40 -07:00
Mark Otto 72198a59c0 removing glyphicons images, swapping in new icon font with new classes 2012-11-02 01:20:06 -07:00
Mark Otto d0c75bbc83 fixes #5742: add cursor: pointer; to labels and selects 2012-11-01 09:44:51 -07:00
Mark Otto d350f577e9 fixes #3222: simpler positioning of modals 2012-10-31 21:43:32 -07:00
Mark Otto 46347fff01 fixes #5692: add version # to readme 2012-10-31 11:17:01 -07:00
Ninir be03a53086 Replaced hardcoded CSS rules with mixins 2012-10-31 11:09:44 -07:00
Mark Otto 14b941744c fixes #5700: restore white text on active dropdown/typeahead text 2012-10-31 10:51:27 -07:00
Mark Otto bf48c31406 Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip 2012-10-31 10:48:44 -07:00
Mark Otto 64326322b4 fixes #5725: hover state for a.muted; also reformatted CSS 2012-10-31 10:46:04 -07:00
Mark Otto d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
fat 3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat 404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Bradly Feeley cbf1dace2f Fixing typos in affix options area in the docs. 2012-10-30 11:46:18 -07:00
Mark Otto b5af762ef5 Merge branch '2.1.2-wip'
Conflicts:
	js/bootstrap-dropdown.js
2012-10-29 22:01:58 -07:00
fat 68cfedb34a Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-29 21:55:07 -07:00
fat f1136228a7 add note about js style 2012-10-29 21:54:51 -07:00
Mark Otto bf10a43ed9 derp, add that in the right spot 2012-10-29 21:34:10 -07:00
Mark Otto 5bb6c42405 fixes #4511: remove focus on opened modal window 2012-10-29 21:33:20 -07:00
Mark Otto a6968c4934 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-29 21:30:45 -07:00
Mark Otto 9352fe1750 add a ton of the new vars to the customizer 2012-10-29 21:30:39 -07:00
fat f595e146d6 http link 2012-10-29 21:29:05 -07:00
fat 31c1eba51b Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Conflicts:
	bootstrap/css/bootstrap.css
	bootstrap/css/bootstrap.min.css
2012-10-29 21:28:17 -07:00
fat 92e7f166e7 remove haunt, remove bootstrap dir, add bower support 2012-10-29 21:27:34 -07:00
Mark Otto 81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -07:00
Mark Otto 41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Andreas Cederström 233e050adf Adding .inline for ul and ol 2012-10-26 09:47:55 +02:00
Mark Otto c33169a6ba fixes #5572: document .input-block-level 2012-10-18 11:19:16 -07:00
Jacob Thornton ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton 45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton 0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton 7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
	js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton 280d4aeb30 rebuild 2012-10-17 22:51:39 -07:00
billy gates 7426ced0fb Merge pull request #5323 from artiz/master
Please check my fix for #4550
2012-10-17 22:50:52 -07:00
billy gates 24b5e6cb14 Merge pull request #5366 from Sinetheta/2.1.2-wip
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton a2fc01444e Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 22:27:00 -07:00
Jacob Thornton edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
billy gates 21f29a7682 Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -07:00
Jacob Thornton 8e6697f2b2 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 21:38:01 -07:00
Jacob Thornton ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
billy gates 0a3e034891 Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates 97bf02d787 Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
Fixed copy/paste caused typo
2012-10-17 21:25:21 -07:00
billy gates 3074737d90 Merge pull request #5549 from mfansler/2.1.2-wip
fixes #5336: reorder focus() call to avoid scrolling
2012-10-17 21:21:31 -07:00
Mark Otto e0a007b929 Merge pull request #5507 from bradly/2.1.2-wip
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto b06724a1a4 Merge pull request #5508 from bradly/fix-readme-link
Updating README link about Less compilation.
2012-10-16 20:36:12 -07:00
Mark Otto 709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto 57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto 0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto 78f7ad95f4 fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component. 2012-10-16 19:56:34 -07:00
Mark Otto bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto 463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
mfansler e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Dmitriy Budnik ae0ba0686e set spesific assertions count for test 2012-10-16 11:16:38 +03:00
Dmitriy Budnik cd55963930 fixed test 2012-10-16 09:49:26 +03:00
dmitriybudnik 432eaff29c Fixed copy/paste caused typo 2012-10-15 22:35:32 +03:00
Mark Otto 0048446db9 improve spacing in carousel example 2012-10-15 13:57:09 -05:00
Martin Stein 6b017b9bea fixed reference to this.tip() so it works in delegate events 2012-10-15 15:17:59 +02:00
Bradly Feeley fda641fb6c Updating README link about Less compilation. 2012-10-13 18:38:34 -07:00
Bradly Feeley ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
James Fuller d19ca23f8f Update package.json
when building using Makefile, dependency for hogan.js needs to be installed
2012-10-11 21:30:04 -03:00
Mark Otto fa778792c5 compress images and add new carousel example for .net magazine article 2012-10-10 17:58:22 -07:00
Mark Otto df9a1c29f4 Merge branch '2.1.2-wip' of https://github.com/twitter/bootstrap into 2.1.2-wip 2012-10-10 10:29:55 -07:00
Mark Otto 31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto 5af5c2ed36 fixes #: remove double background color on dropdown links 2012-10-10 09:51:13 -07:00
Mark Otto b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Kevin Attfield 48a8dd2a23 Added test to fix for #5362 2012-10-08 22:29:44 -07:00
Mark Otto 4702e75410 comments in template 2012-10-08 18:59:44 -07:00
Mark Otto ec8394cb6e adding another template for same-width nav links using 'display: table-cell;' 2012-10-08 18:58:35 -07:00
Mark Otto 7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -07:00
Mark Otto 6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto d76c305cbb remove 'at twitter' part of readme 2012-10-06 14:42:07 -07:00
Mark Otto 7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto 3726ce24bb finish off scoping of grid sizing to table elements 2012-10-03 09:43:14 -07:00
Mark Otto 11ee1633b4 fixes #5257: add data-original-title attribute selector to abbr element 2012-10-03 09:36:45 -07:00
Mark Otto dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto 7732d8b9b0 Merge branch '2.1.2-wip' into exploratory 2012-10-02 15:41:31 -07:00
Mark Otto 630a88d3ce Merge pull request #5281 from GotenXiao/pagination-active-background
Use paginationActiveBackground var to finish fixing #4295
2012-10-02 15:23:59 -07:00
Mark Otto a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto 1bd4723038 fixes #5392: hover on submenu should maintain white icons for active parent a tag 2012-10-02 13:19:11 -07:00
frntz b892a37320 Update js/bootstrap-tooltip.js
Avoid loosing events attached on Jquery object if added via function in popover content
2012-10-02 18:26:55 +03:00
Mark Otto 3bb9e0d753 increase border radius on navbar 2012-10-01 23:42:21 -07:00
Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
Mark Otto 7c9597f4e7 remove double border effect: instead of inset shadow and border on fixed navbars, only border 2012-10-01 23:34:03 -07:00
Mark Otto 1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto 7763cab608 Merge branch '2.1.2-wip' of https://github.com/advancedrei/bootstrap into advancedrei-2.1.2-wip 2012-10-01 16:15:26 -07:00
Mark Otto 5cf7c803e2 Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix 2012-10-01 15:29:21 -07:00
Mark Otto d36e37214b fixes #5319: add backface-visibility for webkit skewing 2012-10-01 15:26:17 -07:00
Mark Otto 86d5ed6f4f fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time 2012-10-01 13:52:50 -07:00
Mark Otto fd1e9b1498 fix copy on modal popover button doodad 2012-10-01 13:28:54 -07:00
Mark Otto f8ac403d8b fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 2012-10-01 13:08:21 -07:00
Mark Otto bc4f5d565e fixes #5275: inline-block badges and labels, then fix padding accordingly 2012-10-01 12:04:10 -07:00
Mark Otto 5035592988 fixes #5193 manually: checkbox and radio padding in .controls-row 2012-10-01 11:53:52 -07:00
Mark Otto e6d6c7a413 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
2012-10-01 11:27:40 -07:00
Mark Otto c6c1ada600 clarify tables support of responsive utility classes, of which there is none 2012-10-01 11:18:49 -07:00
Mark Otto a90334eebb fix docs sidenav width for ie8-9 2012-10-01 11:11:33 -07:00
Mark Otto 239ce24f92 fixes #5188: add .google-maps class to reset responsive images on case-by-case basis 2012-10-01 10:49:19 -07:00
Mark Otto 085d6d185d fixes #5055: wrap legend and form elements in fieldset so IE8 styles the legend properly 2012-10-01 10:42:45 -07:00
Mark Otto 32181816f7 run make on previous merge 2012-10-01 10:27:42 -07:00
Mark Otto c77d4266c0 Merge pull request #5369 from amid2887/2.1.2-wip
Add missing icon class definition for navs.less
2012-10-01 10:27:13 -07:00
amid2887 46764a7165 Add missing icon class definition for navs.less
add missing icon class definition for navs:
'[class*=" icon-"]'

P.S. Sorry for 2 pull requests with the same problem..
2012-10-01 14:32:51 +07:00
Mark Otto 8da78223ff reset input and button heights with updated padding 2012-10-01 00:19:29 -07:00
Mark Otto 56935c64c0 remove left margin reset from old grid system 2012-10-01 00:11:05 -07:00
Mark Otto eb555b7a9d remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on 2012-10-01 00:06:44 -07:00
Mark Otto 26386ad615 remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs 2012-10-01 00:05:18 -07:00
Mark Otto ecf6077f48 remove table grid sizing, it can use the new default grid columns instead 2012-09-30 23:59:35 -07:00
Mark Otto c82b9d1e7c remove gradientbar mixin 2012-09-30 23:54:35 -07:00
Mark Otto 973646ea67 vars less spacing and cleanup 2012-09-30 23:52:02 -07:00
Mark Otto 142643589f remove bluedark var 2012-09-30 23:50:54 -07:00
Mark Otto 3f4076c635 consolidate border-radius on code 2012-09-30 23:49:26 -07:00
Mark Otto bfe51163e2 run make on prev commit 2012-09-30 23:47:00 -07:00
Mark Otto 3934e55254 remove dupe ff3/4 button fixes; also remove headingscolor var 2012-09-30 23:46:48 -07:00
Mark Otto 4b0d71abc1 carousel refinements 2012-09-30 23:44:23 -07:00
Mark Otto b6f6235e9b change notes about responsive in Scaffolding page: no longer separate file 2012-09-30 23:26:51 -07:00
Mark Otto de6ec034db single CSS file for all css, including responsive 2012-09-30 23:24:07 -07:00
Mark Otto 3f2938948d remove more ie7 css hacks 2012-09-30 23:20:43 -07:00
Mark Otto 08446563b9 clean up comments in reset, remove ie7 css hacks 2012-09-30 23:19:55 -07:00
Mark Otto 443b605246 remove -moz-box-shadow from .box-shadow() mixin, but keep -webkit since that's needed for most iOS and Android mobile browsers 2012-09-30 23:17:07 -07:00
Mark Otto 9872902e47 remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions 2012-09-30 23:11:54 -07:00
Mark Otto 0cd186183c add comment for filter opacity browser requirements 2012-09-30 22:54:44 -07:00
Mark Otto 840cad69af remove translucent bg mixin 2012-09-30 22:52:32 -07:00
Mark Otto 2b06edc7d7 remove firefox <3.6 css hacks for buttons 2012-09-30 22:49:14 -07:00
Mark Otto bbd543db53 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto da43c7c27c run make after merge 2012-09-30 22:41:26 -07:00
Mark Otto 40a8a93b22 Merge branch 'amid2887-master' into 2.1.2-wip 2012-09-30 22:41:11 -07:00
amid2887 d49dd766c8 Add missing icon class definition for buttons.less
add missing icon class definition for buttons:
'[class*=" icon-"]'
2012-10-01 12:27:37 +07:00
Mark Otto a4a6244eb7 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Kevin Attfield 82715ae96d Fix for #5362
Fix for issue [5362](https://github.com/twitter/bootstrap/issues/5362):
tab events fired on wrong dropdown anchor.
2012-09-30 21:41:37 -07:00
Mark Otto a2690c6d86 add link to examples on index page; add back narrow marketing page and signin page examples 2012-09-30 21:28:20 -07:00
Mark Otto 57f8dbe25c fixes #5360: typo in tables docs 2012-09-30 21:26:43 -07:00
Mark Otto f8374a754d clean up emphasis docs text 2012-09-28 15:01:12 -07:00
Mark Otto 8ecffcb32f fixes #5334: html snippet comments 2012-09-28 10:39:15 -07:00
Carl Porth e1f6458e36 don't wait for ready when binding events to document 2012-09-27 15:00:02 -07:00
Artem Kustikov 0944e036ae Fix for #4550
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
2012-09-27 21:45:37 +03:00
Andreas Cederström ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02:00
Erlend Halvorsen e9a648cd39 Fixed bug in dropdown toggle where menu would only clear on the first drop down 2012-09-27 10:31:40 +02:00
Carl Porth 474471b831 bind data-api events to document instead of body to allow body replacement 2012-09-26 23:11:03 -07:00
Mark Otto ad96435d27 Merge branch '2.1.2-wip' into box-sizing-exercise 2012-09-26 16:02:33 -07:00
Mark Otto 24e277b85a Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-26 16:01:59 -07:00
Mark Otto 498a28b4cd dat new kippt hotness 2012-09-26 16:01:45 -07:00
Mark Otto cd5ae9e030 change up carousel 2012-09-26 11:20:27 -07:00
Mark Otto 6b578ec8de move mixins that generate css to utilities.less with different class names, but the same mixins 2012-09-26 08:59:57 -07:00
Mark Otto b6ba717b75 fix getting started examples 2012-09-25 23:01:18 -07:00
Mark Otto 80c4d5a9bf fix homepage example sites 2012-09-25 22:59:49 -07:00
Mark Otto 2eb4c6fc79 cleanup breadcrumbs less code (nesting) 2012-09-25 22:57:49 -07:00
Mark Otto ecbf1159a4 remove .dividers from breadcrumbs, instead use :after and content 2012-09-25 22:57:20 -07:00
Mark Otto d1affe6154 restore gradient to navbars 2012-09-25 22:53:41 -07:00
Mark Otto f8efc75a66 increase padding on navbar links, remove font-size override on .navbar from docs css 2012-09-25 22:51:05 -07:00
Mark Otto c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto 08eea302ef remove remaining fluid grid css 2012-09-25 22:20:24 -07:00
Mark Otto 151ed38cdc remove references to row fluid elsewhere 2012-09-25 22:18:34 -07:00
Mark Otto 9e97098802 make .input-* classes match .btn-* size classes 2012-09-25 22:16:47 -07:00
Mark Otto 0220015edd remove all ie7 conditionals and mixins 2012-09-25 22:07:53 -07:00
Mark Otto f0b4f05a27 remove ie7 support from mixins 2012-09-25 22:02:29 -07:00
Mark Otto ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
2012-09-25 22:00:41 -07:00
Mark Otto 527d01ce99 headway, cleanup, and tests 2012-09-25 15:01:03 -07:00
Robin Lewis b29d947477 Use paginationActiveBackground var to finish fixing #4295 2012-09-25 21:12:01 +01:00
Jacob Thornton 0540b63ab0 check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00
Jacob Thornton aec8b08930 update docs for tooltip html + the dropdown methods api 2012-09-24 23:32:55 -07:00
Jacob Thornton 88b1e44dd6 change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton 4a2443901f reverting d797a5fbd7 2012-09-24 23:19:33 -07:00
Jacob Thornton bda3d57a00 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-24 23:16:09 -07:00
Jacob Thornton 003fcccceb change tooltip/popover html default to false for xss safety net 2012-09-24 23:15:36 -07:00
Mark Otto f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto a4bf6ef0a0 match decimal placements in type.less 2012-09-23 15:16:13 -07:00
Mark Otto af871d57c9 fixes #5216: calculate heading sizes via math rather than fixed pixel amounts 2012-09-22 22:16:12 -07:00
Mark Otto c3ea955661 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-22 21:37:08 -07:00
Mark Otto a419e70a42 add specific line items to contributing doc for issues, update branch list 2012-09-21 10:24:16 -07:00
Jacob Thornton ebf94c53a5 change transition.js, rebuild… travis maybe will be happy? 2012-09-20 16:50:36 -07:00
Jacob Thornton 1716b0fdb5 remove src's 2012-09-20 16:31:10 -07:00
Jacob Thornton fe38d12f12 rebuild - fix missing ( 2012-09-20 16:26:00 -07:00
Jacob Thornton 667179f406 added support for jquery 1.8.* 2012-09-20 16:23:54 -07:00
Mark Otto c92a75999f fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms 2012-09-20 11:45:59 -07:00
Mark Otto 532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto 443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto 67585bd34e fixes #5211 manually: spacing in mixins to match others 2012-09-20 09:07:48 -07:00
Mark Otto 6c3cd6fd9d fixes #5212: text emphasis classes only get hover with links 2012-09-20 09:06:43 -07:00
Mark Otto a6206c98d5 increase padding on homepage button 2012-09-19 15:18:14 -07:00
Mark Otto 2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto 2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto 37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto cc3de8bd6e fixes #5177: remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons 2012-09-18 12:00:57 -07:00
Mark Otto 13be8b2031 contributing edits 2012-09-18 11:50:11 -07:00
Mark Otto c15877445c Merge pull request #5187 from caniszczyk/2.1.2-wip
Add CONTRIBUTING.md
2012-09-18 11:44:43 -07:00
Mark Otto 78992bbf42 fixes #5178: update normalize to avoid resetting audio and video elements in android 2012-09-18 11:23:16 -07:00
Chris Aniszczyk 2a20761f07 Add CONTRIBUTING.md
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-09-18 10:50:04 -07:00
Mark Otto 3b3def4898 fixes #5087: add hover states to text emphasis classes for links 2012-09-17 23:19:52 -07:00
Mark Otto 239e6a7d21 fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append 2012-09-17 23:11:49 -07:00
Mark Otto cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto 783f4885ab add the media css to customizer 2012-09-17 18:17:22 -07:00
Mark Otto 26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto 143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Mark Otto 917b46a343 resolve conflicts and remake 2012-09-17 16:43:18 -07:00
Mark Otto caa79ed594 fixes #5001: proper ids on form examples 2012-09-17 16:26:51 -07:00
Mark Otto 6881c193ca fixes #5039: properly set .row-fluid margins for .controls-row 2012-09-17 16:09:36 -07:00
Mark Otto 03a406d920 fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top 2012-09-17 15:49:22 -07:00
Mark Otto f69e244a60 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-17 15:28:41 -07:00
Mark Otto cd876fb659 Merge pull request #5125 from tapcanvas/tab-body-bg
Use @bodyBackground on .nav-tabs active state instead of static color
2012-09-17 15:28:31 -07:00
Mark Otto 6f3bef195a nuke new examples for now 2012-09-17 08:53:13 -07:00
Mark Otto 1ea09b751e fixes #5163: add new var for navbar collapse's default view, use that in responsive navbar css 2012-09-17 08:52:19 -07:00
Mark Otto 6e25aacc91 more carouself example work 2012-09-16 21:54:06 -07:00
Robert McLaws 6aa15eb01f Support for left-opening dropdown submenus
Adds a new class called .dropdown-submenu-left. It is useful when you
have a .pull-right DropDown that has submenus. Without this, the menu
opens left past the page boundary, which can trigger the scrollbars and
cause other nastiness.
2012-09-16 03:02:31 -04:00
Mark Otto 6c4b276cd4 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto 7857089065 tweak copy on each template, add sign in template 2012-09-14 15:21:44 -07:00
Mark Otto 0bcbcf69ec adding new examples 2012-09-14 15:17:46 -07:00
Mark Otto e4e2e37c5c add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it 2012-09-14 14:48:03 -07:00
Mark Otto 5aa1018496 i18n homepage 2012-09-14 14:31:14 -07:00
Mark Otto faa760f563 revert docs change 2012-09-14 10:30:55 -07:00
Martin Bean 2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Adrien Cahen 5331fe39df fix active tab bg on non-white body 2012-09-13 12:16:18 -07:00
Mark Otto 595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Brian Campbell a40ab1cd66 mistakenly committed ALL assets. since only bootstrap.css and bootstrap.min.css are changed i removed all others 2012-09-12 18:11:42 -06:00
Mark Otto 15bb78ce80 fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar 2012-09-12 16:37:41 -07:00
Mark Otto e1deba30aa fixes #5097: js docs typos 2012-09-12 16:22:52 -07:00
Mark Otto 537c5cc33d use local var for a few other .box-shadow mixins to fix CSS not compiling 2012-09-12 16:18:52 -07:00
Mark Otto 65d322958c add space 2012-09-12 16:11:03 -07:00
Mark Otto 38303dd997 revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows 2012-09-12 15:53:29 -07:00
Mark Otto bbadd429a8 change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation 2012-09-12 15:48:56 -07:00
Brian Campbell 2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto 0489c708c7 fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars 2012-09-10 22:51:16 -07:00
Mark Otto 39791a8ea8 fixes #5059 manually: include media type in css getting started block 2012-09-10 22:44:08 -07:00
Mark Otto cd2b12f788 fixes #5064 manually: remove fancy quote mark 2012-09-10 22:41:14 -07:00
Mark Otto 7110b243f5 more tests and experiments 2012-09-10 10:11:02 -07:00
Mark Otto 10faf28aef Merge pull request #5051 from GeoffYoung/2.1.2-wip
Update modal example code to match example
2012-09-10 10:04:34 -07:00
Geoff Young 76e42edb29 Updated sample markup to reflect live demo. 2012-09-09 18:58:23 -04:00
Mark Otto dd1bce2611 latest tweaks to grid classes for forms 2012-09-08 12:50:37 -07:00
Mark Otto b53da4b6e7 commenting out stuff and adding grid test page 2012-09-07 22:46:35 -07:00
Mark Otto 9a39306abe nuke fluid grid docs again 2012-09-07 22:35:51 -07:00
Mark Otto 7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
Mark Otto f29f98501c run make after merging #5028, which removes the left margin of responsive fluid grid offsets 2012-09-07 11:42:21 -07:00
Mark Otto 1f8e2d2617 Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip 2012-09-07 11:41:35 -07:00
Mark Otto 61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Mark Otto f2bd7d9f27 fixes #5018: .btn-block in .modal-footer no longer has left margin 2012-09-07 11:10:00 -07:00
Mark Otto 6c5c3c81ec Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos 2012-09-07 11:06:08 -07:00
Mark Otto 7a0f5c6c00 fixes #5010: .pager span selector should be scoped to immediate children only 2012-09-07 11:04:51 -07:00
Dionysios G. Arvanitis cc4f8b9f6c remove offset margin in row-fluid mobile layout 2012-09-07 17:54:15 +03:00
Giuliano Velli 501a2d69e1 Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component 2012-09-07 10:13:26 +02:00
Giuliano Velli 7762a77c21 Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
2012-09-07 09:59:52 +02:00
Ramiro Morales 138b5a8c05 Fix small documentatio typos. 2012-09-05 23:07:52 -03:00
Mark Otto d4a16d35eb fixes #4996: incorrect border radius on a table 2012-09-05 10:05:54 -07:00
Mark Otto 3fa4ca2d87 Merge branch 'spantaleev-patch-1' into 2.1.2-wip 2012-09-05 10:04:38 -07:00
Mark Otto dfb3175d4b rebuild after merge 2012-09-05 10:04:28 -07:00
Mark Otto 08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Slavi Pantaleev 5ff5d351bf Do not force white icons in active tab links
Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
2012-09-05 19:07:53 +03:00
Jacob Thornton c52368d3c5 last rebuild before 2.1.1 release 2012-09-04 20:44:11 -07:00
Mark Otto df8e3c6ee3 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-09-04 20:13:36 -07:00
Mark Otto bc4ecd9984 regrettably remove the animated button for download on homepage to improve page performance in some browsers 2012-09-04 20:13:27 -07:00
♒∆✝ 9341bb756b Merge pull request #4784 from rossj/2.1.1-wip
Fix Typeahead key navigation with Chrome + jQuery 1.8.0
2012-09-04 20:03:04 -07:00
♒∆✝ 9d890a8412 Merge pull request #4810 from mainerror/2.1.1-wip
Makefile misses a 'clean' directive
2012-09-04 19:54:16 -07:00
Mark Otto 7e4629fbbe fixes #4968 manually: typo in scaffolding docs about offset classes 2012-09-04 14:27:48 -07:00
Mark Otto 73ef263d5f improve comments in image styles 2012-09-04 11:31:48 -07:00
Mark Otto bf590d8c81 fixes #4958: add version to minified js 2012-09-04 11:13:08 -07:00
Mark Otto a1d2ee6542 fixes #4885: correct use of skew in .skew() mixin for FF 2012-09-04 11:08:08 -07:00
Mark Otto de36456f5d fixes #4957: use input border var for select element instead of #ddd 2012-09-04 11:00:25 -07:00
Mark Otto 1f0043a7f5 fixes #4959: docs example 2012-09-04 09:13:09 -07:00
Mark Otto acf2a64016 fixes #4935: properly comment responsive image techniques and add CSS tests to support 2012-09-03 17:35:35 -07:00
Mark Otto 8cda830eaf fixes #4146: IE7-8 responsive image helper 2012-09-03 01:13:42 -07:00
Mark Otto f25129361b add comment to go with updated box-shadow mixin 2012-09-03 01:04:53 -07:00
Mark Otto f46813a8c8 Merge pull request #4763 from Luis-TP/2.1.1-wip
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -07:00
Mark Otto 9d5f9eca85 fixes #4909: add color utility classes .text-warning, etc and document them 2012-09-03 00:47:48 -07:00
Mark Otto 69d4c3f9a1 fixes #4925: ensure docs examples don't use fixed font-size and line-height for .lead 2012-09-02 20:54:41 -07:00
Mark Otto 3737904859 fixes #4922: use basefontsize for realz on .lead 2012-09-02 13:25:03 -07:00
Mark Otto 209852c805 fixes #4902: proper accordion html example 2012-09-01 12:03:55 -07:00
Mark Otto 02f6bd65f5 fixes #4910: use @baseLineHeight * 1.5 for .lead font-size 2012-09-01 12:00:13 -07:00
Mark Otto e8c5b3c9a5 fixes #4869: typo in getting started 2012-08-31 23:51:48 -07:00
Mark Otto b1bdca0fdb fixes #4901: attribute typo and reran make 2012-08-31 23:25:58 -07:00
Mark Otto 00d6f26270 fixes #4896: reflect media query order in docs 2012-08-31 23:12:02 -07:00
Mark Otto 0f85e8b7f8 fixes #4824: scope table grid sizes to .table instead of table 2012-08-31 22:37:46 -07:00
Mark Otto beb0b64096 fixes #4889: btn-link disabled styles 2012-08-31 14:02:18 -07:00
Mark Otto afd931262c Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-29 13:14:11 -07:00
Mark Otto 2da2169a56 fixes #4828: make fluid grid inputs size the same as fixed grid inputs 2012-08-29 13:06:47 -07:00
Mark Otto 2137cd65fb fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake 2012-08-29 13:05:43 -07:00
Mark Otto 010a5dd84d Merge pull request #4816 from desimone/master
Fixed a typo in docs/assets/css/docs.css
2012-08-29 10:48:04 -07:00
Bobby DeSimone 8878facc67 Fixed a typo in docs/assets/css/docs.css 2012-08-29 11:13:55 -03:00
Octavian Damiean a976a1583c Added 'clean' directive to the make file. 2012-08-29 13:24:00 +02:00
Mark Otto cb46ddee72 grid docs changes 2012-08-28 13:46:13 -07:00
Mark Otto 0b122bc5c5 remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles 2012-08-28 13:33:06 -07:00
Mark Otto e27b1355b5 fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0 2012-08-28 10:12:04 -07:00
Ross Johnson b5373d8561 Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip 2012-08-28 11:14:34 -05:00
Ross Johnson 66ad3d62c6 Fix key events with Chrome + jQuery 1.8.0 2012-08-28 00:55:56 -05:00
Mark Otto 545edf5459 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 22:43:05 -07:00
Mark Otto 609142eee2 fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea 2012-08-27 22:42:12 -07:00
Jacob Thornton 3568146b28 only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements 2012-08-27 21:44:09 -07:00
Jacob Thornton 215d92bacd Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:27:31 -07:00
Jacob Thornton 4751a0a274 crude check to make sure element has a # for an id 2012-08-27 21:27:01 -07:00
Mark Otto 7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -07:00
Mark Otto 55982664d0 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:06:29 -07:00
Mark Otto 1eaf1cf418 fixes #4653: add hover states to stateful table rows 2012-08-27 21:06:21 -07:00
Jacob Thornton 601e252074 fix for #4761 2012-08-27 20:58:51 -07:00
Jacob Thornton d797a5fbd7 fix for open elements under modal when .modal-open 2012-08-27 20:43:12 -07:00
Mark Otto 17d8c78e52 fix docs horizontal scroll on tablet viewports 2012-08-27 20:32:42 -07:00
Mark Otto 438f745ea2 Merge pull request #4765 from globocom/missing-i18n-tag-getting-started-download-page
i18n tags missing in some strings at getting started download page
2012-08-27 20:06:42 -07:00
Alexandre Magno b5a8c0a45e i18n tags missing in some strings at getting started download page 2012-08-27 23:54:07 -03:00
Luis Aleman 2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Luis Aleman 67eae2a503 Do not need to write box-shadow in full 2012-08-27 19:13:37 -04:00
Luis Aleman 96a1797af1 No longer need to write box-shadows in full when using lighten or other functions 2012-08-27 19:13:11 -04:00
Luis Aleman 1b7a3ca416 Changed box-shadow mixin to accept infinite, comma separated, shadows 2012-08-27 19:10:20 -04:00
Mark Otto 303a33f15c fixes #4664: spelling mistake in alerts docs 2012-08-27 15:48:54 -07:00
Mark Otto 3b67ece2d1 fixes #4666: overrides for input types with .btn-block 2012-08-27 15:39:55 -07:00
Mark Otto 4674945fa8 fixes #4556: add mention of disable state and required js to buttons docs 2012-08-27 15:27:58 -07:00
Mark Otto b444582ccd fixes #4671: mention collapsing parents in docs for affix plugin 2012-08-27 15:20:50 -07:00
Mark Otto 8610fd9b2b remove min-height from .span3 in docs since we no longer need it 2012-08-27 15:12:55 -07:00
Mark Otto 85dcbd0b34 add min-height: 1px; to .span* classes to prevent grid columns from collapsing 2012-08-27 15:12:22 -07:00
Mark Otto cf9334bd7d fixes #4725: width of .uneditable-input should match standard text input width 2012-08-27 12:07:28 -07:00
Mark Otto 22c4f3d058 fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn 2012-08-27 12:05:15 -07:00
Mark Otto 15317419f4 fixes #4577: no margin on .control-row .span* in responsive 2012-08-27 11:46:47 -07:00
Mark Otto 8a5dde556b fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars 2012-08-27 11:05:01 -07:00
Mark Otto 1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto a2b9a5e1fe fixes #4680: proper margin on buttons in navbar forms 2012-08-27 10:52:11 -07:00
Mark Otto fcd08fce8f fixes #4578: add clearfix to .navbar-inner to clear floats 2012-08-27 10:32:07 -07:00
Mark Otto 54e3a26dda fixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we changed padding) 2012-08-27 10:08:16 -07:00
Mark Otto 96542f14ab fixes #4540: adjust vertical alignment of .btn-group in .navbar 2012-08-27 10:04:58 -07:00
Mark Otto 12d5c88c20 fixes #4742: add default value to striped gradient 2012-08-27 09:53:23 -07:00
Mark Otto bdc3ff99f3 fixes #4749: correct initialism example 2012-08-27 09:18:32 -07:00
Mark Otto 72f176d1f5 fixes #4748: document jquery dependency better 2012-08-27 09:17:20 -07:00
Mark Otto 1b8f4f5bc5 fixes #4512: improved borders on navbars 2012-08-26 23:23:47 -07:00
Mark Otto f15eb7b499 fixes #4506: clearfix added to .dl-horizontal to account for empty dd elements 2012-08-26 23:06:56 -07:00
Mark Otto cfa039d2e0 Merge branch 'sparanoid-master' into 2.1.1-wip 2012-08-26 22:30:49 -07:00
Mark Otto eb8aad85b8 fixes #4734 manually: doctype in getting started in examples 2012-08-26 22:29:40 -07:00
Mark Otto f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Tunghsiao Liu ec6b320003 Add .transition-delay mixin 2012-08-26 13:09:10 +08:00
Mark Otto bb9d1af1ca fixes #4672 manually: placeholder comment 2012-08-25 21:51:07 -07:00
Mark Otto aa07523e69 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-25 19:41:25 -07:00
Mark Otto d9593e217d avoid top margin on input-append/prepend in .navbar-form 2012-08-24 14:45:02 -07:00
Mark Otto 0682780cd8 fixes #4657: proper border radius property in tables 2012-08-23 15:04:41 -07:00
Mark Otto d9fe9af966 Merge pull request #4643 from rpavlik/codespell
Spelling mistake in tooltip test
2012-08-23 09:51:20 -07:00
Mark Otto 5cbb826961 Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr  and .info for .control-group
2012-08-23 09:47:44 -07:00
Ryan Pavlik 019d9bf0f3 Fix typo found with codespell. 2012-08-23 11:41:55 -05:00
Mark Otto be64955e25 nuke 10px right margin on .navbar .nav 2012-08-23 09:38:56 -07:00
Mark Otto 3424df22ee delete components folder 2012-08-23 08:30:27 -07:00
Mark Otto ac4420237c fixes #4591 properly: remove -1px left margin on .input-append .add-on 2012-08-22 20:32:47 -07:00
Mark Otto 4775bc910c fixes #4604: add span support to .pager component 2012-08-22 20:28:08 -07:00
Mark Otto 5da217b96e fixed #4598, typo, manually 2012-08-22 20:23:58 -07:00
Mark Otto 582b178723 fixes #4542 manually: typo in phantomjs and space between url in markdown 2012-08-22 10:44:41 -07:00
Mark Otto 535dfc2153 fixes #4561: typo 2012-08-22 09:51:41 -07:00
Mark Otto 6160667b19 fixes #4564 manually: typo in getting started jumbotron 2012-08-22 09:48:57 -07:00
Mark Otto 5f97e04aa3 fixes #4567: link in scaffolding page 2012-08-22 09:47:56 -07:00
Mark Otto 115c7b82c4 fixes #4586: typo in docs 2012-08-22 09:45:57 -07:00
Andreas Cederström a9764c34a7 Add info state to form validation 2012-08-22 11:24:02 +02:00
Andreas Cederström 361889def9 Add .warning to table rows 2012-08-22 11:20:31 +02:00
Mark Otto 5d41742f17 fixes #4505: lighten navbar text and link color so hover looks darker 2012-08-21 14:53:34 -07:00
Mark Otto 8d00fe4c03 running make on previous merge 2012-08-21 14:43:13 -07:00
Mark Otto 1973c64342 Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip 2012-08-21 14:42:25 -07:00
Mark Otto 46c10c8b58 alternate fix to #4522: increase line-height on btn-mini 2012-08-21 14:38:47 -07:00
Mark Otto 190d3c9c3e fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state 2012-08-21 14:22:26 -07:00
Mark Otto e2ecd2df6c Merge branch 'incbee-master' into 2.1.1-wip 2012-08-21 14:16:09 -07:00
Mark Otto 45978b6674 run make 2012-08-21 14:16:01 -07:00
Mark Otto b1c93c2700 fixes #4523: more specific selectors on white icon inversion 2012-08-21 14:15:01 -07:00
philippm 6e7ba4e24a Fix all submenus expanded recursively in dropdown
The problem was that the CSS selector made *all* of a submenu's nested
menus visible. Fixed by applying the selector to the immediate nested
menu only.
2012-08-21 22:10:36 +01:00
Mark Otto 311c00a29b fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form 2012-08-21 14:07:20 -07:00
Mark Otto 13199c0020 fixes #4530: fix docs nesting cols comments 2012-08-21 13:59:13 -07:00
Mark Otto 6dc13573bf add css tests and stuff for #4528 2012-08-21 13:42:00 -07:00
Mark Otto 1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto b52d29095a fixes #4520: manually fix example html for icon 2012-08-21 13:09:01 -07:00
Mark Otto 4f918ce52c fixes #4517 manually in mustache file as well, typo in docs 2012-08-21 13:08:09 -07:00
Mark Otto 94f9f9de73 Merge branch 'UTGuy-master' into 2.1.1-wip 2012-08-21 13:07:11 -07:00
Mark Otto e5060b8d92 clean up spacing and run make 2012-08-21 13:07:06 -07:00
Mark Otto 8a2b9f4a5f remove entity in content property on dropup carets--not necessary at all 2012-08-21 13:02:02 -07:00
Mark Otto 099cec1ca7 fixes #4493: typo in dimiss alerts docs 2012-08-21 13:00:40 -07:00
Mark Otto 06c718b1d3 fixes #4480: typo in scaffolding page 2012-08-21 12:59:26 -07:00
Mark Otto 55facf1f2e fixes #4473: docs example typo for js affix plugin 2012-08-21 12:58:48 -07:00
Mark Otto 6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
UTGuy 5fc5d26917 Update less/variables.less
https://github.com/twitter/bootstrap/issues/4508

should fix this issue
2012-08-21 11:21:28 -03:00
Pavel Demyanenko fe3ed433e4 Fix bug Collapse broken in IE 2012-08-21 14:33:15 +04:00
Jacob Thornton 320b75de63 add affix to zip 2012-08-20 23:13:43 -07:00
Mark Otto 471d913ab6 add bottom margin back to sidenav for narrow tablets 2012-08-20 16:37:46 -07:00
Mark Otto cbc7873bb4 fix jittering of sidenav 2012-08-20 16:33:41 -07:00
Giuliano Velli 3aa89ded21 Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
Conflicts:
	docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:23:14 +02:00
Giuliano Velli 4fbb400754 Added Medias code and documentation
Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Giuliano Velli f5fd5e7523 Added Medias code and documentation
Added media.less and edited bootstrap.less and responsive.less to manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-20 17:55:22 +02:00
302 arquivos alterados com 24272 adições e 45412 exclusões
+14
Ver Arquivo
@@ -0,0 +1,14 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[Makefile]
indent_style = tab
+5 -1
Ver Arquivo
@@ -1,3 +1,7 @@
# Ignore compiled docs
_gh_pages
_site
# Numerous always-ignore extensions
*.diff
*.err
@@ -10,6 +14,7 @@
*.vi
*~
*.sass-cache
*.ruby-version
# OS or Editor folders
.DS_Store
@@ -34,4 +39,3 @@ nbproject
.CVS
.idea
node_modules
dist
-85
Ver Arquivo
@@ -1,85 +0,0 @@
/* ==========================================================
* issue-guidelines.js
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
var assert = require('assert')
module.exports = {
'pull-requests': {
'should always be made against -wip branches': function (pull) {
assert.ok(/\-wip$/.test(pull.base.ref))
},
'should always be made from feature branches': function (pull) {
assert.notEqual(pull.head.ref, 'master')
},
'should always include a unit test if changing js files': function (pull) {
var hasJS = false
var hasTests = false
pull.files.forEach(function (file) {
if (/^js\/[^./]+.js/.test(file.filename)) hasJS = true
if (/^js\/tests\/unit\/[^.]+.js/.test(file.filename)) hasTests = true
})
assert.ok(!hasJS || hasJS && hasTests)
},
'after': function (pull) {
if (pull.reporter.stats.failures) {
pull.reportFailures(pull.close.bind(pull))
}
}
},
'issues': {
'before': function (issue) {
var plus = {}
var labels = issue.labels.map(function (label) { return label.name });
if (~labels.indexOf('popular')) return
issue.comments.forEach(function (comment) {
if (/\+1/.test(comment.body)) plus[comment.user.login] = true
})
if (Object.keys(plus).length > 5) {
issue.tag('popular')
issue.comment('Tagging this issue as popular, please stop commenting on this issue with +1. thanks!')
}
},
'should include a jsfiddle/jsbin illustrating the problem if tagged with js but not a feature': function (issue) {
var labels = issue.labels.map(function (label) { return label.name });
if (~labels.indexOf('js') && !~labels.indexOf('feature')) assert.ok(/(jsfiddle|jsbin)/.test(issue.body))
},
'after': function (issue) {
if (issue.reporter.stats.failures) {
issue.reportFailures(issue.close.bind(issue))
}
}
}
}
+3 -1
Ver Arquivo
@@ -1,3 +1,5 @@
language: node_js
node_js:
- 0.6
- 0.8
before_script:
- npm install -g grunt-cli
+1
Ver Arquivo
@@ -0,0 +1 @@
getbootstrap.com
+66
Ver Arquivo
@@ -0,0 +1,66 @@
# Contributing to Bootstrap
Looking to contribute something to Bootstrap? **Here's how you can help.**
## Reporting issues
We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
## Key branches
- `master` is the latest, deployed version.
- `gh-pages` is the hosted docs (not to be used for pull requests).
- `*-wip` is the official work in progress branch for the next release.
## Pull requests
- Try to submit pull requests against the latest `*-wip` branch for easier merging
- CSS changes must be done in .less files first, never just the compiled files
- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
- Try not to pollute your pull request with unintended changes--keep them simple and small
- Try to share which browsers your code has been tested in before submitting a pull request
## Coding standards
### HTML
- Two spaces for indentation, never tabs
- Double quotes only, never single quotes
- Always use proper indentation
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
### CSS
- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
- Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
- End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on it's own line
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
### JS
- No semicolons
- Comma first
- 2 spaces (no tabs)
- strict mode
- "Attractive"
## License
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE
+125
Ver Arquivo
@@ -0,0 +1,125 @@
module.exports = function(grunt) {
// Project configuration.
grunt.initConfig({
// Metadata.
pkg: grunt.file.readJSON('package.json'),
banner: '/**\n' +
'* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
'*/\n',
jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
// Task configuration.
clean: {
dist: ['dist']
},
concat: {
options: {
banner: '<%= banner %><%= jqueryCheck %>',
stripBanners: false
},
bootstrap: {
src: ['js/transition.js', 'js/alert.js', 'js/button.js', 'js/carousel.js', 'js/collapse.js', 'js/dropdown.js', 'js/modal.js', 'js/tooltip.js', 'js/popover.js', 'js/scrollspy.js', 'js/tab.js', 'js/affix.js'],
dest: 'dist/js/<%= pkg.name %>.js'
}
},
jshint: {
options: {
jshintrc: 'js/.jshintrc'
},
gruntfile: {
src: 'Gruntfile.js'
},
src: {
src: ['js/*.js']
},
test: {
src: ['js/tests/unit/*.js']
}
},
recess: {
options: {
compile: true
},
bootstrap: {
files: {
'dist/css/bootstrap.css': ['less/bootstrap.less']
}
},
min: {
options: {
compress: true
},
files: {
'dist/css/bootstrap.min.css': ['less/bootstrap.less']
}
}
},
uglify: {
options: {
banner: '<%= banner %>'
},
bootstrap: {
files: {
'dist/js/<%= pkg.name %>.min.js': ['<%= concat.bootstrap.dest %>']
}
}
},
qunit: {
options: {
inject: 'js/tests/unit/phantom.js'
},
files: ['js/tests/*.html']
},
connect: {
server: {
options: {
port: 3000,
base: '.'
}
}
},
watch: {
src: {
files: '<%= jshint.src.src %>',
tasks: ['jshint:src', 'qunit']
},
test: {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit']
},
recess: {
files: 'less/*.less',
tasks: ['recess']
}
}
});
// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-recess');
// Test task.
grunt.registerTask('test', ['jshint', 'qunit']);
// JS distribution task.
grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task.
grunt.registerTask('dist-css', ['recess']);
// Full distribution task.
grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']);
// Default task.
grunt.registerTask('default', ['test', 'dist']);
};
+1 -1
Ver Arquivo
@@ -173,4 +173,4 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS
-101
Ver Arquivo
@@ -1,101 +0,0 @@
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
DATE=$(shell date +%I:%M%p)
CHECK=\033[32m✔\033[39m
HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
#
# BUILD DOCS
#
build:
@echo "\n${HR}"
@echo "Building Bootstrap..."
@echo "${HR}\n"
@jshint js/*.js --config js/.jshintrc
@jshint js/tests/unit/*.js --config js/.jshintrc
@echo "Running JSHint on javascript... ${CHECK} Done"
@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
@echo "Compiling LESS with Recess... ${CHECK} Done"
@node docs/build
@cp img/* docs/assets/img/
@cp js/*.js docs/assets/js/
@cp js/tests/vendor/jquery.js docs/assets/js/
@echo "Compiling documentation... ${CHECK} Done"
@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
@echo "Compiling and minifying javascript... ${CHECK} Done"
@echo "\n${HR}"
@echo "Bootstrap successfully built at ${DATE}."
@echo "${HR}\n"
@echo "Thanks for using Bootstrap,"
@echo "<3 @mdo and @fat\n"
#
# RUN JSHINT & QUNIT TESTS IN PHANTOMJS
#
test:
jshint js/*.js --config js/.jshintrc
jshint js/tests/unit/*.js --config js/.jshintrc
node js/tests/server.js &
phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
kill -9 `cat js/tests/pid.txt`
rm js/tests/pid.txt
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required
#
bootstrap:
mkdir -p bootstrap/img
mkdir -p bootstrap/css
mkdir -p bootstrap/js
cp img/* bootstrap/img/
recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
#
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
gh-pages: bootstrap docs
rm -f docs/assets/bootstrap.zip
zip -r docs/assets/bootstrap.zip bootstrap
rm -r bootstrap
rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
node docs/build production
cp -r docs/* ../bootstrap-gh-pages
#
# WATCH LESS FILES
#
watch:
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"
#
# HAUNT GITHUB ISSUES 4 FAT & MDO ONLY (O_O )
#
haunt:
@haunt .issue-guidelines.js https://github.com/twitter/bootstrap
.PHONY: docs watch gh-pages
+104 -104
Ver Arquivo
@@ -1,21 +1,108 @@
[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
=================
# [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
To get started, checkout http://getbootstrap.com!
To get started, check out [http://getbootstrap.com](http://getbootstrap.com)!
Quick start
-----------
## Quick start
Clone the repo, `git clone git://github.com/twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
Three quick start options are available:
* [Download the latest release](https://github.com/twbs/bootstrap/zipball/master).
* Clone the repo: `git clone git://github.com/twbs/bootstrap.git`.
* Install with [Bower](http://bower.io): `bower install bootstrap`.
Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
Versioning
----------
## Bugs and feature requests
Have a bug or a feature request? [Please open a new issue](https://github.com/twbs/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
## Documentation
Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). The docs may also be run locally.
### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x).
2. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
- **Windows users:** run `chcp 65001` first to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors.
3. Open [http://localhost:9001](http://localhost:9001) in your browser, and voilà.
Learn more about using Jekyll by reading their [documentation](http://jekyllrb.com/docs/home/).
### Documentation for previous releases
Documentation for v2.3.3 has been made available for the time being at [http://getbootstrap.com/2.3.3/](http://getbootstrap.com/2.3.3/) while folks transition to Bootstrap 3.
[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
## Compiling CSS and JavaScript
Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working with the framework. It's how we compile our code, run tests, and more. To use it, install the required dependencies as directed and then run some Grunt commands.
### Install Grunt
From the command line:
1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
2. Install the [necessary local dependencies](package.json) via `npm install`
When completed, you'll be able to run the various Grunt commands provided from the command line.
**Unfamiliar with `npm`? Don't have node installed?** That's a-okay. npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js. [Download and install node.js](http://nodejs.org/download/) before proceeding.
### Available Grunt commands
#### Build - `grunt`
Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires recess and uglify-js.**
#### Only compile CSS and JavaScript - `grunt dist`
`grunt dist` creates the `/dist` directory with compiled files. **Requires recess and uglify-js.**
#### Tests - `grunt test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
#### Watch - `grunt watch`
This is a convenience method for watching just Less files and automatically building them whenever you save.
### Troubleshooting dependencies
Should you encounter problems with installing dependencies or running Grunt commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
## Contributing
Please read through our guidelines for contributing to Bootstrap. Included are directions for opening issues, coding standards, and notes on development.
More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.org](http://editorconfig.org).
## Community
Keep track of development and community news.
* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
* Read and subscribe to the [The Official Bootstrap Blog](http://blog.getbootstrap.com).
* Have a question that's not a feature request or bug report? [Ask on the mailing list.](http://groups.google.com/group/twitter-bootstrap)
* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
## 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.
@@ -29,111 +116,24 @@ And constructed with the following guidelines:
* New additions without breaking backward compatibility bumps the minor (and resets the patch)
* Bug fixes and misc changes bumps the patch
For more information on SemVer, please visit http://semver.org/.
For more information on SemVer, please visit [http://semver.org/](http://semver.org/).
Bug tracker
-----------
Have a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines).
https://github.com/twitter/bootstrap/issues
Twitter account
---------------
Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).
Blog
----
Read more detailed announcements, discussions, and more on [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com).
Mailing list
------------
Have a question? Ask on our mailing list!
twitter-bootstrap@googlegroups.com
http://groups.google.com/group/twitter-bootstrap
IRC
---
Server: irc.freenode.net
Channel: ##twitter-bootstrap (the double ## is not a typo)
Developers
----------
We have included a makefile with convenience methods for working with the Bootstrap library.
+ **dependencies**
Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
```
$ npm install recess connect uglify-js jshint -g
```
+ **build** - `make`
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
+ **test** - `make test`
Runs jshint and qunit tests headlessly in [phatomjs] (http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+ **watch** - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
Contributing
------------
Please submit all pull requests against *-wip branches. If your unit test contains javascript patches or features, you must include relevant unit tests. Thanks!
Authors
-------
## Authors
**Mark Otto**
+ http://twitter.com/mdo
+ http://github.com/markdotto
+ [http://twitter.com/mdo](http://twitter.com/mdo)
+ [http://github.com/mdo](http://github.com/mdo)
**Jacob Thornton**
+ http://twitter.com/fat
+ http://github.com/fat
+ [http://twitter.com/fat](http://twitter.com/fat)
+ [http://github.com/fat](http://github.com/fat)
Copyright and license
---------------------
## Copyright and license
Copyright 2012 Twitter, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License in the LICENSE file, or at:
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Copyright 2012 Twitter, Inc under [the Apache 2.0 license](LICENSE).
+28
Ver Arquivo
@@ -0,0 +1,28 @@
# Dependencies
markdown: rdiscount
pygments: true
# Permalinks
permalink: pretty
# Server
destination: ./_gh_pages
exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", "composer.json", "CONTRIBUTING.md", "CNAME", "LICENSE", "Gruntfile.js", "package.json", "node_modules", "README.md", "less"]
port: 9001
# Custom vars
repo: https://github.com/twbs/bootstrap
download: https://github.com/twbs/bootstrap/archive/v3.0.0-rc1.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0-rc1/bs-v3.0.0-rc1-dist.zip
examples: http://examples.getbootstrap.com
examples_repo: https://github.com/twbs/bootstrap-examples
glyphicons: http://glyphicons.getbootstrap.com
glyphicons_repo: https://github.com/twbs/bootstrap-glyphicons
blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js
+1
Ver Arquivo
@@ -0,0 +1 @@
<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
+26
Ver Arquivo
@@ -0,0 +1,26 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="{{ page.base_url }}assets/js/jquery.js"></script>
<script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="{{ page.base_url }}assets/js/holder.js"></script>
<script src="{{ page.base_url }}assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
+43
Ver Arquivo
@@ -0,0 +1,43 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<title>
{% if page.title == "Bootstrap" %}
{{ page.title }}
{% else if %}
{{ page.title }} &middot; Bootstrap
{% endif %}
</title>
<!-- Bootstrap core CSS -->
<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
<!-- Documentation extras -->
<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet">
<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="/assets/js/html5shiv.js"></script>
<script src="/assets/js/respond.min.js"></script>
<![endif]-->
<!-- Favicons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ page.base_url }}assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ page.base_url }}assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-146052-10']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
+112
Ver Arquivo
@@ -0,0 +1,112 @@
<li>
<a href="#dropdowns">Dropdowns</a>
<ul class="nav">
<li><a href="#dropdowns-example">Example</a></li>
<li><a href="#dropdowns-alignment">Alignment options</a></li>
<li><a href="#dropdowns-headers">Headers</a></li>
<li><a href="#dropdowns-disabled">Disabled menu items</a></li>
</ul>
</li>
<li>
<a href="#btn-groups">Button groups</a>
<ul class="nav">
<li><a href="#btn-groups-single">Basic button group</a></li>
<li><a href="#btn-groups-toolbar">Button toolbar</a></li>
<li><a href="#btn-groups-vertical">Vertical variation</a></li>
<li><a href="#btn-groups-justified">Justified link buttons</a></li>
</ul>
</li>
<li>
<a href="#btn-dropdowns">Button dropdowns</a>
<ul class="nav">
<li><a href="#btn-dropdowns-single">Single button dropdown</a></li>
<li><a href="#btn-dropdowns-split">Split button dropdown</a></li>
<li><a href="#btn-dropdowns-sizes">Button sizes</a></li>
<li><a href="#btn-dropdowns-dropup">Dropup variation</a></li>
</ul>
</li>
<li>
<a href="#nav">Navs</a>
<ul class="nav">
<li><a href="#nav-tabs">Tabs nav</a></li>
<li><a href="#nav-pills">Pills nav</a></li>
<li><a href="#nav-justified">Justified nav</a></li>
<li><a href="#nav-disabled-links">Disabled links</a></li>
<li><a href="#nav-alignment">Alignment options</a></li>
<li><a href="#nav-dropdowns">Using dropdowns</a></li>
</ul>
</li>
<li>
<a href="#navbar">Navbar</a>
<ul class="nav">
<li><a href="#navbar-basic">Basic navbar</a></li>
<li><a href="#navbar-nav">Nav links</a></li>
<li><a href="#navbar-forms">Forms in navbars</a></li>
<li><a href="#navbar-buttons">Buttons in navbars</a></li>
<li><a href="#navbar-text">Text in navbars</a></li>
<li><a href="#navbar-links">Links in navbars</a></li>
<li><a href="#navbar-component-alignment">Component alignment</a></li>
<li><a href="#navbar-fixed-top">Fixed top navbar</a></li>
<li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li>
<li><a href="#navbar-static-top">Static top navbar</a></li>
<li><a href="#navbar-responsive">Responsive navbar</a></li>
</ul>
</li>
<li><a href="#breadcrumbs">Breadcrumbs</a></li>
<li>
<a href="#pagination">Pagination</a>
<ul class="nav">
<li><a href="#pagination-default">Default pagination</a></li>
<li><a href="#pagination-pager">Pager</a></li>
</ul>
</li>
<li><a href="#labels">Labels</a></li>
<li><a href="#badges">Badges</a></li>
<li>
<a href="#type-components">Typography</a>
<ul class="nav">
<li><a href="#type-components-jumbotron">Jumbotron</a></li>
<li><a href="#type-components-page-header">Page header</a></li>
</ul>
</li>
<li><a href="#thumbnails">Thumbnails</a></li>
<li>
<a href="#alerts">Alerts</a>
<ul class="nav">
<li><a href="#alerts-default">Default alert</a></li>
<li><a href="#alerts-block">Block alerts</a></li>
<li><a href="#alerts-alternatives">Contextual alternatives</a></li>
<li><a href="#alerts-links">Links in alerts</a></li>
</ul>
</li>
<li>
<a href="#progress">Progress bars</a>
<ul class="nav">
<li><a href="#progress-basic">Basic progress bar</a></li>
<li><a href="#progress-alternatives">Contextual alternatives</a></li>
<li><a href="#progress-striped">Striped</a></li>
<li><a href="#progress-animated">Animated</a></li>
<li><a href="#progress-stacked">Stacked</a></li>
</ul>
</li>
<li><a href="#media">Media object</a></li>
<li>
<a href="#list-group">List group</a>
<ul class="nav">
<li><a href="#list-group-basic">Basic list group</a></li>
<li><a href="#list-group-badges">Badges</a></li>
<li><a href="#list-group-linked">Linked items</a></li>
<li><a href="#list-group-custom-content">Custom content</a></li>
<!-- <li><a href="#list-group-pic">Leading picture</a></li> -->
</ul>
</li>
<li>
<a href="#panels">Panels</a>
<ul class="nav">
<li><a href="#panels-basic">Basic panel</a></li>
<li><a href="#panels-heading">Panel with heading</a></li>
<li><a href="#panels-alternatives">Contextual alternatives</a></li>
<li><a href="#panels-list-group">With list groups</a>
</ul>
</li>
<li><a href="#wells">Wells</a></li>
+76
Ver Arquivo
@@ -0,0 +1,76 @@
<li>
<a href="#overview">Overview</a>
<ul class="nav">
<li><a href="#overview-doctype">HTML5 doctype</a></li>
<li><a href="#overview-mobile">Mobile first</a></li>
<li><a href="#overview-responsive-images">Responsive images</a></li>
<li><a href="#overview-type-links">Type and links</a></li>
<li><a href="#overview-normalize">Normalize</a></li>
<li><a href="#overview-container">Container</a></li>
</ul>
</li>
<li>
<a href="#glyphicons">Glyphicons</a>
</li>
<li>
<a href="#grid">Grid system</a>
<ul class="nav">
<li><a href="#grid-options">Available options</a></li>
<li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
<li><a href="#grid-example-mixed">Ex: Mobile-desktop</a></li>
<li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktop</a></li>
<li><a href="#grid-offsetting">Offset columns</a></li>
<li><a href="#grid-nesting">Nested columns</a></li>
<li><a href="#grid-column-ordering">Column ordering</a></li>
<li><a href="#grid-less">LESS mixins and variables</a></li>
</ul>
</li>
<li>
<a href="#type">Typography</a>
<ul class="nav">
<li><a href="#type-headings">Headings</a></li>
<li><a href="#type-body-copy">Body copy</a></li>
<li><a href="#type-emphasis">Emphasis</a></li>
<li><a href="#type-abbreviations">Abbreviations</a></li>
<li><a href="#type-addresses">Addresses</a></li>
<li><a href="#type-blockquotes">Blockquotes</a></li>
<li><a href="#type-lists">Lists</a></li>
</ul>
</li>
<li><a href="#code">Code</a></li>
<li>
<a href="#tables">Tables</a>
<ul class="nav">
<li><a href="#tables-example">Basic example</a></li>
<li><a href="#tables-striped">Zebra striping</a></li>
<li><a href="#tables-bordered">Bordered tables</a></li>
<li><a href="#tables-hover-rows">Hover rows</a></li>
<li><a href="#tables-condensed">Condensed tables</a></li>
<li><a href="#tables-row-classes">Contextual row classes</a></li>
</ul>
</li>
<li>
<a href="#forms">Forms</a>
<ul class="nav">
<li><a href="#forms-example">Basic example</a></li>
<li><a href="#forms-inline">Inline variation</a></li>
<li><a href="#forms-horizontal">Horizontal variation</a></li>
<li><a href="#forms-controls">Supported controls</a></li>
<li><a href="#forms-control-states">Control states</a></li>
<li><a href="#forms-input-groups">Input groups</a></li>
<li><a href="#forms-control-sizes">Control sizing</a></li>
<li><a href="#forms-help-text">Help text</a></li>
</ul>
</li>
<li>
<a href="#buttons">Buttons</a>
<ul class="nav">
<li><a href="#buttons-options">Button options</a></li>
<li><a href="#buttons-sizes">Sizes</a></li>
<li><a href="#buttons-disabled">Disabled</a></li>
<li><a href="#buttons-tags">Button tags</a></li>
</ul>
</li>
<li><a href="#images">Images</a></li>
<li><a href="#helper-classes">Helper classes</a></li>
<li><a href="#responsive-utilities">Responsive utilities</a></li>
+40
Ver Arquivo
@@ -0,0 +1,40 @@
<li>
<a href="#less">LESS components</a>
</li>
<li>
<a href="#plugins">jQuery plugins</a>
</li>
<li>
<a href="#less-variables">LESS variables</a>
<ul class="nav">
<li><a href="#variables-basics">Basics</a></li>
<li><a href="#variables-buttons">Buttons</a></li>
<li><a href="#variables-form-states">Form states</a></li>
<li><a href="#variables-alerts">Alerts</a></li>
<li><a href="#variables-navbar">Navbar</a></li>
<li><a href="#variables-nav">Nav</a></li>
<li><a href="#variables-tables">Tables</a></li>
<li><a href="#variables-forms">Forms</a></li>
<li><a href="#variables-dropdowns">Dropdowns</a></li>
<li><a href="#variables-panels-wells">Panels and wells</a></li>
<li><a href="#variables-accordion">Accordion</a></li>
<li><a href="#variables-badges">Badges</a></li>
<li><a href="#variables-breadcrumbs">Breadcrumbs</a></li>
<li><a href="#variables-jumbotron">Jumbotron</a></li>
<li><a href="#variables-modals">Modals</a></li>
<li><a href="#variables-carousel">Carousel</a></li>
<li><a href="#variables-list-group">List group</a></li>
<li><a href="#variables-thumbnails">Thumbnails</a></li>
<li><a href="#variables-progress">Progress bars</a></li>
<li><a href="#variables-pagination">Pagination</a></li>
<li><a href="#variables-pager">Pager</a></li>
<li><a href="#variables-labels">Labels</a></li>
<li><a href="#variables-tooltips-popovers">Tooltips and popovers</a></li>
<li><a href="#variables-close">Close button</a></li>
<li><a href="#variables-type">Type</a></li>
<li><a href="#variables-other">Other</a></li>
</ul>
</li>
<li>
<a href="#download">Download</a>
</li>
+22
Ver Arquivo
@@ -0,0 +1,22 @@
<li>
<a href="#download">Download Bootstrap</a>
<ul class="nav">
<li><a href="#download-options">Download options</a></li>
<li><a href="#download-cdn">Bootstrap CDN</a></li>
</ul>
</li>
<li>
<a href="#whats-included">What's included</a>
</li>
<li>
<a href="#template">Basic template</a>
</li>
<li>
<a href="#browsers">Browser support</a>
</li>
<li>
<a href="#license-faqs">License FAQs</a>
</li>
<li>
<a href="#customizing">Customizing Bootstrap</a>
</li>
+88
Ver Arquivo
@@ -0,0 +1,88 @@
<li>
<a href="#js-overview">Overview</a>
<ul class="nav">
<li><a href="#js-individual-compiled">Individual or compiled</a></li>
<li><a href="#js-data-attrs">Data attributes</a></li>
<li><a href="#js-programmatic-api">Programmatic API</a></li>
<li><a href="#js-noconflict">No Conflict</a></li>
<li><a href="#js-events">Events</a></li>
</ul>
</li>
<li><a href="#transitions">Transitions</a></li>
<li>
<a href="#modals">Modal</a>
<ul class="nav">
<li><a href="#modals-examples">Examples</a></li>
<li><a href="#modals-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#dropdowns">Dropdown</a>
<ul class="nav">
<li><a href="#dropdowns-examples">Examples</a></li>
<li><a href="#dropdowns-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#scrollspy">Scrollspy</a>
<ul class="nav">
<li><a href="#scrollspy-examples">Examples</a></li>
<li><a href="#scrollspy-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#tabs">Tab</a>
<ul class="nav">
<li><a href="#tabs-examples">Examples</a></li>
<li><a href="#tabs-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#tooltips">Tooltip</a>
<ul class="nav">
<li><a href="#tooltips-examples">Examples</a></li>
<li><a href="#tooltips-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#popovers">Popover</a>
<ul class="nav">
<li><a href="#popovers-examples">Examples</a></li>
<li><a href="#popovers-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#alerts">Alert</a>
<ul class="nav">
<li><a href="#alerts-examples">Examples</a></li>
<li><a href="#alerts-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#buttons">Button</a>
<ul class="nav">
<li><a href="#buttons-examples">Examples</a></li>
<li><a href="#buttons-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#collapse">Collapse</a>
<ul class="nav">
<li><a href="#collapse-examples">Examples</a></li>
<li><a href="#collapse-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#carousel">Carousel</a>
<ul class="nav">
<li><a href="#carousel-examples">Examples</a></li>
<li><a href="#carousel-usage">Usage</a></li>
</ul>
</li>
<li>
<a href="#affix">Affix</a>
<ul class="nav">
<li><a href="#affix-examples">Examples</a></li>
<li><a href="#affix-usage">Usage</a></li>
</ul>
</li>
+29
Ver Arquivo
@@ -0,0 +1,29 @@
<div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav">
<div class="container">
<a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC1</a>
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="nav-collapse collapse bs-navbar-collapse">
<ul class="nav navbar-nav">
<li{% if page.slug == "getting-started" %} class="active"{% endif %}>
<a href="{{ page.base_url }}getting-started">Getting started</a>
</li>
<li{% if page.slug == "css" %} class="active"{% endif %}>
<a href="{{ page.base_url }}css">CSS</a>
</li>
<li{% if page.slug == "components" %} class="active"{% endif %}>
<a href="{{ page.base_url }}components">Components</a>
</li>
<li{% if page.slug == "js" %} class="active"{% endif %}>
<a href="{{ page.base_url }}javascript">JavaScript</a>
</li>
<li{% if page.slug == "customize" %} class="active"{% endif %}>
<a href="{{ page.base_url }}customize">Customize</a>
</li>
</ul>
</div>
</div>
</div>
+8
Ver Arquivo
@@ -0,0 +1,8 @@
<div class="bs-old-docs">
<div class="container">
<strong>
<a href="{{ page.base_url }}2.3.2/">Looking for Bootstrap 2.3.2 docs?</a>
</strong>
We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog</a> for details.
</div>
</div>
+16
Ver Arquivo
@@ -0,0 +1,16 @@
<div class="bs-social">
<ul class="bs-social-buttons">
<li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
</li>
<li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
</li>
<li class="follow-btn">
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
</li>
<li class="tweet-btn">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twbs.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
</li>
</ul>
</div>
+51
Ver Arquivo
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta, title, CSS, favicons, etc. -->
{% include header.html %}
<!-- Place anything custom after this. -->
</head>
<body data-spy="scroll" data-target=".bs-sidebar">
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Docs page layout -->
<div class="bs-header">
<div class="container">
<h1>{{ page.title }}</h1>
<p>{{ page.lead }}</p>
{% include ads.html %}
</div>
</div>
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
<div class="bs-customize-placeholder">
<div class="container bs-docs-container">
<p class="lead">Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the <a href="{{ site.repo }}/releases">compiled CSS and JavaScript</a>. Hang tight!</p>
</div>
</div>
<!-- Footer
================================================== -->
<footer class="bs-footer">
{% include social-buttons.html %}
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links">
<li><a href="{{ site.blog }}">Blog</a></li>
<li class="muted">&middot;</li>
<li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="{{ site.repo }}/releases">Releases</a></li>
</ul>
</footer>
<!-- JS and analytics only. -->
{% include footer.html %}
</body>
</html>
+74
Ver Arquivo
@@ -0,0 +1,74 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta, title, CSS, favicons, etc. -->
{% include header.html %}
<!-- Place anything custom after this. -->
</head>
<body>
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Docs page layout -->
<div class="bs-header">
<div class="container">
<h1>{{ page.title }}</h1>
<p>{{ page.lead }}</p>
{% include ads.html %}
</div>
</div>
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
<div class="container bs-docs-container">
<div class="row">
<div class="col-lg-3">
<div class="bs-sidebar">
<ul class="nav bs-sidenav">
{% if page.slug == "getting-started" %}
{% include nav-getting-started.html %}
{% elsif page.slug == "css" %}
{% include nav-css.html %}
{% elsif page.slug == "components" %}
{% include nav-components.html %}
{% elsif page.slug == "js" %}
{% include nav-javascript.html %}
{% elsif page.slug == "customize" %}
{% include nav-customize.html %}
{% endif %}
</ul>
</div>
</div>
<div class="col-lg-9">
{{ content }}
</div>
</div>
</div>
<!-- Quick back to top -->
<a href="#" class="bs-top">Back to top</a>
<!-- Footer
================================================== -->
<footer class="bs-footer">
{% include social-buttons.html %}
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links">
<li><a href="{{ site.blog }}">Blog</a></li>
<li class="muted">&middot;</li>
<li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="{{ site.repo }}/releases">Releases</a></li>
</ul>
</footer>
<!-- JS and analytics only. -->
{% include footer.html %}
</body>
</html>
+42
Ver Arquivo
@@ -0,0 +1,42 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Meta, title, CSS, favicons, etc. -->
{% include header.html %}
<!-- Place anything custom after this. -->
</head>
<body class="bs-docs-home">
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Page content of course! -->
{{ content }}
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
<div class="container">
{% include social-buttons.html %}
<ul class="bs-masthead-links">
<li>
<a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li>
<li>
<a href="{{ site.examples }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
</li>
<li>
<a href="{{ site.glyphicons }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
</li>
<li>
<a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
</li>
</ul>
</div>
<!-- JS and analytics only. -->
{% include footer.html %}
</body>
</html>
+886
Ver Arquivo
@@ -0,0 +1,886 @@
/*
* Bootstrap Documentation
* Special styles for presenting Bootstrap's documentation and code examples.
*/
/* Key scaffolding
-------------------------------------------------- */
body {
position: relative; /* For scrollyspy */
padding-top: 50px; /* Account for fixed navbar */
}
/* Custom docs button */
.btn-bs {
color: #563d7c;
background-color: #fff;
border-color: #e5e5e5;
}
.btn-bs:hover,
.btn-bs:active {
color: #fff;
background-color: #563d7c;
border-color: #563d7c;
}
/* Temp CSS until RC2 */
.bs-customize-placeholder {
margin-bottom: -100px;
padding: 80px 30px;
text-align: center;
background-color: #f5f5f5;
}
/* Top nav and header
-------------------------------------------------- */
.bs-docs-nav {
background-color: #563d7c;
}
.bs-docs-nav .navbar-brand {
color: #fff;
}
.bs-docs-nav .navbar-nav > li > a {
color: #cdbfe3;
}
.bs-docs-nav .navbar-nav > li > a:hover {
color: #fff;
}
.bs-docs-nav .navbar-nav > .active > a,
.bs-docs-nav .navbar-nav > .active > a:hover {
color: #fff;
background-color: #463265;
}
.bs-docs-nav .navbar-toggle {
border-color: #563d7c;
}
.bs-docs-nav .navbar-toggle:hover {
background-color: #463265;
border-color: #463265;
}
/* Old docs callout */
.bs-old-docs {
padding: 15px 20px;
color: #777;
background-color: #fafafa;
border-bottom: 1px solid #e5e5e5;
}
.bs-old-docs strong {
color: #555;
}
.bs-docs-home .bs-old-docs {
text-align: center;
border-top: 1px solid #e5e5e5;
}
/* Homepage masthead
-------------------------------------------------- */
.bs-masthead {
position: relative;
padding: 30px 15px;
text-align: center;
}
.bs-masthead h1 {
font-size: 50px;
line-height: 1;
}
/* Download button */
.bs-masthead .btn-bs {
margin-top: 5px;
margin-bottom: 5px;
padding: 18px 24px;
font-size: 21px;
}
/* Textual links */
.bs-social {
margin-top: 30px;
text-align: center;
}
.bs-masthead-links {
margin-top: 20px;
margin-bottom: 20px;
padding-left: 0;
list-style: none;
text-align: center;
}
.bs-masthead-links li {
display: inline;
color: #999;
}
.bs-masthead-links li + li {
margin-left: 20px;
}
/* Customize and Download button
-------------------------------------------------- */
.bs-customizer .toggle {
float: right;
}
.bs-customizer label {
margin-top: 10px;
font-weight: 500;
color: #444;
}
.bs-customizer h2 {
margin-top: 0;
margin-bottom: 5px;
padding-top: 30px;
}
.bs-customizer h4 {
margin-top: 15px;
}
.bs-customizer input[type="text"] {
background-color: #fafafa;
}
.bs-customizer .help-block {
font-size: 12px;
}
.bs-customize-download {
text-align: center;
}
/* Docs pages and sections
-------------------------------------------------- */
/* Page headers */
.bs-header {
padding: 30px 30px 40px;
font-size: 16px;
color: #5a5a5a;
text-align: center;
border-bottom: 1px solid #e5e5e5;
}
.bs-header h1 {
color: #563d7c;
}
.bs-header p {
font-weight: 300;
line-height: 1.5;
}
.bs-header .container {
position: relative;
}
.bs-docs-section + .bs-docs-section {
margin-top: 80px;
}
/* Ads in page headers */
.carbonad {
width: auto !important;
margin: 50px -30px -40px !important;
padding: 20px !important;
overflow: hidden; /* clearfix */
height: auto !important;
font-size: 13px !important;
line-height: 16px !important;
text-align: left;
background: none !important;
border: 0 !important;
border-top: 1px solid #e5e5e5 !important;
}
.carbonad-img {
margin: 0 !important;
}
.carbonad-text,
.carbonad-tag {
float: none !important;
display: block !important;
width: auto !important;
height: auto !important;
margin-left: 145px !important;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
}
.carbonad-text {
padding-top: 0 !important;
}
.carbonad-tag {
text-align: left !important;
}
.carbonad #azcarbon > img {
display: none; /* hide what I assume are tracking images */
}
/* Docs sidebar
-------------------------------------------------- */
/* By default it's not affixed in mobile views, so undo that */
.bs-sidebar.affix {
position: static;
}
/* First level of nav */
.bs-sidenav {
margin-top: 30px;
margin-bottom: 30px;
padding-top: 10px;
padding-bottom: 10px;
text-shadow: 0 1px 0 #fff;
background-color: #f7f5fa;
border-radius: 5px;
}
/* All levels of nav */
.bs-sidebar .nav > li > a {
display: block;
color: #716b7a;
padding: 5px 20px;
}
.bs-sidebar .nav > li > a:hover,
.bs-sidebar .nav > li > a:focus {
text-decoration: none;
background-color: #e5e3e9;
border-right: 1px solid #dbd8e0;
}
.bs-sidebar .nav > .active > a,
.bs-sidebar .nav > .active:hover > a,
.bs-sidebar .nav > .active:focus > a {
font-weight: bold;
color: #563d7c;
background-color: transparent;
border-right: 1px solid #563d7c;
}
/* Nav: second level (shown on .active) */
.bs-sidebar .nav .nav {
display: none;
margin-bottom: 8px;
}
.bs-sidebar .nav > .active > ul {
display: block;
}
.bs-sidebar .nav .nav > li > a {
padding-top: 3px;
padding-bottom: 3px;
padding-left: 30px;
font-size: 90%;
}
/* Side notes for calling out things
-------------------------------------------------- */
/* Base styles (regardless of theme) */
.bs-callout {
margin: 20px 0;
padding: 15px 30px 15px 15px;
border-left: 5px solid #eee;
}
.bs-callout h4 {
margin-top: 0;
}
.bs-callout p:last-child {
margin-bottom: 0;
}
.bs-callout code,
.bs-callout .highlight {
background-color: #fff;
}
/* Themes for different contexts */
.bs-callout-danger {
background-color: #fcf2f2;
border-color: #dFb5b4;
}
.bs-callout-warning {
background-color: #fefbed;
border-color: #f1e7bc;
}
.bs-callout-info {
background-color: #f0f7fd;
border-color: #d0e3f0;
}
/* Special grid styles
-------------------------------------------------- */
.show-grid {
margin-bottom: 15px;
}
.show-grid [class^="col-"] {
padding-top: 10px;
padding-bottom: 10px;
background-color: #eee;
border: 1px solid #ddd;
background-color: rgba(86,61,124,.15);
border: 1px solid rgba(86,61,124,.2);
}
/* Bootstrap code examples
-------------------------------------------------- */
/* Base class */
.bs-example {
position: relative;
padding: 45px 15px 15px;
margin: 0 -15px -1px;
background-color: #fafafa;
box-shadow: inset 0 3px 6px rgba(0,0,0,.05);
border-color: #e5e5e5 #eee #eee;
border-style: solid;
border-width: 1px 0;
}
/* Echo out a label for the example */
.bs-example:after {
content: "Example";
position: absolute;
top: 15px;
left: 15px;
font-size: 12px;
font-weight: bold;
color: #bbb;
text-transform: uppercase;
letter-spacing: 1px;
}
/* Tweak display of the examples */
.bs-example + .prettyprint,
.bs-example + .highlight {
margin-top: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
/* Tweak content of examples for optimum awesome */
.bs-example > p:last-child,
.bs-example > ul:last-child,
.bs-example > ol:last-child,
.bs-example > blockquote:last-child,
.bs-example > input:last-child,
.bs-example > select:last-child,
.bs-example > textarea:last-child,
.bs-example > .table:last-child,
.bs-example > .navbar:last-child
.bs-example > .jumbotron:last-child,
.bs-example > .alert:last-child,
.bs-example > .panel:last-child,
.bs-example > .list-group:last-child,
.bs-example > .well:last-child {
margin-bottom: 0;
}
.bs-example > p > .close {
float: none;
}
/* Typography */
.bs-example-type .table td {
color: #999;
vertical-align: middle;
border-color: ;
}
.bs-example-type .table td,
.bs-example-type .table th {
padding: 15px 0;
border-color: #eee;
}
.bs-example-type .table tr:first-child td,
.bs-example-type .table tr:first-child th {
border-top: 0;
}
.bs-example-type h1,
.bs-example-type h2,
.bs-example-type h3,
.bs-example-type h4,
.bs-example-type h5,
.bs-example-type h6 {
margin: 0;
}
/* Forms */
.bs-example.form-inline select,
.bs-example.form-inline input[type="text"],
.bs-example.form-inline input[type="password"] {
width: 180px;
}
.bs-example-control-sizing select,
.bs-example-control-sizing input[type="text"] + input[type="text"] {
margin-top: 10px;
}
.bs-example-form .input-group {
margin-bottom: 10px;
}
/* List groups */
.bs-example > .list-group {
max-width: 400px;
}
/* Navbar examples */
.bs-example .navbar:last-child {
margin-bottom: 0;
}
.bs-navbar-top-example,
.bs-navbar-bottom-example {
z-index: 1;
padding: 0;
min-height: 110px;
overflow: hidden; /* cut the drop shadows off */
}
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
position: relative;
margin-left: 0;
margin-right: 0;
}
.bs-navbar-top-example .navbar-fixed-top {
top: -1px;
}
.bs-navbar-bottom-example .navbar-fixed-bottom {
bottom: -1px;
}
.bs-navbar-top-example {
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
}
.bs-navbar-top-example:after {
top: auto;
bottom: 15px;
-webkit-border-radius: 0 4px 0 4px;
-moz-border-radius: 0 4px 0 4px;
border-radius: 0 4px 0 4px;
}
.bs-navbar-bottom-example {
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.bs-navbar-bottom-example .navbar {
margin-bottom: 0;
}
/* Example modals */
.bs-example-modal {
background-color: #f5f5f5;
}
.bs-example-modal .modal {
position: relative;
top: auto;
right: auto;
left: auto;
bottom: auto;
z-index: 1;
display: block;
}
.bs-example-modal .modal-dialog {
left: auto;
margin-left: auto;
margin-right: auto;
}
/* Example dropdowns */
.bs-example > .dropdown > .dropdown-menu,
.bs-example-submenu > .pull-left > .dropup > .dropdown-menu,
.bs-example-submenu > .pull-left > .dropdown > .dropdown-menu {
position: static;
display: block;
margin-bottom: 5px;
}
.bs-example-submenu {
min-height: 230px;
}
.bs-example-submenu > .pull-left + .pull-left {
margin-left: 20px;
}
/* Example tabbable tabs */
.bs-example-tabs .nav-tabs {
margin-bottom: 15px;
}
/* Tooltips */
.bs-example-tooltips {
text-align: center;
}
/* Popovers */
.bs-example-popover {
padding-bottom: 24px;
background-color: #f9f9f9;
}
.bs-example-popover .popover {
position: relative;
display: block;
float: left;
width: 260px;
margin: 20px;
}
/* Example templates
-------------------------------------------------- */
.bs-examples h4 {
margin-bottom: 5px;
}
.bs-examples p {
margin-bottom: 20px;
}
/* Responsive docs
-------------------------------------------------- */
/* Responsive (scrollable) doc tables */
@media (max-width: 768px) {
.bs-table-scrollable {
width: 100%;
margin-bottom: 15px;
overflow-y: hidden;
overflow-x: scroll;
border: 1px solid #ddd;
}
.bs-table-scrollable .table {
margin-bottom: 0;
border: 0;
}
.bs-table-scrollable .table th,
.bs-table-scrollable .table td {
white-space: nowrap;
}
.bs-table-scrollable .table th:first-child,
.bs-table-scrollable .table td:first-child {
border-left: 0;
}
.bs-table-scrollable .table th:last-child,
.bs-table-scrollable .table td:last-child {
border-right: 0;
}
.bs-table-scrollable .table tr:last-child th,
.bs-table-scrollable .table tr:last-child td {
border-bottom: 0;
}
}
/* Related: responsive utilities tables */
.table code {
font-size: 13px;
font-weight: normal;
}
/* Utility classes table
------------------------- */
.bs-table th small,
.responsive-utilities th small {
display: block;
font-weight: normal;
color: #999;
}
.responsive-utilities tbody th {
font-weight: normal;
}
.responsive-utilities td {
text-align: center;
}
.responsive-utilities td.is-visible {
color: #468847;
background-color: #dff0d8 !important;
}
.responsive-utilities td.is-hidden {
color: #ccc;
background-color: #f9f9f9 !important;
}
/* Responsive tests
------------------------- */
.responsive-utilities-test {
margin-top: 5px;
padding-left: 0;
list-style: none;
overflow: hidden; /* clear floats */
}
.responsive-utilities-test li {
position: relative;
float: left;
width: 25%;
}
.responsive-utilities-test li + li {
margin-left: 10px;
}
.responsive-utilities-test span {
padding: 15px 10px;
font-size: 14px;
font-weight: bold;
line-height: 1.1;
text-align: center;
border-radius: 4px;
}
.responsive-utilities-test.visible-on [class*="hidden"],
.responsive-utilities-test.hidden-on [class*="visible"] {
color: #999;
border: 1px solid #ddd;
}
.responsive-utilities-test.visible-on [class*="visible"],
.responsive-utilities-test.hidden-on [class*="hidden"] {
color: #468847;
background-color: #dff0d8;
border: 1px solid #d6e9c6;
}
/* Footer
-------------------------------------------------- */
.bs-footer {
padding-top: 40px;
padding-bottom: 30px;
margin-top: 100px;
text-align: center;
border-top: 1px solid #e5e5e5;
}
.bs-footer p {
margin-bottom: 0;
color: #777;
}
.footer-links {
margin: 10px 0;
padding-left: 0;
}
.footer-links li {
display: inline;
padding: 0 2px;
}
.footer-links li:first-child {
padding-left: 0;
}
/* Social proof buttons from GitHub & Twitter */
.bs-social {
margin-bottom: 20px;
}
.bs-social-buttons {
display: inline-block;
margin-bottom: 0;
padding-left: 0;
list-style: none;
}
.bs-social-buttons li {
display: inline-block;
line-height: 1;
}
.bs-social-buttons li + li {
margin-left: 15px;
}
.bs-social-buttons .twitter-follow-button {
width: 225px !important;
}
.bs-social-buttons .twitter-share-button {
width: 98px !important;
}
/* Misc docs stuff
-------------------------------------------------- */
/* Pseudo :focus state for showing how it looks in the docs */
input.focused {
border-color: rgba(82,168,236,.8);
outline: 0;
outline: thin dotted \9; /* IE6-9 */
-moz-box-shadow: 0 0 8px rgba(82,168,236,.6);
box-shadow: 0 0 8px rgba(82,168,236,.6);
}
/* Scrollspy demo on fixed height div */
.scrollspy-example {
position: relative;
height: 200px;
margin-top: 10px;
overflow: auto;
}
.highlight {
padding: 9px 14px;
margin-bottom: 14px;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
border-radius: 4px;
}
.highlight pre {
padding: 0;
margin-top: 0;
margin-bottom: 0;
background-color: transparent;
border: 0;
white-space: nowrap;
}
.highlight pre code {
font-size: inherit;
color: #333; /* Effectively the base text color */
}
.highlight pre .lineno {
display: inline-block;
width: 22px;
padding-right: 5px;
margin-right: 10px;
text-align: right;
color: #bebec5;
}
/* Better spacing on download options in getting started */
.bs-docs-dl-options h4 {
margin-top: 15px;
margin-bottom: 5px;
}
/* Hide the top link initially */
.bs-top {
display: none;
}
/* Responsive variations
-------------------------------------------------- */
/* Hide code snippets on mobile devices */
@media screen and (max-width: 480px) {
.highlight {
display: none;
}
}
/* Tablets and up */
@media screen and (min-width: 768px) {
/* Back to top link */
.bs-top {
display: block; /* Unhide */
float: left;
padding: 7px 15px;
font-weight: 500;
color: #999;
background-color: #eee;
border-radius: 4px;
}
.bs-top:hover {
color: #fff;
text-decoration: none;
background-color: #999;
}
.bs-top.affix {
position: fixed;
right: 15px;
bottom: 15px;
}
.bs-header {
font-size: 21px;
text-align: left;
}
.bs-header h1 {
font-size: 60px;
line-height: 1;
}
.bs-example {
margin-left: 0;
margin-right: 0;
background-color: #fff;
border-width: 1px;
border-color: #ddd;
border-radius: 4px 4px 0 0;
box-shadow: none;
}
.carbonad {
margin: 0 !important;
border: 1px solid #e5e5e5 !important;
border-radius: 4px;
}
/* Show the docs nav */
.bs-sidebar {
display: block;
}
/* Tweak display of docs jumbotrons */
.bs-masthead {
padding-top: 100px;
padding-bottom: 100px;
}
.bs-masthead h1 {
font-size: 100px;
}
.bs-masthead p {
margin-left: 15%;
margin-right: 15%;
font-size: 30px;
}
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
position: absolute;
}
}
/* Tablets/desktops and up */
@media screen and (min-width: 992px) {
/* Widen the fixed sidebar */
.bs-sidebar.affix,
.bs-sidebar.affix-bottom {
width: 213px;
}
.bs-sidebar.affix {
position: fixed; /* Undo the static from mobile-first approach */
top: 80px;
}
.bs-sidebar.affix-bottom {
position: absolute; /* Undo the static from mobile-first approach */
}
.bs-sidebar.affix-bottom .bs-sidenav,
.bs-sidebar.affix .bs-sidenav {
margin-top: 0;
margin-bottom: 0;
}
.bs-header h1,
.bs-header p {
margin-right: 380px;
}
.carbonad {
position: absolute;
top: 20px;
right: 0;
padding: 15px !important;
width: 330px !important;
min-height: 132px;
}
}
/* Large desktops and up */
@media screen and (min-width: 1200px) {
/* Widen the fixed sidebar again */
.bs-sidebar.affix-bottom,
.bs-sidebar.affix {
width: 270px;
}
}
+66
Ver Arquivo
@@ -0,0 +1,66 @@
.hll { background-color: #ffffcc }
/*{ background: #f0f3f3; }*/
.c { color: #999; } /* Comment */
.err { color: #AA0000; background-color: #FFAAAA } /* Error */
.k { color: #006699; } /* Keyword */
.o { color: #555555 } /* Operator */
.cm { color: #0099FF; font-style: italic } /* Comment.Multiline */
.cp { color: #009999 } /* Comment.Preproc */
.c1 { color: #999; } /* Comment.Single */
.cs { color: #999; } /* Comment.Special */
.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */
.ge { font-style: italic } /* Generic.Emph */
.gr { color: #FF0000 } /* Generic.Error */
.gh { color: #003300; } /* Generic.Heading */
.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */
.go { color: #AAAAAA } /* Generic.Output */
.gp { color: #000099; } /* Generic.Prompt */
.gs { } /* Generic.Strong */
.gu { color: #003300; } /* Generic.Subheading */
.gt { color: #99CC66 } /* Generic.Traceback */
.kc { color: #006699; } /* Keyword.Constant */
.kd { color: #006699; } /* Keyword.Declaration */
.kn { color: #006699; } /* Keyword.Namespace */
.kp { color: #006699 } /* Keyword.Pseudo */
.kr { color: #006699; } /* Keyword.Reserved */
.kt { color: #007788; } /* Keyword.Type */
.m { color: #FF6600 } /* Literal.Number */
.s { color: #d44950 } /* Literal.String */
.na { color: #4f9fcf } /* Name.Attribute */
.nb { color: #336666 } /* Name.Builtin */
.nc { color: #00AA88; } /* Name.Class */
.no { color: #336600 } /* Name.Constant */
.nd { color: #9999FF } /* Name.Decorator */
.ni { color: #999999; } /* Name.Entity */
.ne { color: #CC0000; } /* Name.Exception */
.nf { color: #CC00FF } /* Name.Function */
.nl { color: #9999FF } /* Name.Label */
.nn { color: #00CCFF; } /* Name.Namespace */
.nt { color: #2f6f9f; } /* Name.Tag */
.nv { color: #003333 } /* Name.Variable */
.ow { color: #000000; } /* Operator.Word */
.w { color: #bbbbbb } /* Text.Whitespace */
.mf { color: #FF6600 } /* Literal.Number.Float */
.mh { color: #FF6600 } /* Literal.Number.Hex */
.mi { color: #FF6600 } /* Literal.Number.Integer */
.mo { color: #FF6600 } /* Literal.Number.Oct */
.sb { color: #CC3300 } /* Literal.String.Backtick */
.sc { color: #CC3300 } /* Literal.String.Char */
.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */
.s2 { color: #CC3300 } /* Literal.String.Double */
.se { color: #CC3300; } /* Literal.String.Escape */
.sh { color: #CC3300 } /* Literal.String.Heredoc */
.si { color: #AA0000 } /* Literal.String.Interpol */
.sx { color: #CC3300 } /* Literal.String.Other */
.sr { color: #33AAAA } /* Literal.String.Regex */
.s1 { color: #CC3300 } /* Literal.String.Single */
.ss { color: #FFCC33 } /* Literal.String.Symbol */
.bp { color: #336666 } /* Name.Builtin.Pseudo */
.vc { color: #003333 } /* Name.Variable.Class */
.vg { color: #003333 } /* Name.Variable.Global */
.vi { color: #003333 } /* Name.Variable.Instance */
.il { color: #FF6600 } /* Literal.Number.Integer.Long */
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }
Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 4.8 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 5.5 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 2.9 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 3.4 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 1.9 KiB

+169
Ver Arquivo
@@ -0,0 +1,169 @@
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
!function ($) {
$(function(){
var $window = $(window)
var navHeight = $('.navbar').outerHeight(true) + 10
$(document.body).scrollspy({
target: '.bs-sidebar',
offset: navHeight
})
$('[href=#]').click(function (e) {
e.preventDefault()
})
$(document.body).on('click', '.bs-sidenav [href^=#]', function (e) {
var $target = $(this.getAttribute('href'))
e.preventDefault() // prevent browser scroll
document.body.scrollTop =
$target.offset().top -
navHeight + 5 // offset scroll by nav
})
// back to top
setTimeout(function () {
var $sideBar = $('.bs-sidebar')
$sideBar.affix({
offset: {
top: function () {
var offsetTop = $sideBar.offset().top
var sideBarMargin = parseInt($sideBar.children(0).css('margin-top'), 10)
var navOuterHeight = $('.bs-docs-nav').height()
return (this.top = offsetTop - navOuterHeight - sideBarMargin)
}
, bottom: function () {
return (this.bottom = $('.bs-footer').outerHeight(true))
}
}
})
}, 100)
setTimeout(function () {
$('.bs-top').affix()
}, 100)
// tooltip demo
$('.tooltip-demo').tooltip({
selector: "[data-toggle=tooltip]"
})
$('.tooltip-test').tooltip()
$('.popover-test').popover()
$('.bs-docs-navbar').tooltip({
selector: "a[data-toggle=tooltip]",
container: ".bs-docs-navbar .nav"
})
// popover demo
$("[data-toggle=popover]")
.popover()
// button state demo
$('#fat-btn')
.click(function () {
var btn = $(this)
btn.button('loading')
setTimeout(function () {
btn.button('reset')
}, 3000)
})
// carousel demo
$('.bs-docs-carousel-example').carousel()
// javascript build logic
var inputsComponent = $("#less input")
, inputsPlugin = $("#plugins input")
, inputsVariables = $("#less-variables input")
// toggle all plugin checkboxes
$('#less .toggle').on('click', function (e) {
e.preventDefault()
inputsComponent.prop('checked', !inputsComponent.is(':checked'))
})
$('#plugins .toggle').on('click', function (e) {
e.preventDefault()
inputsPlugin.prop('checked', !inputsPlugin.is(':checked'))
})
$('#less-variables .toggle').on('click', function (e) {
e.preventDefault()
inputsVariables.val('')
})
// request built javascript
$('.bs-customize-download .btn').on('click', function (e) {
e.preventDefault()
var css = $("#less input:checked")
.map(function () { return this.value })
.toArray()
, js = $("#plugins input:checked")
.map(function () { return this.value })
.toArray()
, vars = {}
$("#less-variables input")
.each(function () {
$(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
})
$.ajax({
type: 'POST'
, url: /localhost/.test(window.location) ? 'http://localhost:9001' : 'http://bootstrap.herokuapp.com'
, dataType: 'jsonpi'
, params: {
js: js
, css: css
, vars: vars
}
})
})
})
// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
$.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
var url = opts.url;
return {
send: function(_, completeCallback) {
var name = 'jQuery_iframe_' + jQuery.now()
, iframe, form
iframe = $('<iframe>')
.attr('name', name)
.appendTo('head')
form = $('<form>')
.attr('method', opts.type) // GET or POST
.attr('action', url)
.attr('target', name)
$.each(opts.params, function(k, v) {
$('<input>')
.attr('type', 'hidden')
.attr('name', k)
.attr('value', typeof v == 'string' ? v : JSON.stringify(v))
.appendTo(form)
})
form.appendTo('body').submit()
}
}
})
}(window.jQuery)
Arquivo executável
+419
Ver Arquivo
@@ -0,0 +1,419 @@
/*
Holder - 2.0 - client side image placeholders
(c) 2012-2013 Ivan Malopinsky / http://imsky.co
Provided under the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0
Commercial use requires attribution.
*/
var Holder = Holder || {};
(function (app, win) {
var preempted = false,
fallback = false,
canvas = document.createElement('canvas');
//getElementsByClassName polyfill
document.getElementsByClassName||(document.getElementsByClassName=function(e){var t=document,n,r,i,s=[];if(t.querySelectorAll)return t.querySelectorAll("."+e);if(t.evaluate){r=".//*[contains(concat(' ', @class, ' '), ' "+e+" ')]",n=t.evaluate(r,t,null,0,null);while(i=n.iterateNext())s.push(i)}else{n=t.getElementsByTagName("*"),r=new RegExp("(^|\\s)"+e+"(\\s|$)");for(i=0;i<n.length;i++)r.test(n[i].className)&&s.push(n[i])}return s})
//getComputedStyle polyfill
window.getComputedStyle||(window.getComputedStyle=function(e,t){return this.el=e,this.getPropertyValue=function(t){var n=/(\-([a-z]){1})/g;return t=="float"&&(t="styleFloat"),n.test(t)&&(t=t.replace(n,function(){return arguments[2].toUpperCase()})),e.currentStyle[t]?e.currentStyle[t]:null},this})
//http://javascript.nwbox.com/ContentLoaded by Diego Perini with modifications
function contentLoaded(n,t){var l="complete",s="readystatechange",u=!1,h=u,c=!0,i=n.document,a=i.documentElement,e=i.addEventListener?"addEventListener":"attachEvent",v=i.addEventListener?"removeEventListener":"detachEvent",f=i.addEventListener?"":"on",r=function(e){(e.type!=s||i.readyState==l)&&((e.type=="load"?n:i)[v](f+e.type,r,u),!h&&(h=!0)&&t.call(n,null))},o=function(){try{a.doScroll("left")}catch(n){setTimeout(o,50);return}r("poll")};if(i.readyState==l)t.call(n,"lazy");else{if(i.createEventObject&&a.doScroll){try{c=!n.frameElement}catch(y){}c&&o()}i[e](f+"DOMContentLoaded",r,u),i[e](f+s,r,u),n[e](f+"load",r,u)}};
//https://gist.github.com/991057 by Jed Schmidt with modifications
function selector(a){
a=a.match(/^(\W)?(.*)/);var b=document["getElement"+(a[1]?a[1]=="#"?"ById":"sByClassName":"sByTagName")](a[2]);
var ret=[]; b!=null&&(b.length?ret=b:b.length==0?ret=b:ret=[b]); return ret;
}
//shallow object property extend
function extend(a,b){var c={};for(var d in a)c[d]=a[d];for(var e in b)c[e]=b[e];return c}
//hasOwnProperty polyfill
if (!Object.prototype.hasOwnProperty)
Object.prototype.hasOwnProperty = function(prop) {
var proto = this.__proto__ || this.constructor.prototype;
return (prop in this) && (!(prop in proto) || proto[prop] !== this[prop]);
}
function text_size(width, height, template) {
height = parseInt(height,10);
width = parseInt(width,10);
var bigSide = Math.max(height, width)
var smallSide = Math.min(height, width)
var scale = 1 / 12;
var newHeight = Math.min(smallSide * 0.75, 0.75 * bigSide * scale);
return {
height: Math.round(Math.max(template.size, newHeight))
}
}
function draw(ctx, dimensions, template, ratio) {
var ts = text_size(dimensions.width, dimensions.height, template);
var text_height = ts.height;
var width = dimensions.width * ratio,
height = dimensions.height * ratio;
var font = template.font ? template.font : "sans-serif";
canvas.width = width;
canvas.height = height;
ctx.textAlign = "center";
ctx.textBaseline = "middle";
ctx.fillStyle = template.background;
ctx.fillRect(0, 0, width, height);
ctx.fillStyle = template.foreground;
ctx.font = "bold " + text_height + "px " + font;
var text = template.text ? template.text : (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
var text_width = ctx.measureText(text).width;
if (text_width / width >= 0.75) {
text_height = Math.floor(text_height * 0.75 * (width/text_width));
}
//Resetting font size if necessary
ctx.font = "bold " + (text_height * ratio) + "px " + font;
ctx.fillText(text, (width / 2), (height / 2), width);
return canvas.toDataURL("image/png");
}
function render(mode, el, holder, src) {
var dimensions = holder.dimensions,
theme = holder.theme,
text = holder.text ? decodeURIComponent(holder.text) : holder.text;
var dimensions_caption = dimensions.width + "x" + dimensions.height;
theme = (text ? extend(theme, {
text: text
}) : theme);
theme = (holder.font ? extend(theme, {
font: holder.font
}) : theme);
if (mode == "image") {
el.setAttribute("data-src", src);
el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
if (fallback || !holder.auto) {
el.style.width = dimensions.width + "px";
el.style.height = dimensions.height + "px";
}
if (fallback) {
el.style.backgroundColor = theme.background;
} else {
el.setAttribute("src", draw(ctx, dimensions, theme, ratio));
}
} else if (mode == "background") {
if (!fallback) {
el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")";
el.style.backgroundSize = dimensions.width + "px " + dimensions.height + "px";
}
} else if (mode == "fluid") {
el.setAttribute("data-src", src);
el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
if (dimensions.height.substr(-1) == "%") {
el.style.height = dimensions.height
} else {
el.style.height = dimensions.height + "px"
}
if (dimensions.width.substr(-1) == "%") {
el.style.width = dimensions.width
} else {
el.style.width = dimensions.width + "px"
}
if (el.style.display == "inline" || el.style.display == "") {
el.style.display = "block";
}
if (fallback) {
el.style.backgroundColor = theme.background;
} else {
el.holderData = holder;
fluid_images.push(el);
fluid_update(el);
}
}
};
function fluid_update(element) {
var images;
if (element.nodeType == null) {
images = fluid_images;
} else {
images = [element]
}
for (i in images) {
var el = images[i]
if (el.holderData) {
var holder = el.holderData;
el.setAttribute("src", draw(ctx, {
height: el.clientHeight,
width: el.clientWidth
}, holder.theme, ratio));
}
}
}
function parse_flags(flags, options) {
var ret = {
theme: settings.themes.gray
}, render = false;
for (sl = flags.length, j = 0; j < sl; j++) {
var flag = flags[j];
if (app.flags.dimensions.match(flag)) {
render = true;
ret.dimensions = app.flags.dimensions.output(flag);
} else if (app.flags.fluid.match(flag)) {
render = true;
ret.dimensions = app.flags.fluid.output(flag);
ret.fluid = true;
} else if (app.flags.colors.match(flag)) {
ret.theme = app.flags.colors.output(flag);
} else if (options.themes[flag]) {
//If a theme is specified, it will override custom colors
ret.theme = options.themes[flag];
} else if (app.flags.text.match(flag)) {
ret.text = app.flags.text.output(flag);
} else if (app.flags.font.match(flag)) {
ret.font = app.flags.font.output(flag);
} else if (app.flags.auto.match(flag)) {
ret.auto = true;
}
}
return render ? ret : false;
};
if (!canvas.getContext) {
fallback = true;
} else {
if (canvas.toDataURL("image/png")
.indexOf("data:image/png") < 0) {
//Android doesn't support data URI
fallback = true;
} else {
var ctx = canvas.getContext("2d");
}
}
var dpr = 1, bsr = 1;
if(!fallback){
dpr = window.devicePixelRatio || 1,
bsr = ctx.webkitBackingStorePixelRatio || ctx.mozBackingStorePixelRatio || ctx.msBackingStorePixelRatio || ctx.oBackingStorePixelRatio || ctx.backingStorePixelRatio || 1;
}
var ratio = dpr / bsr;
var fluid_images = [];
var settings = {
domain: "holder.js",
images: "img",
bgnodes: ".holderjs",
themes: {
"gray": {
background: "#eee",
foreground: "#aaa",
size: 12
},
"social": {
background: "#3a5a97",
foreground: "#fff",
size: 12
},
"industrial": {
background: "#434A52",
foreground: "#C2F200",
size: 12
}
},
stylesheet: ".holderjs-fluid {font-size:16px;font-weight:bold;text-align:center;font-family:sans-serif;margin:0}"
};
app.flags = {
dimensions: {
regex: /^(\d+)x(\d+)$/,
output: function (val) {
var exec = this.regex.exec(val);
return {
width: +exec[1],
height: +exec[2]
}
}
},
fluid: {
regex: /^([0-9%]+)x([0-9%]+)$/,
output: function (val) {
var exec = this.regex.exec(val);
return {
width: exec[1],
height: exec[2]
}
}
},
colors: {
regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i,
output: function (val) {
var exec = this.regex.exec(val);
return {
size: settings.themes.gray.size,
foreground: "#" + exec[2],
background: "#" + exec[1]
}
}
},
text: {
regex: /text\:(.*)/,
output: function (val) {
return this.regex.exec(val)[1];
}
},
font: {
regex: /font\:(.*)/,
output: function (val) {
return this.regex.exec(val)[1];
}
},
auto: {
regex: /^auto$/
}
}
for (var flag in app.flags) {
if (!app.flags.hasOwnProperty(flag)) continue;
app.flags[flag].match = function (val) {
return val.match(this.regex)
}
}
app.add_theme = function (name, theme) {
name != null && theme != null && (settings.themes[name] = theme);
return app;
};
app.add_image = function (src, el) {
var node = selector(el);
if (node.length) {
for (var i = 0, l = node.length; i < l; i++) {
var img = document.createElement("img")
img.setAttribute("data-src", src);
node[i].appendChild(img);
}
}
return app;
};
app.run = function (o) {
var options = extend(settings, o),
images = [], imageNodes = [], bgnodes = [];
if(typeof(options.images) == "string"){
imageNodes = selector(options.images);
}
else if (window.NodeList && options.images instanceof window.NodeList) {
imageNodes = options.images;
} else if (window.Node && options.images instanceof window.Node) {
imageNodes = [options.images];
}
if(typeof(options.bgnodes) == "string"){
bgnodes = selector(options.bgnodes);
} else if (window.NodeList && options.elements instanceof window.NodeList) {
bgnodes = options.bgnodes;
} else if (window.Node && options.bgnodes instanceof window.Node) {
bgnodes = [options.bgnodes];
}
preempted = true;
for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]);
var holdercss = document.getElementById("holderjs-style");
if (!holdercss) {
holdercss = document.createElement("style");
holdercss.setAttribute("id", "holderjs-style");
holdercss.type = "text/css";
document.getElementsByTagName("head")[0].appendChild(holdercss);
}
if (!options.nocss) {
if (holdercss.styleSheet) {
holdercss.styleSheet.cssText += options.stylesheet;
} else {
holdercss.appendChild(document.createTextNode(options.stylesheet));
}
}
var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)");
for (var l = bgnodes.length, i = 0; i < l; i++) {
var src = window.getComputedStyle(bgnodes[i], null)
.getPropertyValue("background-image");
var flags = src.match(cssregex);
var bgsrc = bgnodes[i].getAttribute("data-background-src");
if (flags) {
var holder = parse_flags(flags[1].split("/"), options);
if (holder) {
render("background", bgnodes[i], holder, src);
}
}
else if(bgsrc != null){
var holder = parse_flags(bgsrc.substr(bgsrc.lastIndexOf(options.domain) + options.domain.length + 1)
.split("/"), options);
if(holder){
render("background", bgnodes[i], holder, src);
}
}
}
for (l = images.length, i = 0; i < l; i++) {
var attr_src = attr_data_src = src = null;
try{
attr_src = images[i].getAttribute("src");
attr_datasrc = images[i].getAttribute("data-src");
}catch(e){}
if (attr_datasrc == null && !! attr_src && attr_src.indexOf(options.domain) >= 0) {
src = attr_src;
} else if ( !! attr_datasrc && attr_datasrc.indexOf(options.domain) >= 0) {
src = attr_datasrc;
}
if (src) {
var holder = parse_flags(src.substr(src.lastIndexOf(options.domain) + options.domain.length + 1)
.split("/"), options);
if (holder) {
if (holder.fluid) {
render("fluid", images[i], holder, src)
} else {
render("image", images[i], holder, src);
}
}
}
}
return app;
};
contentLoaded(win, function () {
if (window.addEventListener) {
window.addEventListener("resize", fluid_update, false);
window.addEventListener("orientationchange", fluid_update, false);
} else {
window.attachEvent("onresize", fluid_update)
}
preempted || app.run();
});
if (typeof define === "function" && define.amd) {
define("Holder", [], function () {
return app;
});
}
})(Holder, window);
+8
Ver Arquivo
@@ -0,0 +1,8 @@
/*
HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
*/
(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
+5
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+6
Ver Arquivo
@@ -0,0 +1,6 @@
/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.documentElement,e=d.firstElementChild||d.firstChild,f=a.createElement("body"),g=a.createElement("div");return g.id="mq-test-1",g.style.cssText="position:absolute;top:-100em",f.style.background="none",f.appendChild(g),function(a){return g.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',d.insertBefore(f,e),c=42===g.offsetWidth,d.removeChild(f),{matches:c,media:a}}}(document);
/*! Respond.js v1.1.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs */
(function(a){"use strict";function x(){u(!0)}var b={};a.respond=b,b.update=function(){},b.mediaQueriesSupported=a.matchMedia&&a.matchMedia("only all").matches,b.mediaQueriesSupported;var q,r,t,c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=c.getElementsByTagName("base")[0],l=j.getElementsByTagName("link"),m=[],n=function(){for(var b=0;l.length>b;b++){var c=l[b],d=c.href,e=c.media,f=c.rel&&"stylesheet"===c.rel.toLowerCase();d&&f&&!h[d]&&(c.styleSheet&&c.styleSheet.rawCssText?(p(c.styleSheet.rawCssText,d,e),h[d]=!0):(!/^([a-zA-Z:]*\/\/)/.test(d)&&!k||d.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&m.push({href:d,media:e}))}o()},o=function(){if(m.length){var a=m.shift();v(a.href,function(b){p(b,a.href,a.media),h[a.href]=!0,setTimeout(function(){o()},0)})}},p=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),g=d&&d.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c;b.length&&(b+="/"),i&&(g=1);for(var j=0;g>j;j++){var k,l,m,n;i?(k=c,f.push(h(a))):(k=d[j].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),m=k.split(","),n=m.length;for(var o=0;n>o;o++)l=m[o],e.push({media:l.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:f.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},s=function(){var a,b=c.createElement("div"),e=c.body,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",e||(e=f=c.createElement("body"),e.style.background="none"),e.appendChild(b),d.insertBefore(e,d.firstChild),a=b.offsetWidth,f?d.removeChild(e):e.removeChild(b),a=t=parseFloat(a)},u=function(a){var b="clientWidth",h=d[b],k="CSS1Compat"===c.compatMode&&h||c.body[b]||h,m={},n=l[l.length-1],o=(new Date).getTime();if(a&&q&&i>o-q)return clearTimeout(r),r=setTimeout(u,i),void 0;q=o;for(var p in e)if(e.hasOwnProperty(p)){var v=e[p],w=v.minw,x=v.maxw,y=null===w,z=null===x,A="em";w&&(w=parseFloat(w)*(w.indexOf(A)>-1?t||s():1)),x&&(x=parseFloat(x)*(x.indexOf(A)>-1?t||s():1)),v.hasquery&&(y&&z||!(y||k>=w)||!(z||x>=k))||(m[v.media]||(m[v.media]=[]),m[v.media].push(f[v.rules]))}for(var B in g)g.hasOwnProperty(B)&&g[B]&&g[B].parentNode===j&&j.removeChild(g[B]);for(var C in m)if(m.hasOwnProperty(C)){var D=c.createElement("style"),E=m[C].join("\n");D.type="text/css",D.media=C,j.insertBefore(D,n.nextSibling),D.styleSheet?D.styleSheet.cssText=E:D.appendChild(c.createTextNode(E)),g.push(D)}},v=function(a,b){var c=w();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},w=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}();n(),b.update=n,a.addEventListener?a.addEventListener("resize",x,!1):a.attachEvent&&a.attachEvent("onresize",x)})(this);
+11
Ver Arquivo
@@ -0,0 +1,11 @@
{
"name": "bootstrap",
"version": "3.0.0",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"ignore": [
"**/.*"
],
"dependencies": {
"jquery": ">= 1.9.0"
}
}
+2129
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+20
Ver Arquivo
@@ -0,0 +1,20 @@
{
"name": "twitter/bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "keywords": ["bootstrap", "css"]
, "homepage": "http://getbootstrap.com"
, "authors": [
{
"name": "Mark Otto",
"email": "markdotto@gmail.com"
},
{
"name": "Jacob Thornton",
"email": "jacobthornton@gmail.com"
}
]
, "support": {
"issues": "https://github.com/twbs/bootstrap/issues"
}
, "license": "Apache-2.0"
}
+2223
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+1442
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+4677
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+9
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+1964
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+6
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
-5624
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 11 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 16 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 3.9 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 5.5 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 122 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 79 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 48 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 4.9 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 6.3 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 10 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 14 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 39 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 7.1 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 46 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 49 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 23 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 19 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 5.5 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 8.6 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 12 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 84 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 12 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1008 B

-106
Ver Arquivo
@@ -1,106 +0,0 @@
## 2.0 BOOTSTRAP JS PHILOSOPHY
These are the high-level design rules which guide the development of Bootstrap's plugin apis.
---
### DATA-ATTRIBUTE API
We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript.
We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
$('body').off('.data-api')
To target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:
$('body').off('.alert.data-api')
---
### PROGRAMATIC API
We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
All public APIs should be single, chainable methods, and return the collection acted upon.
$(".btn.danger").button("toggle").addClass("fat")
All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
$("#myModal").modal() // initialized with defaults
$("#myModal").modal({ keyboard: false }) // initialized with now keyboard
$("#myModal").modal('show') // initializes and invokes show immediately afterqwe2
---
### OPTIONS
Options should be sparse and add universal value. We should pick the right defaults.
All plugins should have a default object which can be modified to effect all instance's default options. The defaults object should be available via `$.fn.plugin.defaults`.
$.fn.modal.defaults = { … }
An options definition should take the following form:
*noun*: *adjective* - describes or modifies a quality of an instance
examples:
backdrop: true
keyboard: false
placement: 'top'
---
### EVENTS
All events should have an infinitive and past participle form. The infinitive is fired just before an action takes place, the past participle on completion of the action.
show | shown
hide | hidden
---
### CONSTRUCTORS
Each plugin should expose it's raw constructor on a `Constructor` property -- accessed in the following way:
$.fn.popover.Constructor
---
### DATA ACCESSOR
Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this:
$('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor
---
### DATA ATTRIBUTES
Data attributes should take the following form:
- data-{{verb}}={{plugin}} - defines main interaction
- data-target || href^=# - defined on "control" element (if element controls an element other than self)
- data-{{noun}} - defines class instance options
examples:
// control other targets
data-toggle="modal" data-target="#foo"
data-toggle="collapse" data-target="#foo" data-parent="#bar"
// defined on element they control
data-spy="scroll"
data-dismiss="modal"
data-dismiss="alert"
data-toggle="dropdown"
data-toggle="button"
data-toggle="buttons-checkbox"
data-toggle="buttons-radio"
-154
Ver Arquivo
@@ -1,154 +0,0 @@
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
!function ($) {
$(function(){
var $window = $(window)
// Disable certain links in docs
$('section [href^=#]').click(function (e) {
e.preventDefault()
})
// side bar
$('.bs-docs-sidenav').affix({
offset: {
top: function () { return $window.width() <= 980 ? 290 : 210 }
, bottom: 270
}
})
// make code pretty
window.prettyPrint && prettyPrint()
// add-ons
$('.add-on :checkbox').on('click', function () {
var $this = $(this)
, method = $this.attr('checked') ? 'addClass' : 'removeClass'
$(this).parents('.add-on')[method]('active')
})
// add tipsies to grid for scaffolding
if ($('#gridSystem').length) {
$('#gridSystem').tooltip({
selector: '.show-grid > div'
, title: function () { return $(this).width() + 'px' }
})
}
// tooltip demo
$('.tooltip-demo').tooltip({
selector: "a[rel=tooltip]"
})
$('.tooltip-test').tooltip()
$('.popover-test').popover()
// popover demo
$("a[rel=popover]")
.popover()
.click(function(e) {
e.preventDefault()
})
// button state demo
$('#fat-btn')
.click(function () {
var btn = $(this)
btn.button('loading')
setTimeout(function () {
btn.button('reset')
}, 3000)
})
// carousel demo
$('#myCarousel').carousel()
// javascript build logic
var inputsComponent = $("#components.download input")
, inputsPlugin = $("#plugins.download input")
, inputsVariables = $("#variables.download input")
// toggle all plugin checkboxes
$('#components.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsComponent.attr('checked', !inputsComponent.is(':checked'))
})
$('#plugins.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
})
$('#variables.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsVariables.val('')
})
// request built javascript
$('.download-btn').on('click', function () {
var css = $("#components.download input:checked")
.map(function () { return this.value })
.toArray()
, js = $("#plugins.download input:checked")
.map(function () { return this.value })
.toArray()
, vars = {}
, img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
$("#variables.download input")
.each(function () {
$(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
})
$.ajax({
type: 'POST'
, url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap.herokuapp.com'
, dataType: 'jsonpi'
, params: {
js: js
, css: css
, vars: vars
, img: img
}
})
})
})
// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
$.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
var url = opts.url;
return {
send: function(_, completeCallback) {
var name = 'jQuery_iframe_' + jQuery.now()
, iframe, form
iframe = $('<iframe>')
.attr('name', name)
.appendTo('head')
form = $('<form>')
.attr('method', opts.type) // GET or POST
.attr('action', url)
.attr('target', name)
$.each(opts.params, function(k, v) {
$('<input>')
.attr('type', 'hidden')
.attr('name', k)
.attr('value', typeof v == 'string' ? v : JSON.stringify(v))
.appendTo(form)
})
form.appendTo('body').submit()
}
}
})
}(window.jQuery)
-104
Ver Arquivo
@@ -1,104 +0,0 @@
/* ==========================================================
* bootstrap-affix.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* AFFIX CLASS DEFINITION
* ====================== */
var Affix = function (element, options) {
this.options = $.extend({}, $.fn.affix.defaults, options)
this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
this.$element = $(element)
this.checkPosition()
}
Affix.prototype.checkPosition = function () {
if (!this.$element.is(':visible')) return
var scrollHeight = $(document).height()
, scrollTop = this.$window.scrollTop()
, position = this.$element.offset()
, offset = this.options.offset
, offsetBottom = offset.bottom
, offsetTop = offset.top
, reset = 'affix affix-top affix-bottom'
, affix
if (typeof offset != 'object') offsetBottom = offsetTop = offset
if (typeof offsetTop == 'function') offsetTop = offset.top()
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
'bottom' : offsetTop != null && scrollTop <= offsetTop ?
'top' : false
if (this.affixed === affix) return
this.affixed = affix
this.unpin = affix == 'bottom' ? position.top - scrollTop : null
this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
}
/* AFFIX PLUGIN DEFINITION
* ======================= */
$.fn.affix = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('affix')
, options = typeof option == 'object' && option
if (!data) $this.data('affix', (data = new Affix(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.affix.Constructor = Affix
$.fn.affix.defaults = {
offset: 0
}
/* AFFIX DATA-API
* ============== */
$(window).on('load', function () {
$('[data-spy="affix"]').each(function () {
var $spy = $(this)
, data = $spy.data()
data.offset = data.offset || {}
data.offsetBottom && (data.offset.bottom = data.offsetBottom)
data.offsetTop && (data.offset.top = data.offsetTop)
$spy.affix(data)
})
})
}(window.jQuery);
-90
Ver Arquivo
@@ -1,90 +0,0 @@
/* ==========================================================
* bootstrap-alert.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* ALERT CLASS DEFINITION
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
Alert.prototype.close = function (e) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
e && e.preventDefault()
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
$parent.trigger(e = $.Event('close'))
if (e.isDefaultPrevented()) return
$parent.removeClass('in')
function removeElement() {
$parent
.trigger('closed')
.remove()
}
$.support.transition && $parent.hasClass('fade') ?
$parent.on($.support.transition.end, removeElement) :
removeElement()
}
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')
if (!data) $this.data('alert', (data = new Alert(this)))
if (typeof option == 'string') data[option].call($this)
})
}
$.fn.alert.Constructor = Alert
/* ALERT DATA-API
* ============== */
$(function () {
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
}(window.jQuery);
-96
Ver Arquivo
@@ -1,96 +0,0 @@
/* ============================================================
* bootstrap-button.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============================================================ */
!function ($) {
"use strict"; // jshint ;_;
/* BUTTON PUBLIC CLASS DEFINITION
* ============================== */
var Button = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.button.defaults, options)
}
Button.prototype.setState = function (state) {
var d = 'disabled'
, $el = this.$element
, data = $el.data()
, val = $el.is('input') ? 'val' : 'html'
state = state + 'Text'
data.resetText || $el.data('resetText', $el[val]())
$el[val](data[state] || this.options[state])
// push to event loop to allow forms to submit
setTimeout(function () {
state == 'loadingText' ?
$el.addClass(d).attr(d, d) :
$el.removeClass(d).removeAttr(d)
}, 0)
}
Button.prototype.toggle = function () {
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
$parent && $parent
.find('.active')
.removeClass('active')
this.$element.toggleClass('active')
}
/* BUTTON PLUGIN DEFINITION
* ======================== */
$.fn.button = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('button')
, options = typeof option == 'object' && option
if (!data) $this.data('button', (data = new Button(this, options)))
if (option == 'toggle') data.toggle()
else if (option) data.setState(option)
})
}
$.fn.button.defaults = {
loadingText: 'loading...'
}
$.fn.button.Constructor = Button
/* BUTTON DATA-API
* =============== */
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle')
})
})
}(window.jQuery);
-176
Ver Arquivo
@@ -1,176 +0,0 @@
/* ==========================================================
* bootstrap-carousel.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* CAROUSEL CLASS DEFINITION
* ========================= */
var Carousel = function (element, options) {
this.$element = $(element)
this.options = options
this.options.slide && this.slide(this.options.slide)
this.options.pause == 'hover' && this.$element
.on('mouseenter', $.proxy(this.pause, this))
.on('mouseleave', $.proxy(this.cycle, this))
}
Carousel.prototype = {
cycle: function (e) {
if (!e) this.paused = false
this.options.interval
&& !this.paused
&& (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
return this
}
, to: function (pos) {
var $active = this.$element.find('.item.active')
, children = $active.parent().children()
, activePos = children.index($active)
, that = this
if (pos > (children.length - 1) || pos < 0) return
if (this.sliding) {
return this.$element.one('slid', function () {
that.to(pos)
})
}
if (activePos == pos) {
return this.pause().cycle()
}
return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
}
, pause: function (e) {
if (!e) this.paused = true
if (this.$element.find('.next, .prev').length && $.support.transition.end) {
this.$element.trigger($.support.transition.end)
this.cycle()
}
clearInterval(this.interval)
this.interval = null
return this
}
, next: function () {
if (this.sliding) return
return this.slide('next')
}
, prev: function () {
if (this.sliding) return
return this.slide('prev')
}
, slide: function (type, next) {
var $active = this.$element.find('.item.active')
, $next = next || $active[type]()
, isCycling = this.interval
, direction = type == 'next' ? 'left' : 'right'
, fallback = type == 'next' ? 'first' : 'last'
, that = this
, e = $.Event('slide', {
relatedTarget: $next[0]
})
this.sliding = true
isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
if ($next.hasClass('active')) return
if ($.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
$next.addClass(type)
$next[0].offsetWidth // force reflow
$active.addClass(direction)
$next.addClass(direction)
this.$element.one($.support.transition.end, function () {
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
})
} else {
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
}
isCycling && this.cycle()
return this
}
}
/* CAROUSEL PLUGIN DEFINITION
* ========================== */
$.fn.carousel = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('carousel')
, options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
, action = typeof option == 'string' ? option : options.slide
if (!data) $this.data('carousel', (data = new Carousel(this, options)))
if (typeof option == 'number') data.to(option)
else if (action) data[action]()
else if (options.interval) data.cycle()
})
}
$.fn.carousel.defaults = {
interval: 5000
, pause: 'hover'
}
$.fn.carousel.Constructor = Carousel
/* CAROUSEL DATA-API
* ================= */
$(function () {
$('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
$target.carousel(options)
e.preventDefault()
})
})
}(window.jQuery);
-158
Ver Arquivo
@@ -1,158 +0,0 @@
/* =============================================================
* bootstrap-collapse.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============================================================ */
!function ($) {
"use strict"; // jshint ;_;
/* COLLAPSE PUBLIC CLASS DEFINITION
* ================================ */
var Collapse = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.collapse.defaults, options)
if (this.options.parent) {
this.$parent = $(this.options.parent)
}
this.options.toggle && this.toggle()
}
Collapse.prototype = {
constructor: Collapse
, dimension: function () {
var hasWidth = this.$element.hasClass('width')
return hasWidth ? 'width' : 'height'
}
, show: function () {
var dimension
, scroll
, actives
, hasData
if (this.transitioning) return
dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-'))
actives = this.$parent && this.$parent.find('> .accordion-group > .in')
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}
this.$element[dimension](0)
this.transition('addClass', $.Event('show'), 'shown')
$.support.transition && this.$element[dimension](this.$element[0][scroll])
}
, hide: function () {
var dimension
if (this.transitioning) return
dimension = this.dimension()
this.reset(this.$element[dimension]())
this.transition('removeClass', $.Event('hide'), 'hidden')
this.$element[dimension](0)
}
, reset: function (size) {
var dimension = this.dimension()
this.$element
.removeClass('collapse')
[dimension](size || 'auto')
[0].offsetWidth
this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
return this
}
, transition: function (method, startEvent, completeEvent) {
var that = this
, complete = function () {
if (startEvent.type == 'show') that.reset()
that.transitioning = 0
that.$element.trigger(completeEvent)
}
this.$element.trigger(startEvent)
if (startEvent.isDefaultPrevented()) return
this.transitioning = 1
this.$element[method]('in')
$.support.transition && this.$element.hasClass('collapse') ?
this.$element.one($.support.transition.end, complete) :
complete()
}
, toggle: function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']()
}
}
/* COLLAPSIBLE PLUGIN DEFINITION
* ============================== */
$.fn.collapse = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('collapse')
, options = typeof option == 'object' && option
if (!data) $this.data('collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.collapse.defaults = {
toggle: true
}
$.fn.collapse.Constructor = Collapse
/* COLLAPSIBLE DATA-API
* ==================== */
$(function () {
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
var $this = $(this), href
, target = $this.attr('data-target')
|| e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
, option = $(target).data('collapse') ? 'toggle' : $this.data()
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
$(target).collapse(option)
})
})
}(window.jQuery);
-150
Ver Arquivo
@@ -1,150 +0,0 @@
/* ============================================================
* bootstrap-dropdown.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============================================================ */
!function ($) {
"use strict"; // jshint ;_;
/* DROPDOWN CLASS DEFINITION
* ========================= */
var toggle = '[data-toggle=dropdown]'
, Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open')
})
}
Dropdown.prototype = {
constructor: Dropdown
, toggle: function (e) {
var $this = $(this)
, $parent
, isActive
if ($this.is('.disabled, :disabled')) return
$parent = getParent($this)
isActive = $parent.hasClass('open')
clearMenus()
if (!isActive) {
$parent.toggleClass('open')
$this.focus()
}
return false
}
, keydown: function (e) {
var $this
, $items
, $active
, $parent
, isActive
, index
if (!/(38|40|27)/.test(e.keyCode)) return
$this = $(this)
e.preventDefault()
e.stopPropagation()
if ($this.is('.disabled, :disabled')) return
$parent = getParent($this)
isActive = $parent.hasClass('open')
if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
$items = $('[role=menu] li:not(.divider) a', $parent)
if (!$items.length) return
index = $items.index($items.filter(':focus'))
if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index = 0
$items
.eq(index)
.focus()
}
}
function clearMenus() {
getParent($(toggle))
.removeClass('open')
}
function getParent($this) {
var selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
return $parent
}
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this)
})
}
$.fn.dropdown.Constructor = Dropdown
/* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */
$(function () {
$('html')
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
$('body')
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
})
}(window.jQuery);
-239
Ver Arquivo
@@ -1,239 +0,0 @@
/* =========================================================
* bootstrap-modal.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================= */
!function ($) {
"use strict"; // jshint ;_;
/* MODAL CLASS DEFINITION
* ====================== */
var Modal = function (element, options) {
this.options = options
this.$element = $(element)
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
}
Modal.prototype = {
constructor: Modal
, toggle: function () {
return this[!this.isShown ? 'show' : 'hide']()
}
, show: function () {
var that = this
, e = $.Event('show')
this.$element.trigger(e)
if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true
this.escape()
this.backdrop(function () {
var transition = $.support.transition && that.$element.hasClass('fade')
if (!that.$element.parent().length) {
that.$element.appendTo(document.body) //don't move modals dom position
}
that.$element
.show()
if (transition) {
that.$element[0].offsetWidth // force reflow
}
that.$element
.addClass('in')
.attr('aria-hidden', false)
.focus()
that.enforceFocus()
transition ?
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
that.$element.trigger('shown')
})
}
, hide: function (e) {
e && e.preventDefault()
var that = this
e = $.Event('hide')
this.$element.trigger(e)
if (!this.isShown || e.isDefaultPrevented()) return
this.isShown = false
$('body').removeClass('modal-open')
this.escape()
$(document).off('focusin.modal')
this.$element
.removeClass('in')
.attr('aria-hidden', true)
$.support.transition && this.$element.hasClass('fade') ?
this.hideWithTransition() :
this.hideModal()
}
, enforceFocus: function () {
var that = this
$(document).on('focusin.modal', function (e) {
if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
that.$element.focus()
}
})
}
, escape: function () {
var that = this
if (this.isShown && this.options.keyboard) {
this.$element.on('keyup.dismiss.modal', function ( e ) {
e.which == 27 && that.hide()
})
} else if (!this.isShown) {
this.$element.off('keyup.dismiss.modal')
}
}
, hideWithTransition: function () {
var that = this
, timeout = setTimeout(function () {
that.$element.off($.support.transition.end)
that.hideModal()
}, 500)
this.$element.one($.support.transition.end, function () {
clearTimeout(timeout)
that.hideModal()
})
}
, hideModal: function (that) {
this.$element
.hide()
.trigger('hidden')
this.backdrop()
}
, removeBackdrop: function () {
this.$backdrop.remove()
this.$backdrop = null
}
, backdrop: function (callback) {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
if (this.isShown && this.options.backdrop) {
var doAnimate = $.support.transition && animate
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body)
if (this.options.backdrop != 'static') {
this.$backdrop.click($.proxy(this.hide, this))
}
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
this.$backdrop.addClass('in')
doAnimate ?
this.$backdrop.one($.support.transition.end, callback) :
callback()
} else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in')
$.support.transition && this.$element.hasClass('fade')?
this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
this.removeBackdrop()
} else if (callback) {
callback()
}
}
}
/* MODAL PLUGIN DEFINITION
* ======================= */
$.fn.modal = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('modal')
, options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('modal', (data = new Modal(this, options)))
if (typeof option == 'string') data[option]()
else if (options.show) data.show()
})
}
$.fn.modal.defaults = {
backdrop: true
, keyboard: true
, show: true
}
$.fn.modal.Constructor = Modal
/* MODAL DATA-API
* ============== */
$(function () {
$('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
var $this = $(this)
, href = $this.attr('href')
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
, option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
e.preventDefault()
$target
.modal(option)
.one('hide', function () {
$this.focus()
})
})
})
}(window.jQuery);
-103
Ver Arquivo
@@ -1,103 +0,0 @@
/* ===========================================================
* bootstrap-popover.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* =========================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* POPOVER PUBLIC CLASS DEFINITION
* =============================== */
var Popover = function (element, options) {
this.init('popover', element, options)
}
/* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
========================================== */
Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
constructor: Popover
, setContent: function () {
var $tip = this.tip()
, title = this.getTitle()
, content = this.getContent()
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content)
$tip.removeClass('fade top bottom left right in')
}
, hasContent: function () {
return this.getTitle() || this.getContent()
}
, getContent: function () {
var content
, $e = this.$element
, o = this.options
content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
return content
}
, tip: function () {
if (!this.$tip) {
this.$tip = $(this.options.template)
}
return this.$tip
}
, destroy: function () {
this.hide().$element.off('.' + this.type).removeData(this.type)
}
})
/* POPOVER PLUGIN DEFINITION
* ======================= */
$.fn.popover = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('popover')
, options = typeof option == 'object' && option
if (!data) $this.data('popover', (data = new Popover(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.popover.Constructor = Popover
$.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
placement: 'right'
, trigger: 'click'
, content: ''
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
})
}(window.jQuery);
-151
Ver Arquivo
@@ -1,151 +0,0 @@
/* =============================================================
* bootstrap-scrollspy.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* SCROLLSPY CLASS DEFINITION
* ========================== */
function ScrollSpy(element, options) {
var process = $.proxy(this.process, this)
, $element = $(element).is('body') ? $(window) : $(element)
, href
this.options = $.extend({}, $.fn.scrollspy.defaults, options)
this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
this.selector = (this.options.target
|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|| '') + ' .nav li > a'
this.$body = $('body')
this.refresh()
this.process()
}
ScrollSpy.prototype = {
constructor: ScrollSpy
, refresh: function () {
var self = this
, $targets
this.offsets = $([])
this.targets = $([])
$targets = this.$body
.find(this.selector)
.map(function () {
var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& $href.length
&& [[ $href.position().top, href ]] ) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
self.offsets.push(this[0])
self.targets.push(this[1])
})
}
, process: function () {
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
, scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
, maxScroll = scrollHeight - this.$scrollElement.height()
, offsets = this.offsets
, targets = this.targets
, activeTarget = this.activeTarget
, i
if (scrollTop >= maxScroll) {
return activeTarget != (i = targets.last()[0])
&& this.activate ( i )
}
for (i = offsets.length; i--;) {
activeTarget != targets[i]
&& scrollTop >= offsets[i]
&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
&& this.activate( targets[i] )
}
}
, activate: function (target) {
var active
, selector
this.activeTarget = target
$(this.selector)
.parent('.active')
.removeClass('active')
selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li')
.addClass('active')
if (active.parent('.dropdown-menu').length) {
active = active.closest('li.dropdown').addClass('active')
}
active.trigger('activate')
}
}
/* SCROLLSPY PLUGIN DEFINITION
* =========================== */
$.fn.scrollspy = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('scrollspy')
, options = typeof option == 'object' && option
if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.scrollspy.Constructor = ScrollSpy
$.fn.scrollspy.defaults = {
offset: 10
}
/* SCROLLSPY DATA-API
* ================== */
$(window).on('load', function () {
$('[data-spy="scroll"]').each(function () {
var $spy = $(this)
$spy.scrollspy($spy.data())
})
})
}(window.jQuery);
-135
Ver Arquivo
@@ -1,135 +0,0 @@
/* ========================================================
* bootstrap-tab.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ======================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* TAB CLASS DEFINITION
* ==================== */
var Tab = function (element) {
this.element = $(element)
}
Tab.prototype = {
constructor: Tab
, show: function () {
var $this = this.element
, $ul = $this.closest('ul:not(.dropdown-menu)')
, selector = $this.attr('data-target')
, previous
, $target
, e
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
if ( $this.parent('li').hasClass('active') ) return
previous = $ul.find('.active a').last()[0]
e = $.Event('show', {
relatedTarget: previous
})
$this.trigger(e)
if (e.isDefaultPrevented()) return
$target = $(selector)
this.activate($this.parent('li'), $ul)
this.activate($target, $target.parent(), function () {
$this.trigger({
type: 'shown'
, relatedTarget: previous
})
})
}
, activate: function ( element, container, callback) {
var $active = container.find('> .active')
, transition = callback
&& $.support.transition
&& $active.hasClass('fade')
function next() {
$active
.removeClass('active')
.find('> .dropdown-menu > .active')
.removeClass('active')
element.addClass('active')
if (transition) {
element[0].offsetWidth // reflow for transition
element.addClass('in')
} else {
element.removeClass('fade')
}
if ( element.parent('.dropdown-menu') ) {
element.closest('li.dropdown').addClass('active')
}
callback && callback()
}
transition ?
$active.one($.support.transition.end, next) :
next()
$active.removeClass('in')
}
}
/* TAB PLUGIN DEFINITION
* ===================== */
$.fn.tab = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('tab')
if (!data) $this.data('tab', (data = new Tab(this)))
if (typeof option == 'string') data[option]()
})
}
$.fn.tab.Constructor = Tab
/* TAB DATA-API
* ============ */
$(function () {
$('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
e.preventDefault()
$(this).tab('show')
})
})
}(window.jQuery);
-275
Ver Arquivo
@@ -1,275 +0,0 @@
/* ===========================================================
* bootstrap-tooltip.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* TOOLTIP PUBLIC CLASS DEFINITION
* =============================== */
var Tooltip = function (element, options) {
this.init('tooltip', element, options)
}
Tooltip.prototype = {
constructor: Tooltip
, init: function (type, element, options) {
var eventIn
, eventOut
this.type = type
this.$element = $(element)
this.options = this.getOptions(options)
this.enabled = true
if (this.options.trigger == 'click') {
this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
} else if (this.options.trigger != 'manual') {
eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
}
this.options.selector ?
(this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
this.fixTitle()
}
, getOptions: function (options) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
if (options.delay && typeof options.delay == 'number') {
options.delay = {
show: options.delay
, hide: options.delay
}
}
return options
}
, enter: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout)
self.hoverState = 'in'
this.timeout = setTimeout(function() {
if (self.hoverState == 'in') self.show()
}, self.options.delay.show)
}
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide)
}
, show: function () {
var $tip
, inside
, pos
, actualWidth
, actualHeight
, placement
, tp
if (this.hasContent() && this.enabled) {
$tip = this.tip()
this.setContent()
if (this.options.animation) {
$tip.addClass('fade')
}
placement = typeof this.options.placement == 'function' ?
this.options.placement.call(this, $tip[0], this.$element[0]) :
this.options.placement
inside = /in/.test(placement)
$tip
.remove()
.css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body)
pos = this.getPosition(inside)
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
switch (inside ? placement.split(' ')[1] : placement) {
case 'bottom':
tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
break
case 'top':
tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
break
case 'left':
tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
break
case 'right':
tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
break
}
$tip
.css(tp)
.addClass(placement)
.addClass('in')
}
}
, setContent: function () {
var $tip = this.tip()
, title = this.getTitle()
$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
$tip.removeClass('fade in top bottom left right')
}
, hide: function () {
var that = this
, $tip = this.tip()
$tip.removeClass('in')
function removeWithAnimation() {
var timeout = setTimeout(function () {
$tip.off($.support.transition.end).remove()
}, 500)
$tip.one($.support.transition.end, function () {
clearTimeout(timeout)
$tip.remove()
})
}
$.support.transition && this.$tip.hasClass('fade') ?
removeWithAnimation() :
$tip.remove()
return this
}
, fixTitle: function () {
var $e = this.$element
if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
}
}
, hasContent: function () {
return this.getTitle()
}
, getPosition: function (inside) {
return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
width: this.$element[0].offsetWidth
, height: this.$element[0].offsetHeight
})
}
, getTitle: function () {
var title
, $e = this.$element
, o = this.options
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
return title
}
, tip: function () {
return this.$tip = this.$tip || $(this.options.template)
}
, validate: function () {
if (!this.$element[0].parentNode) {
this.hide()
this.$element = null
this.options = null
}
}
, enable: function () {
this.enabled = true
}
, disable: function () {
this.enabled = false
}
, toggleEnabled: function () {
this.enabled = !this.enabled
}
, toggle: function () {
this[this.tip().hasClass('in') ? 'hide' : 'show']()
}
, destroy: function () {
this.hide().$element.off('.' + this.type).removeData(this.type)
}
}
/* TOOLTIP PLUGIN DEFINITION
* ========================= */
$.fn.tooltip = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('tooltip')
, options = typeof option == 'object' && option
if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.tooltip.Constructor = Tooltip
$.fn.tooltip.defaults = {
animation: true
, placement: 'top'
, selector: false
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
, trigger: 'hover'
, title: ''
, delay: 0
, html: true
}
}(window.jQuery);
-60
Ver Arquivo
@@ -1,60 +0,0 @@
/* ===================================================
* bootstrap-transition.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function ($) {
$(function () {
"use strict"; // jshint ;_;
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
$.support.transition = (function () {
var transitionEnd = (function () {
var el = document.createElement('bootstrap')
, transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend'
, 'OTransition' : 'oTransitionEnd otransitionend'
, 'transition' : 'transitionend'
}
, name
for (name in transEndEventNames){
if (el.style[name] !== undefined) {
return transEndEventNames[name]
}
}
}())
return transitionEnd && {
end: transitionEnd
}
})()
})
}(window.jQuery);
-300
Ver Arquivo
@@ -1,300 +0,0 @@
/* =============================================================
* bootstrap-typeahead.js v2.1.0
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============================================================ */
!function($){
"use strict"; // jshint ;_;
/* TYPEAHEAD PUBLIC CLASS DEFINITION
* ================================= */
var Typeahead = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.typeahead.defaults, options)
this.matcher = this.options.matcher || this.matcher
this.sorter = this.options.sorter || this.sorter
this.highlighter = this.options.highlighter || this.highlighter
this.updater = this.options.updater || this.updater
this.$menu = $(this.options.menu).appendTo('body')
this.source = this.options.source
this.shown = false
this.listen()
}
Typeahead.prototype = {
constructor: Typeahead
, select: function () {
var val = this.$menu.find('.active').attr('data-value')
this.$element
.val(this.updater(val))
.change()
return this.hide()
}
, updater: function (item) {
return item
}
, show: function () {
var pos = $.extend({}, this.$element.offset(), {
height: this.$element[0].offsetHeight
})
this.$menu.css({
top: pos.top + pos.height
, left: pos.left
})
this.$menu.show()
this.shown = true
return this
}
, hide: function () {
this.$menu.hide()
this.shown = false
return this
}
, lookup: function (event) {
var items
this.query = this.$element.val()
if (!this.query || this.query.length < this.options.minLength) {
return this.shown ? this.hide() : this
}
items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
return items ? this.process(items) : this
}
, process: function (items) {
var that = this
items = $.grep(items, function (item) {
return that.matcher(item)
})
items = this.sorter(items)
if (!items.length) {
return this.shown ? this.hide() : this
}
return this.render(items.slice(0, this.options.items)).show()
}
, matcher: function (item) {
return ~item.toLowerCase().indexOf(this.query.toLowerCase())
}
, sorter: function (items) {
var beginswith = []
, caseSensitive = []
, caseInsensitive = []
, item
while (item = items.shift()) {
if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
else if (~item.indexOf(this.query)) caseSensitive.push(item)
else caseInsensitive.push(item)
}
return beginswith.concat(caseSensitive, caseInsensitive)
}
, highlighter: function (item) {
var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
return '<strong>' + match + '</strong>'
})
}
, render: function (items) {
var that = this
items = $(items).map(function (i, item) {
i = $(that.options.item).attr('data-value', item)
i.find('a').html(that.highlighter(item))
return i[0]
})
items.first().addClass('active')
this.$menu.html(items)
return this
}
, next: function (event) {
var active = this.$menu.find('.active').removeClass('active')
, next = active.next()
if (!next.length) {
next = $(this.$menu.find('li')[0])
}
next.addClass('active')
}
, prev: function (event) {
var active = this.$menu.find('.active').removeClass('active')
, prev = active.prev()
if (!prev.length) {
prev = this.$menu.find('li').last()
}
prev.addClass('active')
}
, listen: function () {
this.$element
.on('blur', $.proxy(this.blur, this))
.on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keydown, this))
}
this.$menu
.on('click', $.proxy(this.click, this))
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
}
, move: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
e.preventDefault()
this.prev()
break
case 40: // down arrow
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, keydown: function (e) {
this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
this.move(e)
}
, keypress: function (e) {
if (this.suppressKeyPressRepeat) return
this.move(e)
}
, keyup: function (e) {
switch(e.keyCode) {
case 40: // down arrow
case 38: // up arrow
break
case 9: // tab
case 13: // enter
if (!this.shown) return
this.select()
break
case 27: // escape
if (!this.shown) return
this.hide()
break
default:
this.lookup()
}
e.stopPropagation()
e.preventDefault()
}
, blur: function (e) {
var that = this
setTimeout(function () { that.hide() }, 150)
}
, click: function (e) {
e.stopPropagation()
e.preventDefault()
this.select()
}
, mouseenter: function (e) {
this.$menu.find('.active').removeClass('active')
$(e.currentTarget).addClass('active')
}
}
/* TYPEAHEAD PLUGIN DEFINITION
* =========================== */
$.fn.typeahead = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('typeahead')
, options = typeof option == 'object' && option
if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.typeahead.defaults = {
source: []
, items: 8
, menu: '<ul class="typeahead dropdown-menu"></ul>'
, item: '<li><a href="#"></a></li>'
, minLength: 1
}
$.fn.typeahead.Constructor = Typeahead
/* TYPEAHEAD DATA-API
* ================== */
$(function () {
$('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
var $this = $(this)
if ($this.data('typeahead')) return
e.preventDefault()
$this.typeahead($this.data())
})
})
}(window.jQuery);
-2027
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
@@ -1,30 +0,0 @@
.com { color: #93a1a1; }
.lit { color: #195f91; }
.pun, .opn, .clo { color: #93a1a1; }
.fun { color: #dc322f; }
.str, .atv { color: #D14; }
.kwd, .prettyprint .tag { color: #1e347b; }
.typ, .atn, .dec, .var { color: teal; }
.pln { color: #48484c; }
.prettyprint {
padding: 8px;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
.prettyprint.linenums {
-webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
}
/* Specify class=linenums on a pre to get line numbering */
ol.linenums {
margin: 0 0 0 33px; /* IE indents via margin-left */
}
ol.linenums li {
padding-left: 12px;
color: #bebec5;
line-height: 20px;
text-shadow: 0 1px 0 #fff;
}
@@ -1,28 +0,0 @@
var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
-4
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
-1942
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
-44
Ver Arquivo
@@ -1,44 +0,0 @@
#!/usr/bin/env node
var hogan = require('hogan.js')
, fs = require('fs')
, prod = process.argv[2] == 'production'
, title = 'Twitter Bootstrap'
var layout, pages
// compile layout template
layout = fs.readFileSync(__dirname + '/../templates/layout.mustache', 'utf-8')
layout = hogan.compile(layout, { sectionTags: [{o:'_i', c:'i'}] })
// retrieve pages
pages = fs.readdirSync(__dirname + '/../templates/pages')
// iterate over pages
pages.forEach(function (name) {
if (!name.match(/\.mustache$/)) return
var page = fs.readFileSync(__dirname + '/../templates/pages/' + name, 'utf-8')
, context = {}
context[name.replace(/\.mustache$/, '')] = 'active'
context._i = true
context.production = prod
context.title = name
.replace(/\.mustache/, '')
.replace(/\-.*/, '')
.replace(/(.)/, function ($1) { return $1.toUpperCase() })
if (context.title == 'Index') {
context.title = title
} else {
context.title += ' · ' + title
}
page = hogan.compile(page, { sectionTags: [{o:'_i', c:'i'}] })
page = layout.render(context, {
body: page
})
fs.writeFileSync(__dirname + '/../' + name.replace(/mustache$/, 'html'), page, 'utf-8')
})
-93
Ver Arquivo
@@ -1,93 +0,0 @@
#!/usr/bin/env node
/*
* Copyright 2011 Twitter, Inc.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var hogan = require('../lib/hogan.js'),
path = require('path'),
fs = require('fs');
var specials = ['/', '.', '*', '+', '?', '|','(', ')', '[', ']', '{', '}', '\\'],
specialsRegExp = new RegExp('(\\' + specials.join('|\\') + ')', 'g'),
templates;
// Escape special regexp characters
function esc(text) {
return text.replace(specialsRegExp, '\\$1');
}
// Check for dirs and correct ext (<3 for windows)
function extractFiles(args) {
var usage = 'USAGE: hulk ./templates/*.mustaches\n' +
'NOTE: hulk supports the "*" wildcard and allows you to target specific extensions too',
files = [];
if (!args.length) {
console.log(usage);
process.exit(-1);
}
args.forEach(function (arg) {
if (/\*/.test(arg)) {
arg = arg.split('*');
return files = files.concat(
fs.readdirSync(arg[0] || '.')
.map(function (f) {
return new RegExp(esc(arg[1]) + '$').test(f) && path.join(arg[0], f);
})
.filter(function (f) {
return f;
})
);
}
files.push(arg);
})
return files;
}
// Remove utf-8 byte order mark, http://en.wikipedia.org/wiki/Byte_order_mark
function removeByteOrderMark(text) {
if (text.charCodeAt(0) === 0xfeff) {
return text.substring(1);
}
return text;
}
// Write a template foreach file that matches template extension
templates = extractFiles(process.argv.slice(2))
.map(function (file) {
var openedFile = fs.readFileSync(file, 'utf-8'), name;
if (!openedFile) return;
name = file.replace(/\..*$/, '');
openedFile = removeByteOrderMark(openedFile.trim());
return 'templates.' + name + ' = new Hogan.Template(' + hogan.compile(openedFile, { asString: 1 }) + ');';
})
.filter(function (t) {
return t;
});
// Output templates
if (!templates.length) return;
console.log('var templates = {};');
console.log(templates.join('\n'));
-1
Ver Arquivo
@@ -1 +0,0 @@
node_modules
-3
Ver Arquivo
@@ -1,3 +0,0 @@
[submodule "test/spec"]
path = test/spec
url = https://github.com/mustache/spec.git
-177
Ver Arquivo
@@ -1,177 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
-62
Ver Arquivo
@@ -1,62 +0,0 @@
REPO = git@github.com:twitter/hogan.js.git
BUILD := build
VERSION = ${shell node -e 'var s = JSON.parse(require("fs").readFileSync("package.json").toString()).version; console.log(s.substring(0, s.indexOf("-")));'}
#
# Run command line tests
#
test:
@ node test/index.js
#
# Run Mustache spec tests
#
spec:
@ node test/spec.js
#
# Run benchmark
#
benchmark:
@ node benchmark/console/index.js
clean:
@ rm -rf dist/*
#
# Make a new version of Hogan from the current dev version.
#
release: clean
@ echo "Creating a new version of Hogan."
@ mkdir -p dist/nodejs
@ cp -R lib dist/nodejs/lib
@ node tools/release.js
@ mkdir -p web/builds/$(VERSION)
@ cp dist/*.* web/builds/$(VERSION)/.
#
# Make the gh-pages website
#
# This target builds the hogan.js github website using hogan.js.
#
# cd into build/gh-pages to check in the new site.
#
GH_PAGES = $(BUILD)/gh-pages
web: | pages
@cp -R web/* $(GH_PAGES)
@@ node tools/web_templates.js
@echo
@echo "Website built in $(GH_PAGES)."
#
# Checkout the gh-pages branch.
#
pages: | $(BUILD)
@if [ ! -d "$(GH_PAGES)" ]; then \
git clone -b gh-pages $(REPO) $(GH_PAGES); \
rm -rf $(GH_PAGES)/*; \
fi;
@mkdir -p $(GH_PAGES)/images
$(BUILD):
mkdir -p $(BUILD)
.PHONY: test spec benchmark web release

Alguns arquivos não foram exibidos porque demasiados arquivos foram alterados neste diff Mostrar Mais