1
0
mirror of https://github.com/tabler/tabler.git synced 2025-12-22 01:44:25 +04:00

Merge branches 'dev' and 'master' of https://github.com/tabler/tabler into dev

# Conflicts:
#	_config.yml
This commit is contained in:
codecalm
2018-02-19 20:30:15 +01:00
1644 changed files with 13 additions and 31937 deletions

View File

@@ -6,7 +6,6 @@ collections:
docs: docs:
output: true output: true
defaults: defaults:
- scope: - scope:
path: "" path: ""
@@ -14,9 +13,6 @@ defaults:
values: values:
layout: docs layout: docs
source: src
#destination: dist
author: author:
name: codecalm.net name: codecalm.net
url: https://codecalm.net url: https://codecalm.net

View File

@@ -1,4 +1,4 @@
<form class="card" action="./" method="get"> <form class="card" action="" method="get">
<div class="card-body"> <div class="card-body">
@@ -14,6 +14,6 @@
</div> </div>
</div> </div>
<div class="card-footer"> <div class="card-footer">
<a href="./login.html"><i class="mdi mdi-arrow-left"></i> Back to login form</a> <a href="login.html"><i class="mdi mdi-arrow-left"></i> Back to login form</a>
</div> </div>
</form> </form>

View File

@@ -1,4 +1,4 @@
<form class="card" action="./" method="get"> <form class="card" action="" method="get">
<div class="card-body"> <div class="card-body">
<div class="card-title">Sign In</div> <div class="card-title">Sign In</div>

Some files were not shown because too many files have changed in this diff Show More