Skip to content

Commit ec06669

Browse files
Git-GoodGit-Good
authored
Merge branch 'master' into master
2 parents 991316b + ebb40be commit ec06669

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+35560
-1575
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ _site/
88
.DS_Store
99
package-lock.json
1010
/_test/
11-
src/assets/css/dashboard.css
12-
src/assets/css/dashboard.min.css
11+
src/assets/css/*.css
1312
src/assets/plugins/**/plugin.css
1413
src/assets/plugins/**/plugin.min.css
1514
generated-site
1615
deploy-site
1716
/commits.sh
1817
/assets/css/
18+
/vendor/

‎README.md‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Tabler
22

3-
Premium and Open Source dashboard template with responsive and high quality UI.
3+
<a href="https://buddy.works"><img src="https://assets.buddy.works/automated-dark.svg" alt="Automated by Buddy" align="right"></a>
44

5-
<a href="https://www.npmjs.com/package/tabler-ui"><img src="https://img.shields.io/npm/dt/tabler-ui.svg" alt="Total Downloads"></a> <a href="https://github.com/tabler/tabler/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tabler-ui.svg" alt="License"></a> <a href="https://github.com/tabler/tabler/releases"><img src="https://img.shields.io/npm/v/tabler-ui.svg" alt="Latest Release"></a> <a href="https://david-dm.org/tabler/tabler?type=dev"><img src="https://img.shields.io/david/dev/tabler/tabler.svg" alt="devDependency Status"></a>
5+
Premium and Open Source dashboard template with responsive and high quality UI.
66

7-
<strong><a href="https://tabler.github.io/demo/">View Demo</a> | <a href="https://github.com/tabler/tabler/archive/master.zip">Download ZIP</a></strong>
7+
<strong><a href="https://tabler.github.io/demo/">View Demo</a> | <a href="https://github.com/tabler/tabler/archive/master.zip">Download ZIP</a></strong> | <strong><a href="https://goo.gl/zJP2dT">Join us on Slack</a></strong>
88

99
<br><br>
1010

@@ -14,6 +14,7 @@ Premium and Open Source dashboard template with responsive and high quality UI.
1414

1515
<img src="https://tabler.github.io/assets/images/features/features-2.png" width="400" align="right" style="max-width: 50%">
1616

17+
1718
We created this admin panel for everyone who wants to create any templates based on our pre-made components. Our mission is to deliver a user-friendly, clear and easy administration panel, that can be used by both, simple websites and sophisticated systems. The only requirement is a basic HTML and CSS knowledge—as a reward, you'll be able to manage and visualize different types of data in the easiest possible way!
1819

1920
* **Responsive:** With support for mobile, tablet and desktop it doesn’t matter what device you’re using. Tabler is responsive in all major browsers.
@@ -22,6 +23,11 @@ We created this admin panel for everyone who wants to create any templates based
2223
* **Clean Code:** We strictly followed Bootstrap’s guidelines to make your integration as easy as possible. All code is handwritten and W3c valid.
2324
* **Demo pages**: Tabler features over 20 individual pages featuring various components, giving you the freedom of choosing and combining. All components can take variation in color and styling, that can easily be modified using Sass. The sky is the limit!
2425

26+
## Status
27+
28+
<a href="https://www.npmjs.com/package/tabler-ui"><img src="https://img.shields.io/npm/dt/tabler-ui.svg" alt="Total Downloads"></a> <a href="https://github.com/tabler/tabler/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tabler-ui.svg" alt="License"></a> <a href="https://github.com/tabler/tabler/releases"><img src="https://img.shields.io/npm/v/tabler-ui.svg" alt="Latest Release"></a> <a href="https://david-dm.org/tabler/tabler?type=dev"><img src="https://img.shields.io/david/dev/tabler/tabler.svg" alt="devDependency Status"></a> [![buddy pipeline](https://app.buddy.works/codecalm/tabler/pipelines/pipeline/131922/badge.svg?token=1ab151000ecf8700a90dd4d0d7184945d439d2642679b257092d16e76a45dce4 "buddy pipeline")](https://app.buddy.works/codecalm/tabler/pipelines/pipeline/131922)
29+
30+
2531
## Documentation
2632

2733
For full documentation, visit [tabler.github.io/tabler/docs](https://tabler.github.io/tabler/docs/index.html).
@@ -36,15 +42,15 @@ git clone https://github.com/tabler/tabler.git
3642

3743
### Setup environment
3844

39-
To use our build system and run our documentation locally, you'll need a copy of Tabler's source files and Node. Follow these steps:
45+
To use our build system and run documentation locally, you will need a copy of Tabler's source files and Node. Follow the steps below:
4046

41-
1. [Download and install Node.js](https://nodejs.org/download/), which we use to manage our dependencies.
42-
2. Navigate to the root `/tabler` directory and run `npm install` to install our local dependencies listed in `package.json`.
47+
1. [Download and install Node.js](https://nodejs.org/download/), which is used to manage our dependencies.
48+
2. Navigate to the root `/tabler` directory and run `npm install` to install local dependencies listed in `package.json`.
4349
3. [Install Ruby](https://www.ruby-lang.org/en/documentation/installation/), install [Bundler](https://bundler.io/) with `gem install bundler`, and finally run `bundle install`. This will install all Ruby dependencies, such as Jekyll and plugins.
4450

4551
**Windows users:** Read [this guide](https://jekyllrb.com/docs/windows/) to get Jekyll up and running without problems.
4652

47-
When completed, you'll be able to run the various commands provided from the command line.
53+
When completed, you will be able to run the various commands provided in the command line.
4854

4955
### Build Tabler
5056

‎_config.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ title: Tabler
22
description: tabler.github.io - a responsive, flat and full featured admin template
33

44
source: src
5+
host: 0.0.0.0
56

67
plugins:
78
- jekyll-tidy
@@ -24,8 +25,6 @@ exclude:
2425
- .DS_Store
2526
- .sass-cache/
2627
- .asset-cache/
27-
- assets/scss/*
28-
- assets/plugins/**/*.scss
2928
- push-to-repo.sh
3029
- commits.sh
3130

‎composer.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "tabler/tabler",
3+
"description": "Premium and Open Source dashboard template with responsive and high quality UI. For Free!",
4+
"type": "library",
5+
"license": "MIT",
6+
"require": {},
7+
"require-dev": {},
8+
"autoload": {},
9+
"authors": [
10+
{
11+
"name": "codecalm",
12+
"email": "[email protected]"
13+
}
14+
]
15+
}

‎dist-new-version.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env bash
22

3-
version=0.0.16
3+
version=0.0.24
44

55
echo "Version $version"
66

77
npm run dist
88
git add .
9-
git commit -am "generate dist"
9+
git commit -am "version $version"
1010
npm version $version
1111
git push origin master && git push origin master --tags
1212

‎dist/400.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html lang="en" dir="ltr">
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -14,15 +14,15 @@
1414
<meta name="MobileOptimized" content="320">
1515
<link rel="icon" href="./favicon.ico" type="image/x-icon"/>
1616
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
17-
<!-- Generated: 2018-03-27 13:25:03 +0200 -->
17+
<!-- Generated: 2018-04-04 18:58:30 +0200 -->
1818
<title>Page 400 - tabler.github.io - a responsive, flat and full featured admin template</title>
1919
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
2121
<script src="./assets/js/require.min.js"></script>
2222
<script>
2323
requirejs.config({
2424
baseUrl: '.'
25-
});
25+
});
2626
</script>
2727
<!-- Dashboard Core -->
2828
<link href="./assets/css/dashboard.css" rel="stylesheet" />

‎dist/401.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html lang="en" dir="ltr">
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -14,15 +14,15 @@
1414
<meta name="MobileOptimized" content="320">
1515
<link rel="icon" href="./favicon.ico" type="image/x-icon"/>
1616
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
17-
<!-- Generated: 2018-03-27 13:25:03 +0200 -->
17+
<!-- Generated: 2018-04-04 18:58:30 +0200 -->
1818
<title>Page 401 - tabler.github.io - a responsive, flat and full featured admin template</title>
1919
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
2121
<script src="./assets/js/require.min.js"></script>
2222
<script>
2323
requirejs.config({
2424
baseUrl: '.'
25-
});
25+
});
2626
</script>
2727
<!-- Dashboard Core -->
2828
<link href="./assets/css/dashboard.css" rel="stylesheet" />

‎dist/403.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html lang="en" dir="ltr">
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -14,15 +14,15 @@
1414
<meta name="MobileOptimized" content="320">
1515
<link rel="icon" href="./favicon.ico" type="image/x-icon"/>
1616
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
17-
<!-- Generated: 2018-03-27 13:25:03 +0200 -->
17+
<!-- Generated: 2018-04-04 18:58:30 +0200 -->
1818
<title>Page 403 - tabler.github.io - a responsive, flat and full featured admin template</title>
1919
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
2121
<script src="./assets/js/require.min.js"></script>
2222
<script>
2323
requirejs.config({
2424
baseUrl: '.'
25-
});
25+
});
2626
</script>
2727
<!-- Dashboard Core -->
2828
<link href="./assets/css/dashboard.css" rel="stylesheet" />

‎dist/404.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html lang="en" dir="ltr">
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -14,15 +14,15 @@
1414
<meta name="MobileOptimized" content="320">
1515
<link rel="icon" href="./favicon.ico" type="image/x-icon"/>
1616
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
17-
<!-- Generated: 2018-03-27 13:25:03 +0200 -->
17+
<!-- Generated: 2018-04-04 18:58:30 +0200 -->
1818
<title>Page 404 - tabler.github.io - a responsive, flat and full featured admin template</title>
1919
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
2121
<script src="./assets/js/require.min.js"></script>
2222
<script>
2323
requirejs.config({
2424
baseUrl: '.'
25-
});
25+
});
2626
</script>
2727
<!-- Dashboard Core -->
2828
<link href="./assets/css/dashboard.css" rel="stylesheet" />

‎dist/500.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html lang="en" dir="ltr">
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -14,15 +14,15 @@
1414
<meta name="MobileOptimized" content="320">
1515
<link rel="icon" href="./favicon.ico" type="image/x-icon"/>
1616
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
17-
<!-- Generated: 2018-03-27 13:25:03 +0200 -->
17+
<!-- Generated: 2018-04-04 18:58:30 +0200 -->
1818
<title>Page 500 - tabler.github.io - a responsive, flat and full featured admin template</title>
1919
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
2121
<script src="./assets/js/require.min.js"></script>
2222
<script>
2323
requirejs.config({
2424
baseUrl: '.'
25-
});
25+
});
2626
</script>
2727
<!-- Dashboard Core -->
2828
<link href="./assets/css/dashboard.css" rel="stylesheet" />

0 commit comments

Comments
 (0)