2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

3145 Commits

Author SHA1 Message Date
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
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
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
AJ Acevedo 9a2218dd38 Fixed broken Customizer link for docs 2013-05-21 02:23:19 -04: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 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
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
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 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 6307dc40d7 Fixes #7898: ensure button type
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07: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