Skip to content

A
AdminLTE

知鸟1号 / AdminLTE
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
A
AdminLTE

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 2ab586c4 编写于 作者: R Raphael Jackstadt 提交者： GitHub
浏览文件
操作

Merge branch 'v3-dev' into v3-dev

上级 c9b02625 04376358
展开全部 显示空白变更内容
内联 并排
Showing with 1105 addition and 36 deletion
build/scss/_mixins.scss
浏览文件 @ 2ab586c4
......@@ -301,7 +301,7 @@
// Background Variant
@mixin background-variant($name, $color) {
.bg-#{$name} {
background-color: #{$color};
background-color: #{$color} !important;
&,
> a {
......
build/scss/_timeline.scss
浏览文件 @ 2ab586c4
......@@ -3,11 +3,9 @@
//
.timeline {
list-style: none;
margin: 0 0 30px;
margin: 0 0 45px;
padding: 0;
position: relative;
// The line
&::before {
@include border-radius($border-radius);
......@@ -20,13 +18,17 @@
top: 0;
width: 4px;
}
// Element
> div {
&::before,
&::after {
content: "";
display: table;
}
> li {
@include clearfix;
margin-bottom: 15px;
margin-right: 10px;
position: relative;
// The content
> .timeline-item {
@include box-shadow($card-shadow);
......@@ -38,7 +40,6 @@
margin-top: 0;
padding: 0;
position: relative;
// The time and header
> .time {
color: #999;
......@@ -46,7 +47,7 @@
font-size: 12px;
padding: 10px;
}
// Header
> .timeline-header {
border-bottom: 1px solid $card-border-color;
color: $gray-700;
......@@ -54,21 +55,30 @@
line-height: 1.1;
margin: 0;
padding: 10px;
// Link in header
> a {
font-weight: 600;
}
}
// Item body and footer
> .timeline-body,
> .timeline-footer {
padding: 10px;
}
> .timeline-body {
> img {
margin: 10px;
}
}
// The icons
> .timeline-footer {
> a {
color: $white;
}
}
}
// The icons at line
> .fa,
> .fas,
> .far,
......@@ -87,12 +97,10 @@
width: 30px;
}
}
// Time label
> .time-label {
> span {
@include border-radius(4px);
background-color: $white;
display: inline-block;
font-weight: 600;
......@@ -102,7 +110,7 @@
}
.timeline-inverse {
> li {
> div {
> .timeline-item {
@include box-shadow(none);
background: $gray-100;
......
docs/_config.yml
浏览文件 @ 2ab586c4
......@@ -52,6 +52,8 @@ navigation:
url: components/boxes.html
- title: Direct Chat
url: components/direct-chat.html
- title: Timeline
url: components/timeline.html
- title: Ribbons
url: components/ribbons.html
- title: JavaScript
......
docs/components/timeline.md 0 → 100644
浏览文件 @ 2ab586c4
---
layout: page
title: Timeline Component
---
The timeline component displays an event history.
You can use it for descriptions of events that occurred in a particular time section.
##### Default
```html
<!-- Main node for this component -->
<div class="timeline">
<!-- Timeline time label -->
<div class="time-label">
<span class="bg-green">23 Aug. 2019</span>
</div>
<div>
<!-- Before each timeline item corresponds to one icon on the left scale -->
<i class="fas fa-envelope bg-blue"></i>
<!-- Timeline item -->
<div class="timeline-item">
<!-- Time -->
<span class="time"><i class="fas fa-clock"></i> 12:05</span>
<!-- Header. Optional -->
<h3 class="timeline-header"><a href="#">Support Team</a> sent you an email</h3>
<!-- Body -->
<div class="timeline-body">
Etsy doostang zoodles disqus groupon greplin oooj voxy zoodles,
weebly ning heekya handango imeem plugg dopplr jibjab, movity
jajah plickers sifteo edmodo ifttt zimbra. Babblely odeo kaboodle
quora plaxo ideeli hulu weebly balihoo...
</div>
<!-- Placement of additional controls. Optional -->
<div class="timeline-footer">
<a class="btn btn-primary btn-sm">Read more</a>
<a class="btn btn-danger btn-sm">Delete</a>
</div>
</div>
</div>
<!-- The last icon means the story is complete -->
<div>
<i class="fas fa-clock bg-gray"></i>
</div>
</div>
```
{: .max-height-300}
##### Extra style
There is an additional class for styling.
It darkens the elements, highlighting it against the general background.
You can use it with adding `.timeline-inverse` to `.timeline`.
```html
<div class="timeline timeline-inverse">
<!-- ... Item ... -->
</div>
```
index.html
浏览文件 @ 2ab586c4
......@@ -339,6 +339,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="pages/UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
index2.html
浏览文件 @ 2ab586c4
......@@ -326,6 +326,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="pages/UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
index3.html
浏览文件 @ 2ab586c4
......@@ -336,6 +336,12 @@ to get the desired effect
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="pages/UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/buttons.html
浏览文件 @ 2ab586c4
......@@ -328,6 +328,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/general.html
浏览文件 @ 2ab586c4
......@@ -374,6 +374,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/icons.html
浏览文件 @ 2ab586c4
......@@ -328,6 +328,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/modals.html
浏览文件 @ 2ab586c4
......@@ -332,6 +332,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/navbar.html
浏览文件 @ 2ab586c4
......@@ -334,6 +334,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/sliders.html
浏览文件 @ 2ab586c4
......@@ -333,6 +333,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/UI/timeline.html 0 → 100644
浏览文件 @ 2ab586c4
此差异已折叠。
pages/calendar.html
浏览文件 @ 2ab586c4
......@@ -334,6 +334,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/charts/chartjs.html
浏览文件 @ 2ab586c4
......@@ -328,6 +328,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/charts/flot.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/charts/inline.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/404.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/500.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/blank.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/contacts.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/e_commerce.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/invoice.html
浏览文件 @ 2ab586c4
......@@ -328,6 +328,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/language-menu.html
浏览文件 @ 2ab586c4
......@@ -342,6 +342,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/legacy-user-menu.html
浏览文件 @ 2ab586c4
......@@ -357,6 +357,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/profile.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......@@ -810,16 +816,16 @@
<!-- /.tab-pane -->
<div class="tab-pane" id="timeline">
<!-- The timeline -->
<ul class="timeline timeline-inverse">
<div class="timeline timeline-inverse">
<!-- timeline time label -->
<li class="time-label">
<div class="time-label">
<span class="bg-danger">
10 Feb. 2014
</span>
</li>
</div>
<!-- /.timeline-label -->
<!-- timeline item -->
<li>
<div>
<i class="fas fa-envelope bg-primary"></i>
<div class="timeline-item">
......@@ -838,10 +844,10 @@
<a href="#" class="btn btn-danger btn-sm">Delete</a>
</div>
</div>
</li>
</div>
<!-- END timeline item -->
<!-- timeline item -->
<li>
<div>
<i class="fas fa-user bg-info"></i>
<div class="timeline-item">
......@@ -850,10 +856,10 @@
<h3 class="timeline-header border-0"><a href="#">Sarah Young</a> accepted your friend request
</h3>
</div>
</li>
</div>
<!-- END timeline item -->
<!-- timeline item -->
<li>
<div>
<i class="fas fa-comments bg-warning"></i>
<div class="timeline-item">
......@@ -870,17 +876,17 @@
<a href="#" class="btn btn-warning btn-flat btn-sm">View comment</a>
</div>
</div>
</li>
</div>
<!-- END timeline item -->
<!-- timeline time label -->
<li class="time-label">
<div class="time-label">
<span class="bg-success">
3 Jan. 2014
</span>
</li>
</div>
<!-- /.timeline-label -->
<!-- timeline item -->
<li>
<div>
<i class="fas fa-camera bg-purple"></i>
<div class="timeline-item">
......@@ -889,18 +895,18 @@
<h3 class="timeline-header"><a href="#">Mina Lee</a> uploaded new photos</h3>
<div class="timeline-body">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="..." class="margin">
<img src="http://placehold.it/150x100" alt="...">
<img src="http://placehold.it/150x100" alt="...">
<img src="http://placehold.it/150x100" alt="...">
<img src="http://placehold.it/150x100" alt="...">
</div>
</div>
</div>
</li>
<!-- END timeline item -->
<li>
<div>
<i class="far fa-clock bg-gray"></i>
</li>
</ul>
</div>
</div>
</div>
<!-- /.tab-pane -->
......
pages/examples/project_add.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/project_detail.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/project_edit.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/examples/projects.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/forms/advanced.html
浏览文件 @ 2ab586c4
......@@ -342,6 +342,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview menu-open">
......
pages/forms/editors.html
浏览文件 @ 2ab586c4
......@@ -331,6 +331,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview menu-open">
......
pages/forms/general.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview menu-open">
......
pages/layout/boxed.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/layout/collapsed-sidebar.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/layout/fixed-footer.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/layout/fixed-sidebar.html
浏览文件 @ 2ab586c4
......@@ -331,6 +331,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/layout/fixed-topnav.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/mailbox/compose.html
浏览文件 @ 2ab586c4
......@@ -331,6 +331,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/mailbox/mailbox.html
浏览文件 @ 2ab586c4
......@@ -330,6 +330,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/mailbox/read-mail.html
浏览文件 @ 2ab586c4
......@@ -329,6 +329,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/tables/data.html
浏览文件 @ 2ab586c4
......@@ -331,6 +331,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/tables/jsgrid.html
浏览文件 @ 2ab586c4
......@@ -332,6 +332,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/tables/simple.html
浏览文件 @ 2ab586c4
......@@ -328,6 +328,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
pages/widgets.html
浏览文件 @ 2ab586c4
......@@ -328,6 +328,12 @@
<p>Navbar & Tabs</p>
</a>
</li>
<li class="nav-item">
<a href="../UI/timeline.html" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Timeline</p>
</a>
</li>
</ul>
</li>
<li class="nav-item has-treeview">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或