Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
1236e7a9
Commit
1236e7a9
authored
Jan 18, 2015
by
Chris Rebert
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #64 from twbs/fix-build
Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
parents
61a21205
1e5ce1e1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
4 deletions
+4
-4
bower.json
bower.json
+1
-1
grunt/bs-sass-compile/libsass.js
grunt/bs-sass-compile/libsass.js
+1
-1
grunt/bs-sass-compile/sass.js
grunt/bs-sass-compile/sass.js
+1
-1
package.json
package.json
+1
-1
scss/bootstrap.scss
scss/bootstrap.scss
+0
-0
No files found.
bower.json
View file @
1236e7a9
...
...
@@ -14,7 +14,7 @@
],
"homepage"
:
"http://getbootstrap.com"
,
"main"
:
[
"scss/
_
bootstrap.scss"
,
"scss/bootstrap.scss"
,
"dist/css/bootstrap.css"
,
"dist/js/bootstrap.js"
],
...
...
grunt/bs-sass-compile/libsass.js
View file @
1236e7a9
...
...
@@ -12,7 +12,7 @@ module.exports = function configureLibsass(grunt) {
},
core
:
{
files
:
{
'
dist/css/<%= pkg.name %>.css
'
:
'
scss/
_
<%= pkg.name %>.scss
'
'
dist/css/<%= pkg.name %>.css
'
:
'
scss/<%= pkg.name %>.scss
'
}
},
docs
:
{
...
...
grunt/bs-sass-compile/sass.js
View file @
1236e7a9
...
...
@@ -15,7 +15,7 @@ module.exports = function configureRubySass(grunt) {
core
:
{
options
:
options
,
files
:
{
'
dist/css/<%= pkg.name %>.css
'
:
'
scss/
_
<%= pkg.name %>.scss
'
'
dist/css/<%= pkg.name %>.css
'
:
'
scss/<%= pkg.name %>.scss
'
}
},
docs
:
{
...
...
package.json
View file @
1236e7a9
...
...
@@ -17,7 +17,7 @@
"test"
:
"grunt test"
},
"style"
:
"dist/css/bootstrap.css"
,
"sass"
:
"scss/
_
bootstrap.scss"
,
"sass"
:
"scss/bootstrap.scss"
,
"main"
:
"./dist/js/npm"
,
"repository"
:
{
"type"
:
"git"
,
...
...
scss/
_
bootstrap.scss
→
scss/bootstrap.scss
View file @
1236e7a9
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment