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

987 Коммитов

Автор SHA1 Сообщение Дата
Gleb Mazovetskiy c537b2eeb8 Merge pull request #1007 from iammikecohen/master
Add Eyeglass support to Bootstrap
2016-02-19 18:20:56 +02:00
Gleb Mazovetskiy f17b502b4d Merge pull request #1018 from takiy33/fix-capybara
Require capybara/dsl instead of capybara
2016-02-06 16:13:07 +00:00
naiad ec53b469d7 Require capybara/dsl instead of capybara 2016-02-07 00:42:47 +09:00
unknown a8f7d79c70 added documentation for sass-eyeglass 2016-01-22 10:18:15 -06:00
unknown feb7ecdd87 added eyeglass-module keyword to make Bootstrap available to eyeglass 2016-01-22 10:04:15 -06:00
unknown 3d75bc2e12 Added Eyeglass support 2016-01-22 09:54:53 -06:00
Chris Rebert 31acbea483 Merge pull request #1002 from Atul9/master
LICENSE: Update copyright notice to 2016
[ci skip]
2016-01-17 20:34:33 -08:00
Atul Bhosale 422aa5cae2 Update copyright notice to 2016 [ci skip] 2016-01-03 18:40:01 +05:30
Chris Rebert d07b75677e Merge pull request #994 from twbs/readme-config
README: Promote "Configuration" section to an <h2>
2015-12-15 23:59:47 -08:00
Chris Rebert 362dc3a081 README: Promote "Configuration" section to an <h2>
This moves it out from under the "Installation" section.
* The "Installation" section is already pretty long
* The line under `<h2>`s in GitHub Markdown helps clarify that it's not a subsection of the "Bower" or "Node.js Mincer" sections
* Installation and configuration are arguably separate topics
2015-12-15 23:49:53 -08:00
Gleb Mazovetskiy 70f6d4de61 Merge pull request #993 from twbs/readme-npm
README: Add Installation section for npm
2015-12-10 17:15:49 +00:00
Gleb Mazovetskiy 0323f90b50 Merge pull request #995 from twbs/readme-autoprefixer
Document Autoprefixer setting
2015-12-10 17:13:57 +00:00
Chris Rebert cf3d10fdfb Document Autoprefixer setting; fixes #899
[ci skip]
2015-12-08 23:48:37 -08:00
Chris Rebert 6add79b3e8 README: backticks 2015-12-08 23:40:54 -08:00
Chris Rebert 3654ecade7 README: Trivial copyediting
[ci skip]
2015-12-08 23:39:56 -08:00
Chris Rebert c586f8e52b README: Add Installation section for npm 2015-12-08 23:19:41 -08:00
Gleb Mazovetskiy a73cc0f0e5 v3.3.6 changelog typography 2015-11-24 23:08:07 +00:00
Gleb Mazovetskiy 446b41a5af Bump to 3.3.6 2015-11-24 23:06:35 +00:00
Gleb Mazovetskiy 5ad0746ff3 rake convert 2015-11-24 22:57:03 +00:00
Gleb Mazovetskiy 4182a36dea Readme: Add Bootstrap 3 vs 4 notice 2015-11-24 22:56:12 +00:00
Gleb Mazovetskiy d894d66743 rake convert 2015-11-24 22:55:28 +00:00
Gleb Mazovetskiy 382aefc7d0 gemspec: Sass v3.3.4 is required for @at-root 2015-11-24 22:55:28 +00:00
Gleb Mazovetskiy 2d82acb449 rake convert 2015-11-24 22:55:28 +00:00
Gleb Mazovetskiy a2b87bd796 rake convert 2015-11-24 22:55:28 +00:00
Chris Rebert db694eff95 Merge pull request #987 from twbs/bump-node-sass
package.json: Upgrade to node-sass ~3.4.2
2015-11-23 00:37:41 -08:00
Gleb Mazovetskiy e93430486e Merge pull request #982 from Nerian/support-lotus
Support Lotus
2015-11-19 23:51:40 +00:00
Nerian 187814b2b2 Add support for Lotus 2015-11-19 19:33:03 +01:00
Chris Rebert 10ee03ce84 Travis CI: Use Node.js stable 2015-11-17 20:04:16 -08:00
Chris Rebert 7cdba16579 package.json: Upgrade to node-sass ~3.4.2
Fixes #986
2015-11-17 20:00:36 -08:00
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