Skip to content
GitLab
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
6a5bc636
Commit
6a5bc636
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
rename .arrow => .popover-arrow
parent
a1ce6a19
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/_includes/js/popovers.html
+6
-6
docs/_includes/js/popovers.html
docs/javascript/popovers.md
+6
-6
docs/javascript/popovers.md
js/popover.js
+2
-2
js/popover.js
js/tests/unit/popover.js
+1
-1
js/tests/unit/popover.js
scss/_popover.scss
+8
-8
scss/_popover.scss
with
23 additions
and
23 deletions
+23
-23
docs/_includes/js/popovers.html
+
6
-
6
View file @
6a5bc636
...
@@ -40,7 +40,7 @@ $(function () {
...
@@ -40,7 +40,7 @@ $(function () {
<p>
Four options are available: top, right, bottom, and left aligned.
</p>
<p>
Four options are available: top, right, bottom, and left aligned.
</p>
<div
class=
"bs-example bs-example-popover"
>
<div
class=
"bs-example bs-example-popover"
>
<div
class=
"popover top"
>
<div
class=
"popover top"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover top
</h3>
<h3
class=
"popover-title"
>
Popover top
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
...
@@ -48,7 +48,7 @@ $(function () {
...
@@ -48,7 +48,7 @@ $(function () {
</div>
</div>
<div
class=
"popover right"
>
<div
class=
"popover right"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover right
</h3>
<h3
class=
"popover-title"
>
Popover right
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
...
@@ -56,7 +56,7 @@ $(function () {
...
@@ -56,7 +56,7 @@ $(function () {
</div>
</div>
<div
class=
"popover bottom"
>
<div
class=
"popover bottom"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover bottom
</h3>
<h3
class=
"popover-title"
>
Popover bottom
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
...
@@ -65,7 +65,7 @@ $(function () {
...
@@ -65,7 +65,7 @@ $(function () {
</div>
</div>
<div
class=
"popover left"
>
<div
class=
"popover left"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover left
</h3>
<h3
class=
"popover-title"
>
Popover left
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
...
@@ -207,12 +207,12 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
...
@@ -207,12 +207,12 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
<tr>
<tr>
<td>
template
</td>
<td>
template
</td>
<td>
string
</td>
<td>
string
</td>
<td><code>
'
<
div class="popover" role="tooltip"
><
div class="arrow"
><
/div
><
h3 class="popover-title"
><
/h3
><
div class="popover-content"
><
/div
><
/div
>
'
</code></td>
<td><code>
'
<
div class="popover" role="tooltip"
><
div class="
popover-
arrow"
><
/div
><
h3 class="popover-title"
><
/h3
><
div class="popover-content"
><
/div
><
/div
>
'
</code></td>
<td>
<td>
<p>
Base HTML to use when creating the popover.
</p>
<p>
Base HTML to use when creating the popover.
</p>
<p>
The popover's
<code>
title
</code>
will be injected into the
<code>
.popover-title
</code>
.
</p>
<p>
The popover's
<code>
title
</code>
will be injected into the
<code>
.popover-title
</code>
.
</p>
<p>
The popover's
<code>
content
</code>
will be injected into the
<code>
.popover-content
</code>
.
</p>
<p>
The popover's
<code>
content
</code>
will be injected into the
<code>
.popover-content
</code>
.
</p>
<p><code>
.arrow
</code>
will become the popover's arrow.
</p>
<p><code>
.
popover-
arrow
</code>
will become the popover's arrow.
</p>
<p>
The outermost wrapper element should have the
<code>
.popover
</code>
class.
</p>
<p>
The outermost wrapper element should have the
<code>
.popover
</code>
class.
</p>
</td>
</td>
</tr>
</tr>
...
...
This diff is collapsed.
Click to expand it.
docs/javascript/popovers.md
+
6
-
6
View file @
6a5bc636
...
@@ -44,7 +44,7 @@ Four options are available: top, right, bottom, and left aligned.
...
@@ -44,7 +44,7 @@ Four options are available: top, right, bottom, and left aligned.
<div
class=
"bs-example bs-example-popover"
>
<div
class=
"bs-example bs-example-popover"
>
<div
class=
"popover top"
>
<div
class=
"popover top"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover top
</h3>
<h3
class=
"popover-title"
>
Popover top
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
...
@@ -52,7 +52,7 @@ Four options are available: top, right, bottom, and left aligned.
...
@@ -52,7 +52,7 @@ Four options are available: top, right, bottom, and left aligned.
</div>
</div>
<div
class=
"popover right"
>
<div
class=
"popover right"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover right
</h3>
<h3
class=
"popover-title"
>
Popover right
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
...
@@ -60,7 +60,7 @@ Four options are available: top, right, bottom, and left aligned.
...
@@ -60,7 +60,7 @@ Four options are available: top, right, bottom, and left aligned.
</div>
</div>
<div
class=
"popover bottom"
>
<div
class=
"popover bottom"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover bottom
</h3>
<h3
class=
"popover-title"
>
Popover bottom
</h3>
<div class="popover-content">
<div class="popover-content">
...
@@ -69,7 +69,7 @@ Four options are available: top, right, bottom, and left aligned.
...
@@ -69,7 +69,7 @@ Four options are available: top, right, bottom, and left aligned.
</div>
</div>
<div
class=
"popover left"
>
<div
class=
"popover left"
>
<div
class=
"arrow"
></div>
<div
class=
"
popover-
arrow"
></div>
<h3
class=
"popover-title"
>
Popover left
</h3>
<h3
class=
"popover-title"
>
Popover left
</h3>
<div
class=
"popover-content"
>
<div
class=
"popover-content"
>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
<p>
Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.
</p>
...
@@ -222,12 +222,12 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
...
@@ -222,12 +222,12 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
<tr>
<tr>
<td>
template
</td>
<td>
template
</td>
<td>
string
</td>
<td>
string
</td>
<td><code>
'
<
div class="popover" role="tooltip"
><
div class="arrow"
><
/div
><
h3 class="popover-title"
><
/h3
><
div class="popover-content"
><
/div
><
/div
>
'
</code></td>
<td><code>
'
<
div class="popover" role="tooltip"
><
div class="
popover-
arrow"
><
/div
><
h3 class="popover-title"
><
/h3
><
div class="popover-content"
><
/div
><
/div
>
'
</code></td>
<td>
<td>
<p>
Base HTML to use when creating the popover.
</p>
<p>
Base HTML to use when creating the popover.
</p>
<p>
The popover's
<code>
title
</code>
will be injected into the
<code>
.popover-title
</code>
.
</p>
<p>
The popover's
<code>
title
</code>
will be injected into the
<code>
.popover-title
</code>
.
</p>
<p>
The popover's
<code>
content
</code>
will be injected into the
<code>
.popover-content
</code>
.
</p>
<p>
The popover's
<code>
content
</code>
will be injected into the
<code>
.popover-content
</code>
.
</p>
<p><code>
.arrow
</code>
will become the popover's arrow.
</p>
<p><code>
.
popover-
arrow
</code>
will become the popover's arrow.
</p>
<p>
The outermost wrapper element should have the
<code>
.popover
</code>
class.
</p>
<p>
The outermost wrapper element should have the
<code>
.popover
</code>
class.
</p>
</td>
</td>
</tr>
</tr>
...
...
This diff is collapsed.
Click to expand it.
js/popover.js
+
2
-
2
View file @
6a5bc636
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
placement
:
'
right
'
,
placement
:
'
right
'
,
trigger
:
'
click
'
,
trigger
:
'
click
'
,
content
:
''
,
content
:
''
,
template
:
'
<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>
'
template
:
'
<div class="popover" role="tooltip"><div class="
popover-
arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>
'
})
})
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
}
}
Popover
.
prototype
.
arrow
=
function
()
{
Popover
.
prototype
.
arrow
=
function
()
{
return
(
this
.
$arrow
=
this
.
$arrow
||
this
.
tip
().
find
(
'
.arrow
'
))
return
(
this
.
$arrow
=
this
.
$arrow
||
this
.
tip
().
find
(
'
.
popover-
arrow
'
))
}
}
Popover
.
prototype
.
tip
=
function
()
{
Popover
.
prototype
.
tip
=
function
()
{
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/popover.js
+
1
-
1
View file @
6a5bc636
...
@@ -141,7 +141,7 @@ $(function () {
...
@@ -141,7 +141,7 @@ $(function () {
.
bootstrapPopover
({
.
bootstrapPopover
({
title
:
'
Test
'
,
title
:
'
Test
'
,
content
:
'
Test
'
,
content
:
'
Test
'
,
template
:
'
<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"/><div class="content"><p/></div></div></div>
'
template
:
'
<div class="popover foobar"><div class="
popover-
arrow"></div><div class="inner"><h3 class="title"/><div class="content"><p/></div></div></div>
'
})
})
$popover
.
bootstrapPopover
(
'
show
'
)
$popover
.
bootstrapPopover
(
'
show
'
)
...
...
This diff is collapsed.
Click to expand it.
scss/_popover.scss
+
8
-
8
View file @
6a5bc636
...
@@ -47,9 +47,9 @@
...
@@ -47,9 +47,9 @@
// Arrows
// Arrows
//
//
// .arrow is outer, .arrow:after is inner
// .
popover-
arrow is outer, .
popover-
arrow:after is inner
.popover
>
.arrow
{
.popover
>
.
popover-
arrow
{
&
,
&
,
&
:after
{
&
:after
{
position
:
absolute
;
position
:
absolute
;
...
@@ -60,16 +60,16 @@
...
@@ -60,16 +60,16 @@
border-style
:
solid
;
border-style
:
solid
;
}
}
}
}
.popover
>
.arrow
{
.popover
>
.
popover-
arrow
{
border-width
:
$popover-arrow-outer-width
;
border-width
:
$popover-arrow-outer-width
;
}
}
.popover
>
.arrow
:after
{
.popover
>
.
popover-
arrow
:after
{
content
:
""
;
content
:
""
;
border-width
:
$popover-arrow-width
;
border-width
:
$popover-arrow-width
;
}
}
.popover
{
.popover
{
&
.top
>
.arrow
{
&
.top
>
.
popover-
arrow
{
bottom
:
-
$popover-arrow-outer-width
;
bottom
:
-
$popover-arrow-outer-width
;
left
:
50%
;
left
:
50%
;
margin-left
:
-
$popover-arrow-outer-width
;
margin-left
:
-
$popover-arrow-outer-width
;
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
border-bottom-width
:
0
;
border-bottom-width
:
0
;
}
}
}
}
&
.right
>
.arrow
{
&
.right
>
.
popover-
arrow
{
top
:
50%
;
top
:
50%
;
left
:
-
$popover-arrow-outer-width
;
left
:
-
$popover-arrow-outer-width
;
margin-top
:
-
$popover-arrow-outer-width
;
margin-top
:
-
$popover-arrow-outer-width
;
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
border-left-width
:
0
;
border-left-width
:
0
;
}
}
}
}
&
.bottom
>
.arrow
{
&
.bottom
>
.
popover-
arrow
{
top
:
-
$popover-arrow-outer-width
;
top
:
-
$popover-arrow-outer-width
;
left
:
50%
;
left
:
50%
;
margin-left
:
-
$popover-arrow-outer-width
;
margin-left
:
-
$popover-arrow-outer-width
;
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
}
}
}
}
&
.left
>
.arrow
{
&
.left
>
.
popover-
arrow
{
top
:
50%
;
top
:
50%
;
right
:
-
$popover-arrow-outer-width
;
right
:
-
$popover-arrow-outer-width
;
margin-top
:
-
$popover-arrow-outer-width
;
margin-top
:
-
$popover-arrow-outer-width
;
...
...
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