0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

Merge pull request #17521 from vsn4ik/rm_v3_theme

v4 - Remove dropped v3 bootstrap-theme
This commit is contained in:
Chris Rebert 2015-09-07 23:20:16 -07:00
commit 21dadc870a
2 changed files with 1 additions and 2 deletions

1
.gitattributes vendored
View File

@ -12,6 +12,5 @@
# Don't diff or textually merge source maps # Don't diff or textually merge source maps
*.map binary *.map binary
bootstrap-theme.css linguist-vendored=false
bootstrap.css linguist-vendored=false bootstrap.css linguist-vendored=false
bootstrap.js linguist-vendored=false bootstrap.js linguist-vendored=false

View File

@ -135,7 +135,7 @@ Please adhere to the [coding guidelines](#code-guidelines) used throughout the
project (indentation, accurate comments, etc.) and any other requirements project (indentation, accurate comments, etc.) and any other requirements
(such as test coverage). (such as test coverage).
**Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js` **Do not edit `bootstrap.css`, or `bootstrap.js`
directly!** Those files are automatically generated. You should edit the directly!** Those files are automatically generated. You should edit the
source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/master/scss) source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/master/scss)
and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead. and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead.