Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
12b5d46f
Commit
12b5d46f
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
move it to the sidebar
parent
707b362b
5 merge requests
!28721
Hot test
,
!13463
add button to toggle the optional theme when viewing the docs
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/_layouts/default.html
+5
-6
docs/_layouts/default.html
docs/assets/css/_src/docs.css
+9
-9
docs/assets/css/_src/docs.css
docs/assets/css/docs.min.css
+1
-1
docs/assets/css/docs.min.css
docs/assets/js/_src/application.js
+3
-3
docs/assets/js/_src/application.js
docs/assets/js/docs.min.js
+1
-1
docs/assets/js/docs.min.js
with
19 additions
and
20 deletions
+19
-20
docs/_layouts/default.html
+
5
-
6
View file @
12b5d46f
...
@@ -47,15 +47,14 @@
...
@@ -47,15 +47,14 @@
<a
class=
"back-to-top"
href=
"#top"
>
<a
class=
"back-to-top"
href=
"#top"
>
Back to top
Back to top
</a>
</a>
{% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
<a
href=
"#"
class=
"bs-docs-theme-toggle"
>
Preview theme
</a>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
{% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
<div>
<button
id=
"bs-theme-btn"
type=
"button"
class=
"btn btn-default"
>
Activate Theme
</button>
</div>
{% endif %}
</div>
</div>
{% include footer.html %}
{% include footer.html %}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/_src/docs.css
+
9
-
9
View file @
12b5d46f
...
@@ -583,7 +583,8 @@ body {
...
@@ -583,7 +583,8 @@ body {
}
}
/* Back to top (hidden on mobile) */
/* Back to top (hidden on mobile) */
.back-to-top
{
.back-to-top
,
.bs-docs-theme-toggle
{
display
:
none
;
display
:
none
;
padding
:
4px
10px
;
padding
:
4px
10px
;
margin-top
:
10px
;
margin-top
:
10px
;
...
@@ -592,13 +593,18 @@ body {
...
@@ -592,13 +593,18 @@ body {
font-weight
:
500
;
font-weight
:
500
;
color
:
#999
;
color
:
#999
;
}
}
.back-to-top
:hover
{
.back-to-top
:hover
,
.bs-docs-theme-toggle
:hover
{
color
:
#563d7c
;
color
:
#563d7c
;
text-decoration
:
none
;
text-decoration
:
none
;
}
}
.bs-docs-theme-toggle
{
margin-top
:
0
;
}
@media
(
min-width
:
768px
)
{
@media
(
min-width
:
768px
)
{
.back-to-top
{
.back-to-top
,
.bs-docs-theme-toggle
{
display
:
block
;
display
:
block
;
}
}
}
}
...
@@ -1454,9 +1460,3 @@ h1[id] {
...
@@ -1454,9 +1460,3 @@ h1[id] {
-webkit-box-shadow
:
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
-webkit-box-shadow
:
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
box-shadow
:
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
box-shadow
:
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
}
}
#bs-theme-btn
{
position
:
fixed
;
bottom
:
0
;
left
:
0
;
}
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.min.css
+
1
-
1
View file @
12b5d46f
This diff is collapsed.
Click to expand it.
docs/assets/js/_src/application.js
+
3
-
3
View file @
12b5d46f
...
@@ -56,16 +56,16 @@
...
@@ -56,16 +56,16 @@
// theme toggler
// theme toggler
;(
function
()
{
;(
function
()
{
var
stylesheetLink
=
$
(
'
#bs-theme-stylesheet
'
)
var
stylesheetLink
=
$
(
'
#bs-theme-stylesheet
'
)
var
themeBtn
=
$
(
'
#b
s-theme-
btn
'
)
var
themeBtn
=
$
(
'
.bs-doc
s-theme-
toggle
'
)
themeBtn
.
click
(
function
()
{
themeBtn
.
click
(
function
()
{
var
href
=
stylesheetLink
.
attr
(
'
href
'
);
var
href
=
stylesheetLink
.
attr
(
'
href
'
);
if
(
!
href
||
href
.
indexOf
(
'
data
'
)
===
0
)
{
if
(
!
href
||
href
.
indexOf
(
'
data
'
)
===
0
)
{
stylesheetLink
.
attr
(
'
href
'
,
stylesheetLink
.
attr
(
'
data-href
'
))
stylesheetLink
.
attr
(
'
href
'
,
stylesheetLink
.
attr
(
'
data-href
'
))
themeBtn
.
text
(
'
D
eactivat
e
T
heme
'
)
themeBtn
.
text
(
'
D
isabl
e
t
heme
preview
'
)
}
}
else
{
else
{
stylesheetLink
.
attr
(
'
href
'
,
''
)
stylesheetLink
.
attr
(
'
href
'
,
''
)
themeBtn
.
text
(
'
Activate T
heme
'
)
themeBtn
.
text
(
'
Preview t
heme
'
)
}
}
})
})
})();
})();
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/docs.min.js
+
1
-
1
View file @
12b5d46f
...
@@ -13,4 +13,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI
...
@@ -13,4 +13,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
*/
!
function
(
a
){
a
(
function
(){
var
b
=
a
(
window
),
c
=
a
(
document
.
body
);
c
.
scrollspy
({
target
:
"
.bs-docs-sidebar
"
}),
b
.
on
(
"
load
"
,
function
(){
c
.
scrollspy
(
"
refresh
"
)}),
a
(
"
.bs-docs-container [href=#]
"
).
click
(
function
(
a
){
a
.
preventDefault
()}),
setTimeout
(
function
(){
var
b
=
a
(
"
.bs-docs-sidebar
"
);
b
.
affix
({
offset
:{
top
:
function
(){
var
c
=
b
.
offset
().
top
,
d
=
parseInt
(
b
.
children
(
0
).
css
(
"
margin-top
"
),
10
),
e
=
a
(
"
.bs-docs-nav
"
).
height
();
return
this
.
top
=
c
-
e
-
d
},
bottom
:
function
(){
return
this
.
bottom
=
a
(
"
.bs-docs-footer
"
).
outerHeight
(
!
0
)}}})},
100
),
setTimeout
(
function
(){
a
(
"
.bs-top
"
).
affix
()},
100
),
function
(){
var
b
=
a
(
"
#bs-theme-stylesheet
"
),
c
=
a
(
"
#bs-theme-btn
"
);
c
.
click
(
function
(){
var
a
=
b
.
attr
(
"
href
"
);
a
&&
0
!==
a
.
indexOf
(
"
data
"
)?(
b
.
attr
(
"
href
"
,
""
),
c
.
text
(
"
Activate Theme
"
)):(
b
.
attr
(
"
href
"
,
b
.
attr
(
"
data-href
"
)),
c
.
text
(
"
Deactivate Theme
"
))})}(),
a
(
"
.tooltip-demo
"
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
container
:
"
body
"
}),
a
(
"
.tooltip-test
"
).
tooltip
(),
a
(
"
.popover-test
"
).
popover
(),
a
(
"
.bs-docs-navbar
"
).
tooltip
({
selector
:
'
a[data-toggle="tooltip"]
'
,
container
:
"
.bs-docs-navbar .nav
"
}),
a
(
"
.bs-docs-popover
"
).
popover
(),
a
(
"
.bs-docs-popover-dismiss
"
).
popover
({
trigger
:
"
focus
"
}),
a
(
"
#loading-example-btn
"
).
click
(
function
(){
var
b
=
a
(
this
);
b
.
button
(
"
loading
"
),
setTimeout
(
function
(){
b
.
button
(
"
reset
"
)},
3
e3
)})})}(
jQuery
);
!
function
(
a
){
a
(
function
(){
var
b
=
a
(
window
),
c
=
a
(
document
.
body
);
c
.
scrollspy
({
target
:
"
.bs-docs-sidebar
"
}),
b
.
on
(
"
load
"
,
function
(){
c
.
scrollspy
(
"
refresh
"
)}),
a
(
"
.bs-docs-container [href=#]
"
).
click
(
function
(
a
){
a
.
preventDefault
()}),
setTimeout
(
function
(){
var
b
=
a
(
"
.bs-docs-sidebar
"
);
b
.
affix
({
offset
:{
top
:
function
(){
var
c
=
b
.
offset
().
top
,
d
=
parseInt
(
b
.
children
(
0
).
css
(
"
margin-top
"
),
10
),
e
=
a
(
"
.bs-docs-nav
"
).
height
();
return
this
.
top
=
c
-
e
-
d
},
bottom
:
function
(){
return
this
.
bottom
=
a
(
"
.bs-docs-footer
"
).
outerHeight
(
!
0
)}}})},
100
),
setTimeout
(
function
(){
a
(
"
.bs-top
"
).
affix
()},
100
),
function
(){
var
b
=
a
(
"
#bs-theme-stylesheet
"
),
c
=
a
(
"
.bs-docs-theme-toggle
"
);
c
.
click
(
function
(){
var
a
=
b
.
attr
(
"
href
"
);
a
&&
0
!==
a
.
indexOf
(
"
data
"
)?(
b
.
attr
(
"
href
"
,
""
),
c
.
text
(
"
Preview theme
"
)):(
b
.
attr
(
"
href
"
,
b
.
attr
(
"
data-href
"
)),
c
.
text
(
"
Disable theme preview
"
))})}(),
a
(
"
.tooltip-demo
"
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
container
:
"
body
"
}),
a
(
"
.tooltip-test
"
).
tooltip
(),
a
(
"
.popover-test
"
).
popover
(),
a
(
"
.bs-docs-navbar
"
).
tooltip
({
selector
:
'
a[data-toggle="tooltip"]
'
,
container
:
"
.bs-docs-navbar .nav
"
}),
a
(
"
.bs-docs-popover
"
).
popover
(),
a
(
"
.bs-docs-popover-dismiss
"
).
popover
({
trigger
:
"
focus
"
}),
a
(
"
#loading-example-btn
"
).
click
(
function
(){
var
b
=
a
(
this
);
b
.
button
(
"
loading
"
),
setTimeout
(
function
(){
b
.
button
(
"
reset
"
)},
3
e3
)})})}(
jQuery
);
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets