Skip to content

Commit 8fb3fdc

Browse files
committed
adds bootstrap with bower and compiles with gulp
1 parent f72b507 commit 8fb3fdc

File tree

196 files changed

+37915
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+37915
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"name": "bootstrap-sass",
3+
"version": "3.3.3",
4+
"homepage": "https://github.com/twbs/bootstrap-sass",
5+
"authors": [
6+
"Thomas McDonald",
7+
"Tristan Harward",
8+
"Peter Gumeson",
9+
"Gleb Mazovetskiy"
10+
],
11+
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
12+
"main": [
13+
"assets/stylesheets/_bootstrap.scss",
14+
"assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
15+
"assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
16+
"assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
17+
"assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
18+
"assets/fonts/bootstrap/glyphicons-halflings-regular.woff2",
19+
"assets/javascripts/bootstrap.js"
20+
],
21+
"keywords": [
22+
"twbs",
23+
"bootstrap",
24+
"sass"
25+
],
26+
"license": "MIT",
27+
"ignore": [
28+
"**/.*",
29+
"lib",
30+
"tasks",
31+
"templates",
32+
"test",
33+
"*.gemspec",
34+
"Rakefile",
35+
"Gemfile"
36+
],
37+
"dependencies": {
38+
"jquery": ">= 1.9.0"
39+
},
40+
"_release": "3.3.3",
41+
"_resolution": {
42+
"type": "version",
43+
"tag": "v3.3.3",
44+
"commit": "ed0a2bfdc9e33c3f350306252ee8da9da47d6107"
45+
},
46+
"_source": "git://github.com/twbs/bootstrap-sass.git",
47+
"_target": "~3.3.3",
48+
"_originalSource": "bootstrap-sass-official",
49+
"_direct": true
50+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
# Changelog
2+
3+
## 3.3.3
4+
5+
This is a re-packaged release of 3.3.2.1 (v3.3.2+1).
6+
7+
Versions are now strictly semver.
8+
The PATCH version may be ahead of the upstream.
9+
10+
Framework version: Bootstrap **v3.3.2**.
11+
12+
## 3.3.2.1
13+
14+
* Fix glyphicons regression (revert 443d5b49eac84aec1cb2f8ea173554327bfc8c14)
15+
16+
## 3.3.2.0
17+
18+
* Autoprefixer is now required, and `autoprefixer-rails` is now a dependency for the ruby gem. [#824](https://github.com/twbs/bootstrap-sass/issues/824)
19+
* Minimum precision reduced from 10 to 8 [#821](https://github.com/twbs/bootstrap-sass/issues/821)
20+
* Requiring bootstrap JS from npm now works [#812](https://github.com/twbs/bootstrap-sass/issues/812)
21+
* Fix Sass 3.4.x + IE10 compatibility issue [#803](https://github.com/twbs/bootstrap-sass/issues/803)
22+
* Provide minified JS bundle [#777](https://github.com/twbs/bootstrap-sass/issues/777)
23+
* Bower package is now at bootstrap-sass [#813](https://github.com/twbs/bootstrap-sass/issues/813)
24+
25+
26+
## 3.3.1.0
27+
28+
* Variables override template at templates/project/_bootstrap-variables.sass
29+
* Readme: Bower + Rails configuration
30+
31+
## 3.3.0.1
32+
33+
* Fix loading issue with the ruby gem version
34+
35+
## 3.3.0
36+
37+
* Improve libsass compatibility
38+
* Support using Bower package with Rails
39+
40+
## 3.2.0.2
41+
42+
Main bootstrap file is now a partial (_bootstrap.scss), for compatibility with Compass 1+.
43+
44+
Fixed a number of bugs. [Issues closed in v3.2.0.2](https://github.com/twbs/bootstrap-sass/issues?q=is%3Aissue+is%3Aclosed+milestone%3Av3.2.0.2).
45+
46+
## 3.2.0.1
47+
48+
Fixed a number of bugs: [Issues closed in v3.2.0.1](https://github.com/twbs/bootstrap-sass/issues?q=is%3Aissue+is%3Aclosed+milestone%3Av3.2.0.1).
49+
50+
## 3.2.0.0
51+
52+
- Assets (Sass, JS, fonts) moved from `vendor/assets` to `assets`. `bootstrap.js` now contains concatenated JS.
53+
- Compass generator now copies JS and fonts, and provides a better default `styles.sass`.
54+
- Compass, Sprockets, and Mincer asset path helpers are now provided in pure Sass: `bootstrap-compass`, `bootstrap-sprockets`, and `bootstrap-mincer`.
55+
Asset path helpers must be imported before `bootstrap`, more in Readme.
56+
- Sprockets / Mincer JS manifest has been moved to `bootstrap-sprockets.js`.
57+
It can be required without adding Bootstrap JS directory to load path, as it now uses relative paths.
58+
- Sprockets: `depend_on_asset` (`glyphicons.scss`) has been changed to `depend_on` to work around an issue with `depend_on_asset`.
59+
[More information](https://github.com/twbs/bootstrap-sass/issues/592#issuecomment-46570286).
60+
61+
## 3.1.1.0
62+
63+
- Updated Bower docs
64+
65+
## 3.1.0.2
66+
67+
- #523: Rails 3.2 compatibility
68+
- Bugfixes from upstream up to 7eb532262fbd1112215b5a547b9285794b5360ab.
69+
70+
## 3.1.0.1
71+
72+
- #518: `scale` mixin Sass compatibility issue
73+
74+
## 3.1.0.0
75+
76+
* compiles with libsass master
77+
78+
## 3.0.2.1
79+
80+
* fix vendor paths for compass
81+
82+
## 3.0.0.0
83+
84+
* Fully automated (lots of string juggling) LESS -> Sass conversion. - *Gleb Mazovetskiy*
85+
* Ported rake task from vwall/compass-twitter-bootstrap to convert Bootstrap upstream - *Peter Gumeson*
86+
* Moved javascripts to us `bootstrap-component.js` to `bootstrap/component.js` - *Peter Gumeson*
87+
88+
## 2.3.2.2
89+
90+
* Allow sass-rails `>= 3.2` - *Thomas McDonald*
91+
92+
## 2.3.2.1
93+
94+
## 2.3.2.0
95+
96+
* Update to Bootstrap 2.3.2 - *Dan Allen*
97+
98+
## 2.3.1.3
99+
100+
* Find the correct Sprockets context for the `image_path` function - *Tristan Harward, Gleb Mazovetskiy*
101+
102+
## 2.3.1.2
103+
104+
* Fix changes to image url - *Gleb Mazovetskiy*
105+
* Copy _variables into project on Compass install - *Phil Thompson*
106+
* Add `bootstrap-affix` to the Compass template file - *brief*
107+
108+
## 2.3.1.1 (yanked)
109+
110+
* Change how image_url is handled internally - *Tristan Harward*
111+
* Fix some font variables not having `!default` - *Thomas McDonald*
112+
113+
## 2.3.0.0
114+
* [#290] Update to Bootstrap 2.3.0 - *Tristan Harward*
115+
* Fix `rake:debug` with new file locations - *Thomas McDonald*
116+
* Add draft contributing document - *Thomas McDonald*
117+
* [#260] Add our load path to the global Sass load path - *Tristan Harward*
118+
* [#275] Use GitHub notation in Sass head testing gemfile - *Timo Schilling*
119+
* [#279, #283] Readme improvements - *theverything, Philip Arndt*
120+
121+
## 2.2.2.0
122+
* [#270] Update to Bootstrap 2.2.2 - *Tristan Harward*
123+
* [#266] Add license to gemspec - *Peter Marsh*
124+
125+
## 2.2.1.1
126+
* [#258] Use `bootstrap` prefix for `@import`ing files in `bootstrap/bootstrap.scss` - *Umair Siddique*
127+
128+
## 2.2.1.0
129+
* [#246] Update to Bootstrap 2.2.1 - *Tristan Harward*
130+
* [#246] Pull Bootstrap updates from jlong/sass-twitter-bootstrap - *Tristan Harward*
131+
132+
## 2.1.1.0
133+
* Update to Bootstrap 2.1.1
134+
* [#222] Remove 100% multiplier in vertical-three-colours
135+
* [#227] Fix IE component animation collapse
136+
* [#228] Fix variables documentation link
137+
* [#231] Made .input-block-level a class as well as mixin
138+
139+
## 2.1.0.1
140+
* [#219] Fix expected a color. Got: transparent.
141+
* [#207] Add missing warning style for table row highlighting
142+
* [#208] Use grid-input-span for input spans
143+
144+
## 2.1.0.0
145+
* Updated to Bootstrap 2.1
146+
* Changed some mixin names to be more consistent. Nested mixins in Less are separated by a `-` when they are flattened in Sass.
147+
148+
## 2.0.4.1
149+
* Fix `.row-fluid > spanX` nesting
150+
* Small Javascript fixes for those staying on the 2.0.4 release
151+
* Add `!default` to z-index variables.
152+
153+
## 2.0.4.0
154+
* Updated to Bootstrap 2.0.4
155+
* Switched to Bootstrap 2.0.3+'s method of separating responsive files
156+
* [#149, #150] Fix off by one error introduced with manual revert of media query breakpoints
157+
* `rake debug` and `rake test` both compile bootstrap & bootstrap-responsive
158+
159+
## 2.0.3.1
160+
* [#145, #146] Fix button alignment in collapsing navbar as a result of an incorrect variable
161+
162+
## 2.0.3
163+
* Updated to Bootstrap 2.0.3
164+
* [#106] Support for Rails < 3.1 through Compass
165+
* [#132] Add CI testing
166+
* [#106] Support Rails w/Compass
167+
* [#134] Fix support for Rails w/Compass
168+
169+
## 2.0.2
170+
* [#86] Updated to Bootstrap 2.0.2
171+
Things of note: static navbars now have full width. (to be fixed in 2.0.3) `.navbar-inner > .container { width:940px; }` seems to work in the meanwhile
172+
* [#62] Fixed asset compilation taking a *very* long time.
173+
* [#69, #79, #80] \(Hopefully) clarified README. Now with less cat humour.
174+
* [#91] Removed doubled up Sass extensions for Rails.
175+
* [#63, #73] Allow for overriding of image-path
176+
* [[SO](http://stackoverflow.com/a/9909626/241212)] Added makeFluidColumn mixin for defining fluid columns. Fluid rows must use `@extend .row-fluid`, and any column inside it can use `@include makeFluidColumn(num)`, where `num` is the number of columns. Unfortunately, there is a rather major limitation to this: margins on first-child elements must be overriden. See the attached Stack Overflow answer for more information.
177+
178+
## 2.0.1
179+
* Updated to Bootstrap 2.0.1
180+
* Modified `@mixin opacity()` to take an argument `0...1` rather than `0...100` to be consistent with Compass.
181+
182+
## 2.0.0
183+
* Updated to Bootstrap 2.0.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# Contributing to bootstrap-sass
2+
3+
## Asset Changes
4+
5+
Any changes to `bootstrap-sass` assets (scss, javascripts, fonts) should be checked against the `convert` rake task.
6+
For usage instructions, see the [README](/README.md).
7+
8+
If something is broken in the converter, it's preferable to update the converter along with the asset itself.
9+
10+
11+
## Bugs
12+
13+
A bug is a _demonstrable problem_ that is caused by the code in the
14+
repository. Good bug reports are extremely helpful - thank you!
15+
16+
Guidelines for bug reports:
17+
18+
1. **Does it belong here?** &mdash; is this a problem with bootstrap-sass, or
19+
it an issue with [twbs/bootstrap](https://github.com/twbs/bootstrap)?
20+
We only distribute a direct port and will not modify files if they're not
21+
changed upstream.
22+
23+
2. **Use the GitHub issue search** &mdash; check if the issue has already been
24+
reported.
25+
26+
3. **Isolate the problem** &mdash; ideally create a [reduced test
27+
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
28+
29+
A good bug report shouldn't leave others needing to chase you up for more
30+
information. Please try to be as detailed as possible in your report. What is
31+
your environment? What steps will reproduce the issue? What browser(s) and OS
32+
experience the problem? What would you expect to be the outcome? All these
33+
details will help people to fix any potential bugs.
34+
35+
Example:
36+
37+
> Short and descriptive example bug report title
38+
>
39+
> A summary of the issue and the browser/OS environment in which it occurs. If
40+
> suitable, include the steps required to reproduce the bug.
41+
>
42+
> 1. This is the first step
43+
> 2. This is the second step
44+
> 3. Further steps, etc.
45+
>
46+
> `<url>` (a link to the reduced test case)
47+
>
48+
> Any other information you want to share that is relevant to the issue being
49+
> reported. This might include the lines of code that you have identified as
50+
> causing the bug, and potential solutions (and your opinions on their
51+
> merits).
52+
53+
**[File a bug report](https://github.com/twbs/bootstrap-sass/issues/)**
54+
55+
56+
## Pull requests
57+
58+
**We will not accept pull requests that modify the SCSS beyond fixing bugs caused by *our* code!**
59+
60+
We use a [converter script][converter-readme] to automatically convert upstream bootstrap, written in LESS, to Sass.
61+
62+
Issues related to styles or javascript but unrelated to the conversion process should go to [twbs/bootstrap][upstream].
63+
64+
Pull requests that fix bugs caused by our code should not modify the SCSS directly, but should patch the converter instead.
65+
66+
Good pull requests - patches, improvements, new features - are a fantastic
67+
help. They should remain focused in scope and avoid containing unrelated
68+
commits. If your contribution involves a significant amount of work or substantial
69+
changes to any part of the project, please open an issue to discuss it first.
70+
71+
Make sure to adhere to the coding conventions used throughout a project
72+
(indentation, accurate comments, etc.). Please update any documentation that is
73+
relevant to the change you're making.
74+
75+
## Do not…
76+
77+
Please **do not** use the issue tracker for personal support requests (use
78+
[Stack Overflow](http://stackoverflow.com/)).
79+
80+
Please **do not** derail or troll issues. Keep the
81+
discussion on topic and respect the opinions of others.
82+
83+
*props [html5-boilerplate](https://github.com/h5bp/html5-boilerplate/blob/master/CONTRIBUTING.md)*
84+
85+
[upstream]: https://github.com/twbs/bootstrap
86+
[converter-readme]: https://github.com/twbs/bootstrap-sass/blob/master/README.md#upstream-converter
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2013 Twitter, Inc
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

0 commit comments

Comments
 (0)