]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
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 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 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

13 years agogray out links for active state on pagination
Mark Otto [Sun, 15 Jan 2012 07:33:42 +0000 (23:33 -0800)] 
gray out links for active state on pagination

13 years agodates updated to 2012
Mark Otto [Sun, 15 Jan 2012 07:28:48 +0000 (23:28 -0800)] 
dates updated to 2012

13 years agochange up classes on tables and forms, fix nav list styles in example
Mark Otto [Sun, 15 Jan 2012 05:28:47 +0000 (21:28 -0800)] 
change up classes on tables and forms, fix nav list styles in example

13 years agoadding the pager component after rewriting the pagination docs and css
Mark Otto [Sun, 15 Jan 2012 04:54:37 +0000 (20:54 -0800)] 
adding the pager component after rewriting the pagination docs and css

13 years agorestore top bar on home page
Mark Otto [Sun, 15 Jan 2012 03:17:48 +0000 (19:17 -0800)] 
restore top bar on home page

13 years agoallow btn-groups to work in navbars
Mark Otto [Sun, 15 Jan 2012 01:16:46 +0000 (17:16 -0800)] 
allow btn-groups to work in navbars

13 years agofix duplicate icons
Mark Otto [Sun, 15 Jan 2012 00:56:47 +0000 (16:56 -0800)] 
fix duplicate icons

13 years agoupdate preventing double border line for bordered tables by account for th elements...
Mark Otto [Sun, 15 Jan 2012 00:50:36 +0000 (16:50 -0800)] 
update preventing double border line for bordered tables by account for th elements in tr elements

13 years agoadd user-select mixin
Mark Otto [Sun, 15 Jan 2012 00:45:01 +0000 (16:45 -0800)] 
add user-select mixin

13 years agomake inline and search form labels inline-block
Mark Otto [Sun, 15 Jan 2012 00:38:40 +0000 (16:38 -0800)] 
make inline and search form labels inline-block

13 years agomove up alert message close icon
Mark Otto [Sun, 15 Jan 2012 00:24:23 +0000 (16:24 -0800)] 
move up alert message close icon

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

13 years agorewrite alert messages to use less code, combine the look of default and block messag...
Mark Otto [Sun, 15 Jan 2012 00:18:15 +0000 (16:18 -0800)] 
rewrite alert messages to use less code, combine the look of default and block messages, simplify docs

13 years agoMerge pull request #1003 from cgunther/docs-fixes
Mark Otto [Sat, 14 Jan 2012 21:08:39 +0000 (13:08 -0800)] 
Merge pull request #1003 from cgunther/docs-fixes

Fix links in docs top bar and section ids

13 years agoadd Progress Bars to Components narbar dropdown 1003/head
Chris Gunther [Sat, 14 Jan 2012 20:24:35 +0000 (15:24 -0500)] 
add Progress Bars to Components narbar dropdown

13 years agofix section ID for thumbnails
Chris Gunther [Sat, 14 Jan 2012 20:21:57 +0000 (15:21 -0500)] 
fix section ID for thumbnails

13 years agofix section ID for pagination
Chris Gunther [Sat, 14 Jan 2012 20:21:09 +0000 (15:21 -0500)] 
fix section ID for pagination

13 years agofix navbar links to base CSS > typography
Chris Gunther [Sat, 14 Jan 2012 20:18:59 +0000 (15:18 -0500)] 
fix navbar links to base CSS > typography

13 years agofix navbar links to scaffolding > grid system
Chris Gunther [Sat, 14 Jan 2012 20:15:24 +0000 (15:15 -0500)] 
fix navbar links to scaffolding > grid system

13 years agoMerge pull request #995 from renajohn/2.0-wip
Jacob Thornton [Sat, 14 Jan 2012 18:21:08 +0000 (10:21 -0800)] 
Merge pull request #995 from renajohn/2.0-wip

Fix bug on tooltips placement when passed as a function

13 years agoFixed when placement is a function 995/head
Renault John Lecoultre [Fri, 13 Jan 2012 21:33:05 +0000 (22:33 +0100)] 
Fixed when placement is a function

13 years agoupdate dropdowns spacing and docs section spacing
Mark Otto [Fri, 13 Jan 2012 18:07:56 +0000 (10:07 -0800)] 
update dropdowns spacing and docs section spacing

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Fri, 13 Jan 2012 17:55:43 +0000 (09:55 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoupdated js includes to make nav work everywhere
Mark Otto [Fri, 13 Jan 2012 17:55:15 +0000 (09:55 -0800)] 
updated js includes to make nav work everywhere

13 years agoMerge pull request #986 from purwandi/2.0-wip
Jacob Thornton [Fri, 13 Jan 2012 08:32:12 +0000 (00:32 -0800)] 
Merge pull request #986 from purwandi/2.0-wip

Fix id anchor javascript

13 years agoRemove sidebar with icon from my own repo 985/head 986/head
Purwandi [Fri, 13 Jan 2012 08:03:23 +0000 (15:03 +0700)] 
Remove sidebar with icon from my own repo

13 years agoMerge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip
Purwandi [Fri, 13 Jan 2012 07:58:13 +0000 (14:58 +0700)] 
Merge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip

13 years agoFix id anchor javascript
Purwandi [Fri, 13 Jan 2012 07:57:21 +0000 (14:57 +0700)] 
Fix id anchor javascript

13 years agonuke uber footer, bring back topbar dropdowns
Mark Otto [Thu, 12 Jan 2012 23:29:16 +0000 (15:29 -0800)] 
nuke uber footer, bring back topbar dropdowns

13 years agofix heading
Mark Otto [Thu, 12 Jan 2012 20:30:36 +0000 (12:30 -0800)] 
fix heading

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Thu, 12 Jan 2012 18:29:16 +0000 (10:29 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agofix type shorthand in blockquote
Mark Otto [Thu, 12 Jan 2012 18:19:07 +0000 (10:19 -0800)] 
fix type shorthand in blockquote

13 years agoMerge pull request #972 from billmn/2.0-wip
Jacob Thornton [Thu, 12 Jan 2012 17:50:49 +0000 (09:50 -0800)] 
Merge pull request #972 from billmn/2.0-wip

Fixed broken anchors on js docs page

13 years agoFixed broken anchors on js docs page 972/head
Davide Bellini [Thu, 12 Jan 2012 11:04:17 +0000 (12:04 +0100)] 
Fixed broken anchors on js docs page

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

Conflicts:
bootstrap.css

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

Conflicts:
bootstrap.css

13 years agoadd build tool for js + rename twipsy to tooltip + lots of little doc cleanup
Jacob Thornton [Thu, 12 Jan 2012 05:42:55 +0000 (21:42 -0800)] 
add build tool for js +  rename twipsy to tooltip + lots of little doc cleanup

13 years agocomments and borders for multiple tbody
Mark Otto [Wed, 11 Jan 2012 17:43:13 +0000 (09:43 -0800)] 
comments and borders for multiple tbody

13 years agoaccount for multiple tbody with 2px border between
Mark Otto [Wed, 11 Jan 2012 05:54:11 +0000 (21:54 -0800)] 
account for multiple tbody with 2px border between

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

13 years agotypo
Mark Otto [Tue, 10 Jan 2012 23:58:44 +0000 (15:58 -0800)] 
typo

13 years agoremove some tabs from demo + fix dropdowns for pills
Jacob Thornton [Tue, 10 Jan 2012 03:53:52 +0000 (19:53 -0800)] 
remove some tabs from demo + fix dropdowns for pills

13 years agoremove empty margin property
Mark Otto [Mon, 9 Jan 2012 17:15:42 +0000 (09:15 -0800)] 
remove empty margin property

13 years agoremove static popovers, modals, and twipsies from components in favor of full javascr...
Mark Otto [Mon, 9 Jan 2012 07:14:07 +0000 (23:14 -0800)] 
remove static popovers, modals, and twipsies from components in favor of full javascript page

13 years agoupdated js pages to put examples first
Mark Otto [Mon, 9 Jan 2012 05:48:07 +0000 (21:48 -0800)] 
updated js pages to put examples first

13 years agoadd utilities.less file for generic classes
Mark Otto [Sun, 8 Jan 2012 23:38:57 +0000 (15:38 -0800)] 
add utilities.less file for generic classes

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

13 years agofix dropdowns for active state in dropdown menus
Mark Otto [Sun, 8 Jan 2012 23:33:44 +0000 (15:33 -0800)] 
fix dropdowns for active state in dropdown menus

13 years agoMerge pull request #932 from blizzy78/typo
Jacob Thornton [Sun, 8 Jan 2012 23:13:56 +0000 (15:13 -0800)] 
Merge pull request #932 from blizzy78/typo

Tiny typo fix

13 years agomove hover state out of timeout duh
Jacob Thornton [Sun, 8 Jan 2012 23:12:34 +0000 (15:12 -0800)] 
move hover state out of timeout duh

13 years agofix typo 932/head
Maik Schreiber [Sun, 8 Jan 2012 23:02:13 +0000 (00:02 +0100)] 
fix typo

13 years agochange prepend to append
Jacob Thornton [Sun, 8 Jan 2012 23:01:23 +0000 (15:01 -0800)] 
change prepend to append

13 years agoadd note about firefox persisting disabled state on buttons
Jacob Thornton [Sun, 8 Jan 2012 22:54:36 +0000 (14:54 -0800)] 
add note about firefox persisting disabled state on buttons

13 years agofix modal insertion boolean
Jacob Thornton [Sun, 8 Jan 2012 22:38:21 +0000 (14:38 -0800)] 
fix modal insertion boolean

13 years agoonly append modal to dom if not already present
Jacob Thornton [Sun, 8 Jan 2012 22:36:41 +0000 (14:36 -0800)] 
only append modal to dom if not already present

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sun, 8 Jan 2012 22:33:52 +0000 (14:33 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agofix navbar styles for .brand
Mark Otto [Sun, 8 Jan 2012 22:33:14 +0000 (14:33 -0800)] 
fix navbar styles for .brand

13 years agoupdated js docs page to use grid of plugins instead of table
Mark Otto [Sun, 8 Jan 2012 22:33:03 +0000 (14:33 -0800)] 
updated js docs page to use grid of plugins instead of table

13 years agomake dropdowns toggle when clicked (for mobile)
Jacob Thornton [Sun, 8 Jan 2012 22:19:53 +0000 (14:19 -0800)] 
make dropdowns toggle when clicked (for mobile)

13 years agodocument slide and slid methods
Jacob Thornton [Sun, 8 Jan 2012 21:54:00 +0000 (13:54 -0800)] 
document slide and slid methods

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

13 years agoadd slide and slid events + disable sliding during slide
Jacob Thornton [Sun, 8 Jan 2012 21:39:27 +0000 (13:39 -0800)] 
add slide and slid events + disable sliding during slide

13 years agofix placement of dropdowns in navbar after getting to general in those styles
Mark Otto [Sun, 8 Jan 2012 21:30:23 +0000 (13:30 -0800)] 
fix placement of dropdowns in navbar after getting to general in those styles

13 years agocorrect navbar scaffolding code snippet
Mark Otto [Sun, 8 Jan 2012 21:22:20 +0000 (13:22 -0800)] 
correct navbar scaffolding code snippet