Skip to content

Commit

Permalink
Merge pull request #3 from themesberg/v1.0.1
Browse files Browse the repository at this point in the history 
V1.0.1
  • Loading branch information
@zoltanszogyenyi
zoltanszogyenyi committed Aug 25, 2020
2 parents 3145cf3 + 80f1c9e commit 538ca28
Show file tree
Hide file tree
Showing 23 changed files with 449 additions and 239 deletions.
53 changes: 52 additions & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"nouislider": "11.0.3",
"onscreen": "1.3.4",
"popper.js": "1.16.0",
"simplebar": "^6.0.0-beta.2",
"smooth-scroll": "^16.1.0",
"vanillajs-datepicker": "^1.0.3",
"waypoints": "4.0.1"
Expand Down
6 changes: 6 additions & 0 deletions src/assets/js/volt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ d.addEventListener("DOMContentLoaded", function(event) {
el.style.background = 'url(' + el.getAttribute('data-background') + ')';
});

[].slice.call(d.querySelectorAll('[data-background-lg]')).map(function(el) {
if(document.body.clientWidth > breakpoints.lg) {
el.style.background = 'url(' + el.getAttribute('data-background-lg') + ')';
}
});

[].slice.call(d.querySelectorAll('[data-background-color]')).map(function(el) {
el.style.background = 'url(' + el.getAttribute('data-background-color') + ')';
});
Expand Down
4 changes: 4 additions & 0 deletions src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
})
<main>

@@include('./_preloader.html', {
"path": "../.."
})

<!-- Hero -->
<section class="section-header pb-9 pb-lg-12 bg-primary text-white">
<div class="container">
Expand Down
6 changes: 1 addition & 5 deletions src/pages/components/buttons.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
})
</head>

<body>
<body class="bg-soft">

@@include('./dashboard/_nav.html', {
"path": "../.."
Expand All @@ -46,10 +46,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
Expand Down
6 changes: 1 addition & 5 deletions src/pages/components/forms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
})
</head>

<body>
<body class="bg-soft">

@@include('./dashboard/_nav.html', {
"path": "../.."
Expand All @@ -46,10 +46,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
Expand Down
12 changes: 4 additions & 8 deletions src/pages/components/modals.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
})
</head>

<body>
<body class="bg-soft">

@@include('./dashboard/_nav.html', {
"path": "../.."
Expand All @@ -46,10 +46,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
Expand Down Expand Up @@ -291,13 +287,13 @@ <h2 class="mb-0 h5">Create Account</h2>
<div class="modal-dialog modal-tertiary modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header mx-auto">
<p class="lead mb-0">You just unlocked a new badge</p>
<p class="lead mb-0 text-white">You just unlocked a new badge</p>
</div>
<div class="modal-body">
<div class="py-3 px-5 text-center">
<span class="modal-icon display-1-lg"><span class="fas fa-medal"></span></span>
<h2 class="h3 modal-title mb-3">Author Level 5</h2>
<p class="mb-4">One Thousand Dollars! Well done mate - heads are turning your way.</p>
<h2 class="h3 modal-title mb-3 text-white">Author Level 5</h2>
<p class="mb-4 text-white">One Thousand Dollars! Well done mate - heads are turning your way.</p>
<div class="progress-wrapper">
<div class="progress">
<div class="progress-bar bg-primary" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"></div>
Expand Down
16 changes: 6 additions & 10 deletions src/pages/components/notifications.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
})
</head>

<body>
<body class="bg-soft">

@@include('./dashboard/_nav.html', {
"path": "../.."
})

<div class="container-fluid bg-soft">
<div class="container-fluid">
<div class="row">
<div class="col-12">

Expand All @@ -46,10 +46,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
Expand Down Expand Up @@ -108,7 +104,7 @@ <h2 class="h4 mb-0">Notyf</h2>
types: [
{
type: 'info',
background: 'blue',
background: '#0948B3',
icon: {
className: 'fas fa-info-circle',
tagName: 'span',
Expand All @@ -133,7 +129,7 @@ <h2 class="h4 mb-0">Notyf</h2>
types: [
{
type: 'error',
background: 'red',
background: '#FA5151',
icon: {
className: 'fas fa-times',
tagName: 'span',
Expand All @@ -158,7 +154,7 @@ <h2 class="h4 mb-0">Notyf</h2>
types: [
{
type: 'warning',
background: 'orange',
background: '#F5B759',
icon: {
className: 'fas fa-exclamation-triangle',
tagName: 'span',
Expand All @@ -183,7 +179,7 @@ <h2 class="h4 mb-0">Notyf</h2>
types: [
{
type: 'info',
background: 'black',
background: '#262B40',
icon: {
className: 'fas fa-comment-dots',
tagName: 'span',
Expand Down
6 changes: 1 addition & 5 deletions src/pages/components/typography.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
})
</head>

<body>
<body class="bg-soft">

@@include('./dashboard/_nav.html', {
"path": "../.."
Expand All @@ -46,10 +46,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
Expand Down
4 changes: 0 additions & 4 deletions src/pages/dashboard/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
<div class="btn-toolbar dropdown">
<button class="btn btn-primary btn-sm mr-2 dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/examples/sign-in.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Section -->
<section class="vh-lg-100 d-flex align-items-center">
<div class="container">
<div class="row justify-content-center form-bg-image" data-background="../../assets/img/illustrations/signin.svg">
<div class="row justify-content-center form-bg-image" data-background-lg="../../assets/img/illustrations/signin.svg">
<div class="col-12 d-flex align-items-center justify-content-center">
<div class="signin-inner my-3 my-lg-0 bg-white shadow-soft border rounded border-light p-4 p-lg-5 w-100 fmxw-500">
<div class="text-center text-md-center mb-4 mt-md-0">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/examples/sign-up.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Section -->
<section class="vh-lg-100 d-flex align-items-center">
<div class="container">
<div class="row justify-content-center form-bg-image" data-background="../../assets/img/illustrations/signin.svg">
<div class="row justify-content-center form-bg-image" data-background-lg="../../assets/img/illustrations/signin.svg">
<div class="col-12 d-flex align-items-center justify-content-center">
<div class="signin-inner my-3 my-lg-0 bg-white shadow-soft border rounded border-light p-4 p-lg-5 w-100 fmxw-500">
<div class="text-center text-md-center mb-4 mt-md-0">
Expand Down
8 changes: 1 addition & 7 deletions src/pages/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
"path": ".."
})

@@include('./_preloader.html', {
"path": ".."
})

<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
<div>
<button class="btn btn-secondary text-dark mr-2 dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand All @@ -63,9 +59,7 @@
</div>
</div>
<div>
<div class="btn-group">
<button type="button" data-toggle="tooltip" title="Calendar" class="btn btn-primary"><span class="fas fa-calendar-alt"></span></button>
</div>
<button type="button" class="btn btn-primary mr-2"><span class="fas fa-calendar-alt"></span></button>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="fas fa-clipboard mr-2"></span>Reports
<span class="icon icon-small ml-1"><span class="fas fa-chevron-down"></span></span>
Expand Down
4 changes: 0 additions & 4 deletions src/pages/tables/bootstrap-tables.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
"path": "../.."
})

@@include('./_preloader.html', {
"path": "../.."
})

<div class="py-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
Expand Down
4 changes: 0 additions & 4 deletions src/pages/transactions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
"path": ".."
})

@@include('./_preloader.html', {
"path": ".."
})

<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
<div class="d-block mb-4 mb-md-0">
<nav aria-label="breadcrumb" class="d-none d-md-inline-block">
Expand Down
3 changes: 3 additions & 0 deletions src/partials/_scripts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<!-- Datepicker -->
<script src="@@path/vendor/vanillajs-datepicker/dist/js/datepicker.min.js"></script>

<!-- Simplebar -->
<script src="@@path/vendor/simplebar/dist/simplebar.min.js"></script>

<!-- Github buttons -->
<script async defer src="https://buttons.github.io/buttons.js"></script>

Expand Down

0 comments on commit 538ca28

Please sign in to comment.