Merge remote-tracking branch 'origin/dev' into dev

Gemfile

@@ -10,4 +10,4 @@ gem "jekyll-tidy"
 gem "jekyll-timeago"
 gem 'jekyll-redirect-from'
 gem 'jekyll-include-cache'
-
+gem 'wdm', '>= 0.1.1' if Gem.win_platform?

README.md

@@ -6,10 +6,12 @@ Premium and Open Source dashboard template with responsive and high-quality UI.
 
 <strong><a href="https://tabler.github.io/demo/">View Demo</a> | <a href="https://github.com/tabler/tabler-react">View React Version</a> | <a href="https://github.com/tabler/tabler/archive/master.zip">Download ZIP</a> | <a href="https://goo.gl/zJP2dT">Join us on Slack</a></strong>
 
-<br><br>
-
 ![Tabler preview](https://tabler.github.io/img/dashboard-preview.png)
 
+## Status
+
+<a href="https://www.npmjs.com/package/tabler-ui"><a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/tabler/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/tabler/sponsors/badge.svg" /></a> <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>
+
 ## Features
 
 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!
@@ -21,9 +23,31 @@ We created this admin panel for everyone who wants to create any templates based
 * **Demo pages**: Tabler features over 20 individual pages featuring various components, giving you the freedom to choose and combine. All components can take variation in color and styling that can easily be modified using Sass. The sky is the limit!
 * **Single Page Application versions:** [Tabler React](https://github.com/tabler/tabler-react) has React components for Tabler.
 
-## Status
+## Setup environment
 
-<a href="https://www.npmjs.com/package/tabler-ui"><a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/tabler/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/tabler/sponsors/badge.svg" /></a> <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>
+To use our build system and run our documentation locally, you'll need a copy of Tabler's source files. Follow these steps:
+
+1. [Install Node.js](https://nodejs.org/download/), which we use to manage our dependencies.
+2. Navigate to the root `/tabler` directory and run `npm install` to install our local dependencies listed in `package.json`.
+3. [Install Ruby](https://ruby-lang.org/en/documentation/installation/), recommended version is [2.5.5](https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.5.tar.gz).
+4. [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](https://jekyllrb.com).
+   
+**Windows users**: 
+1. [Install Git](https://git-scm.com/download/win) in `C:\\Program Files\\git\\bin` directory and run `npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"` to change default shell.
+2. [Install Ruby+Devkit](https://rubyinstaller.org/downloads/), recommended version is [2.5.5](https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-devkit-2.5.5-1-x86.exe).
+3. [Read guide](https://jekyllrb.com/docs/installation/windows/) to get Jekyll up and running without problems.
+  
+When completed, you'll be able to run the various commands provided from the command line.
+
+## Build locally
+
+1. From the root `/tabler` directory, run `npm run start` in the command line.
+2. Open [http://localhost:4000](http://localhost:4000) in your browser, and voilà.
+3. Any change in `/pages` directory will build application and refresh the page.
+
+**Note**: 
+Run `npm run build` for rerforms a one off build application without refresh.
+Open [http://localhost:3001](http://localhost:3001) to configure the Web server.
 
 ## Feature requests
 
@@ -44,8 +68,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/ta
 ## Contributors
 
 This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
-<a href="graphs/contributors"><img src="https://opencollective.com/tabler/contributors.svg?width=890&button=false" /></a>
+<a href="graphs/contributors"><img src="https://opencollective.com/tabler/contributors.svg?width=890&button=false"></a>
-
 
 ## Backers
 
@@ -69,8 +92,6 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/tabler/sponsor/8/website" target="_blank"><img src="https://opencollective.com/tabler/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/tabler/sponsor/9/website" target="_blank"><img src="https://opencollective.com/tabler/sponsor/9/avatar.svg"></a>
 
-
-
 ## Copyright and license
 
 Code and documentation copyright 2018 the [Tabler Authors](https://github.com/tabler/tabler/graphs/contributors) and [codecalm.net](https://codecalm.net). Code released under the [MIT License](https://github.com/tabler/tabler/blob/master/LICENSE).

_config.yml

@@ -3,6 +3,7 @@ destination: tmp
 
 title: Tabler Admin Template
 description: Premium and Open Source dashboard template with responsive and high quality UI.
+github_url: https://github.com/tabler/tabler
 
 debug: false
 

js/demo.js

@@ -27,7 +27,7 @@ class TablerDemo {
     this.config = this.getConfig();
   };
 
-  getConfig = function () {
+  getConfig() {
     return {
       colorScheme: (localStorage.getItem('tablerColorScheme')) ? localStorage.getItem('tablerColorScheme') : 'light',
       navPosition: (localStorage.getItem('tablerNavPosition')) ? localStorage.getItem('tablerNavPosition') : 'side',
@@ -40,7 +40,7 @@ class TablerDemo {
     };
   };
 
-  setConfig = function (key, value, availableValues, onSuccess) {
+  setConfig(key, value, availableValues, onSuccess) {
     if (availableValues && availableValues.indexOf(value) !== -1) {
       key = 'tabler' + key.charAt(0).toUpperCase() + key.slice(1);
 
@@ -52,7 +52,7 @@ class TablerDemo {
     return this.getConfig();
   };
 
-  onSubmitForm = function () {
+  onSubmitForm() {
     const form = this.form;
 
     this.toggleColorScheme(form.querySelector('[name="color-scheme"]:checked').value);
@@ -65,7 +65,7 @@ class TablerDemo {
     this.toggleSidebarFixed(form.querySelector('[name="sidebar-fixed"]:checked').value);
   };
 
-  initFormControls = function() {
+  initFormControls() {
     const config = this.getConfig();
 
     this.toggleColorScheme(config.colorScheme);
@@ -78,7 +78,7 @@ class TablerDemo {
     this.toggleSidebarFixed(config.sidebarFixed);
   };
 
-  setFormValue = function(name, value,) {
+  setFormValue(name, value) {
     if(this.form) {
       let elements = this.form.querySelectorAll(`[name="${name}"]`);
 

pages/_data/docs.yml

@@ -1,3 +1,4 @@
+- page: index
 - page: alerts
 - page: autosize
 - page: avatars
@@ -6,6 +7,7 @@
 - page: buttons
 - page: cards
 - page: carousel
+- page: cursors
 - page: charts
 - page: divider
 - page: flags

pages/_docs/alerts.md

@@ -25,7 +25,7 @@ Add the `alert-link` class to any links inside the alert box to create "matching
 {% example %}
 {% for variant in site.variants %}
 	{% capture variant-text %}
-		This is a {{ variant.name }} alert — <a href="#">check it out!</a>
+		This is a {{ variant.name }} alert — <a href="#" class="alert-link">check it out</a>!
 	{% endcapture %}
 	{% include ui/alert.html type=variant.name text=variant-text %}
 {% endfor %}

pages/_docs/cursors.md

@@ -0,0 +1,29 @@
+---
+title: Cursors
+menu: docs.cursors
+---
+
+### Cursor utilities 
+
+{% example html %}
+<div class="row text-center">
+  <div class="col-4 mb-3">
+    <div class="cursor-auto bg-light py-3">Cursor auto</div>
+  </div>
+  <div class="col-4 mb-3">
+    <div class="cursor-pointer bg-light py-3">Cursor pointer</div>
+  </div>
+  <div class="col-4 mb-3">
+    <div class="cursor-move bg-light py-3">Cursor move</div>
+  </div>
+  <div class="col-4">
+    <div class="cursor-not-allowed bg-light py-3">Cursor not allowed</div>
+  </div>
+  <div class="col-4">
+    <div class="cursor-zoom-in bg-light py-3">Cursor zoom in</div>
+  </div>
+  <div class="col-4">
+    <div class="cursor-zoom-out bg-light py-3">Cursor zoom out</div>
+  </div>
+</div>
+{% endexample %}

pages/_docs/index.md

@@ -7,17 +7,19 @@ order: -1
 
 We’ve created this admin panel for everyone who wants to create any templates based on our ready 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!
 
-
-
 ### Setup environment
 
-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:
+To use our build system and run our documentation locally, you'll need a copy of Tabler's source files. Follow these steps:
 
-1. [Download and install Node.js](https://nodejs.org/download/), which we use to manage our dependencies.
+1. [Install Node.js](https://nodejs.org/download/), which we use to manage our dependencies.
 2. Navigate to the root `/tabler` directory and run `npm install` to install our local dependencies listed in `package.json`.
-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.
+3. [Install Ruby](https://ruby-lang.org/en/documentation/installation/), recommended version is [2.5.5](https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.5.tar.gz).
+4. [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](https://jekyllrb.com).
    
-   **Windows users:** Read [this guide](https://jekyllrb.com/docs/windows/) to get Jekyll up and running without problems.
+**Windows users**:
+1. [Install Git](https://git-scm.com/download/win) in `C:\\Program Files\\git\\bin` directory and run `npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"` to change default shell.
+2. [Install Ruby+Devkit](https://rubyinstaller.org/downloads/), recommended version is [2.5.5](https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-devkit-2.5.5-1-x86.exe).
+3. [Read guide](https://jekyllrb.com/docs/installation/windows/) to get Jekyll up and running without problems.
   
 When completed, you'll be able to run the various commands provided from the command line.
 
@@ -27,7 +29,9 @@ When completed, you'll be able to run the various commands provided from the com
 2. Open [http://localhost:4000](http://localhost:4000) in your browser, and voilà.
 3. Any change in `/pages` directory will build application and refresh the page.
 
-**Note**: run `npm run build` for rerforms a one off build application without refresh.
+**Note**:
+Run `npm run build` for rerforms a one off build application without refresh.
+Open [http://localhost:3001](http://localhost:3001) to configure the Web server.
 
 ### Bugs and feature requests
 

pages/_includes/parts/navbar.html

@@ -98,7 +98,7 @@
       {% endif %}
 
       <li class="nav-item d-none d-lg-flex mr-3">
-         <a href="https://github.com/tabler/tabler" class="btn btn-sm btn-outline-primary" target="_blank">Source code</a>
+         <a href="{{ site.github_url }}" class="btn btn-sm btn-outline-primary" target="_blank">Source code</a>
       </li>
 
       {% if include.user-menu %}

scss/_variables.scss

@@ -4,7 +4,7 @@ $font-family-serif: "Georgia", "Times New Roman", times, serif !default;
 $font-icons: "tabler-webfont" !default;
 
 // EXTERNAL FONTS
-$google-font-url: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,500,600,700&display=swap" !default;
+$google-font-url: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700&display=swap" !default;
 $icon-fonts: () !default;
 
 // COLORS
@@ -205,6 +205,9 @@ $container-max-widths: (
   xl: 1200px
 ) !default;
 
+//alerts
+$alert-link-font-weight: 600 !default;
+
 //close
 $close-font-weight: 400 !default;
 $close-font-size: 1.5rem !default;
@@ -313,4 +316,16 @@ $utilities: (
       loose: 2 !important,
     )
   ),
+  "cursor": (
+    property: cursor,
+    class: cursor,
+    values: (
+      auto: auto,
+      pointer: pointer,
+      move: move,
+      not-allowed: not-allowed,
+      zoom-in: zoom-in,
+      zoom-out: zoom-out
+    )
+  )
 ) !default;

scss/tabler.scss

@@ -55,6 +55,5 @@
 @import "utils/opacity";
 @import "utils/shadow";
 
-
 @import "dark";
 @import "rtl";