rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
7,209 Commits 108 Branches 89 Tags 552 MiB
9d485db721
Commit Graph

2165 Commits

Author SHA1 Message Date
Mark Otto
ed44a3255c Merge branch 'master' of github.com:twbs/bootstrap 2013-09-22 09:20:15 -05:00
Mark Otto
000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Zlatan Vasović
dc3d16648c @headingsColor → @headings-color 2013-09-21 14:19:11 +02:00
Zlatan Vasović
2304ba6a25 Avoid LESS nesting if isn't needed 2013-09-20 18:06:48 +02:00
Mark Otto
e148923f27 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-19 22:57:11 -05:00
Mark Otto
ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00
XhmikosR
60afea85b4 less/mixins.less: tabs to spaces. 2013-09-18 08:14:19 +03:00
XhmikosR
0cd6d35058 Update normalize to v2.1.3. 2013-09-18 08:05:34 +03:00
Frederico Carvalho
29f24f746c corrected caret colour when a nav dropdown is open 2013-09-18 14:45:56 +10:00
Frederico Carvalho
b1208f380a fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue 2013-09-18 14:31:52 +10:00
Mark Otto
f2750dd6bc Merge pull request #10626 from buob/variablize-nav-pill-border-radius 
Variablize nav pill border radius
 2013-09-16 22:00:39 -07:00
Mark Otto
bf47968d9c Merge pull request #10655 from Soben713/master 
Remove unnecessary semicolons
 2013-09-16 21:49:01 -07:00
Mark Otto
515e11da32 Merge pull request #10663 from lipis/patch-1 
Changed the border-color of .navbar-form to @navbar-default-border
 2013-09-16 20:36:04 -07:00
Lipis
a6e2a93feb Changed the border-color of .navbar-form to @navbar-default-border 2013-09-16 19:36:39 +02:00
Steve S
ae3a9169e0 Simplified CSS responsive-invisibility mixin 2013-09-16 09:16:53 -05:00
Soheil Behnezhad
cc69911335 Derp, there were more 2013-09-16 16:37:03 +04:30
Soheil Behnezhad
0c39045222 Remove some more unnecessary semicolons 2013-09-16 16:25:53 +04:30
Chris Ziogas
ab3d0a27b3 Dropdown in panel header does not inherit its colors 
Fix for issue #10627
 2013-09-16 12:38:26 +03:00
Soheil Behnezhad
bff23ee1fe Remove unnecessary semicolons 2013-09-16 13:47:48 +04:30
Jake Buob
2381ab088b Add nav-pills-border-radius variable 2013-09-13 15:57:10 -04:00
Jake Buob
4d4976fdcc Make nav pills border-radius border-radius-base 2013-09-13 15:56:30 -04:00
Zlatan Vasović
5caf780081 @grid-float-breakpoint need to be @screen-sm-min 
😄
 2013-09-12 09:52:33 +02:00
Mark Otto
88ae76536d Merge pull request #10573 from gribelu/tooltip-fix 
Hardcoded Tooltip arrow positioning
 2013-09-11 23:19:56 -07:00
Mark Otto
dbcb05880f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-11 23:13:28 -07:00
Mark Otto
28e5572bf4 Fixes #10492: Account for responsive tables in panels 2013-09-11 23:11:18 -07:00
Mark Otto
9c0d04d3e4 Merge pull request #10569 from ZDroid/patch-2 
Change @screen-* to @screen-*-min
 2013-09-11 23:07:47 -07:00
Mark Otto
291a23aa4f Massive customizer audit and overhaul 
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910. I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.

/cc @cvrebert @juthilo @saas786
 2013-09-11 21:14:10 -07:00
Mark Otto
d88e743b41 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-11 16:35:27 -07:00
Chris Rebert
725e2b9ccf re-fix typo in comment 2013-09-11 16:24:03 -07:00
Mark Otto
b0ea3a08cd Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports 
Conflicts:
	getting-started.html
	less/responsive-utilities.less
 2013-09-11 16:15:12 -07:00
Mark Otto
6519303549 fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 16:06:43 -07:00
Mark Otto
6e064894db remove unnecessary right and left properties on .modal-dialog 2013-09-11 14:56:02 -07:00
Mark Otto
2dc7ab4bbb fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 14:46:31 -07:00
Mark Otto
37933a9e08 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-11 12:31:21 -07:00
Mark Otto
5d1707a25c Remove old and unused .prettyprint styles in code.less (per #10566) 2013-09-11 11:09:50 -07:00
gribelu
d8202dd626 Fixed hardcoded tooltip arrow positioning 
Tooltip Arrow positioning was hardcoded to 5px instead of using @tooltip-arrow-width.
 2013-09-11 16:47:13 +03:00
Zlatan Vasović
50fcaba24f The last 2013-09-11 10:38:42 +02:00
Zlatan Vasović
d9613268b0 Again? 2013-09-11 10:35:12 +02:00
Zlatan Vasović
a0653ef018 Rumbo Jumbo 2013-09-11 10:33:30 +02:00
Zlatan Vasović
e2e1c80d1a Another fixup 2013-09-11 10:32:08 +02:00
Zlatan Vasović
b8a33eb1e0 Eagle eye 2013-09-11 10:29:15 +02:00
Zlatan Vasović
c10238c95f Use @screen-sm-min in forms 2013-09-11 09:54:38 +02:00
Mark Otto
b7e1103c32 Merge pull request #9989 from eins78/more-monospace-elements 
code.less: also set default monospace font for `<kbd>` and `<samp>`
 2013-09-10 21:38:24 -07:00
Mark Otto
e645d51b62 Merge pull request #10565 from twbs/gruntfile-css-banner 
generate CSS banners via Gruntfile; fixes #10101
 2013-09-10 21:27:07 -07:00
Mark Otto
84567af1a8 Merge pull request #10560 from ZDroid/patch-1 
Remove display: block from address
 2013-09-10 21:25:31 -07:00
Chris Rebert
2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert
52516eceba add missing comma in carousel.less; fixes #10562 2013-09-10 16:20:36 -07:00
Zlatan Vasović
886e7037f6 Remove display: block from address 
<address> is already displayed as block in all browsers (UAs).
 2013-09-10 23:27:04 +02:00
Mark Otto
fff5e540f5 fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally 2013-09-08 20:03:52 -07:00
Mark Otto
afb6cf1d01 Match order of vars to order of components; darken some alert borders 2013-09-08 16:58:56 -07:00
Mark Otto
16279056ae Merge branch 'master' of github.com:twbs/bootstrap 2013-09-08 08:04:19 -07:00
Mark Otto
3f158175ce fixes #10521: Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables 2013-09-08 08:04:11 -07:00
Zlatan Vasović
f9fe6cd05f Added missing semicolon 2013-09-08 15:37:02 +02:00
Mark Otto
8bea86e2ef fixes #10024: Use negative margin to fix the border between button and input in input groups 2013-09-06 09:50:38 -07:00
Mark Otto
e5038a339c Merge pull request #9968 from thelukemcdonald/master 
Apply gradient stripe @color parameter
 2013-09-06 09:31:36 -07:00
Mark Otto
5c4c7eba54 Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-06 09:23:49 -07:00
Mark Otto
72a39eb747 Merge pull request #10025 from barryvdh/patch-2 
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
 2013-09-06 09:18:00 -07:00
Mark Otto
b51579241f account for last child bottom border; use 0 instead of none 2013-09-05 15:10:56 -07:00
Kevin O'Connor
ac244040d1 Don't double border a bordered table within a panel 2013-09-05 15:54:18 -04:00
Mark Otto
56c8826c77 Fixes #10452: Add note about deprecation of .nav-divider 
Should have been dropped in v3, but ah well, we missed it. So, it gets
the deprecation.
 2013-09-04 18:52:45 -07:00
Mark Otto
1c4bdb053b Fixes #10399: Add hover styles to text emphasis classes 2013-09-04 13:56:32 -07:00
Mark Otto
d8dc805f9b Merge branch 'master' of github.com:twbs/bootstrap 2013-09-04 09:09:22 -07:00
Mark Otto
34f1487146 Fixes #10436: use screen-sm var instead of hardcoded pixel value 2013-09-04 09:08:52 -07:00
Liam
12558bb504 Fixed error in documentation in mixins.less 2013-09-04 18:59:44 +10:00
Mark Otto
143403f3fd Fixes #10407: Add line-height to progress bar for proper text alignment within 2013-09-03 20:11:27 -07:00
Mark Otto
0a78e7907d fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width 2013-09-03 15:49:03 -07:00
Mark Otto
dd44123881 remove unused .panel-collapse ruleset 2013-09-03 01:04:17 -07:00
Mark Otto
a245c0d1cd derp, add on to #10153 with proper variable /cc @ggam 2013-09-01 20:52:23 -07:00
Mark Otto
de82c80784 update vars to use new component-active-color 2013-09-01 23:40:04 +02:00
Mark Otto
1fd9237840 fixes #9909: Add component active color variable to complement component active bg variable 2013-09-01 23:38:11 +02:00
Mark Otto
26727bfefd Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 21:55:59 +02:00
Mark Otto
b45c3ea647 fixes #10164: Document .center-block mixin and update CSS to include it as a class as well 2013-09-01 11:21:14 +02:00
Mark Otto
50bf4d47b1 reverse vars for backwards compatibility /cc @cvrebert 2013-09-01 11:06:33 +02:00
Mark Otto
25cc04c5ab Merge branch 'deprecate_screen_containers' 2013-09-01 11:05:14 +02:00
Mark Otto
d28abc4bf1 fixes #10115: Default carousel controls and Glyphicon controls should behave the same on small devices and up 2013-09-01 11:03:19 +02:00
Mark Otto
62477653e7 fixes #10111: different colors for dropdown link hover and active states 2013-09-01 11:00:40 +02:00
Chris Rebert
604c3b2efc tweak #10336 to double up on the hyphen-minuses to better approximate a long dash 2013-09-01 01:46:18 -07:00
Chris Rebert
24d45f26eb Merge pull request #10336 from Shipow/master 
Replace invalid US-ASCII character "\xE2")
 2013-09-01 01:43:48 -07:00
Mark Otto
9a32b21dc7 Merge branch 'master' into tagliala-patch-1 2013-09-01 10:13:47 +02:00
Mark Otto
7f6210cea4 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 10:04:54 +02:00
Mark Otto
daa8330b41 Merge branch 'master' into dancek-breadcrumb-separator 2013-09-01 10:01:57 +02:00
Mark Otto
560753da96 Merge branch 'master' into table-nesting 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-01 09:59:27 +02:00
Mark Otto
4b53ea52e9 fixes #10223: adds color to input addon 2013-09-01 09:53:41 +02:00
Mark Otto
794d784519 fixes #10153: restore headings-color variable 2013-09-01 09:49:28 +02:00
Mark Otto
f29ec45715 Merge branch 'master' into deprecate_screen_containers 2013-09-01 09:33:11 +02:00
Mark Otto
9ba64cc1a9 Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1 2013-09-01 08:13:51 +02:00
Mark Otto
eb95574d80 Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dancek-breadcrumb-separator 2013-09-01 08:12:56 +02:00
Kevin Granger
f849e65d56 Replace invalid US-ASCII character "\xE2") 
Replace invalid US-ASCII character "\xE2") '—' => '-'
 2013-08-31 17:50:14 +02:00
Mark Otto
3e62905f9d Merge branch 'master' of github.com:twbs/bootstrap 2013-08-31 09:04:17 +02:00
Chris Rebert
2ef147b16b fix #10252 by restricting Android Firefox reset to only .form-control & .btn 2013-08-28 15:37:34 -07:00
Geremia Taglialatela
86632a242b Base the navbar default brand hover color on default brand color 
IMHO this default is better
 2013-08-28 18:18:44 +02:00
Hannu Hartikainen
a19ff2f50f Parameterize @breadcrumb-separator 2013-08-28 12:17:46 +03:00
Chris Rebert
901da1b2b4 use direct-child selector more in table styles to better support nested tables; fixes #10231 2013-08-27 17:13:34 -07:00
Mark Otto
58408b0232 Fixes #10154: add .small 2013-08-27 09:21:09 -07:00
Mark Otto
7796e645c9 Add margin to thumbnails for proper spacing 
Hadn't thought about this until fixes #10137, but it makes sense I
think to have margin on the bottom of thumbnails for spacing when
stacking (or using different grid tiers).
 2013-08-26 17:48:32 -07:00
Mark Otto
4d23aa4ef5 Address #9873 and fix #9774 
* Update styling of justified nav links to be more mobile friendly
(with all four rounded corners and some margin between items)
* Add note to docs to callout bogus WebKit rendering on component and
example
 2013-08-26 17:37:52 -07:00
Julian Thilo
8f83a6010a rm inverted navbar search styles 2013-08-26 18:42:03 +02:00
Mark Otto
5491d53b99 Deprecate container-{device} vars for container-{size} classes; updates customizer and grid to do the same 2013-08-24 14:00:52 -07:00
Mark Otto
d9e991fefe Merge pull request #10059 from felixhirschfeld/patch-1 
Add mixin for transition-property
 2013-08-24 00:19:37 -07:00
Mark Otto
c7db8eadc2 Merge pull request #10022 from thomaswelton/proposal-glyphicon-block 
Proposal - Fixed width for glypicons
 2013-08-24 00:15:34 -07:00
Mark Otto
9733a998e2 fixes #9969: add support for output element 2013-08-24 00:14:09 -07:00
Mark Otto
fc0e7686fb Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-23 23:40:12 -07:00
Mark Otto
d82030f482 Merge pull request #10057 from sambowler/patch-1 
Fix responsive table scrolling on Windows Phone 8.
 2013-08-23 23:19:05 -07:00
Mark Otto
0a2ec5545b Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-23 23:16:37 -07:00
Mark Otto
b86cd3bc3d Merge branch 'master' into deprecate-screen-device-vars 
Conflicts:
	less/variables.less
 2013-08-23 22:56:23 -07:00
Mark Otto
d5a2785545 more specific deprecation comment 2013-08-23 22:51:39 -07:00
Mark Otto
8a96616726 Merge pull request #9963 from twbs/min-breakpoint-naming 
rename @screen-XX to @screen-XX-min for clarity+unambiguity
 2013-08-23 22:50:41 -07:00
Mark Otto
a66ccbc562 split mixin and grunt dist to be sure 2013-08-23 22:19:58 -07:00
Mark Otto
6de67c0ab6 Deprecate .hide-text mixin for .text-hide as mixin and class 2013-08-23 22:11:41 -07:00
Mark Otto
2b37d2b533 Update and document use of small in headings 2013-08-23 14:22:51 -07:00
Mark Otto
310642d5ac Merge branch 'master' into header-font-size-vars 2013-08-23 14:00:28 -07:00
Mark Otto
a0d0864bd7 fixes #9877: improve active state on nav list items in theme 2013-08-23 10:44:13 -07:00
Mark Otto
5bbbdb399b fixes #9879: add hover state to theme buttons 2013-08-23 10:36:37 -07:00
Cameron Little
9bdc841acc Added -webkit-overflow-scrolling: touch to responsive tables 2013-08-23 08:55:02 -07:00
Felix Hirschfeld
c52e1b85ab Add mixin for transition-property 
It's quite handy if a transition needs the same duration, timing-function or delay and only specific properties to animate.
 2013-08-23 09:22:54 +02:00
Sam Bowler
343fd1bb1e Fix responsive table scrolling on Windows Phone 8. 2013-08-23 07:53:09 +01:00
Barry vd. Heuvel
c5cfc690dd Add missing methods (rotateX/Y, perspective(-origin) and transform-origin) 
Added missing mixins:
rotateX
rotateY
perspective
perspective-origin
transform-origin
 2013-08-22 13:05:06 +02:00
Thomas Welton
31ab249809 Removed glyphicon-block instead target :empty .glyphicons 2013-08-22 10:30:18 +01:00
Thomas Welton
8663b75c4d Added glyphicon-block class 
Prevents elements moving around the page after the font file has loaded by setting a defined width on elements using the icon font.
 2013-08-22 02:54:54 +01:00
Jason Nutter
a40568a1e0 Fixing carousel control positioning 
The left control should be positioned from the left, while the right
control should be positioning from the right. Positioning both from the
left results in the right carousel control being incorrectly positioned
(most noticeable with a larger than normal font size).
 2013-08-21 15:51:24 -07:00
Chris Rebert
22ce649910 deprecate @screen-{phone,tablet,desktop} vars 2013-08-21 12:26:20 -07:00
James Lawrence
2cb1626907 Fixes #9974 
Added th selector in .table-row-variant mixin
 2013-08-21 17:56:36 +01:00
Max F. Albrecht
27d92f45a5 code.less: also set default monospace font for <kbd> and <samp> 2013-08-21 14:08:43 +02:00
Denis Gonchar
4284fc0a5e fix #9941 2013-08-21 15:57:48 +06:00
Chris Rebert
a3a02f9e6e rename @screen-XX to @screen-XX-min for clarity+unambiguity 2013-08-20 23:25:13 -07:00
Luke McDonald
c8402e6e2a Remove progress bar striped @color parameters; use default transparent white. 
* If the @color parameter is not removed, the stripes are the same color as the element background color. In this case, the stripes do not appear.
 2013-08-20 22:46:01 -05:00
Luke McDonald
e965ef0df3 Apply @color argument to striped gradient 
The @color argument is currently not being used for the striped gradient.
 2013-08-20 22:13:03 -05:00
Chris Rebert
9a4fbde461 add variables for heading font sizes; fixes #9921 2013-08-20 17:49:23 -07:00
Geremia Taglialatela
db7cce42f2 Removing whitespaces 2013-08-20 14:56:10 +02:00
Mark Otto
3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
Mark Otto
3d5ccc6c6f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 10:43:45 -07:00
Mark Otto
723b9b89d7 Merge pull request #9864 from boomsb/3.0.0-wip 
Update tables.less
 2013-08-19 10:43:26 -07:00
Mark Otto
16976cc494 Fixes secondary issue in #9798 2013-08-19 09:36:56 -07:00
Mark Otto
7bc845abfa Add default navbar z-index to fix #9844 
iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
 2013-08-19 09:31:16 -07:00
boomsb
bfe2dc4109 Update tables.less 
Fixed Table cell sizing with multiple classes by using *= instead of ^=
 2013-08-19 11:30:38 -05:00
Mark Otto
d195d5989f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 08:58:59 -07:00
Mark Otto
f497b5e1f5 move dropdown change from navbar to dropdowns to fix customizer compiling 2013-08-19 08:54:40 -07:00
Mark Otto
a9297c7ad2 save and recompile for that last commit 2013-08-19 08:51:25 -07:00
Mark Otto
7e82ceb533 fix #9832 somewhat: more vars for jumbotron 2013-08-19 08:46:49 -07:00
saiwang
fabbb9e4ba .table style is duplicate in List groups in panels and Tables in panels 2013-08-19 22:08:06 +08:00
Mark Otto
285393fb77 Re-enable glyphicons in carousel controls and then remove redundant CSS from example 2013-08-19 00:58:29 -07:00
Mark Otto
d8128fca94 Change up label padding to equalize top and bottom 2013-08-19 00:36:39 -07:00
Mark Otto
14c4484ec4 Nuke margin for last child navbar text 2013-08-19 00:34:31 -07:00
Mark Otto
3260288df8 Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip 2013-08-19 00:15:47 -07:00
Mark Otto
e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Elvis Ratzlaff
988c03d462 Variable name fix 2013-08-19 00:46:09 -04:00
Mark Otto
e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Elvis Ratzlaff
5b3e6eb563 make visible/hidden classes mixable 2013-08-19 00:23:53 -04:00
Mark Otto
a9378a9267 Merge branch '3.0.0-wip' into bs3_homepage 
Conflicts:
	customize.html
	dist/css/bootstrap.min.css
 2013-08-18 20:15:45 -07:00
Mark Otto
a1db2d7a5e Merge branch '3.0.0-wip' into bs3_panel_base_class 
Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-08-18 20:11:04 -07:00