Skip to content

Commit

Permalink
tabler v1 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
codecalm committed Oct 31, 2020
1 parent 4531ba2 commit 3aa23ff
Show file tree
Hide file tree
Showing 17 changed files with 267 additions and 110 deletions.
63 changes: 60 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,63 @@ exclude:
- .jekyll-cache
- redirects.json

- all.html
- blank.html
- buttons.html
- calendar.html
- cards.html
- cards-masonry.html
- carousel.html
- changelog.html
- charts.html
- charts-heatmap.html
- crypto-currencies.html
- docs.html
- dropdowns.html
- empty.html
- error-404.html
- error-500.html
- error-maintenance.html
- favicon.ico
- flags.html
- forgot-password.html
- form-elements.html
- gallery.html
- icons.html
- index.html
- invoice.html
- layout-combo.html
- layout-condensed.html
- layout-condensed-dark.html
- layout-dark.html
- layout-fluid.html
- layout-fluid-vertical.html
- layout-horizontal.html
- layout-navbar-dark.html
- layout-navbar-overlap.html
- layout-vertical.html
- layout-vertical-right.html
- license.html
- lists.html
- maps.html
- maps-vector.html
- markdown.md
- modals.html
- music.html
- navigation.html
- pagination.html
- pricing.html
- search-results.html
- sign-in.html
- sign-up.html
- snippets.html
- social.html
- tables.html
- tabs.html
- typography.html
- users.html
- wizard.html

markdown: kramdown
kramdown:
input: GFM
Expand All @@ -50,9 +107,9 @@ toc:
max_level: 3
list_class: list-unstyled

collections:
docs:
output: true
#collections:
# docs:
# output: true

defaults:
- scope:
Expand Down
1 change: 1 addition & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ gulp.task('sass', () => {
.src(`${srcDir}/scss/*.scss`)
.pipe(sass({
style: 'expanded',
precision: 7,
importer: (url, prev, done) => {
if (url[0] === '~') {
url = path.resolve('node_modules', url.substr(1));
Expand Down
55 changes: 55 additions & 0 deletions src/pages/_data/settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
- title: General
icon: settings
description: View and update your store details

- title: Payments
icon: cash
description: Enable and manage your store's payment providers

- title: Checkout
icon: shopping-cart
description: Customize your online checkout process

- title: Shipping and delivery
icon: truck-delivery
description: Manage how you ship orders to customers

- title: Taxes
icon: tax
description: Manage how your store charges taxes

- title: Locations
icon: map-pin
description: Manage the places you stock inventory, fulfill orders, and sell products

- title: Notifications
icon: bell
description: Manage notifications sent to you and your customers

- title: Gift cards
icon: gift
description: Enable Apple Wallet passes and set gift card expiry dates

- title: Files
icon: file-invoice
description: Upload images, videos, and documents

- title: Sales channels
icon: chart-line
description: Manage the channels you use to sell your products and services

- title: Plan and permissions
icon: user
description: View plan information and manage what staff can see or do in your store

- title: Store languages
icon: language
description: Manage the languages your customers can view on your store

- title: Billing
icon: wallet
description: Manage your billing information and view your invoices

- title: Legal
icon: license
description: Manage your store's legal pages
10 changes: 3 additions & 7 deletions src/pages/_includes/layout/css.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@

<link href="{{ site.base }}/dist/css/tabler{% if jekyll.environment == 'production' %}.min{% endif %}.css{% if site.preview %}?{{ site.time | date: '%s' }}{% endif %}" rel="stylesheet"/>

{% if page.libs %}
{% for plugin in site.tabler-plugins %}
{% if page.libs contains plugin %}
<link href="{{ site.base }}/dist/css/{{ plugin }}{% if jekyll.environment == 'production' %}.min{% endif %}.css{% if site.preview %}?{{ site.time | date: '%s' }}{% endif %}" rel="stylesheet"/>
{% endif %}
{% endfor %}
{% endif %}
{% for plugin in site.tabler-plugins %}
<link href="{{ site.base }}/dist/css/{{ plugin }}{% if jekyll.environment == 'production' %}.min{% endif %}.css{% if site.preview %}?{{ site.time | date: '%s' }}{% endif %}" rel="stylesheet"/>
{% endfor %}

<link href="{{ site.base }}/dist/css/demo{% if jekyll.environment == 'production' %}.min{% endif %}.css{% if site.preview %}?{{ site.time | date: '%s' }}{% endif %}" rel="stylesheet"/>
43 changes: 21 additions & 22 deletions src/pages/_includes/layout/page-header-actions.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,31 @@
<!-- Page title actions -->
<div class="col-auto ml-auto d-print-none">
{% if actions == 'users' %}
<div class="d-flex">
<input type="search" class="form-control d-inline-block w-9 mr-3" placeholder="Search user…"/>
{% include ui/button.html text="New user" color="primary" icon="plus" %}
</div>
<div class="d-flex">
<input type="search" class="form-control d-inline-block w-9 mr-3" placeholder="Search user…"/>
{% include ui/button.html text="New user" color="primary" icon="plus" %}
</div>
{% elsif actions == 'calendar' %}
<div class="d-flex">
{% include ui/button.html text="Add event" color="primary" icon="plus" %}
</div>
<div class="d-flex">
{% include ui/button.html text="Add event" color="primary" icon="plus" %}
</div>
{% elsif actions == 'photos' %}
<div class="d-flex">
<div class="mr-3">
{% include ui/form/input-icon.html %}
<div class="d-flex">
<div class="mr-3">
{% include ui/form/input-icon.html %}
</div>
{% include ui/button.html text="Add event" color="primary" icon="plus" %}
</div>
{% include ui/button.html text="Add event" color="primary" icon="plus" %}
</div>
{% elsif actions == 'breadcrumb' %}
<div class="d-flex">
{% include ui/breadcrumb.html class="breadcrumb-alternate" %}
</div>
<div class="d-flex">
{% include ui/breadcrumb.html class="breadcrumb-alternate" %}
</div>
{% elsif actions == 'buttons' %}
<span class="d-none d-sm-inline">
{% include ui/button.html text="New view" color="white" %}
</span>
{% include ui/button.html icon="plus" text="Create new report" color="primary" class="ml-3 d-none d-sm-inline-block" modal-id="report" %}
{% include ui/button.html icon="plus" icon-only=true color="primary" class="ml-3 d-sm-none" text="Create new report" modal-id="report" %}
<span class="d-none d-sm-inline">
{% include ui/button.html text="New view" color="white" %}
</span>
{% include ui/button.html icon="plus" text="Create new report" color="primary" class="ml-3 d-none d-sm-inline-block" modal-id="report" %}
{% include ui/button.html icon="plus" icon-only=true color="primary" class="ml-3 d-sm-none" text="Create new report" modal-id="report" %}
{% include ui/modal.html modal-id="report" size="lg" top=true %}
{% endif %}

{% include ui/modal.html modal-id="report" size="lg" top=true %}
</div>
8 changes: 3 additions & 5 deletions src/pages/_includes/layout/page-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
<h2 class="page-title">
{{ include.title }}
</h2>
</div>

{% if include.description %}
<div class="col-auto">
<div class="text-muted text-h5 mt-2">{{ include.description }}</div>
{% if include.description %}
<div class="text-muted mt-1">{{ include.description }}</div>
{% endif %}
</div>
{% endif %}

{% if include.actions %}
{% include layout/page-header-actions.html actions=include.actions %}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</head>

{% assign layout-dark = page.layout-dark | default: site.layout-dark %}
<body class="{% if layout-dark %} theme-dark{% endif %}{% if layout.body-class %} {{ layout.body-class }}{% endif %}{% if page.body-class %} {{ page.body-class }}{% endif %}">
<body class="antialiased{% if layout-dark %} theme-dark{% endif %}{% if layout.body-class %} {{ layout.body-class }}{% endif %}{% if page.body-class %} {{ page.body-class }}{% endif %}">

{{ content }}

Expand Down
9 changes: 9 additions & 0 deletions src/pages/_layouts/card.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: default
---

<div class="card">
<div class="card-body">
{{ content }}
</div>
</div>
35 changes: 32 additions & 3 deletions src/scss/_utilities.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$margin-spacers: map-merge($spacers, (auto: auto, null: $spacer));

//Utilities
$utilities: (
"text-align": (
Expand All @@ -10,6 +12,15 @@ $utilities: (
center: center
)
),
"float": (
property: float,
responsive: true,
values: (
left: inline-start,
right: inline-end,
none: none
)
),
"object": (
property: object-fit,
class: object,
Expand Down Expand Up @@ -59,6 +70,7 @@ $utilities: (
values: (
light: $font-weight-light,
normal: $font-weight-normal,
medium: $font-weight-medium,
bold: $font-weight-bold,
)
),
Expand Down Expand Up @@ -117,7 +129,6 @@ $utilities: (
class: h,
values: $size-values
),

//Flow-relative values
"padding-right": (
responsive: true,
Expand All @@ -131,17 +142,35 @@ $utilities: (
class: pl,
values: $spacers
),
"margin": (
responsive: true,
property: margin,
class: m,
values: $margin-spacers
),
"margin-right": (
responsive: true,
property: margin-inline-end,
class: mr,
values: map-merge($spacers, (auto: auto))
values: $margin-spacers
),
"margin-left": (
responsive: true,
property: margin-inline-start,
class: ml,
values: map-merge($spacers, (auto: auto))
values: $margin-spacers
),
"margin-top": (
responsive: true,
property: margin-top,
class: mt,
values: $margin-spacers
),
"margin-bottom": (
responsive: true,
property: margin-bottom,
class: mb,
values: $margin-spacers
),
"negative-margin-right": (
responsive: true,
Expand Down

0 comments on commit 3aa23ff

Please sign in to comment.