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
a8023edf
Commit
a8023edf
authored
Aug 12, 2015
by
Thomas McDonald
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v4' of github.com:twbs/derpstrap into v4
parents
1d631e6c
3406e2fd
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
92 additions
and
19 deletions
+92
-19
Gruntfile.js
Gruntfile.js
+1
-12
docs/_includes/header.html
docs/_includes/header.html
+0
-4
docs/assets/js/docs.min.js
docs/assets/js/docs.min.js
+8
-1
docs/assets/js/src/application.js
docs/assets/js/src/application.js
+78
-0
docs/assets/js/vendor/tether.min.js
docs/assets/js/vendor/tether.min.js
+2
-0
grunt/configBridge.json
grunt/configBridge.json
+1
-0
js/tests/vendor/tether.min.js
js/tests/vendor/tether.min.js
+2
-2
No files found.
Gruntfile.js
View file @
a8023edf
...
...
@@ -57,7 +57,6 @@ module.exports = function (grunt) {
},
// JS build configuration
lineremover
:
{
es6Import
:
{
files
:
{
...
...
@@ -201,9 +200,7 @@ module.exports = function (grunt) {
files
:
'
js/tests/index.html
'
},
// CSS build configuration
scsslint
:
{
options
:
{
config
:
'
scss/.scsslint.yml
'
,
...
...
@@ -362,17 +359,9 @@ module.exports = function (grunt) {
files
:
'
<%= jscs.core.src %>
'
,
tasks
:
[
'
babel:dev
'
]
},
test
:
{
files
:
'
<%= jscs.test.src %>
'
,
tasks
:
[
'
qunit
'
]
},
sass
:
{
files
:
'
scss/**/*.scss
'
,
tasks
:
'
sass-compile
'
},
docs
:
{
files
:
'
docs/assets/scss/*.scss
'
,
tasks
:
'
sass:docs
'
tasks
:
[
'
sass-compile
'
,
'
postcss:core
'
,
'
autoprefixer:core
'
,
'
usebanner
'
,
'
csscomb:dist
'
,
'
cssmin:core
'
,
'
cssmin:docs
'
,
'
docs-css
'
,
'
clean:docs
'
,
'
copy:docs
'
]
}
},
...
...
docs/_includes/header.html
View file @
a8023edf
...
...
@@ -14,11 +14,7 @@
</title>
<!-- Bootstrap core CSS -->
{% if jekyll.environment == "development" %}
<link
href=
"{{ site.baseurl }}/dist/css/bootstrap.css"
rel=
"stylesheet"
>
{% else %}
<link
href=
"{{ site.baseurl }}/dist/css/bootstrap.min.css"
rel=
"stylesheet"
>
{% endif %}
<!-- Documentation extras -->
<link
href=
"{{ site.baseurl }}/assets/css/docs.min.css"
rel=
"stylesheet"
>
...
...
docs/assets/js/docs.min.js
View file @
a8023edf
This diff is collapsed.
Click to expand it.
docs/assets/js/src/application.js
0 → 100644
View file @
a8023edf
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* JavaScript for Bootstrap's docs (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see https://creativecommons.org/licenses/by/3.0/.
*/
/* global ZeroClipboard, anchors */
!
function
(
$
)
{
'
use strict
'
;
$
(
function
()
{
// Tooltip and popover demos
$
(
'
.tooltip-demo
'
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
container
:
'
body
'
})
$
(
'
[data-toggle="popover"]
'
).
popover
()
// Demos within modals
$
(
'
.tooltip-test
'
).
tooltip
()
$
(
'
.popover-test
'
).
popover
()
// Config ZeroClipboard
ZeroClipboard
.
config
({
moviePath
:
'
/assets/flash/ZeroClipboard.swf
'
,
hoverClass
:
'
btn-clipboard-hover
'
})
// Insert copy to clipboard button before .highlight
$
(
'
.highlight
'
).
each
(
function
()
{
var
btnHtml
=
'
<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>
'
$
(
this
).
before
(
btnHtml
)
})
var
zeroClipboard
=
new
ZeroClipboard
(
$
(
'
.btn-clipboard
'
))
var
$htmlBridge
=
$
(
'
#global-zeroclipboard-html-bridge
'
)
// Handlers for ZeroClipboard
zeroClipboard
.
on
(
'
load
'
,
function
()
{
$htmlBridge
.
data
(
'
placement
'
,
'
top
'
)
.
attr
(
'
title
'
,
'
Copy to clipboard
'
)
.
tooltip
()
// Copy to clipboard
zeroClipboard
.
on
(
'
dataRequested
'
,
function
(
client
)
{
var
highlight
=
$
(
this
).
parent
().
nextAll
(
'
.highlight
'
).
first
()
client
.
setText
(
highlight
.
text
())
})
// Notify copy success and reset tooltip title
zeroClipboard
.
on
(
'
complete
'
,
function
()
{
$htmlBridge
.
attr
(
'
title
'
,
'
Copied!
'
)
.
tooltip
(
'
fixTitle
'
)
.
tooltip
(
'
show
'
)
.
attr
(
'
title
'
,
'
Copy to clipboard
'
)
.
tooltip
(
'
fixTitle
'
)
})
})
// Hide copy button when no Flash is found
// or wrong Flash version is present
zeroClipboard
.
on
(
'
noflash wrongflash
'
,
function
()
{
$
(
'
.zero-clipboard
'
).
remove
()
ZeroClipboard
.
destroy
()
})
})
}(
jQuery
)
docs/assets/js/vendor/tether.min.js
0 → 100644
View file @
a8023edf
This diff is collapsed.
Click to expand it.
grunt/configBridge.json
View file @
a8023edf
...
...
@@ -5,6 +5,7 @@
"assets/js/vendor/jekyll-search.js"
,
"../assets/js/vendor/ZeroClipboard.min.js"
,
"../assets/js/vendor/anchor.js"
,
"../assets/js/vendor/tether.min.js"
,
"../assets/js/src/application.js"
]
},
...
...
js/tests/vendor/tether.min.js
View file @
a8023edf
This diff is collapsed.
Click to expand it.
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