Skip to content

feat: widget design && fix title styles #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

feat: widget design && fix title styles #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51f435b
implement widget design && fix title styles
goldenmaya Jul 20, 2023
faf99c0
small fixes
goldenmaya Jul 20, 2023
5056f79
fix layout
goldenmaya Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 40 additions & 15 deletions dist/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5280,7 +5280,7 @@ tags-input .tags.focused {
.gridster .list-item {
background: #fbfdfe;
box-sizing: border-box;
box-shadow: 0 0 0 2px #dee9f0 inset;
box-shadow: 0 0 0 1px #dee9f0 inset;
padding: 2px;
position: absolute;
text-align: center;
Expand All @@ -5291,22 +5291,22 @@ tags-input .tags.focused {
}
.gridster .list-item.error {
background: #f2dede;
box-shadow: 0 0 0 2px #ebccd1 inset;
box-shadow: 0 0 0 1px #ebccd1 inset;
color: #e0a9a9;
}
.gridster .list-item.success {
background: #dff0d8;
box-shadow: 0 0 0 2px #d6e9c6 inset;
box-shadow: 0 0 0 1px #d6e9c6 inset;
color: #b2e0a9;
}
.gridster .list-item.warning {
background: #fcf8e3;
box-shadow: 0 0 0 2px #faebcc inset;
box-shadow: 0 0 0 1px #faebcc inset;
color: #e0d8a9;
}
.gridster .list-item.info {
background: #d9edf7;
box-shadow: 0 0 0 2px #bce8f1 inset;
box-shadow: 0 0 0 1px #bce8f1 inset;
color: #a9d1e0;
}
.gridster .gridster-item-moving {
Expand Down Expand Up @@ -5958,23 +5958,23 @@ tags-input .tags.focused {
overflow: auto;
}
.dashboard .dashboard-inner {
height: calc(100% - 22px);
padding: 22px 90px 0;
height: calc(100% - 40px);
padding: 40px 90px 0;
position: relative;
}
.dashboard .dashboard-inner .gridster-loaded {
width: 770px;
}
.dashboard .dashboard-title {
position: absolute;
top: 30px;
font-weight: 300;
left: 90px;
text-shadow: 1px 2px rgba(255, 255, 255, 0.5), 2px -2px rgba(255, 255, 255, 0.5), -2px 2px rgba(255, 255, 255, 0.5), -2px -2px rgba(255, 255, 255, 0.5);
display: flex;
align-items: center;
gap: 16px;
padding: 30px 90px 0;
}
.dashboard .dashboard-title h1,
.dashboard .dashboard-title .__logo {
display: inline;
.dashboard .dashboard-title h1 {
margin: 0;
font-size: 41px;
font-weight: 300;
}
.dashboard .dashboard-title .__logo {
max-height: 53px;
Expand Down Expand Up @@ -7906,6 +7906,31 @@ body .blade .blade-wrapper .blade-container .bc.blade-static .form-group .form-c
transform: none;
}

.vc-gridster {
box-sizing: border-box;
display: flex;
align-items: center;
gap: 24px;
padding: 24px 30px;
text-align: left;
min-height: 134px;
}
.vc-gridster__img {
width: 58px;
height: 58px;
}
.vc-gridster__title {
margin-bottom: 4px;
font-size: 18px;
font-weight: 600;
}
.vc-gridster__description {
font-size: 13px;
}
.vc-gridster__description a {
font-size: inherit;
}

.vc-alert {
display: flex;
align-items: center;
Expand Down
1 change: 1 addition & 0 deletions dist/images/order-statistic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 21 additions & 12 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,27 @@
</head>
<body style="display: flex; align-items: center; justify-content: center; min-height: 100vh;">
<div>
<h4>Sign In pages</h4>
<hr>
<ol>
<li><a class="vc-link" href="/login-form.html" target="_blank">Login Form</a></li>
<li><a class="vc-link" href="/login-form-error.html" target="_blank">Login Form Error</a></li>
<li><a class="vc-link" href="/login-form-warning.html" target="_blank">Login Form Warning</a></li>
<li><a class="vc-link" href="/login-form-and-socials.html" target="_blank">Login Form and Social buttons</a></li>
<li><a class="vc-link" href="/login-socials.html" target="_blank">Login Social buttons</a></li>
<li><a class="vc-link" href="/forgot-password.html" target="_blank">Forgot Password</a></li>
<li><a class="vc-link" href="/forgot-password-error.html" target="_blank">Forgot Password Error</a></li>
<li><a class="vc-link" href="/loader.html" target="_blank">Loader</a></li>
</ol>
<div>
<h4>Sign In pages</h4>
<hr>
<ol>
<li><a class="vc-link" href="/login-form.html" target="_blank">Login Form</a></li>
<li><a class="vc-link" href="/login-form-error.html" target="_blank">Login Form Error</a></li>
<li><a class="vc-link" href="/login-form-warning.html" target="_blank">Login Form Warning</a></li>
<li><a class="vc-link" href="/login-form-and-socials.html" target="_blank">Login Form and Social buttons</a></li>
<li><a class="vc-link" href="/login-socials.html" target="_blank">Login Social buttons</a></li>
<li><a class="vc-link" href="/forgot-password.html" target="_blank">Forgot Password</a></li>
<li><a class="vc-link" href="/forgot-password-error.html" target="_blank">Forgot Password Error</a></li>
<li><a class="vc-link" href="/loader.html" target="_blank">Loader</a></li>
</ol>
</div>
<div style="margin-top: 30px;">
<h4>Home page</h4>
<hr>
<ol>
<li><a class="vc-link" href="/widget.html" target="_blank">Widget</a></li>
</ol>
</div>
</div>
</body>
</html>
43 changes: 43 additions & 0 deletions dist/widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-------------------------------------------------------->
<!-------------------------------------------------------->
<!-------------------------------------------------------->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover,maximum-scale=1,user-scalable=0">
<!-- Google Fonts -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700;900&family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
<title>vc-gridster</title>
<link rel="stylesheet" href="/css/main.css">
</head>
<body>
<div class="cnt-inner">
<div class="dashboard">
<div class="dashboard-area">
<div class="dashboard-inner">
<div group="mainDashboard" style="position: relative;">
<div gridster="gridsterOpts" class="gridster gridster-desktop gridster-loaded" style="height: 510px;"><!-- ngIf: gridster.movingItem -->
<ul class="list">
<li class="list-item gridster-item">
<div ng-include="widget.template" ng-controller="virtoCommerce.orderModule.dashboard.statisticsWidgetController" ng-model="widget" class="ng-pristine ng-untouched ng-valid">
<div class="vc-gridster">
<img class="vc-gridster__img" src="images/order-statistic.svg" alt="">
<div class="vc-gridster__info">
<div class="vc-gridster__title">Order statistic</div>
<div class="vc-gridster__description"> You do not currently have access to this feature. Please <a href="#">contact your account administrator</a> for access. </div>
</div>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
34 changes: 22 additions & 12 deletions src/ejs/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,28 @@
</head>
<body style="display: flex; align-items: center; justify-content: center; min-height: 100vh;">
<div>
<h4>Sign In pages</h4>
<hr />
<ol>
<li><a class="vc-link" href="/login-form.html" target="_blank">Login Form</a></li>
<li><a class="vc-link" href="/login-form-error.html" target="_blank">Login Form Error</a></li>
<li><a class="vc-link" href="/login-form-warning.html" target="_blank">Login Form Warning</a></li>
<li><a class="vc-link" href="/login-form-and-socials.html" target="_blank">Login Form and Social buttons</a></li>
<li><a class="vc-link" href="/login-socials.html" target="_blank">Login Social buttons</a></li>
<li><a class="vc-link" href="/forgot-password.html" target="_blank">Forgot Password</a></li>
<li><a class="vc-link" href="/forgot-password-error.html" target="_blank">Forgot Password Error</a></li>
<li><a class="vc-link" href="/loader.html" target="_blank">Loader</a></li>
</ol>
<div>
<h4>Sign In pages</h4>
<hr />
<ol>
<li><a class="vc-link" href="/login-form.html" target="_blank">Login Form</a></li>
<li><a class="vc-link" href="/login-form-error.html" target="_blank">Login Form Error</a></li>
<li><a class="vc-link" href="/login-form-warning.html" target="_blank">Login Form Warning</a></li>
<li><a class="vc-link" href="/login-form-and-socials.html" target="_blank">Login Form and Social buttons</a></li>
<li><a class="vc-link" href="/login-socials.html" target="_blank">Login Social buttons</a></li>
<li><a class="vc-link" href="/forgot-password.html" target="_blank">Forgot Password</a></li>
<li><a class="vc-link" href="/forgot-password-error.html" target="_blank">Forgot Password Error</a></li>
<li><a class="vc-link" href="/loader.html" target="_blank">Loader</a></li>
</ol>
</div>

<div style="margin-top: 30px;">
<h4>Home page</h4>
<hr />
<ol>
<li><a class="vc-link" href="/widget.html" target="_blank">Widget</a></li>
</ol>
</div>
</div>
</body>
</html>
9 changes: 9 additions & 0 deletions src/ejs/partials/_vc-gridster.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="vc-gridster">
<img class="vc-gridster__img" src="images/order-statistic.svg" alt="">
<div class="vc-gridster__info">
<div class="vc-gridster__title">Order statistic</div>
<div class="vc-gridster__description">
You do not currently have access to this feature. Please <a href="#">contact your account administrator</a> for access.
</div>
</div>
</div>
41 changes: 41 additions & 0 deletions src/ejs/widget.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-------------------------------------------------------->
<% var path = './'; %>
<!-------------------------------------------------------->
<% const pageMeta = { title: 'vc-gridster', description: '', url: '', }; %>
<!-------------------------------------------------------->
<%- include(`${path}partials/_head`, { meta: pageMeta }); %>
</head>

<body>
<div class="cnt-inner">
<div class="dashboard">
<div class="dashboard-area">
<div class="dashboard-inner">
<div group="mainDashboard" style="position: relative;">
<div gridster="gridsterOpts" class="gridster gridster-desktop gridster-loaded" style="height: 510px;"><!-- ngIf: gridster.movingItem -->
<ul class="list">
<li class="list-item gridster-item">
<div ng-include="widget.template" ng-controller="virtoCommerce.orderModule.dashboard.statisticsWidgetController" ng-model="widget" class="ng-pristine ng-untouched ng-valid">

<%- include(`${path}partials/_vc-gridster`); %>

</div>

</li>

</ul>
</div>
</div>



</div>
</div>
</div>
</div>

</body>
</html>
1 change: 1 addition & 0 deletions src/images/order-statistic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/sass/main.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

@import "blade-constructor.scss"

// Login components
// Components
@import "modules/_vc-gridster.sass"
@import "modules/_vc-alert.sass"
@import "modules/_vc-button.sass"
@import "modules/_vc-button-social.sass"
Expand Down
10 changes: 5 additions & 5 deletions src/sass/modules/_base-modules.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2075,27 +2075,27 @@ tags-input
.list-item
background: $lightBg
box-sizing: border-box
box-shadow: 0 0 0 2px #dee9f0 inset
box-shadow: 0 0 0 1px #dee9f0 inset
padding: 2px
position: absolute
text-align: center
&:hover
box-shadow: 0 0 0 2px #a1c0d4 inset
.list-item.error
background: #f2dede
box-shadow: 0 0 0 2px #ebccd1 inset
box-shadow: 0 0 0 1px #ebccd1 inset
color: #e0a9a9
.list-item.success
background: #dff0d8
box-shadow: 0 0 0 2px #d6e9c6 inset
box-shadow: 0 0 0 1px #d6e9c6 inset
color: #b2e0a9
.list-item.warning
background: #fcf8e3
box-shadow: 0 0 0 2px #faebcc inset
box-shadow: 0 0 0 1px #faebcc inset
color: #e0d8a9
.list-item.info
background: #d9edf7
box-shadow: 0 0 0 2px #bce8f1 inset
box-shadow: 0 0 0 1px #bce8f1 inset
color: #a9d1e0
.gridster-item-moving
opacity: .7
Expand Down
21 changes: 12 additions & 9 deletions src/sass/modules/_project-modules.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/* Dashboard */
$dashboardHorizontalPadding: 90px
$dashboardVerticalPadding: 22px
$dashboardVerticalPadding: 40px
$dashboardHeadHeight: 80px

.dashboard
Expand All @@ -49,15 +49,18 @@ $dashboardHeadHeight: 80px
position: relative
.gridster-loaded
width: 770px

.dashboard-title
position: absolute
top: 30px
font-weight: 300
left: $dashboardHorizontalPadding
text-shadow: 1px 2px rgba(255,255,255,.5), 2px -2px rgba(255,255,255,.5), -2px 2px rgba(255,255,255,.5), -2px -2px rgba(255,255,255,.5)
h1,
.__logo
display: inline
display: flex
align-items: center
gap: 16px
padding: 30px $dashboardHorizontalPadding 0

h1
margin: 0
font-size: 41px
font-weight: 300

.__logo
max-height: $h1FontSize
vertical-align: top
Expand Down
22 changes: 22 additions & 0 deletions src/sass/modules/_vc-gridster.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.vc-gridster
box-sizing: border-box
display: flex
align-items: center
gap: 24px
padding: 24px 30px
text-align: left
min-height: 134px

&__img
width: 58px
height: 58px

&__title
margin-bottom: 4px
font-size: 18px
font-weight: 600

&__description
font-size: 13px
a
font-size: inherit