Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/tabler/tabler into dev-navba…
Browse files Browse the repository at this point in the history
…r-fixes

� Conflicts:
�	package.json
  • Loading branch information
codecalm committed Oct 24, 2021
2 parents a2ae5c1 + d984781 commit d4ada59
Show file tree
Hide file tree
Showing 187 changed files with 6,295 additions and 4,150 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "jekyll", "4.2.0"
gem "jekyll", "4.2.1"

group :jekyll_plugins do
gem "jekyll-random"
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ We've created this admin panel for everyone who wants to create templates based
* **Demo pages**: Tabler features over 20 individual pages using various components, which gives you the freedom to choose and combine. All components can vary in color and styling that you can easily modify using Sass. Sky is the limit!
* **Single Page Application versions:** [Tabler React](https://github.com/tabler/tabler-react) has React components for Tabler.


## Documentation

Documentation is available as a part of Tabler preview: https://preview.tabler.io/docs/

## Sponsor Tabler

<a href="https://github.com/sponsors/codecalm" target="_blank"><img src="/src/static/sponsor-banner-readme.png?raw=true" alt="Sponsor Tabler" /></a>
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ socials:
title: Flickr
bitbucket:
icon: brand-bitbucket
title: Bitbucker
title: Bitbucket
tabler:
icon: brand-tabler
title: Tabler
Expand Down
7 changes: 5 additions & 2 deletions demo/accordion.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -439,7 +442,7 @@ <h2 class="accordion-header" id="heading-4">
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
7 changes: 5 additions & 2 deletions demo/activity.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -641,7 +644,7 @@ <h2 class="page-title">
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion demo/auth-lock.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down
7 changes: 5 additions & 2 deletions demo/blank.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -390,7 +393,7 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
11 changes: 7 additions & 4 deletions demo/buttons.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -1036,7 +1039,7 @@ <h3 class="card-title">Icon buttons</h3>
</a>
</div>
<div class="col-6 col-sm-4 col-md-2 col-xl-auto mb-3">
<a href="#" class="btn btn-bitbucket w-100 btn-icon" aria-label="Bitbucker">
<a href="#" class="btn btn-bitbucket w-100 btn-icon" aria-label="Bitbucket">
<!-- Download SVG icon from http://tabler-icons.io/i/brand-bitbucket -->
<svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3.648 4a0.64 .64 0 0 0 -.64 .744l3.14 14.528c.07 .417 .43 .724 .852 .728h10a0.644 .644 0 0 0 .642 -.539l3.35 -14.71a0.641 .641 0 0 0 -.64 -.744l-16.704 -.007z" /><path d="M14 15h-4l-1 -6h6z" /></svg>
</a>
Expand Down Expand Up @@ -1146,7 +1149,7 @@ <h3 class="card-title">Social colors</h3>
<a href="#" class="btn btn-bitbucket w-100">
<!-- Download SVG icon from http://tabler-icons.io/i/brand-bitbucket -->
<svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3.648 4a0.64 .64 0 0 0 -.64 .744l3.14 14.528c.07 .417 .43 .724 .852 .728h10a0.644 .644 0 0 0 .642 -.539l3.35 -14.71a0.641 .641 0 0 0 -.64 -.744l-16.704 -.007z" /><path d="M14 15h-4l-1 -6h6z" /></svg>
Bitbucker
Bitbucket
</a>
</div>
<div class="col-6 col-sm-4 col-md-2 col-xl-auto mb-3">
Expand Down Expand Up @@ -1188,7 +1191,7 @@ <h3 class="card-title">Social colors</h3>
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
7 changes: 5 additions & 2 deletions demo/cards-masonry.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -637,7 +640,7 @@ <h3 class="card-title">Header title</h3>
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
7 changes: 5 additions & 2 deletions demo/cards.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -982,7 +985,7 @@ <h3 class="card-title">Card with footer buttons</h3>
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
7 changes: 5 additions & 2 deletions demo/carousel.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -547,7 +550,7 @@ <h3>Slide label</h3>
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
9 changes: 6 additions & 3 deletions demo/changelog.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -655,7 +658,7 @@ <h2 class="page-title">
<li class="nav-item">
<a href="./changelog.html" class="nav-link active">
Changelog
<span class="badge bg-blue-lt ms-auto">1.0.0-beta3</span>
<span class="badge bg-blue-lt ms-auto">1.0.0-beta4</span>
</a>
</li>
</ul>
Expand Down Expand Up @@ -712,7 +715,7 @@ <h1 class="m-0">Changelog</h1>
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
7 changes: 5 additions & 2 deletions demo/charts.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -568,7 +571,7 @@ <h3 class="card-title">Social referrals</h3>
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
7 changes: 5 additions & 2 deletions demo/colors.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<!--
* Tabler - Premium and Open Source dashboard template with responsive and high quality UI.
* @version 1.0.0-beta3
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -176,6 +176,9 @@ <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-m
<a class="dropdown-item" href="./typography.html" >
Typography
</a>
<a class="dropdown-item" href="./offcanvas.html" >
Offcanvas
</a>
<a class="dropdown-item" href="./markdown.html" >
Markdown
</a>
Expand Down Expand Up @@ -685,7 +688,7 @@ <h2 class="page-title">
All rights reserved.
</li>
<li class="list-inline-item">
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta3</a>
<a href="./changelog.html" class="link-secondary" rel="noopener">v1.0.0-beta4</a>
</li>
</ul>
</div>
Expand Down
10 changes: 5 additions & 5 deletions demo/dist/css/demo.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Tabler v1.0.0-beta3 (https://tabler.io)
* @version 1.0.0-beta3
* Tabler v1.0.0-beta4 (https://tabler.io)
* @version 1.0.0-beta4
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand All @@ -11,7 +11,7 @@ pre.highlight,
max-height: 30rem;
margin: 1.5rem 0;
overflow: auto;
font-size: 85.7142857%;
font-size: 80%;
border-radius: 4px; }
pre.highlight::-webkit-scrollbar,
.highlight pre::-webkit-scrollbar {
Expand Down Expand Up @@ -198,8 +198,8 @@ pre.highlight,
flex: 0 auto; }

.example-content {
font-size: 0.875rem;
line-height: 1.4285714;
font-size: 0.9375rem;
line-height: 1.3333333;
color: #232e3c;
flex: 1;
max-width: 100%; }
Expand Down

0 comments on commit d4ada59

Please sign in to comment.