github.com/twbs/bootstrap-rubygem commits | Ecosyste.ms: OpenCollective

Merge branch 'master' into upd

Conflicts:
lib/bootstrap-sass/version.rb

deade0a69bc8eb667c99c1bf68be8ff81db29ffd authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

3.0.0.0 release

799b474cc0379b0eb16217fa7106b5e6dce7b58a authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Custom grids!!! Refs #454

a8518604b982b581b1a6ca76f8e67e10ca68acca authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

DRY converter network

7b86d76b8d2927255ec4bfe33bc80f41012fec09 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

split-up conversion

957f11b85df7274f5ff1658fdf100163eadc3d82 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert

331333f4b31082e5f3e8d6c9fa5b2b24dbbcb480 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

conversion pre 3.0.1

dbff8cdf3161471a0ccf69b0c539fb70bda55abb authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

update to the latest twbs/bootstrap

1c95e926a11269bd28e8ba1abb08db656eee5599 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

added documentation, how to use variables

couldn't understand how to modify the bootstrap variables. Added an example where we redefined a...

90dc860249d55623a7d1a029af63b5b9b81eb397 authored about 11 years ago by Harry Moreno <[email protected]>

Update Readme \#393

c3f74a5b38792d7164f64af7de452f6df37ca376 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

refs #409 min number precision: 10

6fa811399d9186e42a49814e177e11b8cec53028 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

travis

2b2defa3654b7ffbc747711f24a84cb3d54add95 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

travis, changelog

95455501e92355c3b418b660563481227c7904f9 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

bump to rc2 for compass support

458c8de863e7d3f6cd300c699ea371789f756e7b authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

refs #451 inject bs_variables_path

2cdb154a47cd5afbb157a4d11f7e5a7124818cdc authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

3.0.0.0.rc - finally

e551ce0a8f3df19ebbac3fe053d4c2ba72d76a22 authored about 11 years ago by Thomas McDonald <[email protected]>

Remove Sass reference

dc1022ef2ca1723a33e120c512d140e753004d00 authored about 11 years ago by Thomas McDonald <[email protected]>

Remove docs directory

d9680b700662b7af14b519b0db2e2f0d78443d57 authored about 11 years ago by Thomas McDonald <[email protected]>

Update README.md

6cc04bda62ed7ccf71d445fa82e706cb696b4fdb authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

travis: compass 0.13+ requirement for sass 3.3+

097aa2b8d9e4f3fec4eeed1e9176e42de1e635bf authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

travis: sass 3.3.0.rc.1

2fcd8a42583330035e6502752c512574adecc966 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

travis.yml: add sass_3.3.gemfile to the list

c3557a1736901b0a2b3a5f697e2cba7ce118b018 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

travis: add 3.3 gemfile, fix 3.2 to point to 3.2.0 <= version < 3.3

91097c6853356b2a0e1c8c5a8cc588a161bf4b2a authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Update .travis.yml

0151f454feb5161e4505f08ee0f27d1d47667b72 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Update .travis.yml

bd004fc6cb8e4e5969e495324b07137028df48dd authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Create compass_test.rb

e0502c9177a9dafdf4d449c235f3140c53a40f3d authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Update README.md

956eaf4425d3a32e5e409b45b6a30287a1eb66be authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Update Javascript doc

fb84acf0b45cf582aa0f4a0f57a6b2787e13ab18 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Compass manifest.rb: remove hard-coded JS files list

0411a9ea076dda703c22894bd21f484c12e0ba85 authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Merge pull request #446 from glebm/doc-upd

Fix compass, update docs

a6c38bd84fbfc1db216df113518db6190c3e54b0 authored about 11 years ago by Thomas McDonald <[email protected]>

Update README.md

38d9cc238246e2edad5c04f43649f8cb64a9903f authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

update compass + improve docs

57dce4c74d7ea7be2b526b27c0ff55aff374ff9d authored about 11 years ago by Gleb Mazovetskiy <[email protected]>

Merge pull request #436 from thomas-mcdonald/trisweb-update-docs-to-be-clearer

Improve the organization of the docs -- put important things in README

6e21c5b1c2b32204c48b1aa8a09a47eb04d441a0 authored about 11 years ago by Thomas McDonald <[email protected]>

Merge pull request #424 from thomas-mcdonald/dummy

Add a dummy Rails app for testing against

ab2f7dd92491bd490e545c18d32e966567b84a3b authored over 11 years ago by Thomas McDonald <[email protected]>

Added Bootstrap 3 note in Development section for users

Again trying to redirect confused people as best as we can.

87ea216a7d2ed7f56fdcdc9fc1e2a0433956cc50 authored over 11 years ago by Tristan Harward <[email protected]>

Changed heading sizes slightly and added 3.0 blurb

Also added the word "Compass" all over the compass section to reduce confusion for Rails people.

3da02e902b43cfcfa9b257f7a05c140c76dc50f4 authored over 11 years ago by Tristan Harward <[email protected]>

Improve the organization of the docs -- put important things in README

People are looking for usage docs in the README, and that's where they should be. I've seen too ...

93b292571cfd3e10bfb1d903685925a707f8b0e7 authored over 11 years ago by Tristan Harward <[email protected]>

Merge pull request #426 from nickurban/master

Remove Bootstrap 2.3.2 responsive.scss

c0e12a90ba3e44ab68d3f153411fba3edc400b2a authored over 11 years ago by Thomas McDonald <[email protected]>

Remove Bootstrap 2.3.2 responsive.scss

2e93a28adb66ee9390732773e2c02cdf987befed authored over 11 years ago by Nick Urban <[email protected]>

clear cache before running

cca6f5e121b924dc76cc923b8a82948ab8d75f70 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Ignore the dummy application test log

852737b40c59cd09744c765b476228ecdb7522b0 authored over 11 years ago by Thomas McDonald <[email protected]>

fixed typo in gemfile doc

53ea52cd57898e1b2ba4e73678f1e2950d66ccd4 authored over 11 years ago by Damien Cavaillès <[email protected]>

dummy app

204489259b780c71ad8ee4f0386c3fb4dfde62a8 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Rerun converter at 3.0.0

Removes a mistakenly merged piece of 2.3.2

08e0c86948e7b255eeab422c0927df8022a8f77e authored over 11 years ago by Thomas McDonald <[email protected]>

Remove merge markers at bottom of README

88664875f68258a06fa48a2aca9aea9e6defecb9 authored over 11 years ago by Thomas McDonald <[email protected]>

Merge branch '3'

This isn't quite finished, but we can work on the issues on master

544ad6c18af788582c62ef578587dcd0ae58b363 authored over 11 years ago by Thomas McDonald <[email protected]>

Merge pull request #422 from tjohn/patch-1

Fix typo with loading individual Javascript files.

1344c58711e9ba30cbbd028908ea3fe6df73969d authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Fix typo with loading individual Javascript files.

2545963974edfc5da87f53b8db93d25d88554019 authored over 11 years ago by Trevor <[email protected]>

Shell out to git commands to compute Gem files

This includes test files, and so fixes #321

82f1b343ffc0069bf99d2a3d4f0190bc87ba89ed authored over 11 years ago by Thomas McDonald <[email protected]>

correct versioning operator

2f69aef9608a882d3d4fd2fdef7fc641df60d256 authored over 11 years ago by Thomas McDonald <[email protected]>

Loosen dependency on sass-rails

0d28c45d3c8f4e17cecc81d7832d24c550000282 authored over 11 years ago by Thomas McDonald <[email protected]>

Rollback Sass changes to v3.0.0 tag

3bff31150aed6342a9f3a8001d580662497a9c10 authored over 11 years ago by Thomas McDonald <[email protected]>

Allow sass-rails >= 3.2

061ef3280711a36580f278da889658c6a79416e7 authored over 11 years ago by Thomas McDonald <[email protected]>

rake convert

e21b64bb2791f8f564b5ae33c77ecc4e4447c0d0 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert (the previous was not 3.0.1 release, just me confused)

a71f09a26b2d6a56a70a2cdf26110434cd3fbdf8 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert (this is 3.0.1)

571ba865e1cd01f583c5949446803b9f2cd21926 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert

4a8d1a9add83896cbc5f5441e209b00626f74338 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Update README.md

23c3af675301bbb5e2f52dfe6c28a27036595d42 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Update README.md

4d0a4a39a699906a70c3eb40c32bd11bc7bfc7ee authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert

35705f455d37218d48116bacf6002ff1cb753083 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

precompile glyphicons

0e8d41db36b41d0ffd37b6f1839b51d8e8d875d4 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Update RAILS.md

cc5495eaa665a0e919768231c93c6e83c909d837 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Update README.md

79d39e42e26a3352837d4ba92cfc55d292084b7e authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Merge pull request #407 from noahd1/master

Add Code Climate badge to README

16da2ffb1fb98672f498b482c318db0cfb20a054 authored over 11 years ago by Thomas McDonald <[email protected]>

converter: replace_calculation_semantics for any number of values

36426d1cc7067cf55201765165c7bbfa2bfb6855 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Link to documentation on the 3 branch for now

b26103105001aad20bbbc523e738ec99968f8e51 authored over 11 years ago by Thomas McDonald <[email protected]>

Split Readme up into rails/compass instructions

1cb7c0ffdb3534f053667c37c18225c6d5140145 authored over 11 years ago by Thomas McDonald <[email protected]>

converter: calculation semantics (see jlong/sass-bootstrap#96)

18ebc453136f4ae23aa84f51353601d9083c0a4f authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

fix glyphicons

6b9dd2965c5a892a51f4cfdf2a1d5ecc1597daf8 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter fixes

91d8dc386fa12713f80a655484fbbf43438be95d authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: better mixin processing, CharStringScanner

376b398459b5886418e2c57c8aab8e58eee92ac8 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: comments on mixin handling

6361f4ee208335780bfcbfb7d83d5134af96009f authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: simpler process_stylesheet_assets

f3cce170a404286ecbf16b55a123cea2625d6c1d authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter simplify regex

6dc5af03e632689cfc4624d239653fec06c0849c authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

dont log replace_mixin_definitions, all files go through it

daea4b9ffc15db4ee3a86b65d10f0f3485ce284a authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

font path fix

b7f8a2e92ec964b895e276a2441710f148dbc756 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter load fonts

ed4b3776832c1225dc68d8fef24f67084b19d5fb authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

oops. remove byebug from gemspec

48fdde6b135db2a909454e820844e38f9d6e3f99 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

fixes

263bcc32f2df7cd11fbfbe1a05b1c2aafd7eaf19 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

update to master

e372820a1850dc690190aa24edd273e09e9fe907 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

update

dc0448326d7bc5c525d448e4995bf05336bcdf7b authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: cache files, understand in-file mixin definitinos

089174049c83b698b92f483aef146d0fd54efb9f authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake compile will compile CSS to tmp/

07f9d01b559327c0587ec52784170e7ab3b147b5 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: _theme imports

7050cd0e9ae71f37f2161895927b776812b02512 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: cache dl by sha

a936bff77e259fa47c97624964e2c4ddb68f0103 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

update

5bf533b803e92042c846dbf80faa4411951bb890 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: extract_parent_selector automatically construct target class

280c3bc33e31f61e476d3cb2ea7b6c8045c9007a authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter + update

f10c454237080063fd27da3955f2a9c8cdd372eb authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

accordion removed from upstream

926ac84f3bff912fc7daa475c63177414112a8c7 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

update converter & convert

41d2c1d3e72b61eeb8e7051304256d4a573df3d2 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert[3.0.0-wip]

e67ac6d4c0f9fac09a1f8d275229aee7056bd699 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert[3.0.0-wip]

c8d0e2a3e6f1742c343afd71c6696d1742c207bc authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

add conversion rules and rake convert[3.0.0-wip]

04d52241cbceea9c3fa8464c9351554735e2f126 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Merge pull request #410 from cvrebert/patch-1

Reflect Bootstrap's org move in the README

a2baa72adc48fa795ee34f1563b76bc748c5e8c9 authored over 11 years ago by Thomas McDonald <[email protected]>

rake convert[3.0.0-wip]

f898af4dcb7e6a02f094c593dfe0ca9c49331a3c authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

Reflect Bootstrap's org move

Bootstrap is now under its own separate GitHub Organization.

eee63e262f30f2adf57b03befa183e3a29416162 authored over 11 years ago by Chris Rebert <[email protected]>

converter: log deinterpolate_vararg_mixins

1685fb137e2b858a6387eb669d32dae104b58929 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert[3.0.0-wip]

b5dc3674472248c258b92b26b37bec35584f4543 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

converter: vararg mixins

466d5a3293bb02cda9e99d2afc616d7624ac5556 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>

rake convert[3.0.0-wip]

b20233cf7a02a7ac23ad93b01679456b8d76bc25 authored over 11 years ago by Gleb Mazovetskiy <[email protected]>