0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

201 Commits

Author SHA1 Message Date
Mark Otto
7301931a6d Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into 2.1.0-wip 2012-06-20 20:20:22 -07:00
Mark Otto
f5a2d82a3a Merge branch 'EngineerGio-patch-1' into 2.1.0-wip 2012-06-20 19:36:16 -07:00
Mark Otto
83e46b8df9 reorder for t-r-b-l 2012-06-20 19:36:06 -07:00
EngineerGio
5bd9217f9b Added border-radius mixins to set single corner radius and single side border radius 2012-06-21 01:50:28 +03:00
Mark Otto
ce140662a0 remove unused container reset 2012-06-19 20:01:03 -07:00
François Robichet
fb31cdba9c Remove useless ms prefixes 2012-06-15 15:23:40 +03:00
Marcus Schwab
bd19b42c15 Proper spacing between offsets
row-fluids don't have the same negative margin-left as rows. This was
throwing everything off.
So added a different rule for first-child and subsequent "spans".
2012-06-11 01:51:19 -07:00
Marcus Schwab
c3f5d7c62d ajgon's fluid offsets working with first-child 2012-06-07 17:23:22 -07:00
Igor Rzegocki
f8d68002dc Added offsets for .row-fluid 2012-06-07 17:23:22 -07:00
Mark Otto
9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Corey Innis
8a06339501 fixes .placeholder to work as a "grouped selector"
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto
72e3b3beb3 Merge branch 'ademaro-patch-1' into 2.0.4-wip 2012-05-24 19:17:49 -07:00
Ademaro
34e5bc5f1d ie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx) 2012-05-24 13:57:02 +04:00
Mark Otto
3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07:00
Mark Otto
8f44245850 document .hyphens() mixin 2012-05-13 14:31:31 -07:00
Mark Otto
23401e811f Merge branch 'Synchro-hyphenation' into 2.0.4-wip 2012-05-13 14:29:08 -07:00
Mark Otto
3a21891824 #3469: add variables for dropdown menu dividers 2012-05-13 13:58:42 -07:00
David Hirtle
452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Synchro
ca369c4b2a Add Opera prefix 2012-05-01 17:54:53 +02:00
Synchro
dcc89e7400 Coding style 2012-05-01 17:06:19 +02:00
Synchro
5ffb6d6706 Add .hyphens mixin 2012-05-01 17:01:26 +02:00
Mark Otto
d8aaf50798 implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid 2012-04-24 02:11:59 -07:00
Han Lin Yap
c09602d172 add -ms-user-select 2012-04-18 11:38:14 +03:00
Jacob Thornton
2881269e16 lots of property ordering 2012-04-16 16:34:08 -07:00
Jacob Thornton
a3ec868ac2 few more property orders 2012-04-16 15:37:17 -07:00
Jacob Thornton
457859feba Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-16 15:09:26 -07:00
Jacob Thornton
498b7d984a a few property reordering things 2012-04-16 15:09:05 -07:00
Mark Otto
d374fe92e5 simplify the left margin for offset grid columns 2012-04-15 16:48:17 -07:00
Mark Otto
d8acc062c1 Merge branch 'gruvii-patch-2' into 2.0.3-wip 2012-04-14 18:11:40 -07:00
Mark Otto
28c4ed824e Merge branch 'alecrust-patch-3' into 2.0.3-wip 2012-04-07 23:38:16 -07:00
Alec Rust
ff57f59562 Corrected spacing 2012-04-03 12:15:36 +02:00
Mark Otto
2355fd224d remove @shadow instances and replace with escaped values, update mixins to not use a default value at all 2012-03-31 21:06:16 -07:00
Mark Otto
37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -07:00
Mark Otto
2f4810e72f Merge branch 'grantzau-patch-1' into 2.0.3-wip 2012-03-30 23:38:16 -07:00
Julius Graakjær Grantzau
6564afbe73 Renaming @gridColumnGutter to @gridGutterWidth 2012-03-29 14:56:53 +03:00
Mark Otto
04baa07547 document .backface-visibility and update comments and initial value 2012-03-28 18:25:27 -07:00
Mark Otto
feccc6e705 Merge branch 'backface-visibility' of https://github.com/dannykeane/bootstrap into dannykeane-backface-visibility 2012-03-28 18:21:04 -07:00
Danny Keane
2165ab2620 Added the back-face visibility css property to mixins.less, this property prevents the browser flickered experienced especially in Chrome when using 3D transformations. 2012-03-28 15:05:49 +01:00
Mark Otto
95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto
c0f28d81b0 Remove black border on buttons in IE7:
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
2012-03-25 14:28:24 -07:00
Mark Otto
a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -07:00
Mark Otto
f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
2012-03-23 20:56:48 -07:00
Mark Otto
c7afe382a2 fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition 2012-03-23 20:56:04 -07:00
Bart Teeuwisse
035b85eeba The native box-shadow, background-clip and background-size instructions all take 1 or more arguments. In 1.3.0 LESS became arity aware, see https://gist.github.com/1933613. As a result the signatures of these mixins had to change a little. 2012-03-23 12:37:40 -07:00
Mark Otto
ceab161324 fix unescaped reset filter per #2575 2012-03-22 17:31:09 -07:00
Mark Figueredo
d115d169b7 Added offset parameter to .makeColumn. 2012-03-19 14:58:55 -03:00
ctalkington
51f37cbb81 make font family mixins customizable with variables. 2012-03-15 13:34:50 -05:00
Jacob Thornton
8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Jacob Thornton
6d4867e799 remove commented out width 2012-03-12 13:45:36 -07:00
Mark Otto
0630cd62b3 rewrite the fluid grid mixin to be simpler, per #2370 2012-03-11 22:45:10 -07:00
Mark Otto
1a11c526b9 Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip 2012-03-11 22:25:34 -07:00
Mark Otto
ee5d2ec91a add block level input mixin for border-box box-sizing 2012-03-11 21:21:51 -07:00
Mark Otto
c8f4325c19 remove text indent on carets (not needed) and add inline replacement mixin 2012-03-11 21:12:59 -07:00
Mark Otto
ce292a8bb8 fix overflowing thumbnails in responsive <767px layouts 2012-03-11 15:15:55 -07:00
Mark Otto
a97b9c1122 in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width 2012-03-11 14:41:52 -07:00
Mark Otto
635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Jacob Thornton
a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton
1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-03-10 12:41:41 -08:00
Luke Thomas
1cc1852a9a added ability to set custom colors for popover arrow mixin 2012-03-08 19:02:29 -06:00
Mark Otto
79090ac121 fix input grid sizing, fix background color on form actions and append add-ons 2012-03-05 23:06:27 -08:00
Jacob Thornton
29c63fdb6a true > child + varargs 2012-03-04 14:27:13 -08:00
Jacob Thornton
3524aa909c make sure to pass child var through 2012-03-04 14:21:54 -08:00
Jacob Thornton
2f598e35a0 when > 0 rather than when not 0 2012-03-04 14:11:51 -08:00
Jacob Thornton
1aeca545c8 new approach to grid with recursive mixins :D 2012-03-04 14:06:30 -08:00
Mark Otto
fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -08:00
Jacob Thornton
8615987243 add guard for child spans 2012-02-27 18:21:21 -08:00
Jacob Thornton
ae3382d797 working through new grid implementation... 2012-02-27 18:15:59 -08:00
Mark Otto
b86969f762 restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080 2012-02-22 08:21:29 -08:00
Jacob Thornton
f3b6cf1d6d Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
2012-02-21 23:18:18 -08:00
Jacob Thornton
5ad5dde1e2 rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. 2012-02-21 23:16:06 -08:00
Mark Otto
a139167489 set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) 2012-02-21 23:15:43 -08:00
Mark Otto
e3ae517555 move container up in default grid mixin 2012-02-21 15:21:18 -08:00
Mark Otto
8665fa8c50 move table columns mixin to mixins.less 2012-02-21 15:18:05 -08:00
Emanuele Gaspari
45cec4a6fa added .span[13-24] and .offset[12-23] to support up to 24-columns layout 2012-02-21 19:07:55 +01:00
Mark Otto
d2630ff84e introduce new mixin to do navbar vertical centering 2012-02-20 19:14:26 -08:00
Mark Otto
7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto
89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Jacob Rask
82457603b6 Separate span12 and container classes
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631 Add Opera-prefixed radial gradient
Tested and works in Opera 11.61
2012-02-19 21:42:12 +01:00
Mark Otto
6f6adfb52f change clearfix mixin to drop parens that prevent it from being a class, too 2012-02-16 22:04:11 -08:00
Mark Otto
61e2201c64 fix buttons focus state and swap a buttons for button buttons 2012-02-16 21:25:40 -08:00
Mark Otto
944c7298d3 adding makeRow and makeColumn mixins for generating more semantic layouts 2012-02-12 20:46:39 -08:00
Mark Otto
5fc62c5fcc clear up scaffolding page to separate fixed from fluid grid systems 2012-02-12 16:59:29 -08:00
Mark Otto
2d9b3c45d3 move formfieldstate mixin to mixins.less for #1785 2012-02-07 00:13:52 -08:00
Mark Otto
b5f1d2f3a4 rearrange order of 3d and skew mixins: 2012-02-06 23:48:48 -08:00
Mark Otto
6840d8f776 Merge branch 'tobaco-master' into 2.0.1-wip 2012-02-06 23:48:16 -08:00
Torsten Baldes
9ba9185afc Removed double declaration of Skew
+ added translate3d to mixins.less
2012-02-06 09:59:23 +01:00
Mark Otto
53da88e561 add mixin for text-overflow 2012-02-05 01:49:36 -08:00
Mark Otto
2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto
2c8ca4f5e2 add skew mixin 2012-01-30 07:54:47 -08:00
Mark Otto
ae7f94eeff overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts 2012-01-30 00:39:44 -08:00
Mark Otto
fda77e69eb move vars and mixins for default grid back to appropriate files 2012-01-29 16:58:51 -08:00
Mark Otto
48529ad01f last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now 2012-01-29 13:06:57 -08:00
Mark Otto
1a22c3b30a restore IE filters, but reset them on buttons 2012-01-28 13:13:01 -08:00
Mark Otto
39f70afed9 update mixins to fix radial gradient 2012-01-28 12:03:26 -08:00
Mark Otto
28ba9d69c8 nav, buttons, and docs updates to account for outline: 0; on :active 2012-01-28 11:21:39 -08:00
Mark Otto
aaa530c27e combined .disabled and [disabled] and confirmed in ie7/8 2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063 new tab focus style and mixin 2012-01-27 18:33:25 -08:00
Pete Hopkins
1c9db106fa Moves buttonBackground to mixins (issue 1292) 2012-01-27 16:39:27 -05:00
Pete Hopkins
347a15b69a Cleans up IE7 inline margins for buttons and adds them for sprites, also fixes button padding for large/small sizes 2012-01-27 16:10:40 -05:00
Jacob Thornton
dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00