]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agowhat up breadcrumbs, we added you
Mark Otto [Thu, 8 Sep 2011 16:43:37 +0000 (09:43 -0700)] 
what up breadcrumbs, we added you

13 years agoremove active state from dropdown
Mark Otto [Wed, 7 Sep 2011 06:32:20 +0000 (23:32 -0700)] 
remove active state from dropdown

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Wed, 7 Sep 2011 06:30:45 +0000 (23:30 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoupdate diagrams to use smaller border radius, add new container-app example
Mark Otto [Wed, 7 Sep 2011 06:30:21 +0000 (23:30 -0700)] 
update diagrams to use smaller border radius, add new container-app example

13 years agomove javascript from examples into docs
Jacob Thornton [Wed, 7 Sep 2011 06:20:56 +0000 (23:20 -0700)] 
move javascript from examples into docs

13 years agofirst pass at enabling active states in dropdowns in topbar and fixing the bug of...
Mark Otto [Wed, 7 Sep 2011 04:54:00 +0000 (21:54 -0700)] 
first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown

13 years agoaddng docs for the themes stuff and examples
Mark Otto [Sun, 4 Sep 2011 21:02:56 +0000 (14:02 -0700)] 
addng docs for the themes stuff and examples

13 years agoadding temp theme file to help with customization; still needs work
Mark Otto [Sun, 4 Sep 2011 05:53:21 +0000 (22:53 -0700)] 
adding temp theme file to help with customization; still needs work

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Sat, 3 Sep 2011 06:35:44 +0000 (23:35 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoupdated address examples
Mark Otto [Sat, 3 Sep 2011 06:35:28 +0000 (23:35 -0700)] 
updated address examples

13 years agoadding support for and example ul in block-messages
Mark Otto [Sat, 3 Sep 2011 06:28:01 +0000 (23:28 -0700)] 
adding support for and example ul in block-messages

13 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Sat, 3 Sep 2011 06:16:06 +0000 (23:16 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

13 years agoadds small js section to docs index
Jacob Thornton [Sat, 3 Sep 2011 06:15:38 +0000 (23:15 -0700)] 
adds small js section to docs index

13 years agoadding link support to regular text in the topbar
Mark Otto [Sat, 3 Sep 2011 06:09:59 +0000 (23:09 -0700)] 
adding link support to regular text in the topbar

13 years agoupdated hero example, added fluid example, resolved issue with tabs and fluid nav
Mark Otto [Sat, 3 Sep 2011 06:01:38 +0000 (23:01 -0700)] 
updated hero example, added fluid example, resolved issue with tabs and fluid nav

13 years agoresolve conflict
Mark Otto [Sat, 3 Sep 2011 05:09:49 +0000 (22:09 -0700)] 
resolve conflict

13 years agofix repeated margin-left
Mark Otto [Sat, 3 Sep 2011 05:09:12 +0000 (22:09 -0700)] 
fix repeated margin-left

13 years agoupdated container mixin to be fixed-container instead so we can keep the .container...
Mark Otto [Sat, 3 Sep 2011 05:08:38 +0000 (22:08 -0700)] 
updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code

13 years agotweak readonly, disabled, and uneditable form elements
Mark Otto [Sat, 3 Sep 2011 04:54:11 +0000 (21:54 -0700)] 
tweak readonly, disabled, and uneditable form elements

13 years agoMerge branch 'js-examples' into 1.3-wip
Jacob Thornton [Sat, 3 Sep 2011 04:06:49 +0000 (21:06 -0700)] 
Merge branch 'js-examples' into 1.3-wip

Conflicts:
bootstrap-1.2.0.css

13 years agomore js chagnes
Jacob Thornton [Sat, 3 Sep 2011 04:06:20 +0000 (21:06 -0700)] 
more js chagnes

13 years agoMerge branch 'master' of github.com:twitter/bootstrap into js-examples
Jacob Thornton [Sat, 3 Sep 2011 04:04:25 +0000 (21:04 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less

13 years agoimprove CSS properties for centering content, the container, and fluid container...
Mark Otto [Sat, 3 Sep 2011 04:00:01 +0000 (21:00 -0700)] 
improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible

13 years agowelcome to 1.2.0 v1.2.0
Jacob Thornton [Fri, 2 Sep 2011 22:07:12 +0000 (15:07 -0700)] 
welcome to 1.2.0

13 years agofix broken checkbox in ie7
Mark Otto [Fri, 2 Sep 2011 19:46:47 +0000 (12:46 -0700)] 
fix broken checkbox in ie7

13 years agoremove rounded corners on buttons from IE9 so gradients don't bleed out
Mark Otto [Fri, 2 Sep 2011 19:35:41 +0000 (12:35 -0700)] 
remove rounded corners on buttons from IE9 so gradients don't bleed out

13 years agofix docs.css spacing, add gradient support for ie9 back
Mark Otto [Fri, 2 Sep 2011 19:31:14 +0000 (12:31 -0700)] 
fix docs.css spacing, add gradient support for ie9 back

13 years agocleanup docs and fix gradient in masthead
Mark Otto [Fri, 2 Sep 2011 19:24:28 +0000 (12:24 -0700)] 
cleanup docs and fix gradient in masthead

13 years agoadd reset filter to preboot for turning off gradients in IE when necessary; make...
Mark Otto [Fri, 2 Sep 2011 19:19:43 +0000 (12:19 -0700)] 
add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage

13 years agoresolve
Mark Otto [Fri, 2 Sep 2011 19:02:36 +0000 (12:02 -0700)] 
resolve

13 years agobutton tweaks
Mark Otto [Fri, 2 Sep 2011 19:02:20 +0000 (12:02 -0700)] 
button tweaks

13 years ago\9 for 8 or less ie
Jacob Thornton [Fri, 2 Sep 2011 19:01:41 +0000 (12:01 -0700)] 
\9 for 8 or less ie

13 years agoresolve conflicts
Mark Otto [Fri, 2 Sep 2011 18:54:17 +0000 (11:54 -0700)] 
resolve conflicts

13 years agoupdate the file input to undo the damage of the generic input selector
Mark Otto [Fri, 2 Sep 2011 18:53:58 +0000 (11:53 -0700)] 
update the file input to undo the damage of the generic input selector

13 years agoMerge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 18:49:41 +0000 (11:49 -0700)] 
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css

13 years agoMerge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 18:49:03 +0000 (11:49 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css

13 years agomerge in master after merging a pull request, add comment
Mark Otto [Fri, 2 Sep 2011 16:52:33 +0000 (09:52 -0700)] 
merge in master after merging a pull request, add comment

13 years agoMerge pull request #138 from pthrasher/master
Mark Otto [Fri, 2 Sep 2011 16:51:32 +0000 (09:51 -0700)] 
Merge pull request #138 from pthrasher/master

Fix for popover issue from #136

13 years agoran make build 138/head
pthrasher [Fri, 2 Sep 2011 16:48:32 +0000 (12:48 -0400)] 
ran make build

13 years agocleanup and tweaks
Mark Otto [Fri, 2 Sep 2011 16:48:31 +0000 (09:48 -0700)] 
cleanup and tweaks

13 years agoincorporated idea from @markdotto in #138
pthrasher [Fri, 2 Sep 2011 16:45:03 +0000 (12:45 -0400)] 
incorporated idea from @markdotto in #138

13 years agoremove fixed width from topbar form to allow for applying classes to resize it
Mark Otto [Fri, 2 Sep 2011 16:35:26 +0000 (09:35 -0700)] 
remove fixed width from topbar form to allow for applying classes to resize it

13 years agoran make build, issues #136 and #138
pthrasher [Fri, 2 Sep 2011 15:19:05 +0000 (11:19 -0400)] 
ran make build, issues #136 and #138

13 years agoFix for issue #136. Now nests fine in both layouts.
pthrasher [Fri, 2 Sep 2011 14:43:26 +0000 (10:43 -0400)] 
Fix for issue #136. Now nests fine in both layouts.

13 years agoadd old dropdown support to tabs dropdowns
Mark Otto [Fri, 2 Sep 2011 08:03:16 +0000 (01:03 -0700)] 
add old dropdown support to tabs dropdowns

13 years agofix dropdown bug, remove second topbar from docs now
Mark Otto [Fri, 2 Sep 2011 07:58:07 +0000 (00:58 -0700)] 
fix dropdown bug, remove second topbar from docs now

13 years agoremove active state from buttons by moving the :active before :disabled
Mark Otto [Fri, 2 Sep 2011 07:56:03 +0000 (00:56 -0700)] 
remove active state from buttons by moving the :active before :disabled

13 years agoresolve conflicts
Mark Otto [Fri, 2 Sep 2011 07:52:22 +0000 (00:52 -0700)] 
resolve conflicts

13 years agoadd temp second topbar to nav section, fix it's compatibility issues
Mark Otto [Fri, 2 Sep 2011 07:50:05 +0000 (00:50 -0700)] 
add temp second topbar to nav section, fix it's compatibility issues

13 years agoadd doc styles back to topbar-inner
Jacob Thornton [Fri, 2 Sep 2011 07:47:06 +0000 (00:47 -0700)] 
add doc styles back to topbar-inner

13 years agofix for dropdown
Jacob Thornton [Fri, 2 Sep 2011 07:42:22 +0000 (00:42 -0700)] 
fix for dropdown

13 years agoremake
Jacob Thornton [Fri, 2 Sep 2011 07:32:57 +0000 (00:32 -0700)] 
remake

13 years agoMerge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 07:32:09 +0000 (00:32 -0700)] 
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less

13 years agodiv > ul ftw
Jacob Thornton [Fri, 2 Sep 2011 07:31:19 +0000 (00:31 -0700)] 
div > ul ftw

13 years agomove comment so less compiles
Mark Otto [Fri, 2 Sep 2011 07:29:54 +0000 (00:29 -0700)] 
move comment so less compiles

13 years agoresolve conflict
Mark Otto [Fri, 2 Sep 2011 07:29:27 +0000 (00:29 -0700)] 
resolve conflict

13 years agoadd backwards compatability for dropdowns in topbar
Mark Otto [Fri, 2 Sep 2011 07:28:54 +0000 (00:28 -0700)] 
add backwards compatability for dropdowns in topbar

13 years agothis works O_O
Jacob Thornton [Fri, 2 Sep 2011 07:26:58 +0000 (00:26 -0700)] 
this works O_O

13 years ago> seems to work O_O
Jacob Thornton [Fri, 2 Sep 2011 07:21:55 +0000 (00:21 -0700)] 
> seems to work O_O

13 years agobackwards compat for old nav o_O
Jacob Thornton [Fri, 2 Sep 2011 07:17:13 +0000 (00:17 -0700)] 
backwards compat for old nav o_O

13 years agoremove inset shadow from disabled buttons
Mark Otto [Fri, 2 Sep 2011 07:02:44 +0000 (00:02 -0700)] 
remove inset shadow from disabled buttons

13 years agoMerge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Fri, 2 Sep 2011 05:54:59 +0000 (22:54 -0700)] 
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css

13 years agofor html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit
Jacob Thornton [Fri, 2 Sep 2011 05:53:24 +0000 (22:53 -0700)] 
for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit

13 years agomerging in remote and recompiling
Mark Otto [Wed, 31 Aug 2011 23:27:28 +0000 (16:27 -0700)] 
merging in remote and recompiling

13 years agospelling mistakes and undo of one comment
Mark Otto [Wed, 31 Aug 2011 23:26:47 +0000 (16:26 -0700)] 
spelling mistakes and undo of one comment

13 years agotry daves background thing again...
Jacob Thornton [Wed, 31 Aug 2011 17:55:53 +0000 (10:55 -0700)] 
try daves background thing again...

13 years agoMerge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Jacob Thornton [Wed, 31 Aug 2011 06:37:46 +0000 (23:37 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
README.md
bootstrap-1.2.0.css

13 years agorename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html
Jacob Thornton [Wed, 31 Aug 2011 06:34:19 +0000 (23:34 -0700)] 
rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html

13 years agorevert dhg mdo suggestion for fixing ie
Jacob Thornton [Wed, 31 Aug 2011 06:25:37 +0000 (23:25 -0700)] 
revert dhg mdo suggestion for fixing ie

13 years agoie7 background toggle open
Jacob Thornton [Wed, 31 Aug 2011 06:08:34 +0000 (23:08 -0700)] 
ie7 background toggle open

13 years agoremove * hack for ie7 + remove -1 margin bug for ie7
Jacob Thornton [Wed, 31 Aug 2011 06:03:01 +0000 (23:03 -0700)] 
remove * hack for ie7 + remove -1 margin bug for ie7

13 years agoMerge pull request #126 from DHS/fix-select-labels
Mark Otto [Wed, 31 Aug 2011 01:26:11 +0000 (18:26 -0700)] 
Merge pull request #126 from DHS/fix-select-labels

Fixed duplicate element ids in documentation

13 years agoMerge pull request #125 from DHS/readme-spelling
Mark Otto [Wed, 31 Aug 2011 01:25:32 +0000 (18:25 -0700)] 
Merge pull request #125 from DHS/readme-spelling

Fixed readme spelling mistake, closes #123

13 years agochange type of comment
Mark Otto [Tue, 30 Aug 2011 15:27:55 +0000 (08:27 -0700)] 
change type of comment

13 years agoFixed duplicate element ids 126/head
David Haywood Smith [Tue, 30 Aug 2011 10:47:40 +0000 (11:47 +0100)] 
Fixed duplicate element ids

Also updated labels where required

13 years agoFixed readme spelling mistake, closes #123 125/head
David Haywood Smith [Tue, 30 Aug 2011 10:19:46 +0000 (11:19 +0100)] 
Fixed readme spelling mistake, closes #123

13 years agofix background color for ie7 -- negative margin bug still there though ;_;
Jacob Thornton [Tue, 30 Aug 2011 05:43:40 +0000 (22:43 -0700)] 
fix background color for ie7 -- negative margin bug still there though ;_;

13 years agofix open ui for ie 7
Jacob Thornton [Tue, 30 Aug 2011 05:36:05 +0000 (22:36 -0700)] 
fix open ui for ie 7

13 years agolulz nbsp
Jacob Thornton [Tue, 30 Aug 2011 05:34:13 +0000 (22:34 -0700)] 
lulz nbsp

13 years agobtn's need &nbps; seperating them for ie7
Jacob Thornton [Tue, 30 Aug 2011 04:52:45 +0000 (21:52 -0700)] 
btn's need &nbps; seperating them for ie7

13 years agoremove repeated table reset
Mark Otto [Tue, 30 Aug 2011 04:42:44 +0000 (21:42 -0700)] 
remove repeated table reset

13 years agoadding more grid docs
Mark Otto [Tue, 30 Aug 2011 04:41:32 +0000 (21:41 -0700)] 
adding more grid docs

13 years agoremove duplicate defined btn class O_O
Jacob Thornton [Tue, 30 Aug 2011 04:41:12 +0000 (21:41 -0700)] 
remove duplicate defined btn class O_O

13 years agole merging conflicts
Mark Otto [Tue, 30 Aug 2011 04:26:53 +0000 (21:26 -0700)] 
le merging conflicts

13 years agoresolving deltas between that epic css selector specifity pull request and latest...
Mark Otto [Tue, 30 Aug 2011 04:24:00 +0000 (21:24 -0700)] 
resolving deltas between that epic css selector specifity pull request and latest changes here

13 years agowindow -> body for ie
Jacob Thornton [Mon, 29 Aug 2011 00:52:55 +0000 (17:52 -0700)] 
window -> body for ie

13 years agomove removeClass up
Jacob Thornton [Mon, 29 Aug 2011 00:52:00 +0000 (17:52 -0700)] 
move removeClass up

13 years agodrop top position a bit
Jacob Thornton [Mon, 29 Aug 2011 00:50:14 +0000 (17:50 -0700)] 
drop top position a bit

13 years agoblah
Jacob Thornton [Mon, 29 Aug 2011 00:45:57 +0000 (17:45 -0700)] 
blah

13 years agoremake with opacity thin
Jacob Thornton [Mon, 29 Aug 2011 00:42:09 +0000 (17:42 -0700)] 
remake with opacity thin

13 years agotry using tricker opacity thingy
Jacob Thornton [Mon, 29 Aug 2011 00:40:25 +0000 (17:40 -0700)] 
try using tricker opacity thingy

13 years agolisten to delegation for ie
Jacob Thornton [Mon, 29 Aug 2011 00:32:31 +0000 (17:32 -0700)] 
listen to delegation for ie

13 years agowrap for domready
Jacob Thornton [Sun, 28 Aug 2011 23:47:38 +0000 (16:47 -0700)] 
wrap for domready

13 years agochange window to 'body'
Jacob Thornton [Sun, 28 Aug 2011 23:36:44 +0000 (16:36 -0700)] 
change window to 'body'

13 years agoalpha for ie
Jacob Thornton [Sun, 28 Aug 2011 23:23:57 +0000 (16:23 -0700)] 
alpha for ie

13 years agochange backdrop for ie
Jacob Thornton [Sun, 28 Aug 2011 21:06:37 +0000 (14:06 -0700)] 
change backdrop for ie

13 years agoadd google code prettify
Jacob Thornton [Sun, 28 Aug 2011 20:30:04 +0000 (13:30 -0700)] 
add google code prettify

13 years agoadd topbar dropdown js
Jacob Thornton [Sun, 28 Aug 2011 04:46:50 +0000 (21:46 -0700)] 
add topbar dropdown js

13 years agoblahsdfasldflaskdfj
Jacob Thornton [Sun, 28 Aug 2011 01:09:03 +0000 (18:09 -0700)] 
blahsdfasldflaskdfj

13 years agorebuild and change data-attr to have priority over options
Jacob Thornton [Sun, 28 Aug 2011 01:05:10 +0000 (18:05 -0700)] 
rebuild and change data-attr to have priority over options