Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tabler/tabler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: silverbackhq/tabler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 16 commits
  • 4 files changed
  • 8 contributors

Commits on Apr 26, 2018

  1. correct img src tag

    Sliverwing committed Apr 26, 2018
    Copy the full SHA
    9ac7354 View commit details

Commits on Aug 3, 2018

  1. Update maps.html

    On mobile, Expand map-metro to full width
    amitozdeol authored Aug 3, 2018
    Copy the full SHA
    bb5a46d View commit details

Commits on Aug 15, 2018

  1. Copy the full SHA
    d8e772d View commit details

Commits on Aug 21, 2018

  1. Fixing typo

    "Awerage" -> "Average"
    HyperKids authored Aug 21, 2018
    Copy the full SHA
    7af0276 View commit details

Commits on Aug 27, 2018

  1. Merge pull request #181 from HyperKids/patch-2

    Fixing typo
    codecalm authored Aug 27, 2018
    Copy the full SHA
    ca81856 View commit details
  2. Merge pull request #176 from amitozdeol/dev

    Update maps.html
    codecalm authored Aug 27, 2018
    Copy the full SHA
    54e9403 View commit details

Commits on Oct 2, 2018

  1. Copy the full SHA
    797057b View commit details

Commits on Oct 10, 2018

  1. Copy the full SHA
    d9f2842 View commit details
  2. Adding to feature list.

    AaronCoplan committed Oct 10, 2018
    Copy the full SHA
    f6291c4 View commit details

Commits on Oct 18, 2018

  1. Update bundle.scss

    Change the path of bootstrap for fix the bug in webpack
    majidalavizadeh authored Oct 18, 2018
    Copy the full SHA
    1763df7 View commit details

Commits on Oct 26, 2018

  1. Merge pull request #209 from AaronCoplan/dev

    Add tabler-react repository link to README
    codecalm authored Oct 26, 2018
    Copy the full SHA
    c3b565d View commit details
  2. Merge pull request #215 from majidalavizadeh/dev

    Update bundle.scss
    codecalm authored Oct 26, 2018
    Copy the full SHA
    f5a4826 View commit details
  3. Merge pull request #204 from AndreasElia/patch-1

    Grammar fixes in readme
    codecalm authored Oct 26, 2018
    Copy the full SHA
    cc8773e View commit details
  4. Merge pull request #119 from Sliverwing/dev

    correct img src tag
    codecalm authored Oct 26, 2018
    Copy the full SHA
    fb60444 View commit details
  5. Copy the full SHA
    b0c4bbd View commit details
  6. Merge pull request #179 from gergo85/patch-1

    Improve the responsive view of Maps page
    codecalm authored Oct 26, 2018
    Copy the full SHA
    a09fd46 View commit details
Showing with 17 additions and 16 deletions.
  1. +11 −10 README.md
  2. +2 −2 src/_includes/cards/finance.html
  3. +2 −2 src/assets/scss/bundle.scss
  4. +2 −2 src/maps.html
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

4 changes: 2 additions & 2 deletions src/_includes/cards/finance.html
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions src/assets/scss/bundle.scss
Original file line number Diff line number Diff line change
@@ -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';
4 changes: 2 additions & 2 deletions src/maps.html
Original file line number Diff line number Diff line change
@@ -21,10 +21,10 @@
{% include cards/map-world.html %}

<div class="row">
<div class="col-6">
<div class="col-lg-6 col-md-12">
{% include cards/map-metro.html %}
</div>
<div class="col-6"></div>
<div class="col-lg-6 col-md-12"></div>
</div>
</div>
</div>