Summary Files Commits Branches @commit @diff @stats
path: root / docs / src / components
diff options
context:
space:
mode:
Commit81ee834ec6914f8b284e0724d541ed927513e6bd (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2018-11-20 11:54:48 +0800
Committer
 GitHub <noreply@github.com>
2018-11-20 11:54:48 +0800
Filesac0c29f2a5fa344bb7a05638602dd6dc60ce9e37 /docs/src/components
Spectre-Dark-Gruvbox-81ee834ec6914f8b284e0724d541ed927513e6bd.tar
Spectre-Dark-Gruvbox-81ee834ec6914f8b284e0724d541ed927513e6bd.tar.gz
Spectre-Dark-Gruvbox-81ee834ec6914f8b284e0724d541ed927513e6bd.zip
Parentca1bdc5d86edb4d1baf3e9d1fabc89977950a2b4 (diff)
Parentba4c380af32bc75dad1e03c2386b5f8a3fb9118f (diff)
Merge pull request #534 from picturepan2/0.5.6 v0.5.6
0.5.6
3 files changed, 27 insertions, 8 deletions
-rw-r--r--docs/src/components/tabs.pug4
-rw-r--r--docs/src/components/toasts.pug15
-rw-r--r--docs/src/components/tooltips.pug16
diff --git a/docs/src/components/tabs.pug b/docs/src/components/tabs.pug
index 0050682..27f5644 100644
--- a/docs/src/components/tabs.pug
+++ b/docs/src/components/tabs.pug
@@ -119,7 +119,7 @@ block docs-content
| Store
li.tab-item.tab-action
.input-group.input-inline
- input.form-input.input-sm(type="text" placeholder="search")
+ input.form-input.input-sm(type="text")
button.btn.btn-primary.btn-sm.input-group-btn Search
p
@@ -137,7 +137,7 @@ block docs-content
</li>
<li class="tab-item tab-action">
<div class="input-group input-inline">
- <input class="form-input input-sm" type="text" placeholder="search">
+ <input class="form-input input-sm" type="text">
<button class="btn btn-primary btn-sm input-group-btn">Search</button>
</div>
</li>
diff --git a/docs/src/components/toasts.pug b/docs/src/components/toasts.pug
index d1d9bb9..718300b 100644
--- a/docs/src/components/toasts.pug
+++ b/docs/src/components/toasts.pug
@@ -17,11 +17,13 @@ block docs-content
.toast
button.btn.btn-clear.float-right
h6 Toast Title
- | Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ p
+ | Lorem ipsum dolor sit amet, consectetur adipiscing elit.
.column.col-9.col-sm-12
.toast.toast-primary
button.btn.btn-clear.float-right
- | Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ p
+ | Lorem ipsum dolor sit amet, consectetur adipiscing elit.
p
| Add a container element with the #[code toast] class.
@@ -39,15 +41,18 @@ block docs-content
.column.col-sm-12
.toast.toast-success
button.btn.btn-clear.float-right
- | Toast success
+ p
+ | Toast success
.column.col-sm-12
.toast.toast-warning
button.btn.btn-clear.float-right
- | Toast warning
+ p
+ | Toast warning
.column.col-sm-12
.toast.toast-error
button.btn.btn-clear.float-right
- | Toast error
+ p
+ | Toast error
p
| And you can add the #[code toast-primary], #[code toast-success], #[code toast-warning] or #[code toast-error] class for additional toast colors.
diff --git a/docs/src/components/tooltips.pug b/docs/src/components/tooltips.pug
index 7fdafde..e9b041e 100644
--- a/docs/src/components/tooltips.pug
+++ b/docs/src/components/tooltips.pug
@@ -20,7 +20,7 @@ block docs-content
.column.col-xs-12
button.btn.btn-primary.tooltip.tooltip-bottom(data-tooltip="Bottom Tooltip Text") bottom tooltip
.column.col-xs-12
- button.btn.btn-primary.tooltip.tooltip-left(data-tooltip="Left Tooltip Text") left tooltip
+ button.btn.btn-primary.tooltip.tooltip-left(data-tooltip="Left Tooltip Text\nMultiline") left tooltip
p Tooltips component is built entirely in CSS.
p
@@ -34,6 +34,20 @@ block docs-content
:highlight(lang="html")
<button class="btn tooltip" data-tooltip="Lorem ipsum dolor sit amet">top tooltip</button>
<button class="btn tooltip tooltip-right" data-tooltip="Lorem ipsum dolor sit amet">right tooltip</button>
+
+ +docs-subheading('tooltips-multiline', 'Multiline tooltips')
+
+ .docs-demo.columns
+ .column.col-12
+ button.btn.btn-primary.tooltip(data-tooltip="First Line Tooltip Text \n Second Line Tooltip Text \n Third Line Tooltip Text") multiline tooltip
+
+ p
+ | Add the #[code \n] string between any text for multiline tooltips.
+
+ pre.code(data-lang='HTML')
+ code
+ :highlight(lang="html")
+ <button class="btn tooltip" data-tooltip="First Line Tooltip Text \n Second Line Tooltip Text">multiline tooltip</button>
include ../_layout/_ad-c.pug