Merge branch 'dev' into patch-1

README.md

@@ -1,11 +1,11 @@
-# Tabler 
+# Tabler
 [![Backers on Open Collective](https://opencollective.com/tabler/backers/badge.svg)](#backers)
- [![Sponsors on Open Collective](https://opencollective.com/tabler/sponsors/badge.svg)](#sponsors) 
+ [![Sponsors on Open Collective](https://opencollective.com/tabler/sponsors/badge.svg)](#sponsors)
 <a href="https://buddy.works"><img src="https://assets.buddy.works/automated-dark.svg" alt="Automated by Buddy" align="right"></a>
 
-Premium and Open Source dashboard template with responsive and high quality UI.
+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/archive/master.zip">Download ZIP</a> | <a href="https://goo.gl/zJP2dT">Join us on Slack</a></strong>
+<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>
 
@@ -19,10 +19,11 @@ Premium and Open Source dashboard template with responsive and high quality UI.
 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!
 
 * **Responsive:** With support for mobile, tablet and desktop it doesn’t matter what device you’re using. Tabler is responsive in all major browsers.
-* **Cross Browser:** Our theme works perfectly with: Latest Chrome, Firefox+, Latest Safari, Opera, Internet Explorer 10+ and mobile browsers. We work hard to continuously support them.
+* **Cross Browser:** Our theme works perfectly with Latest Chrome, Firefox+, Latest Safari, Opera, Internet Explorer 10+ and mobile browsers. We work hard to continuously support them.
 * **HTML5 & CSS3:** We only use modern web technologies like HTML5 and CSS3. Our theme includes some subtle CSS3 animations so you will get anyone’s attention.
 * **Clean Code:** We strictly followed Bootstrap’s guidelines to make your integration as easy as possible. All code is handwritten and W3C valid.
 * **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
 
@@ -48,22 +49,22 @@ To use our build system and run documentation locally, you will need a copy of T
 1. [Download and install Node.js](https://nodejs.org/download/), which is used to manage our dependencies.
 2. Navigate to the root `/tabler` directory and run `npm install` to install 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.
-   
+
    **Windows users:** Read [this guide](https://jekyllrb.com/docs/windows/) to get Jekyll up and running without problems.
-  
+
 When completed, you will be able to run the various commands provided in the command line.
 
 ### Build Tabler
 
 1. From the root `/tabler` directory, run `npm run serve` in the command line.
 2. Open [http://localhost:4000](http://localhost:4000) in your browser, and voilà.
-3. Any change in `/src` directory will build application and refresh the page.
+3. Any change in the `/src` directory will build the application and refresh the page.
 
-**Warning!** all changes made in `_site/` folder would be overwritten on application build.
+**Warning!** all changes made in the `_site/` folder will be overwritten on application build.
 
 ## Development preview
 
-All changes made on `dev` branch are avaliable on http://tabler.codecalm.net/dev/. Every change in the code automatically compiles the source code.
+All changes made on `dev` branch are available on http://tabler.codecalm.net/dev/. Every change in the code automatically compiles the source code.
 
 ## Bugs and feature requests
 

src/_includes/cards/finance.html

@@ -12,7 +12,7 @@ <h3 class="card-title">
 						<div class="h5 mb-0">
 							IPO Margin
 						</div>
-						<span class="small text-muted">Awerage IPO Margin</span>
+						<span class="small text-muted">Average IPO Margin</span>
 					</div>
 					<div class="col text-right">
 						<span class="h4 text-primary font-weight-bold">+24%</span>
@@ -60,4 +60,4 @@ <h3 class="card-title">
 			</li>
 		</ul>
 	</div>
-</div>
+</div>

src/assets/scss/bundle.scss

@@ -3,5 +3,5 @@ Dashboard UI
  */
 
 @import 'variables';
-@import '../../../node_modules/bootstrap/scss/bootstrap.scss';
-@import 'dashboard/dashboard';
+@import '~bootstrap/scss/bootstrap.scss';
+@import 'dashboard/dashboard';