]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoran make build 138/head
pthrasher [Fri, 2 Sep 2011 16:48:32 +0000 (12:48 -0400)] 
ran make build

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 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 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 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 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 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 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 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

13 years agoMerge pull request #71 from DHS/fix-select-labels
Jacob Thornton [Wed, 24 Aug 2011 02:52:27 +0000 (19:52 -0700)] 
Merge pull request #71 from DHS/fix-select-labels

Fixed empty for fields on select labels in documentation

13 years agoFixed empty for fields on select labels 71/head
David Haywood Smith [Tue, 23 Aug 2011 23:05:07 +0000 (00:05 +0100)] 
Fixed empty for fields on select labels

Also added id fields to selects where needed

13 years agoadd delete button + give .btn cursor:pointer
Jacob Thornton [Tue, 23 Aug 2011 06:53:02 +0000 (23:53 -0700)] 
add delete button + give .btn cursor:pointer

13 years agocomment out button method with // so less doesn't compile it into source
Jacob Thornton [Tue, 23 Aug 2011 05:02:31 +0000 (22:02 -0700)] 
comment out button method with // so less doesn't compile it into source

13 years agoappend checkbox to password input #36
Jacob Thornton [Tue, 23 Aug 2011 04:51:17 +0000 (21:51 -0700)] 
append checkbox to password input #36

13 years agoremake
Jacob Thornton [Tue, 23 Aug 2011 04:47:34 +0000 (21:47 -0700)] 
remake

13 years agogoodbye -ms-filter.
Jacob Thornton [Tue, 23 Aug 2011 04:31:30 +0000 (21:31 -0700)] 
goodbye -ms-filter.

13 years agoremove templates v1.1.0
Jacob Thornton [Mon, 22 Aug 2011 20:14:54 +0000 (13:14 -0700)] 
remove templates

13 years agorename examples dir
Jacob Thornton [Mon, 22 Aug 2011 20:12:37 +0000 (13:12 -0700)] 
rename examples dir

13 years agoadding first template to the repo for a generic website page
Mark Otto [Mon, 22 Aug 2011 19:50:30 +0000 (12:50 -0700)] 
adding first template to the repo for a generic website page

13 years agoBugfix and copy changes
Mark Otto [Mon, 22 Aug 2011 19:34:55 +0000 (12:34 -0700)] 
Bugfix and copy changes

13 years agoremake
Jacob Thornton [Mon, 22 Aug 2011 18:29:01 +0000 (11:29 -0700)] 
remake

13 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Mon, 22 Aug 2011 18:27:21 +0000 (11:27 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

13 years agofix copy for ie in docs
Jacob Thornton [Mon, 22 Aug 2011 18:26:04 +0000 (11:26 -0700)] 
fix copy for ie in docs

13 years agoMerge pull request #51 from Tigraine/master
Mark Otto [Mon, 22 Aug 2011 16:35:09 +0000 (09:35 -0700)] 
Merge pull request #51 from Tigraine/master

Fixed syntax error in patterns.less

13 years agoMerge pull request #58 from sankage/master
Mark Otto [Mon, 22 Aug 2011 16:34:39 +0000 (09:34 -0700)] 
Merge pull request #58 from sankage/master

fixed #10: color-stop() function removed, @colorStop fixed for moz to be unitless

13 years agochanged @colorStop to be unitless 58/head
sankage [Mon, 22 Aug 2011 21:19:39 +0000 (18:19 -0300)] 
changed @colorStop to be unitless

13 years agofixed color-stop for opera, ie10, w3c, new webkit
sankage [Mon, 22 Aug 2011 21:01:11 +0000 (18:01 -0300)] 
fixed color-stop for opera, ie10, w3c, new webkit

13 years agoFixed a syntax error preventing less compilation with dotless 51/head
Daniel Hoelbling [Mon, 22 Aug 2011 07:36:35 +0000 (09:36 +0200)] 
Fixed a syntax error preventing less compilation with dotless

13 years agoupdate copy for browser support
Jacob Thornton [Mon, 22 Aug 2011 05:48:01 +0000 (22:48 -0700)] 
update copy for browser support

13 years agov1.1.0
Jacob Thornton [Mon, 22 Aug 2011 05:30:39 +0000 (22:30 -0700)] 
v1.1.0

13 years agofinish cleaning up ie 7-8 support
Jacob Thornton [Mon, 22 Aug 2011 05:26:54 +0000 (22:26 -0700)] 
finish cleaning up ie 7-8 support

13 years agoupdate few things for ie
Jacob Thornton [Mon, 22 Aug 2011 05:13:35 +0000 (22:13 -0700)] 
update few things for ie

13 years agolink docs to correct css
Jacob Thornton [Mon, 22 Aug 2011 05:05:49 +0000 (22:05 -0700)] 
link docs to correct css

13 years agofix crappy merge
Jacob Thornton [Mon, 22 Aug 2011 05:05:07 +0000 (22:05 -0700)] 
fix crappy merge

13 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Mon, 22 Aug 2011 04:42:56 +0000 (21:42 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html

13 years agoMerge branch 'misc_css_fixes'
Jacob Thornton [Mon, 22 Aug 2011 04:42:10 +0000 (21:42 -0700)] 
Merge branch 'misc_css_fixes'

Conflicts:
bootstrap-1.0.0.css
lib/patterns.less

13 years agoremake
Jacob Thornton [Mon, 22 Aug 2011 04:30:41 +0000 (21:30 -0700)] 
remake

13 years agogo with greyed out next
Jacob Thornton [Mon, 22 Aug 2011 04:30:19 +0000 (21:30 -0700)] 
go with greyed out next

13 years agohide overflow for ie 7
Jacob Thornton [Mon, 22 Aug 2011 04:26:15 +0000 (21:26 -0700)] 
hide overflow for ie 7

13 years agofix border for popover ie6-7
Jacob Thornton [Mon, 22 Aug 2011 04:20:51 +0000 (21:20 -0700)] 
fix border for popover ie6-7

13 years agoremove ie8 hack
Jacob Thornton [Mon, 22 Aug 2011 04:18:36 +0000 (21:18 -0700)] 
remove ie8 hack

13 years agoie-6/7 hack for border colors
Jacob Thornton [Mon, 22 Aug 2011 04:09:54 +0000 (21:09 -0700)] 
ie-6/7 hack for border colors

13 years agofix conflict
Jacob Thornton [Mon, 22 Aug 2011 04:06:09 +0000 (21:06 -0700)] 
fix conflict

13 years ago1 more space for disabled
Jacob Thornton [Mon, 22 Aug 2011 03:57:09 +0000 (20:57 -0700)] 
1 more space for disabled

13 years agomore tweaks to resolve some missed conflicts
Mark Otto [Mon, 22 Aug 2011 03:56:06 +0000 (20:56 -0700)] 
more tweaks to resolve some missed conflicts

13 years agononbreaking spaces for ie7 after buttons :/
Jacob Thornton [Mon, 22 Aug 2011 03:53:54 +0000 (20:53 -0700)] 
nonbreaking spaces for ie7 after buttons :/

13 years agore-add div to error class
Mark Otto [Mon, 22 Aug 2011 03:53:52 +0000 (20:53 -0700)] 
re-add div to error class

13 years agoresolve conflicts again and rebuild
Mark Otto [Mon, 22 Aug 2011 03:51:25 +0000 (20:51 -0700)] 
resolve conflicts again and rebuild

13 years agoresolve conflicts
Mark Otto [Mon, 22 Aug 2011 03:51:13 +0000 (20:51 -0700)] 
resolve conflicts

13 years agomerge in master, resolve conflicts
Mark Otto [Mon, 22 Aug 2011 03:47:24 +0000 (20:47 -0700)] 
merge in master, resolve conflicts

13 years agoupated compiled
Mark Otto [Mon, 22 Aug 2011 03:44:10 +0000 (20:44 -0700)] 
upated compiled

13 years agoremake with latest
Jacob Thornton [Mon, 22 Aug 2011 03:43:05 +0000 (20:43 -0700)] 
remake with latest

13 years agoMerge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes
Jacob Thornton [Mon, 22 Aug 2011 03:42:54 +0000 (20:42 -0700)] 
Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes

Conflicts:
lib/forms.less

13 years agomore little ie6-7 hacks :/
Jacob Thornton [Mon, 22 Aug 2011 03:41:34 +0000 (20:41 -0700)] 
more little ie6-7 hacks :/

13 years agoupdated to resolve conflicts
Mark Otto [Mon, 22 Aug 2011 03:38:57 +0000 (20:38 -0700)] 
updated to resolve conflicts

13 years agoresolve conflicts
Mark Otto [Mon, 22 Aug 2011 03:33:54 +0000 (20:33 -0700)] 
resolve conflicts

13 years agofix topbar dropdown active and hover states
Mark Otto [Mon, 22 Aug 2011 03:30:58 +0000 (20:30 -0700)] 
fix topbar dropdown active and hover states

13 years agoremove tags from form selectors
Mark Otto [Mon, 22 Aug 2011 03:27:19 +0000 (20:27 -0700)] 
remove tags from form selectors

13 years agofix color for alert blocks in ie6-7
Jacob Thornton [Mon, 22 Aug 2011 03:21:59 +0000 (20:21 -0700)] 
fix color for alert blocks in ie6-7

13 years agogive popovers and modals border colors you can see in IE8 and down
Mark Otto [Mon, 22 Aug 2011 03:17:10 +0000 (20:17 -0700)] 
give popovers and modals border colors you can see in IE8 and down

13 years agotweak pagination styles to include better border and box shadow
Mark Otto [Mon, 22 Aug 2011 03:12:18 +0000 (20:12 -0700)] 
tweak pagination styles to include better border and box shadow

13 years agorebuild and updated tables to remove tags from selectors
Mark Otto [Mon, 22 Aug 2011 03:07:15 +0000 (20:07 -0700)] 
rebuild and updated tables to remove tags from selectors

13 years agoupdated list html, tweaks to patterns
Mark Otto [Mon, 22 Aug 2011 03:03:12 +0000 (20:03 -0700)] 
updated list html, tweaks to patterns

13 years agotouch up less
Jacob Thornton [Mon, 22 Aug 2011 02:59:43 +0000 (19:59 -0700)] 
touch up less

13 years agofix btn borders ie7/ie8
Jacob Thornton [Mon, 22 Aug 2011 02:56:43 +0000 (19:56 -0700)] 
fix btn borders ie7/ie8

13 years agoFix for alert box gradients in IE7/8
Jacob Thornton [Mon, 22 Aug 2011 02:49:31 +0000 (19:49 -0700)] 
Fix for alert box gradients in IE7/8

13 years agomake topbar .fill wrap
Jacob Thornton [Mon, 22 Aug 2011 01:14:53 +0000 (18:14 -0700)] 
make topbar .fill wrap

13 years agofix disabled button for ie 8 and below
Jacob Thornton [Mon, 22 Aug 2011 01:07:47 +0000 (18:07 -0700)] 
fix disabled button for ie 8 and below

13 years agopull filter gradients out completely because IE can't render them correctly in half...
Mark Otto [Mon, 22 Aug 2011 00:30:45 +0000 (17:30 -0700)] 
pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button;

13 years agoremove 60px top margin on body and tweak a few other things
Mark Otto [Mon, 22 Aug 2011 00:06:37 +0000 (17:06 -0700)] 
remove 60px top margin on body and tweak a few other things

13 years agofix up the modals for ie8
Jacob Thornton [Sun, 21 Aug 2011 20:36:06 +0000 (13:36 -0700)] 
fix up the modals for ie8

13 years agodarken shadow for ie
Jacob Thornton [Sun, 21 Aug 2011 20:27:17 +0000 (13:27 -0700)] 
darken shadow for ie