Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
oyejorge committed Mar 29, 2021
2 parents f493001 + fbf53b7 commit 8dd401f
Show file tree
Hide file tree
Showing 156 changed files with 65,944 additions and 57,748 deletions.
147 changes: 87 additions & 60 deletions demo/accordion.html

Large diffs are not rendered by default.

455 changes: 241 additions & 214 deletions demo/activity.html

Large diffs are not rendered by default.

743 changes: 388 additions & 355 deletions demo/all.html

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions 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-beta
* @version 1.0.0-beta2
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand All @@ -21,8 +21,8 @@
<link href="./dist/css/demo.min.css" rel="stylesheet"/>
</head>
<body class="antialiased border-top-wide border-primary d-flex flex-column">
<div class="flex-fill d-flex flex-column justify-content-center py-4">
<div class="container-tight py-6">
<div class="page page-center">
<div class="container-tight py-4">
<div class="text-center mb-4">
<a href="."><img src="./static/logo.svg" height="36" alt=""></a>
</div>
Expand All @@ -41,6 +41,7 @@ <h3>Paweł Kuna</h3>
</div>
<div>
<a href="#" class="btn btn-primary w-100">
<!-- Download SVG icon from http://tabler-icons.io/i/lock-open -->
<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"/><rect x="5" y="11" width="14" height="10" rx="2" /><circle cx="12" cy="16" r="1" /><path d="M8 11v-5a4 4 0 0 1 8 0" /></svg>
Unlock
</a>
Expand Down
90 changes: 59 additions & 31 deletions demo/blank.html

Large diffs are not rendered by default.

1,555 changes: 805 additions & 750 deletions demo/buttons.html

Large diffs are not rendered by default.

486 changes: 259 additions & 227 deletions demo/cards-masonry.html

Large diffs are not rendered by default.

1,046 changes: 539 additions & 507 deletions demo/cards.html

Large diffs are not rendered by default.

333 changes: 180 additions & 153 deletions demo/carousel.html

Large diffs are not rendered by default.

683 changes: 364 additions & 319 deletions demo/changelog.html

Large diffs are not rendered by default.

492 changes: 265 additions & 227 deletions demo/charts.html

Large diffs are not rendered by default.

657 changes: 342 additions & 315 deletions demo/colors.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo/dist/css/demo.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Tabler v1.0.0-beta (https://tabler.io)
* @version 1.0.0-beta
* Tabler v1.0.0-beta2 (https://tabler.io)
* @version 1.0.0-beta2
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down
6 changes: 3 additions & 3 deletions demo/dist/css/demo.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions demo/dist/css/demo.rtl.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Tabler v1.0.0-beta (https://tabler.io)
* @version 1.0.0-beta
* Tabler v1.0.0-beta2 (https://tabler.io)
* @version 1.0.0-beta2
* @link https://tabler.io
* Copyright 2018-2021 The Tabler Authors
* Copyright 2018-2021 codecalm.net Paweł Kuna
Expand Down Expand Up @@ -183,7 +183,7 @@ pre.highlight,

.example {
padding: 2rem;
margin: 2rem 0;
margin: 1rem 0 2rem;
border: 1px solid #e6e8e9;
border-radius: 3px 3px 0 0;
position: relative;
Expand Down

0 comments on commit 8dd401f

Please sign in to comment.