]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoFinal translation tags in Base CSS 1153/head
Gaëtan Muller [Tue, 24 Jan 2012 21:17:32 +0000 (22:17 +0100)] 
Final translation tags in Base CSS

13 years agoMore translation tags in Base CSS
Gaëtan Muller [Tue, 24 Jan 2012 20:45:42 +0000 (21:45 +0100)] 
More translation tags in Base CSS

13 years agoStart adding tag for Base CSS translation
Gaëtan Muller [Tue, 24 Jan 2012 20:29:55 +0000 (21:29 +0100)] 
Start adding tag for Base CSS translation

13 years agoMerge pull request #1134 from trevyn/2.0-wip
Mark Otto [Tue, 24 Jan 2012 18:48:44 +0000 (10:48 -0800)] 
Merge pull request #1134 from trevyn/2.0-wip

overzealous 2011/2012 search/replace

13 years agoMerge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopk...
Mark Otto [Tue, 24 Jan 2012 18:45:51 +0000 (10:45 -0800)] 
Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar

13 years agoadd bottom-up styles to the dropdown menus
Mark Otto [Tue, 24 Jan 2012 18:45:29 +0000 (10:45 -0800)] 
add bottom-up styles to the dropdown menus

13 years agoremake css
Mark Otto [Tue, 24 Jan 2012 18:43:13 +0000 (10:43 -0800)] 
remake css

13 years agoFixes apostrophe in less.html 1136/head
Pete Hopkins [Tue, 24 Jan 2012 17:52:06 +0000 (12:52 -0500)] 
Fixes apostrophe in less.html

13 years agoSpelling and typos in components.html and javascript.html
Pete Hopkins [Tue, 24 Jan 2012 17:49:30 +0000 (12:49 -0500)] 
Spelling and typos in components.html and javascript.html

13 years agoFixes apostrophe usage in base-css.html
Pete Hopkins [Tue, 24 Jan 2012 17:12:35 +0000 (12:12 -0500)] 
Fixes apostrophe usage in base-css.html

13 years agoi don't think the batch s/2011/2012/ was supposed to hit this. :) 1134/head
Eden [Tue, 24 Jan 2012 16:27:19 +0000 (08:27 -0800)] 
i don't think the batch s/2011/2012/ was supposed to hit this. :)

13 years agomove translation tag for bootstrap
Jacob Thornton [Tue, 24 Jan 2012 03:59:05 +0000 (19:59 -0800)] 
move translation tag for bootstrap

13 years agostart wrapping text in {{_i}} for translation
Jacob Thornton [Tue, 24 Jan 2012 03:55:00 +0000 (19:55 -0800)] 
start wrapping text in {{_i}} for translation

13 years agorebuild with new templates
Jacob Thornton [Mon, 23 Jan 2012 23:17:32 +0000 (15:17 -0800)] 
rebuild with new templates

13 years agorebuild
Jacob Thornton [Mon, 23 Jan 2012 23:07:07 +0000 (15:07 -0800)] 
rebuild

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Mon, 23 Jan 2012 23:06:56 +0000 (15:06 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html

13 years agoadd templates for doc generation
Jacob Thornton [Mon, 23 Jan 2012 22:14:16 +0000 (14:14 -0800)] 
add templates for doc generation

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Mon, 23 Jan 2012 21:51:12 +0000 (13:51 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agofix up the modals in responsive a bit
Mark Otto [Mon, 23 Jan 2012 21:50:55 +0000 (13:50 -0800)] 
fix up the modals in responsive a bit

13 years agocomment in forms'
Mark Otto [Mon, 23 Jan 2012 21:46:26 +0000 (13:46 -0800)] 
comment in forms'

13 years agoMerge pull request #1118 from olvlvl/2.0-wip
Mark Otto [Mon, 23 Jan 2012 20:49:09 +0000 (12:49 -0800)] 
Merge pull request #1118 from olvlvl/2.0-wip

Remove .alert-message IE hack

13 years ago.alert-message no longer exists 1118/head
Olivier Laviale [Mon, 23 Jan 2012 20:22:08 +0000 (21:22 +0100)] 
.alert-message no longer exists

13 years agocut margin in half on default forms
Mark Otto [Mon, 23 Jan 2012 20:21:00 +0000 (12:21 -0800)] 
cut margin in half on default forms

13 years agoclean up subnav aesthetics
Mark Otto [Mon, 23 Jan 2012 20:04:48 +0000 (12:04 -0800)] 
clean up subnav aesthetics

13 years agoremove dropdowns, add in sub nav instead
Mark Otto [Mon, 23 Jan 2012 19:55:04 +0000 (11:55 -0800)] 
remove dropdowns, add in sub nav instead

13 years agorevert to negative margin on grid row
Mark Otto [Mon, 23 Jan 2012 19:35:39 +0000 (11:35 -0800)] 
revert to negative margin on grid row

13 years agoMerge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
Mark Otto [Mon, 23 Jan 2012 19:25:16 +0000 (11:25 -0800)] 
Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize

Conflicts:
bootstrap.css
bootstrap.min.css
lib/type.less

13 years ago:focus:required:invalid: http://www.alistapart.com/articles/forward-thinking-form...
Jacob Thornton [Mon, 23 Jan 2012 04:50:35 +0000 (20:50 -0800)] 
:focus:required:invalid: http://www.alistapart.com/articles/forward-thinking-form-validation

13 years agorebuild
Jacob Thornton [Mon, 23 Jan 2012 04:47:24 +0000 (20:47 -0800)] 
rebuild

13 years agoMerge pull request #1046 from kevva/dropdown-menus
Jacob Thornton [Mon, 23 Jan 2012 04:41:52 +0000 (20:41 -0800)] 
Merge pull request #1046 from kevva/dropdown-menus

Scalable dropdown menus

13 years agogive default valuse for border-radius-custom
Jacob Thornton [Mon, 23 Jan 2012 04:31:58 +0000 (20:31 -0800)] 
give default valuse for border-radius-custom

13 years agodon't use negative margin - use first child to set to 0
Jacob Thornton [Mon, 23 Jan 2012 04:12:26 +0000 (20:12 -0800)] 
don't use negative margin - use first child to set to 0

13 years agofix sans-serif order in forms.less and rebuild
Jacob Thornton [Mon, 23 Jan 2012 04:07:17 +0000 (20:07 -0800)] 
fix sans-serif order in forms.less and rebuild

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Mon, 23 Jan 2012 04:03:17 +0000 (20:03 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoshare -> share-alt
Jacob Thornton [Mon, 23 Jan 2012 04:02:56 +0000 (20:02 -0800)] 
share -> share-alt

13 years agoMerge pull request #1098 from lookfirst/fixstuff
Jacob Thornton [Mon, 23 Jan 2012 03:50:16 +0000 (19:50 -0800)] 
Merge pull request #1098 from lookfirst/fixstuff

2.0-wip: clean up variable usage with colors

13 years agoMerge pull request #1106 from olvlvl/2.0-wip
Jacob Thornton [Mon, 23 Jan 2012 03:48:53 +0000 (19:48 -0800)] 
Merge pull request #1106 from olvlvl/2.0-wip

2.0 wip

13 years agoMerge pull request #1053 from scottwater/patch-1
Jacob Thornton [Mon, 23 Jan 2012 03:38:48 +0000 (19:38 -0800)] 
Merge pull request #1053 from scottwater/patch-1

Added missing 'data-dismiss="modal"' on the first example model source.

13 years agoUsing variables rather than numeric values 1106/head
Olivier Laviale [Sun, 22 Jan 2012 21:32:16 +0000 (22:32 +0100)] 
Using variables rather than numeric values

13 years agoMerge pull request #1105 from olvlvl/2.0-wip
Jacob Thornton [Sun, 22 Jan 2012 21:01:28 +0000 (13:01 -0800)] 
Merge pull request #1105 from olvlvl/2.0-wip

2.0 wip

13 years agoFixed typo 1105/head
Olivier Laviale [Sun, 22 Jan 2012 20:45:20 +0000 (21:45 +0100)] 
Fixed typo

13 years agoMerge pull request #1104 from cgunther/dropdown-docs
Jacob Thornton [Sun, 22 Jan 2012 20:25:51 +0000 (12:25 -0800)] 
Merge pull request #1104 from cgunther/dropdown-docs

Dropdown docs error in example

13 years agoMerge pull request #1101 from ansman/2.0-wip
Jacob Thornton [Sun, 22 Jan 2012 20:20:39 +0000 (12:20 -0800)] 
Merge pull request #1101 from ansman/2.0-wip

Fix for #1102 and #1100

13 years agorename tooltip test file
Jacob Thornton [Sun, 22 Jan 2012 20:19:22 +0000 (12:19 -0800)] 
rename tooltip test file

13 years agoMove placement of ID in docs example for dropdowns 1104/head
Chris Gunther [Sun, 22 Jan 2012 16:46:44 +0000 (11:46 -0500)] 
Move placement of ID in docs example for dropdowns

The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu

13 years agoRename the tooltip test file 1101/head
Nicklas Ansman Giertz [Sun, 22 Jan 2012 11:33:30 +0000 (12:33 +0100)] 
Rename the tooltip test file

It had not been renamed when twipsys became tooltips.

13 years agoAdd testcase to popover
Nicklas Ansman Giertz [Sun, 22 Jan 2012 11:32:37 +0000 (12:32 +0100)] 
Add testcase to popover

This test case verifies that custom classes are respected.

13 years agoMake the popove respect custom classes
Nicklas Ansman Giertz [Sun, 22 Jan 2012 11:06:59 +0000 (12:06 +0100)] 
Make the popove respect custom classes

13 years agoadd ability to cycle carousel to a particular frame
Jacob Thornton [Sun, 22 Jan 2012 07:02:29 +0000 (23:02 -0800)] 
add ability to cycle carousel to a particular frame

13 years agoremove tabs 1098/head
Jon Stevens [Sun, 22 Jan 2012 06:35:03 +0000 (22:35 -0800)] 
remove tabs

13 years agomore efficient matcher + bold matched query in item
Jacob Thornton [Sun, 22 Jan 2012 06:06:36 +0000 (22:06 -0800)] 
more efficient matcher + bold matched query in item

13 years agomake case lookahead case insensitive
Jacob Thornton [Sun, 22 Jan 2012 05:46:47 +0000 (21:46 -0800)] 
make case lookahead case insensitive

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sun, 22 Jan 2012 05:35:53 +0000 (21:35 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agochange scrollspy offset to be option + fix typo in scrollspy
Jacob Thornton [Sun, 22 Jan 2012 05:35:20 +0000 (21:35 -0800)] 
change scrollspy offset to be option + fix typo in scrollspy

13 years agoMerge pull request #1097 from buraktuyan/2.0-wip
Jacob Thornton [Sun, 22 Jan 2012 05:14:46 +0000 (21:14 -0800)] 
Merge pull request #1097 from buraktuyan/2.0-wip

2.0-wip: Optimize all PNG files (without any quality loss)

13 years agoclean up variable usage with colors
Jon Stevens [Sat, 21 Jan 2012 23:24:06 +0000 (15:24 -0800)] 
clean up variable usage with colors

13 years agoOptimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using... 1097/head
Burak Tuyan [Sat, 21 Jan 2012 21:52:39 +0000 (23:52 +0200)] 
Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode)

13 years agofix typo
Jacob Thornton [Sat, 21 Jan 2012 04:28:40 +0000 (20:28 -0800)] 
fix typo

13 years agoonly prevent default of links in sections
Jacob Thornton [Sat, 21 Jan 2012 04:05:16 +0000 (20:05 -0800)] 
only prevent default of links in sections

13 years agoshould check for alert class not alertmessage
Jacob Thornton [Fri, 20 Jan 2012 21:50:36 +0000 (13:50 -0800)] 
should check for alert class not alertmessage

13 years agoonly prevent default if getting data-href
Jacob Thornton [Fri, 20 Jan 2012 21:42:10 +0000 (13:42 -0800)] 
only prevent default if getting data-href

13 years agoRemove global reset in favour of contextual reset. 1085/head
Nicolas Gallagher [Fri, 20 Jan 2012 21:16:40 +0000 (21:16 +0000)] 
Remove global reset in favour of contextual reset.

Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.

This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.

13 years agoMerge pull request #1069 from necolas/2.0-wip
Mark Otto [Fri, 20 Jan 2012 17:30:06 +0000 (09:30 -0800)] 
Merge pull request #1069 from necolas/2.0-wip

2.0-wip: Changes to .gitignore, clearfix mixin, and search input reset

13 years agoRemove search input cancel button in WebKit-OSX. 1069/head
Nicolas Gallagher [Thu, 19 Jan 2012 21:02:00 +0000 (21:02 +0000)] 
Remove search input cancel button in WebKit-OSX.

On input elements with a `type` of `search`, WebKit on OS X will
display a cancel button after text has been entered. This can
look ugly or be poorly position when you've added other styles to
the input (especially additional padding).

13 years agoRemove unnecessary CSS properties from the clearfix mixin.
Nicolas Gallagher [Thu, 19 Jan 2012 20:33:22 +0000 (20:33 +0000)] 
Remove unnecessary CSS properties from the clearfix mixin.

13 years agoAdd various always-ignore extensions, files, and folders to `.gitignore`
Nicolas Gallagher [Thu, 19 Jan 2012 20:31:45 +0000 (20:31 +0000)] 
Add various always-ignore extensions, files, and folders to `.gitignore`

13 years agoAdded missing 'data-dismiss="modal"' on the first example model source. 1052/head 1053/head
Scott Watermasysk [Wed, 18 Jan 2012 19:53:59 +0000 (14:53 -0500)] 
Added missing 'data-dismiss="modal"' on the first example model source.

13 years agoMake dropdown menus scalable. 1046/head
Kevin Martensson [Wed, 18 Jan 2012 13:02:18 +0000 (14:02 +0100)] 
Make dropdown menus scalable.

13 years agodon't scope placeholder text color to just inputs
Mark Otto [Wed, 18 Jan 2012 08:35:14 +0000 (00:35 -0800)] 
don't scope placeholder text color to just inputs

13 years agomake button active state clearer by lightening the inner shadow and removing the...
Mark Otto [Wed, 18 Jan 2012 08:30:49 +0000 (00:30 -0800)] 
make button active state clearer by lightening the inner shadow and removing the background image

13 years agorename navbar variables, change navbar search placeholder to mixin
Mark Otto [Wed, 18 Jan 2012 08:24:10 +0000 (00:24 -0800)] 
rename navbar variables, change navbar search placeholder to mixin

13 years agore-org variables
Mark Otto [Wed, 18 Jan 2012 08:12:58 +0000 (00:12 -0800)] 
re-org variables

13 years agorevamp the mixins file to organize things a bit more, make placeholder text use a...
Mark Otto [Wed, 18 Jan 2012 07:52:49 +0000 (23:52 -0800)] 
revamp the mixins file to organize things a bit more, make placeholder text use a new variable instead of relying solely on @grayLight

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Wed, 18 Jan 2012 07:39:28 +0000 (23:39 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoscope table styles to a class, .table, instead of on the generic element as a smarter...
Mark Otto [Wed, 18 Jan 2012 07:39:18 +0000 (23:39 -0800)] 
scope table styles to a class, .table, instead of on the generic element as a smarter default

13 years agocleanup accordion css and add comments
Mark Otto [Wed, 18 Jan 2012 07:24:59 +0000 (23:24 -0800)] 
cleanup accordion css and add comments

13 years agoMerge pull request #1042 from boberkfell/2.0-wip
Mark Otto [Wed, 18 Jan 2012 07:21:52 +0000 (23:21 -0800)] 
Merge pull request #1042 from boberkfell/2.0-wip

2.0 wip Small typo fix in docs

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Wed, 18 Jan 2012 07:19:50 +0000 (23:19 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Wed, 18 Jan 2012 07:19:21 +0000 (23:19 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.min.css
docs/javascript.html
lib/accordion.less

13 years agotypo fix in component docs 1042/head
Ben Oberkfell [Wed, 18 Jan 2012 06:37:24 +0000 (00:37 -0600)] 
typo fix in component docs

13 years agowrap transition
Jacob Thornton [Tue, 17 Jan 2012 18:32:25 +0000 (10:32 -0800)] 
wrap transition

13 years agofix js link in docs nav, restyle accordion with new css
Mark Otto [Tue, 17 Jan 2012 01:27:30 +0000 (17:27 -0800)] 
fix js link in docs nav, restyle accordion with new css

13 years agoreorder properties
Jacob Thornton [Mon, 16 Jan 2012 05:58:45 +0000 (21:58 -0800)] 
reorder properties

13 years agodo some trickery to get borders looking right
Jacob Thornton [Mon, 16 Jan 2012 05:54:58 +0000 (21:54 -0800)] 
do some trickery to get borders looking right

13 years agofix margin
Jacob Thornton [Mon, 16 Jan 2012 05:50:04 +0000 (21:50 -0800)] 
fix margin

13 years agomake accordions little bit smoother
Jacob Thornton [Mon, 16 Jan 2012 05:48:58 +0000 (21:48 -0800)] 
make accordions little bit smoother

13 years agoMerge pull request #1020 from lookfirst/fixtest
Mark Otto [Mon, 16 Jan 2012 04:51:45 +0000 (20:51 -0800)] 
Merge pull request #1020 from lookfirst/fixtest

Fix typo in tables docs

13 years agofix typo 1020/head
Jon Stevens [Mon, 16 Jan 2012 03:38:30 +0000 (19:38 -0800)] 
fix typo

13 years agoupdated accordion and carousel; accordion still needs work
Mark Otto [Mon, 16 Jan 2012 02:40:17 +0000 (18:40 -0800)] 
updated accordion and carousel; accordion still needs work

13 years agomove carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination...
Mark Otto [Mon, 16 Jan 2012 00:27:36 +0000 (16:27 -0800)] 
move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts

13 years agofix the js alerts examples
Mark Otto [Sun, 15 Jan 2012 23:06:30 +0000 (15:06 -0800)] 
fix the js alerts examples

13 years agomake dl and child elements less specific
Mark Otto [Sun, 15 Jan 2012 21:12:29 +0000 (13:12 -0800)] 
make dl and child elements less specific

13 years agofix grid sized horizontal form layout
Mark Otto [Sun, 15 Jan 2012 20:53:35 +0000 (12:53 -0800)] 
fix grid sized horizontal form layout

13 years agofix modal horizontal alignment
Mark Otto [Sun, 15 Jan 2012 19:41:46 +0000 (11:41 -0800)] 
fix modal horizontal alignment

13 years agomake horizontal form labels map to default grid sizing
Mark Otto [Sun, 15 Jan 2012 19:33:30 +0000 (11:33 -0800)] 
make horizontal form labels map to default grid sizing

13 years agonormalize the alert classes to match last night's flip for form and table classes
Mark Otto [Sun, 15 Jan 2012 19:30:24 +0000 (11:30 -0800)] 
normalize the alert classes to match last night's flip for form and table classes

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sun, 15 Jan 2012 19:26:21 +0000 (11:26 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agofix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager exampl...
Mark Otto [Sun, 15 Jan 2012 19:26:06 +0000 (11:26 -0800)] 
fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code

13 years agoMerge pull request #1012 from pkauders/patch-1
Mark Otto [Sun, 15 Jan 2012 19:23:34 +0000 (11:23 -0800)] 
Merge pull request #1012 from pkauders/patch-1

Fix small typo in docs home page

13 years agoFix typo in Responsive design content 1012/head
Paul Kauders [Sun, 15 Jan 2012 13:46:25 +0000 (07:46 -0600)] 
Fix typo in Responsive design content