0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

404 Commits

Author SHA1 Message Date
Chris Rebert
ae80cdca24 Revert "Temporarily revert README deletions from #13470,"
This reverts commit 54284a13c6.
2014-05-12 12:58:47 -07:00
Chris Rebert
54284a13c6 Temporarily revert README deletions from #13470,
pending the release of v3.2.0's updated hosted docs.

Fixes #13572.
2014-05-12 12:54:10 -07:00
Chris Rebert
5d8880fdfa move Grunt info from README into HTML docs
Fixes #13470
2014-05-07 19:38:27 -07:00
Chris Rebert
21feb7c58e README: Authors => Creators 2014-04-23 14:08:25 -07:00
Chris Rebert
b882a63ff7 the master branch is the relevant one for current build status 2014-04-23 14:01:40 -07:00
XhmikosR
9863344e9a README.md: switch to SVG badges. 2014-04-08 18:05:15 +03:00
XhmikosR
00943d0ecb Update Jekyll to 1.5.0.
The 1.4.3 Windows bug is fixed, plus the encoding workaround isn't needed anymore.
2014-03-25 10:03:45 +02:00
Zlatan Vasović
874bb1b9b5 Remove redundant <code> styling
npm shouldn't have `<code>` styling.
2014-03-20 21:54:14 +01:00
Zlatan Vasović
d985e5bf56 Correct the page name
"Getting started" is used in the docs.
2014-03-10 08:31:55 +01:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Chris Rebert
f2d45fd2f8 add Bower badge to README 2014-02-01 21:25:19 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Chris Rebert
9ec1e8694b README: use Bootstrap v3-specific StackOverflow tag 2014-01-25 16:38:47 -08:00
Chris Rebert
c658e4e926 fix typo in README 2014-01-21 00:55:56 -08:00
Mark Otto
e5d6ab9b31 link to docs license 2014-01-18 14:50:45 -08:00
Chris Rebert
8dc1d00dd4 add a couple commas 2014-01-15 13:44:23 -08:00
Julian Thilo
00239f6034 Set Jekyll encoding and tweak Windows notes 2014-01-15 22:18:35 +01:00
Zlatan Vasović
8c85e1b5a3 Use absolute instead of relative URLs 2014-01-09 20:33:13 +01:00
Waynn Lue
f116106bf6 missing a period after "Twitter, Inc" 2014-01-09 00:11:01 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Chris Rebert
aed56fc0a6 New Year 2014-01-05 23:45:15 -08:00
XhmikosR
5cb8510a81 README.md: switch to the shields.io dependency badges theme. 2013-12-26 19:52:39 +02:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Mark Otto
146800ef43 Merge pull request #11979 from ZDroid/fix-old-links
Fix old links
2013-12-22 17:30:35 -08:00
Zlatan Vasović
28adcbe439 Fix old links
Replace recess with less.
2013-12-22 16:26:05 +01:00
Mark Otto
5f9695ae7c readme typo from #11965 2013-12-21 09:36:51 -08:00
tomByrer
c84688fc4f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 2013-12-21 09:39:34 -07:00
Mark Otto
81b1e6801f correct jsbin link 2013-12-19 19:28:22 -08:00
Chris Rebert
07da1d731a mention core team maintenance & community contributors 2013-12-18 18:54:07 -08:00
Mark Otto
629a4743f0 remove license readme mention 2013-12-18 15:08:38 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto
cb40a2ee8c Punt Apache license information and stick with MIT 2013-12-18 14:54:24 -08:00
Mark Otto
56c36346c1 drop the the, it's cleaner 2013-12-18 14:38:10 -08:00
Mark Otto
79e97fef40 derp 2013-12-18 14:37:30 -08:00
Mark Otto
0a955844ab rewrite readme to restore lost information, only with a bit more formatting consistency 2013-12-18 14:24:59 -08:00
Julian Thilo
2b312bf3c1 Revert commits
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
7ea34ae0ef , 7376eef378 , 303ba1326b , 7d1c8c2a0c , 11319f6da9 , 110fc88601 , ced08f6935
2013-12-18 22:58:13 +01:00
XhmikosR
6355832e90 Clarify Windows workarounds. 2013-12-11 12:57:18 +02:00
Mark Otto
2bc08190ec Combine updates to Windows Jekyll stuff 2013-12-10 19:43:52 -08:00
Mark Otto
f32ef36daf Merge pull request #11830 from XhmikosR/jekyll-windows
Update Jekyll on Windows info
2013-12-10 19:40:51 -08:00
Julian Thilo
1d56211653 Help Windows users install Jekyll 2013-12-11 00:13:02 +01:00
XhmikosR
b9f12a5637 README.md: mention an alternative workaround for the jekyll issue on Windows. 2013-12-11 00:06:25 +02:00
XhmikosR
fc3e7433c2 Update README.md.
Mention that Python needs to be in PATH for Pygments to work and thus jekyll not fail.
2013-12-11 00:06:25 +02:00
Mark Otto
73da46c8bb Fixes #11760: Remove mailing list links from readme and about pages
Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.
2013-12-07 11:22:38 -08:00
Chris Rebert
bd9332a58a switch to Sauce Labs for our cross-browser JS unit testing needs
Fixes #11087
2013-12-03 21:57:22 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
98acdaeb00 bump links to 3.0.2; change readme download to release URL format 2013-11-06 13:09:35 -08:00
Bogdan
bb54ce0db6 Update README.md
Row 13 link update to tag v3.0.1
2013-11-01 19:30:27 +01:00
Zlatan Vasović
8a9e1af18d Continue tag way implementation 2013-10-20 18:50:14 +02:00
Zlatan Vasović
d2ad1dc88f (Not HTML) tag way is much better 2013-10-18 21:34:18 +02:00
Lipis
397481903a Fixed broken link 2013-10-16 16:42:32 +02:00
Rhodry Korb
dd5c8a53ee Add Note About Changing to MIT 2013-10-15 13:06:27 -07:00
Mark Otto
202f395b2f Merge branch 'docs_welcome' 2013-10-13 23:19:17 -07:00
Chris Rebert
da4a275473 Merge pull request #10896 from ZDroid/patch-3
Change clone protocol from git:// to https://
2013-10-09 12:45:43 -07:00
Zlatan Vasović
32c7483215 Correct grammar
Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.
2013-10-03 23:05:23 +02:00
Zlatan Vasović
41444cd83a Change clone protocol from git:// to https://
Cloning with git: protocol doesn't allow to change anything in `.git/`, like when using `git pull`.
2013-10-01 10:20:31 +02:00
Alex Kalicki
80d74c1bf7 Moved 'getting started' link out of 'What's included' section in README 2013-09-29 20:45:55 -04:00
Alex Kalicki
e21c744a57 Added abridged form of 'What's included' docs to README 2013-09-29 18:17:46 -04:00
Mathias Ose
03b1aed37b As a node.js noob, even with the previous clarification this was a bit unclear. This change should (hopefully) make it obvious. 2013-09-13 17:54:48 +02:00
Mark Otto
77549410d5 Add Welcome section to docs
* Fixes unrelated typo in readme
* Add new Welcome section with history, team, callouts, and community
subsections
* Redesigns callouts to be a bit lighterweight with colored headings
2013-09-08 18:37:39 -07:00
Chris Rebert
a9b58181c6 clarify working directory requirement of npm install 2013-09-04 15:25:07 -07:00
Mark Otto
700d7e7b2c Remove footnote links and inline them; link to contributing guidelines in readme 2013-08-23 23:58:38 -07:00
Mark Otto
24f57bdf41 Merge pull request #10012 from twbs/david-badge
add David (david-dm.org) badge to monitor currentness of dependencies
2013-08-22 19:26:18 -07:00
Chris Rebert
31641d3d6d add David (david-dm.org) badge to monitor currentness of dependencies 2013-08-21 15:11:56 -07:00
Nick Schonning
b32cfa2cf2 Update Grunt instruction links and wording 2013-08-21 18:11:33 -04:00
Chris Rebert
924e9e7450 update copyright year 2013-08-20 16:34:57 -07:00
Chris Rebert
7c88db5c42 master branch is no longer stationary, so don't imply otherwise 2013-08-20 14:18:30 -07:00
Chris Rebert
55088bbff8 point release download link to an actual release instead of master 2013-08-20 14:00:48 -07:00
Chris Rebert
6735dc8c16 fix #9917 2013-08-20 13:36:22 -07:00
Mark Otto
55b7b1494f Update jsbin example 2013-08-19 08:56:08 -07:00
Mark Otto
3fbc1fc555 Fixes #9749: provide js bin link in readme for easier bug reports 2013-08-17 15:43:54 -07:00
Chris Rebert
521f852744 update phantomjs link 2013-08-06 14:01:10 -07:00
Cédric Aellen
4599eb69a4 Link to phantomjs 2013-08-06 15:06:25 +02:00
Cédric Aellen
3fb41d2400 link to Uglify-js repo 2013-08-06 15:04:52 +02:00
Cédric Aellen
3e3e6f13aa links to Recess repo 2013-08-06 14:57:34 +02:00
Chris Rebert
33a61baf38 fix the download link to 3.0.0-wip 2013-07-29 11:20:41 -07:00
Cyril Jouve
b4f5687c05 fix README.md 2013-07-28 02:52:39 +02:00
Chris Rebert
6aa051b000 README: update stray "2.3.2" to "2.3.3" 2013-07-26 15:12:32 -07:00
Mark Otto
5dd2bff38c more readme clarity and reorg--think this makes more sense now 2013-07-26 14:15:48 -07:00
Mark Otto
fd6f7dcce1 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-26 14:09:45 -07:00
Mark Otto
b82692b2bf more readme love 2013-07-26 14:09:12 -07:00
Chris Rebert
0168ebade2 tweak terminology to be pedantically correct & add link 2013-07-26 14:04:35 -07:00
Mark Otto
953e0e445c update 2.3.x version mention and link in readme 2013-07-26 13:59:56 -07:00
Mark Otto
bc1ba8f08b update readme per comments in pr 2013-07-26 13:58:18 -07:00
Mark Otto
1ad3e1e8a7 Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip 2013-07-26 13:51:27 -07:00
Ben Alman
102fad4ebd It's Grunt, not GruntJS :) 2013-07-26 12:00:45 -04:00
Jordan Hess
cd23ae00dd Added windows hint to jekyll documentation instructions. 2013-07-26 03:25:12 -06:00
Jordan Hess
fe095d17a2 Changed old reference to "grunt bootstrap" to "grunt dist" 2013-07-26 03:16:27 -06:00
Mark Otto
2a51ebf671 readme /cc @zdroid 2013-07-26 01:46:30 -07:00
John-Philip Johansson
0d33455ef4 Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
Chris Rebert
90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto
72237acf52 fix #8584: add readme callout for npm and node 2013-07-25 09:57:33 -07:00
Mark Otto
984a0d1c78 Update link to blog 2013-07-23 19:52:44 -07:00
Guillermo González de Agüero
abb1013f25 Updated readme.md to reflect the latest changes in directory structure 2013-07-21 21:57:41 +02:00
Jeroen Visser
c926309371 Fixed typo 2013-07-21 14:20:21 +02:00
Mark Otto
e7be60fd4d Update readme to point previous releases to GitHub project releases (fixes #8508) 2013-07-17 17:21:11 -07:00
Mark Otto
c6c3009dd0 Add note about Jekyll version per #8195 2013-06-17 21:36:03 -07:00
Karel Vuong
0b7b40e281 Fixed link. 2013-06-15 22:23:09 -04:00
Mark Otto
e5bdb2497e fixes #8062: correct link to editorconfig website 2013-06-03 11:55:55 -07:00
Mark Otto
13a4fb678b Refactor readme to include directions on running jekyll locally 2013-05-20 00:25:41 -07:00
Mark Otto
d2b588b10e nuke unfinished readme section 2013-05-16 18:38:09 -07:00
Mark Otto
94dec1bbd2 Update readme link to Bower per #7790 2013-05-16 18:37:00 -07:00
Koen Punt
739ef39050 Updated URL for jekyll installation 2013-05-07 15:20:28 +03:00
Chad Smith
9237b25300 Updating the README.md to fix the link to Bower 2013-05-01 13:47:52 -04:00
Mark Otto
a4f896ef1a shoutout to editorconfig in readme 2013-04-22 23:02:57 -07:00
Mark Otto
dea134d6ee explicit callout in readme for building static assets; fixes #7632 2013-04-22 23:01:11 -07:00
Mark Otto
e60c07327b Merge branch 'reversefold-master' into 3.0.0-wip
Conflicts:
	README.md
2013-04-20 12:13:05 -07:00
Justin Patrin
496f1933bb watchr should be lower-case 2013-04-16 13:07:05 -07:00
Mark Otto
7dca242b5e nuke all the assets 2013-04-14 15:33:48 -07:00
Mark Otto
160ff23c85 Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip 2013-03-17 11:45:21 -07:00
Mark Otto
8d5a9371be update readme to resolve conflict 2013-03-17 11:45:13 -07:00
Mark Otto
4247008e23 more readme copy 2013-03-14 20:55:23 -07:00
Mark Otto
b375283597 readme copy 2013-03-14 20:54:53 -07:00
Mark Otto
2b9c936a3a start listing other bootstrap powered starter doodads in the readme 2013-03-14 19:19:06 -07:00
Mark Otto
c9bfcfcfd5 underp license maybe 2013-03-14 19:08:09 -07:00
Mark Otto
45606ae6a0 herp derp, spelling booboo 2013-03-14 19:06:47 -07:00
Mark Otto
8f20a5ac91 Rename license to license.md; point readme to it via link 2013-03-14 19:05:54 -07:00
Philip Arndt
086e8a5b3c Fix minor grammatical problem
"check out" makes more sense here.
2013-03-11 12:07:52 +13:00
fat
3469339068 2.3.1 2013-02-28 20:55:14 -08:00
Mark Otto
e6a6fd2585 Backport v3's readme update on npm install to 2.3 2013-02-17 15:36:24 -08:00
Mark Otto
077b70112f add note to readme about fubared npm installs 2013-02-17 13:54:47 -08:00
Mark Otto
e2fabe2317 clarification on readme makefile 2013-02-17 13:42:31 -08:00
Jeff Froom
ba8ba1fe72 Added Development > build: "make bootstrap" notes. 2013-02-16 21:37:08 -06:00
Mark Otto
0c25546e1c rearrange readme 2013-02-14 23:48:29 -08:00
Mark Otto
b12ff91d48 update readme to point to getting started page; twerk link 2013-02-13 22:01:34 -08:00
Mark Otto
0c1142f6fb readme improvements 2013-02-13 20:02:00 -08:00
Mark Otto
2b05b335b0 update readme to reflect jekyll docs and local npm install method 2013-02-13 12:51:25 -08:00
Mark Otto
7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto
24f7df15e6 Remove mention of Extend page from readme and index page 2013-01-12 13:57:41 -08:00
Mark Otto
f74990d898 Version bump 2012-12-22 16:10:06 -08:00
Mark Otto
442012f0f5 Smaller image update to readme 2012-12-21 19:02:33 -08:00
Mark Otto
5a2966a2c2 Downsize image 2012-12-21 18:59:51 -08:00
Mark Otto
ccafc8a010 Explore adding icon to readme 2012-12-21 18:58:59 -08:00
Mark Otto
529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto
33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
439ff09701 herpderp 2012-12-02 18:15:40 -08:00
Mark Otto
c8862d91bc Readme reorg
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -08:00
Mark Otto
98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08:00
Mark Otto
79b7017227 version bump 2012-11-05 09:32:48 -08:00
Mark Otto
46347fff01 fixes #5692: add version # to readme 2012-10-31 11:17:01 -07:00
fat
f595e146d6 http link 2012-10-29 21:29:05 -07:00
fat
92e7f166e7 remove haunt, remove bootstrap dir, add bower support 2012-10-29 21:27:34 -07:00
Bradly Feeley
fda641fb6c Updating README link about Less compilation. 2012-10-13 18:38:34 -07:00
Mark Otto
d76c305cbb remove 'at twitter' part of readme 2012-10-06 14:42:07 -07:00
Mark Otto
582b178723 fixes #4542 manually: typo in phantomjs and space between url in markdown 2012-08-22 10:44:41 -07:00
Mark Otto
a12c19b3c8 updated package and readme 2012-08-19 23:05:16 -07:00
Mark Otto
f61dd7239b fixes #4277: typo 2012-08-05 00:15:09 -07:00
Mark Otto
b05fc00d59 fixes #4148, readme typo 2012-07-23 12:51:36 -07:00
Mark Otto
3d770ab7bd Merge branch 'philfreo-patch-1' into 2.1.0-wip 2012-07-06 10:22:53 -07:00
Phil Freo
4d6434a2c7 Adding 'connect' npm requirement as it is required to run make test (in order for it to run node js/tests/server.js) 2012-07-03 23:34:11 -07:00
Mark Otto
f109be4e8a update readme to match master 2012-06-07 10:31:52 -07:00
Mark Otto
857b8fb8be Update master 2012-06-07 10:31:26 -07:00
Jacob Thornton
b8a8927b0c add link to phantomjs in docs #3347 2012-06-02 18:36:45 -07:00
Jacob Thornton
ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Jacob Thornton
a85c8fe74e add note about contributing 2012-05-27 20:07:58 -07:00
Jacob Thornton
03f78f7a60 run qunit tests in phantomjs for travis-ci 2012-04-19 17:34:07 -07:00
Chris Aniszczyk
c99dcd2e93 Add Travis CI Support
Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-04-19 16:09:59 -07:00
Jacob Thornton
edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton
575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
TJ Rana
7ea34ae0ef Add "the" on lines 28 and 29 2012-03-22 23:31:52 -07:00
TJ Rana
7376eef378 Add s to bumps on line 30 2012-03-22 23:31:52 -07:00
TJ Rana
303ba1326b Make guidelines for release numbering more specific 2012-03-22 23:31:52 -07:00
Mark Otto
d335adf644 Updated readme to include blog mention 2012-03-22 00:33:18 -07:00
Mark Otto
9f608411cb no more uppercase in readme 2012-02-19 22:53:34 -08:00
Mark Otto
f81e5fbe9f readme cleanup 2012-02-19 22:52:32 -08:00
Jacob Thornton
03e6dc66c2 Merge branch '2.0.1-wip' 2012-02-16 22:41:02 -08:00
Jacob Thornton
9143d8e449 update irc spacing in readme 2012-02-13 18:11:41 -08:00
Jacob Thornton
28cfa8be03 add irc note 2012-02-13 18:10:36 -08:00
Mark Otto
16f2e0e19e add link to docs compiling section in readme 2012-02-12 16:05:25 -08:00
Mark Otto
87ed82207a update readme to clarify dependencies of make command, per #1756 2012-02-12 16:04:02 -08:00
TannerNMO
11319f6da9 Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx 2012-02-01 14:14:49 -07:00
Jacob Thornton
a25f0cce95 simplify readme 2012-01-26 22:11:32 -08:00
Mark Otto
16eccc43d9 dates updated to 2012 2012-01-14 23:28:48 -08:00
Silumesii Maboshe
1af3596a5e Capitalising 'Bootstrap' and abbreviations. Fixing typos. 2011-11-28 08:13:54 +02:00
Jacob Thornton
f03f7da08b fix readme link spacing 2011-09-16 12:30:30 -07:00
Jacob Thornton
c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Jacob Thornton
472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Mark Otto
427a001c47 Link Twitter account in readme 2011-09-12 14:33:39 -07:00
Mark Otto
a218475ffc Edited README.md via GitHub 2011-09-12 14:33:00 -07:00
Sam Soffes
86bb0733a2 Add pretty code coloring to readme 2011-09-11 21:56:54 -07:00
Mark Otto
1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Jacob Thornton
90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
David Haywood Smith
a16dfb735a Fixed readme spelling mistake, closes #123 2011-08-30 11:19:46 +01:00
Mark Otto
f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -07:00
Mark Otto
315af8e18b Edited readme to include the versioning approach we'll be striving to use 2011-08-27 00:49:48 -07:00
Jacob Thornton
273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Jacob Thornton
3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07:00
Jacob Thornton
1a805151da clean up readme 2011-08-19 11:25:19 -07:00
Chris Aniszczyk
3ad9febe04 Edited README.md via GitHub 2011-08-18 16:58:49 -07:00
Chris Aniszczyk
9de97057ec Cleaned up README.md - modified mailing list and google group 2011-08-18 16:58:22 -07:00
Jacob Thornton
088b81f7cd update readme with info about makefile for devs 2011-08-18 14:45:07 -07:00
Mark Otto
ae02a8a300 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-08-18 11:39:22 -07:00
Jacob Thornton
6d57f8a3db add google group 2011-08-18 11:37:18 -07:00
Mark Otto
8ba5a29456 capitalize github properly, fix url for compiled css 2011-08-17 22:38:14 -07:00
Jacob Thornton
9ec3bdd2d8 fix doc link in readme 2011-08-16 23:15:45 -07:00
Jacob Thornton
f53ddcc6fe add link to docs 2011-08-16 23:14:09 -07:00
Jacob Thornton
6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -07:00
Jacob Thornton
5eb962faea Boostrap lulz 2011-07-29 14:28:37 -07:00
Jacob Thornton
a480e0f3f3 add github links 2011-07-29 14:26:33 -07:00
Jacob Thornton
946efe97cb fix up readme md 2011-07-29 14:24:27 -07:00
Mark Otto
68d4b85ffc no idea what these changes are 2011-07-29 12:30:59 -07:00
Mark Otto
e0b09867c2 fix spacing in readme 2011-06-29 07:54:55 -07:00
Jacob Thornton
0a627019a5 add to readme + add license 2011-05-10 15:30:49 -07:00
Jacob Thornton
96c3e70996 cleanup old stuff 2011-05-03 18:12:43 -07:00