Граф коммитов

1008 Коммитов

Автор SHA1 Сообщение Дата
Chris Rebert ab4d5855e2 Merge pull request #984 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2015-11-16 17:32:30 -08:00
ReadmeCritic ce44bb4317 Update README URLs based on HTTP redirects 2015-11-14 19:53:59 -08:00
Gleb Mazovetskiy e15eef6a47 Travis: ruby 2.2.3 (2.2.2+ required by rails 5) 2015-09-27 13:59:06 +01:00
Gleb Mazovetskiy 4007eaed98 Travis: cache bundler 2015-09-27 13:57:47 +01:00
Gleb Mazovetskiy e7ac42381a Travis: update ruby version, add sudo false 2015-09-27 13:56:20 +01:00
Gleb Mazovetskiy c3809eda68 Update LICENSE year 2015-09-27 13:52:33 +01:00
Gleb Mazovetskiy ab2a21db3f Test with Rails HEAD 2015-09-27 13:51:03 +01:00
Gleb Mazovetskiy fdf1c797d4 sprockets-rails 3+ support 2015-09-27 13:22:47 +01:00
Gleb Mazovetskiy fcd8c36f30 Update test dependencies 2015-09-27 13:22:29 +01:00
Gleb Mazovetskiy 0399482b49 Merge pull request #965 from lucasmazza/lm-sprockets-rails-3
Add support for `sprockets-rails` 3 and `sprockets` 4.
2015-09-27 13:18:39 +01:00
Gleb Mazovetskiy 0c7cec06c5 Merge pull request #969 from takiy33/fix-deprecated-warnings
Use #default_max_wait_time= instead of #default_wait_time=
2015-09-27 13:17:43 +01:00
takiy33 f6ce89fffd Use #default_max_wait_time= instead of #default_wait_time= 2015-09-27 21:02:45 +09:00
Lucas Mazza 3e0fafa09a Add support for `sprockets-rails` 3 and `sprockets` 4.
`sprockets-rails` 3 already precompiles any asset that is referenced by the `font-path`
and `image-path` helpers, and `sprockets` 4 does not support Regexpes as the
`precompile` flag.
2015-09-11 16:43:55 -03:00
Gleb Mazovetskiy f1d9a24118 Merge pull request #947 from BobRazoswki/master
README: Change require syntax in RoR section
2015-09-02 22:30:45 +01:00
BobRazowski bb9d03d750 fix typos 2015-07-27 18:22:42 +02:00
Gleb Mazovetskiy 8cd2bf8e01 remove rbx from travis 2015-07-01 20:48:59 +01:00
Gleb Mazovetskiy 7097cf5572 Update node.js devDeps, tests, new mincer compat 2015-07-01 20:45:14 +01:00
Gleb Mazovetskiy 47819e892f Fix #919
Work around for https://github.com/sass/libsass/issues/1115
2015-07-01 20:26:13 +01:00
Gleb Mazovetskiy ffe92a9cf3 Micro-bump the rubygem to reflect updated Sass dep
See #922
2015-06-25 21:03:39 +01:00
Gleb Mazovetskiy 791e18bf47 Merge pull request #922 from fofr/update-sass-minimum-version
Change minimum sass version
2015-06-23 16:06:40 +01:00
Paul Hayes bf9b497538 Change minimum sass version
As of version 3.3.5, the @at-root sass feature has been introduced:
https://github.com/twbs/bootstrap-sass/pull/805
2579e3374f

This feature depends on sass >= 3.3.

* Bump minimum sass version
* Remove sass 3.2 gemfile and update tests

See also:
https://github.com/twbs/bootstrap-sass/issues/920
2015-06-18 11:37:51 +01:00
Gleb Mazovetskiy d64d48fd23 Bump to 3.3.5 2015-06-16 16:29:50 +00:00
Gleb Mazovetskiy 4536e9e122 rake convert 2015-06-16 16:29:46 +00:00
Gleb Mazovetskiy 1172bcd0d0 Merge remote-tracking branch 'origin/pr/915' into next 2015-06-10 20:50:17 +01:00
Gleb Mazovetskiy bf96b0be2f rake convert 2015-06-10 20:47:49 +01:00
Justin Charette c7d05c1e11 play nice with stand-alone compass extensions
fixes issue #914

Signed-off-by: Justin Charette <charetjc@gmail.com>
2015-06-10 12:41:00 -04:00
Gleb Mazovetskiy 0158151055 rake convert 2015-05-28 14:43:00 +01:00
Gleb Mazovetskiy 488c8b35ec rake convert 2015-05-06 21:59:22 +01:00
Gleb Mazovetskiy e1179d3708 Readme: Compatible with node-sass 3.2.0+
Also fix a mistake in version description: MINOR -> PATCH.
2015-04-27 20:45:17 +01:00
Gleb Mazovetskiy 9eda0c73a1 Merge pull request #897 from twbs/moduleType
bower.json: Set `moduleType` to `globals`
2015-04-27 20:22:08 +01:00
Gleb Mazovetskiy e62a79b1a7 Merge pull request #898 from twbs/bower-main-spec
bower.json: Remove font files from `main`
2015-04-27 20:21:28 +01:00
Gleb Mazovetskiy 2017c89dcd Merge pull request #896 from twbs/bower-version-rm
bower.json: Remove moot `version` field
2015-04-27 20:20:00 +01:00
Chris Rebert a55d411828 bower.json: Remove font files from `main`
Per https://github.com/bower/bower.json-spec/pull/43 :
> font files [...] are not `main` files as they are not entry-points.

If you have a complaint about this, take it up with the Bower folks:
https://github.com/bower/bower.json-spec/issues
2015-04-27 12:18:52 -07:00
Chris Rebert ddd70187f7 bower.json: Set `moduleType` to `globals`
Per 632ff90a2c (commitcomment-10914138)
[ci skip]
2015-04-27 12:17:00 -07:00
Chris Rebert 81a8d48412 bower.json: Remove moot `version` field
Per a325da3d79
2015-04-27 12:10:02 -07:00
Gleb Mazovetskiy b01ab49422 rake convert 2015-04-27 20:02:35 +01:00
Gleb Mazovetskiy 2579e3374f wrap at-groups with @at-root #805 2015-04-27 20:02:26 +01:00
Gleb Mazovetskiy f95e617f9d rake convert 2015-04-27 09:59:39 +01:00
Gleb Mazovetskiy 4d879df2cb converter: extract a& in _buttons.scss 2015-04-27 09:59:18 +01:00
Gleb Mazovetskiy 1f269b15ff Bump the Ruby gem version only
Fix botched permission for v3.3.4 Ruby gem. #873
2015-03-18 21:35:54 +00:00
Gleb Mazovetskiy d047ceac00 bump bower.json to v3.3.4 2015-03-16 16:38:32 +00:00
Gleb Mazovetskiy 1a5c521451 v3.3.4 2015-03-16 16:23:24 +00:00
Gleb Mazovetskiy dc4f93a51e rake convert 2015-03-16 16:20:23 +00:00
Gleb Mazovetskiy aad446e98f rake convert 2015-03-16 15:38:27 +00:00
Gleb Mazovetskiy e6f8936f4d rake convert 2015-03-16 15:38:18 +00:00
Gleb Mazovetskiy e0ddfcdf28 rake convert 2015-03-16 15:38:18 +00:00
Gleb Mazovetskiy 606c0f083b tests: fix rails app config deprecation 2015-03-16 15:38:18 +00:00
Gleb Mazovetskiy c45209470e converter: simplify replace_mixins 2015-03-16 15:38:18 +00:00
Gleb Mazovetskiy 5d3c30a148 converter: recursive tree fetch 2015-03-16 15:38:18 +00:00
Gleb Mazovetskiy 49322ce2a3 package.json: update devDependencies 2015-03-16 15:38:18 +00:00