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

1008 Коммитов

Автор SHA1 Сообщение Дата
Dima Mescheryakov b9d2bd4f38 Update bootstrap-sass version in README. 2017-11-01 17:04:01 +01:00
Gleb Mazovetskiy 9766e03213 Merge pull request #1141 from ltfschoen/patch-1
Update README.md advising use of jquery-rails
2017-09-28 09:55:51 +01:00
Luke Schoen 1ef34115ea Update README.md advising use of jquery-rails
Users running Rails 5.1+ are required to also add jquery-rails to their Gemfile otherwise missing jquery dependency occurs. The other Bootstrap 4 version already includes this instruction in its readme file [here on line 47](https://github.com/twbs/bootstrap-rubygem/blob/master/README.md)
2017-09-28 16:06:41 +10:00
Gleb Mazovetskiy 5d6b2ebba0 Bump to v3.3.7 2016-07-25 20:58:53 +01:00
Gleb Mazovetskiy 563a9ba4bf rake convert 2016-07-25 20:42:29 +01:00
Gleb Mazovetskiy 63f0a72bfc rake convert 2016-07-25 20:41:04 +01:00
Gleb Mazovetskiy 5904c7db1d Specify package.json files
Resolves #1020 and #1006
2016-07-25 20:41:04 +01:00
Gleb Mazovetskiy 20b7a2c9cb rake convert 2016-07-25 20:40:38 +01:00
Gleb Mazovetskiy cb53158988 Merge pull request #1062 from twbs/bump-node-sass
Bump node-sass to ^3.8.0
2016-07-25 07:13:13 +01:00
Gleb Mazovetskiy 71c43f84a8 Merge pull request #1063 from twbs/copyright
Update copyright notice
2016-07-25 07:12:57 +01:00
Chris Rebert acc6dc4fce Update copyright notice
Ports https://github.com/twbs/bootstrap/pull/19936 to bootstrap-sass
2016-07-23 18:20:22 -07:00
Chris Rebert c76a445222 Bump node-sass to ^3.8.0 2016-07-23 18:12:16 -07:00
Chris Rebert d4dc758d9f bower.json: Allow jQuery v3 (#1061)
Fixes #1048
Refs https://github.com/twbs/bootstrap/issues/16834
2016-07-23 18:09:53 -07:00
Gleb Mazovetskiy 27e7ac8831 Merge pull request #1060 from ferdiunal/patch-1
Update .gitignore
2016-07-23 23:22:45 +01:00
Ferdi ÜNAL b1ad78473f Update .gitignore 2016-07-22 20:15:38 +03:00
Chris Rebert 6424fb7c84 Add "sass" field to package.json for consistency with upstream
Refs #1045
2016-06-23 23:39:57 -07:00
Marco 0a9d3969be Add "style" field to package.json (#1051); fixes #1045 2016-06-23 23:36:43 -07:00
Gleb Mazovetskiy a11455f9db Pin Rake version for Sass 3.3 gemfile
See the discussion at https://github.com/sass/sass/pull/2016
2016-06-10 08:50:57 +01:00
Gleb Mazovetskiy 67539e6dba package.json: bump devDependencies 2016-06-10 08:44:37 +01:00
Rob Soule 02c6138862 bower.json: Update jQuery version range to exclude v3 (#1043)
Also makes the range match that of upstream Less-based Bootstrap.
Fixes #1042
2016-06-10 00:09:27 -07:00
Gleb Mazovetskiy 0a64ad7610 Readme: fix typo [ci-skip] 2016-02-19 16:24:35 +00:00
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