mirror of
https://github.com/tabler/tabler.git
synced 2025-12-24 10:48:14 +04:00
Merge remote-tracking branch 'origin/dev-v1' into dev-v1
# Conflicts: # pages/_includes/cards/blog-single.html
This commit is contained in:
mrszympek
@@ -1,21 +1,29 @@
|
||||
{% assign id = 0 | random_id %}
|
||||
{% if include.id %}
|
||||
{% assign id = include.id %}
|
||||
{% endif %}
|
||||
{% assign icon-class = "mr-2" %}
|
||||
{% if include.hide-text %}
|
||||
{% assign icon-class = "" %}
|
||||
{% endif %}
|
||||
{% assign reverse = include.reverse | default: false %}
|
||||
|
||||
<div class="card">
|
||||
<ul class="nav nav-tabs{% if include.alternative %} nav-tabs-alt{% endif %}{% if reverse %} flex-row-reverse{% endif %}{% if include.justified %} nav-fill{% endif %}" data-toggle="tabs">
|
||||
<li class="nav-item ">
|
||||
<a href="#tabs-home-{{ id }}" class="nav-link active" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="home" class="mr-2" %}{% endif %}Home</a>
|
||||
<li class="nav-item">
|
||||
<a href="#tabs-home-{{ id }}" class="nav-link active" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="home" class=icon-class %}{% endif %}{% unless include.hide-text %}Home{% endunless %}</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#tabs-profile-{{ id }}" class="nav-link" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="user" class="mr-2" %}{% endif %}Profile</a>
|
||||
<a href="#tabs-profile-{{ id }}" class="nav-link" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="user" class=icon-class %}{% endif %}{% unless include.hide-text %}Profile{% endunless %}</a>
|
||||
</li>
|
||||
{% if include.activity %}
|
||||
<li class="nav-item">
|
||||
<a href="#tabs-activity-{{ id }}" class="nav-link" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="activity" class="mr-2" %}{% endif %}Activity</a>
|
||||
<a href="#tabs-activity-{{ id }}" class="nav-link" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="activity" class=icon-class %}{% endif %}{% unless include.hide-text %}Activity{% endunless %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if include.disabled %}
|
||||
<li class="nav-item">
|
||||
<a href="#tabs-activity-{{ id }}" class="nav-link disabled" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="x" class="mr-2" %}{% endif %}Disabled</a>
|
||||
<a href="#tabs-activity-{{ id }}" class="nav-link disabled" data-toggle="tab">{% if include.icons %}{% include ui/icon.html icon="x" class=icon-class %}{% endif %}{% unless include.hide-text %}Disabled{% endunless %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if include.dropdown %}
|
||||
@@ -56,4 +64,4 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
1
pages/_includes/icons/x-octagon.svg
Normal file
1
pages/_includes/icons/x-octagon.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x-octagon"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="15" y1="9" x2="9" y2="15"></line><line x1="9" y1="9" x2="15" y2="15"></line></svg>
|
||||
|
After Width: | Height: | Size: 406 B |
@@ -13,146 +13,28 @@
|
||||
{% for item in site.data.menu %}
|
||||
{% assign icon = item[1].icon %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link{% if item[1].active %} active{% endif %}" {% if item[1].children %}href="#sidebar-{{ id }}" data-toggle="collapse" role="button" aria-expanded="false"{% else %}href="{{ site.base }}/{{ item[1].url }}"{% endif %}>
|
||||
<a class="nav-link{% if item[1].active %} active{% endif %}" {% if item[1].children or item[1].docs %}href="#sidebar-{{ id }}" data-toggle="collapse" role="button" aria-expanded="false"{% else %}href="{{ site.base }}/{{ item[1].url }}"{% endif %}>
|
||||
{% include ui/icon.html icon=icon %}
|
||||
<span class="nav-link-text">{{ item[1].title }}</span>
|
||||
{% if item[1].label %}
|
||||
<span class="badge bg-primary text-white ml-auto">{{ item[1].label }}</span>
|
||||
{% endif %}
|
||||
</a>
|
||||
{% if item[1].children %}
|
||||
<div class="collapse navbar-collapse" id="sidebar-{{ id }}">
|
||||
{% if item[1].children or item[1].docs %}
|
||||
<div class="collapse navbar-collapse show" id="sidebar-{{ id }}">
|
||||
<ul class="nav nav-sm flex-column">
|
||||
|
||||
{% if item[1].docs %}
|
||||
{% assign docs-key = item[1].docs %}
|
||||
{% for p in site.docs-menu[docs-key].pages %}
|
||||
{% assign doc = site.docs | where: "slug", p | first %}
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Alerts
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Avatars
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Badges
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Breadcrumb
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Buttons
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Button group
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Cards
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Charts
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Dropdowns
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Forms
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Icons
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Lists
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Modal
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Navs
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Navbar
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Page headers
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Pagination
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Popovers
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Progress
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Social post
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Spinners
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Tables
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Toasts
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Tooltips
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Typography
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link">
|
||||
Utilities
|
||||
<a href="{{ site.base }}/docs/{{ doc.slug }}.html" class="nav-link">
|
||||
{{ doc.title }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
{% include layout/sidenav-content.html logo="white" %}
|
||||
</div>
|
||||
</div>
|
||||
{% comment %}
|
||||
<div class="sidenav sidenav-expand-xl">
|
||||
<div class="container">
|
||||
{% include layout/sidenav-content.html%}
|
||||
</div>
|
||||
</div>
|
||||
{% endcomment %}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<div class="alert alert-{{ include.type | default: 'primary'}}" role="alert">
|
||||
{% if include.close %}<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>{% endif %}
|
||||
{% if include.icon %}{% include ui/icon.html icon=include.icon %}{% endif %} {{ include.text | default: "This is a custom alert box!" }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user