Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-07-16 18:41:40 +04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chomik
2018-03-27 11:29:15 +02:00
parent a4aedce2cf af02126876
commit 659ae22a31
8 changed files with 116 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CODE_OF_CONDUCT.md
+46
View File
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at codecalm@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "tabler-ui",
"description": "Premium and Open Source dashboard template with responsive and high quality UI. For Free!",
"version": "0.0.7",
"version": "0.0.8",
"keywords": [
"css",
"sass",
src/_includes/cards/development-activity.html
+49 -47
View File
@@ -3,53 +3,55 @@
<h3 class="card-title">Development Activity</h3>
</div>
<div id="chart-development-activity" style="height: 10rem"></div>
<table class="table card-table table-striped table-vcenter">
<thead>
<tr>
<th colspan="2">User</th>
<th>Commit</th>
<th>Date</th>
<th></th>
</tr>
</thead>
<tbody>
<tr>
<td class="w-1"><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[10].photo }})"></span></td>
<td>{{ site.data.users[10].name }} {{ site.data.users[10].surname }}</td>
<td>Initial commit</td>
<td>May 6, 2018</td>
<td class="w-1"><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar">BM</span></td>
<td>{{ site.data.users[17].name }} {{ site.data.users[17].surname }}</td>
<td>Main structure</td>
<td>April 22, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[16].photo }})"></span></td>
<td>{{ site.data.users[16].name }} {{ site.data.users[16].surname }}</td>
<td>Left sidebar adjusments</td>
<td>April 15, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[12].photo }})"></span></td>
<td>{{ site.data.users[12].name }} {{ site.data.users[12].surname }}</td>
<td>Topbar dropdown style</td>
<td>April 8, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[19].photo }})"></span></td>
<td>{{ site.data.users[19].name }} {{ site.data.users[19].surname }}</td>
<td>Fixes #625</td>
<td>April 9, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
</tbody>
</table>
<div class="table-responsive">
<table class="table card-table table-striped table-vcenter">
<thead>
<tr>
<th colspan="2">User</th>
<th>Commit</th>
<th>Date</th>
<th></th>
</tr>
</thead>
<tbody>
<tr>
<td class="w-1"><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[10].photo }})"></span></td>
<td>{{ site.data.users[10].name }} {{ site.data.users[10].surname }}</td>
<td>Initial commit</td>
<td class="text-nowrap">May 6, 2018</td>
<td class="w-1"><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar">BM</span></td>
<td>{{ site.data.users[17].name }} {{ site.data.users[17].surname }}</td>
<td>Main structure</td>
<td class="text-nowrap">April 22, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[16].photo }})"></span></td>
<td>{{ site.data.users[16].name }} {{ site.data.users[16].surname }}</td>
<td>Left sidebar adjusments</td>
<td class="text-nowrap">April 15, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[12].photo }})"></span></td>
<td>{{ site.data.users[12].name }} {{ site.data.users[12].surname }}</td>
<td>Topbar dropdown style</td>
<td class="text-nowrap">April 8, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
<tr>
<td><span class="avatar" style="background-image: url({{ site.base }}/{{ site.data.users[19].photo }})"></span></td>
<td>{{ site.data.users[19].name }} {{ site.data.users[19].surname }}</td>
<td>Fixes #625</td>
<td class="text-nowrap">April 9, 2018</td>
<td><a href="#" class="icon"><i class="fe fe-trash"></i></a></td>
</tr>
</tbody>
</table>
</div>
</div>
{% include js-charts.html id="chart-development-activity" data="development-activity" %}
src/_includes/cards/invoices.html
+2 -6
View File
@@ -14,12 +14,8 @@
<th>Created</th>
<th>Status</th>
<th>Price</th>
<th>
<span class="sr-only">Actions</span>
</th>
<th>
<span class="sr-only">Download</span>
</th>
<th></th>
<th></th>
</tr>
</thead>
src/_includes/cards/table-users.html
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="card">
<table class="table table-responsive-sm table-hover table-outline table-vcenter card-table">
<table class="table table-responsive table-hover table-outline table-vcenter text-nowrap card-table">
<thead>
<tr>
<th class="text-center w-1"><i class="icon-people"></i></th>
src/assets/plugins/charts-c3/scss/_c3.scss
+4
View File
@@ -1,4 +1,8 @@
/*-- Chart --*/
.c3 {
overflow: hidden;
}
.c3 svg {
font: 10px sans-serif;
-webkit-tap-highlight-color: transparent;
src/assets/scss/dashboard/_cards.scss
+1
View File
@@ -225,6 +225,7 @@
margin-top: -1rem;
position: relative;
z-index: 1;
overflow: hidden;
}
.card-options {
src/index.html
+12 -12
View File
@@ -34,23 +34,23 @@ menu: index
{% comment %}{% include cards/tasks.html %}{% endcomment %}
</div>
<div class="col-sm-6">
<div class="col-md-6">
<div class="alert alert-primary">Are you in trouble? <a href="{{ site.base }}/docs/index.html" class="alert-link">Read our documentation</a> with code samples.</div>
<div class="row">
<div class="col-6">
<div class="col-sm-6">
{% include cards/chart.html height=12 title="Chart title" id="chart-donut" data="donut" %}
</div>
<div class="col-6">
<div class="col-sm-6">
{% include cards/chart.html height=12 title="Chart title" id="chart-pie" data="pie" %}
</div>
<div class="col-4">
<div class="col-sm-4">
{% include cards/digit.html color="red" title="New fedbacks" digit="62" width="28%" %}
</div>
<div class="col-4">
<div class="col-sm-4">
{% include cards/digit.html color="green" title="Today profit" digit="$652" width="84%" %}
</div>
<div class="col-4">
<div class="col-sm-4">
{% include cards/digit.html color="yellow" title="Users online" digit="76" width="34%" %}
</div>
</div>
@@ -91,22 +91,22 @@ menu: index
<div class="col-sm-6 col-lg-4">
{% include cards/projects-list.html %}
</div>
<div class="col-sm-6 col-lg-4">
<div class="col-md-6 col-lg-4">
{% include cards/members.html %}
</div>
<div class="col-sm-6 col-lg-12">
<div class="col-md-6 col-lg-12">
<div class="row">
<div class="col-lg-3">
<div class="col-sm-6 col-lg-3">
{% include cards/chart-bg.html id="chart-bg-users-1" %}
</div>
<div class="col-lg-3">
<div class="col-sm-6 col-lg-3">
{% include cards/chart-bg.html id="chart-bg-users-2" offset=60 aggregate=true color="red" rate="-3%" %}
</div>
<div class="col-lg-3">
<div class="col-sm-6 col-lg-3">
{% include cards/chart-bg.html id="chart-bg-users-3" offset=50 color="green" rate="-3%" %}
</div>
<div class="col-lg-3">
<div class="col-sm-6 col-lg-3">
{% include cards/chart-bg.html id="chart-bg-users-4" offset=40 color="yellow" rate="9%" %}
</div>
</div>