]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoAdd pretty code coloring to readme 194/head
Sam Soffes [Mon, 12 Sep 2011 04:56:54 +0000 (21:56 -0700)] 
Add pretty code coloring to readme

13 years agofix the grid before 1.3.0 drops soon
Mark Otto [Sat, 10 Sep 2011 03:48:45 +0000 (20:48 -0700)] 
fix the grid before 1.3.0 drops soon

13 years agoMerge pull request #149 from yury/version_var
Jacob Thornton [Sun, 4 Sep 2011 06:12:36 +0000 (23:12 -0700)] 
Merge pull request #149 from yury/version_var

use VERSION var in build script

13 years agouse @VERSION var in build script 149/head
yury [Sat, 3 Sep 2011 16:10:42 +0000 (20:10 +0400)] 
use @VERSION var in build script

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 agoredefine the grid to use attribute selectors with css regex, make previously fixed...
Mark Otto [Sat, 27 Aug 2011 22:30:18 +0000 (15:30 -0700)] 
redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere

13 years agoEdited readme to include the versioning approach we'll be striving to use
Mark Otto [Sat, 27 Aug 2011 07:49:48 +0000 (00:49 -0700)] 
Edited readme to include the versioning approach we'll be striving to use

13 years agomake dropdowns in the topbar black again
Mark Otto [Sat, 27 Aug 2011 06:18:39 +0000 (23:18 -0700)] 
make dropdowns in the topbar black again

13 years agoadding dropdowns to tabs by refactoring the shizzzz out of them
Mark Otto [Sat, 27 Aug 2011 03:38:23 +0000 (20:38 -0700)] 
adding dropdowns to tabs by refactoring the shizzzz out of them

13 years agosmall typo in offset generation
Jacob Thornton [Sat, 27 Aug 2011 02:31:50 +0000 (19:31 -0700)] 
small typo in offset generation

13 years agoMerge remote branch 'origin/master' into 1.2-wip
Mark Otto [Fri, 26 Aug 2011 23:08:03 +0000 (16:08 -0700)] 
Merge remote branch 'origin/master' into 1.2-wip

13 years agomake and publish 1.1.1 v1.1.1
Jacob Thornton [Fri, 26 Aug 2011 22:21:39 +0000 (15:21 -0700)] 
make and publish 1.1.1

13 years agoMerge branch '1.1.1-wip'
Jacob Thornton [Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)] 
Merge branch '1.1.1-wip'

13 years agoupdate everything to 1.1.1
Jacob Thornton [Fri, 26 Aug 2011 18:13:47 +0000 (11:13 -0700)] 
update everything to 1.1.1

13 years agoclean up redundant google prettify code
Jacob Thornton [Fri, 26 Aug 2011 17:53:21 +0000 (10:53 -0700)] 
clean up redundant google prettify code

13 years agobump less version number in docs
Mark Otto [Fri, 26 Aug 2011 17:09:57 +0000 (10:09 -0700)] 
bump less version number in docs

13 years agoMerge pull request #89 from karthikv/clean-up
Mark Otto [Fri, 26 Aug 2011 16:54:08 +0000 (09:54 -0700)] 
Merge pull request #89 from karthikv/clean-up

Made JavaScript Unobtrusive and Removed Unused Class

13 years agoMerge pull request #94 from weslly/master
Mark Otto [Fri, 26 Aug 2011 16:53:22 +0000 (09:53 -0700)] 
Merge pull request #94 from weslly/master

fixed background-color for disabled links in pagination

13 years agofixed background-color for disabled links in pagination ('none' isn't a valid value... 94/head
Weslly Honorato [Fri, 26 Aug 2011 16:30:38 +0000 (13:30 -0300)] 
fixed background-color for disabled links in pagination ('none' isn't a valid value for background-color property http://www.w3.org/TR/CSS2/colors.html#propdef-background-color)

13 years agoMade JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also... 89/head
Karthik Viswanathan [Fri, 26 Aug 2011 07:00:05 +0000 (00:00 -0700)] 
Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo.

13 years agobe more specific in gradient mixin
Mark Otto [Fri, 26 Aug 2011 06:31:16 +0000 (23:31 -0700)] 
be more specific in gradient mixin

13 years agoupdated le docs to include note about topbar and padding on box (issue #86) and add...
Mark Otto [Fri, 26 Aug 2011 06:25:21 +0000 (23:25 -0700)] 
updated le docs to include note about topbar and padding on box (issue #86) and add snippet about @basefont and @baseline to type section

13 years agospacing
Mark Otto [Fri, 26 Aug 2011 06:19:01 +0000 (23:19 -0700)] 
spacing

13 years agopull table class from docs again
Mark Otto [Fri, 26 Aug 2011 06:18:15 +0000 (23:18 -0700)] 
pull table class from docs again

13 years agoresolve conflicts in merging in other branch
Mark Otto [Fri, 26 Aug 2011 06:12:29 +0000 (23:12 -0700)] 
resolve conflicts in merging in other branch

13 years agoupdated docs for b/i tags based on issue #62
Mark Otto [Fri, 26 Aug 2011 06:10:18 +0000 (23:10 -0700)] 
updated docs for b/i tags based on issue #62

13 years agoupdated classnames in the docs for the alerts, updated colors on error and info alert...
Mark Otto [Fri, 26 Aug 2011 05:52:21 +0000 (22:52 -0700)] 
updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons

13 years agoMerge pull request #87 from igorbozato/patch-1
Mark Otto [Fri, 26 Aug 2011 05:44:31 +0000 (22:44 -0700)] 
Merge pull request #87 from igorbozato/patch-1

.sidebar and .content in fluid layouts don't need to be divs

13 years ago.sidebar and .content in fluid layouts don't need to be divs 87/head
Igor Bozato [Fri, 26 Aug 2011 06:17:38 +0000 (03:17 -0300)] 
.sidebar and .content in fluid layouts don't need to be divs

13 years agoresolve issue #87 in this branch
Mark Otto [Fri, 26 Aug 2011 05:44:23 +0000 (22:44 -0700)] 
resolve issue #87 in this branch

13 years agomerged in my pending changes from 1.2-wip branch, resolve diffs as best as i could...
Mark Otto [Fri, 26 Aug 2011 05:41:45 +0000 (22:41 -0700)] 
merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts

13 years agoremove common-table class in the docs
Mark Otto [Thu, 25 Aug 2011 22:53:25 +0000 (15:53 -0700)] 
remove common-table class in the docs

13 years agoclean up btn selectors a bit
Jacob Thornton [Thu, 25 Aug 2011 20:52:04 +0000 (13:52 -0700)] 
clean up btn selectors a bit

13 years agoupdate alert and button styling aproach
Jacob Thornton [Thu, 25 Aug 2011 20:31:46 +0000 (13:31 -0700)] 
update alert and button styling aproach

13 years agobig update to change the alerts, normal and block level, to have simpler css and...
Mark Otto [Thu, 25 Aug 2011 09:00:07 +0000 (02:00 -0700)] 
big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme

13 years agobase import of normalize into the reset css, tweaks to selector specificity across...
Mark Otto [Thu, 25 Aug 2011 07:13:40 +0000 (00:13 -0700)] 
base import of normalize into the reset css, tweaks to selector specificity across the board

13 years agoadd opera to browser support
Jacob Thornton [Thu, 25 Aug 2011 02:55:11 +0000 (19:55 -0700)] 
add opera to browser support

13 years agooptimize btn for outputted code + line-height: normal for firefox with adjusted padding
Jacob Thornton [Wed, 24 Aug 2011 22:55:08 +0000 (15:55 -0700)] 
optimize btn for outputted code + line-height: normal for firefox with adjusted padding

13 years agooptimized grid system from @necolas
Jacob Thornton [Wed, 24 Aug 2011 03:16:39 +0000 (20:16 -0700)] 
optimized grid system from @necolas