Skip to content

Commit dab0639

Browse files
BlariBlari
committed
Several fixes
1 parent 09826d5 commit dab0639

File tree

12 files changed

+76
-9248
lines changed

12 files changed

+76
-9248
lines changed

‎package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
"@vue/cli-service": "^3.12.0",
8383
"vue-template-compiler": "^2.6.12"
8484
},
85+
"engines": {
86+
"node": "^14"
87+
},
8588
"eslintConfig": {
8689
"root": true,
8790
"env": {

‎src/components/Header/Header.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</b-nav>
3535
<b-nav>
3636
<b-form class="d-md-down-none ms-5 my-auto" inline>
37-
<b-form-group>
37+
<b-form-group class="mb-0">
3838
<b-input-group class="input-group-no-border search-input">
3939
<template v-slot:prepend>
4040
<div class="headerSvgFlipColor">

‎src/components/Helper/Helper.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="widget-body mt-3">
1111
<div class="theme-settings">
1212
<h5 style="position: static" id="v-step-4">Navbar Type</h5>
13-
<div class="row my-2">
13+
<div class="row mb-4">
1414
<div class="abc-radio col-auto">
1515
<input type="radio" name="navbar-type" :value="navbarTypes.STATIC" id="navbar_static"
1616
:checked="navbarType === navbarTypes.STATIC" @change="updateLayoutComponentType({component: layoutComponents.NAVBAR, type: navbarTypes.STATIC})">
@@ -31,7 +31,7 @@
3131
></colorpicker>
3232

3333
<h5 id="v-step-6">Sidebar Type</h5>
34-
<div class="row">
34+
<div class="row mb-4">
3535
<div class="abc-radio col-auto">
3636
<input type="radio" name="sidebar-type" :value="sidebarTypes.TRANSPARENT" id="sidebar_transparent"
3737
:checked="sidebarType === sidebarTypes.TRANSPARENT"
@@ -53,7 +53,7 @@
5353
@change="updateLayoutComponentColor({component: layoutComponents.SIDEBAR, color: $event})"
5454
></colorpicker>
5555
</div>
56-
<div class="mt-4 d-grid">
56+
<div class="m-4 d-grid">
5757
<a href="https://flatlogic.com/templates/sing-app-vue"
5858
id="v-step-8"
5959
target="_blank"
@@ -64,7 +64,7 @@
6464
<a href="http://demo.flatlogic.com/sing-app-vue/#/documentation/"
6565
target="_blank"
6666
role="button"
67-
class="btn btn-primary btn-rounded-f btn-block fs-mini mt-4">
67+
class="btn btn-primary btn-rounded-f btn-block fs-mini mt-2">
6868
Documentation
6969
</a>
7070
</div>

‎src/components/Sidebar/Sidebar.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<router-link to="/app/main/analytics"><span class="primary-word">Sing</span> <span class="secondary-word"> App</span></router-link>
1010
</header>
1111

12-
<a class="generator-link navTitle" target="_blank" href="https://flatlogic.com/generator">Generate App</a>
13-
1412
<h5 class="navTitle first">
1513
APP
1614
</h5>

‎src/pages/Charts/Apex/mock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import config from '../../../config';
22

3-
const {info, primary, danger, warning, success, textColor, gray} = config.app.colors;
3+
const {info, primary, danger, warning, success, textColor} = config.app.colors;
44
const {axisColor} = config.app.chartColors;
55

66
var generateDayWiseTimeSeries = function (baseval, count, yrange) {

‎src/pages/Charts/Highcharts/mock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import usdeur from './usdeur';
33
import sunburstData from './sunburstData';
44
import config from '../../../config';
55

6-
const {inverse, info, primary, danger, warning, success, textColor, gray} = config.app.colors;
6+
const {inverse, info, primary, danger, warning, success, textColor} = config.app.colors;
77
const {axisColor} = config.app.chartColors;
88

99
let wordCloudText = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean bibendum erat ac justo sollicitudin, quis lacinia ligula fringilla. Pellentesque hendrerit, nisi vitae posuere condimentum, lectus urna accumsan libero, rutrum commodo mi lacus pretium erat. Phasellus pretium ultrices mi sed semper.';

‎src/pages/Ecommerce/ProductPage/components/General/General.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@
3131
.ratingWrapper {
3232
display: flex;
3333

34-
@include media-breakpoint-down(sm) {
35-
justify-content: flex-end;
36-
}
34+
//@include media-breakpoint-down(sm) {
35+
// justify-content: flex-end;
36+
//}
3737
}
3838

3939
.dataWrapper {
4040
display: flex;
4141
flex-direction: column;
4242

43-
@include media-breakpoint-down(sm) {
44-
flex-direction: column-reverse;
45-
margin-top: -31px;
46-
47-
& :global .title {
48-
margin-bottom: 25px;
49-
margin-top: 5px;
50-
}
51-
52-
& :global .subtitle {
53-
margin-bottom: 0;
54-
}
55-
}
43+
//@include media-breakpoint-down(sm) {
44+
// flex-direction: column-reverse;
45+
// margin-top: -31px;
46+
//
47+
// & :global .title {
48+
// margin-bottom: 25px;
49+
// margin-top: 5px;
50+
// }
51+
//
52+
// & :global .subtitle {
53+
// margin-bottom: 0;
54+
// }
55+
//}
5656
}

‎src/pages/Ecommerce/ProductsGrid/components/MobileModal/MobileModal.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@
2323
border-bottom: 2px solid $addition-bg;
2424
font-weight: $font-weight-normal;
2525
}
26-
27-
& :global .option {
28-
border: none;
29-
}
3026
}

‎src/pages/Extra/Timeline/Timeline.scss

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
font-size: $font-size-sm;
66
padding-left: 0;
77

8-
@include clearfix();
8+
//@include clearfix();
99

1010
.postLinks + & {
1111
margin-top: $spacer / 2;
@@ -16,7 +16,7 @@
1616
border-top: 1px solid #e7e7e7;
1717
list-style: none;
1818

19-
@include clearfix();
19+
//@include clearfix();
2020

2121
&:last-child {
2222
padding-bottom: 0;
@@ -45,12 +45,12 @@
4545
font-size: 11px;
4646
}
4747

48-
:global {
48+
4949
.widget > footer & {
5050
margin-left: -$widget-padding-horizontal;
5151
margin-right: -$widget-padding-horizontal;
5252
}
53-
}
53+
5454
}
5555

5656
/* Post Links */
@@ -59,7 +59,7 @@
5959
font-size: $font-size-sm;
6060
padding-left: 0;
6161

62-
@include clearfix();
62+
//@include clearfix();
6363

6464
> li {
6565
float: left;
@@ -83,14 +83,14 @@
8383
}
8484
}
8585

86-
:global {
86+
8787
.no-separator > li + li {
8888
margin-left: 12px;
8989

9090
&::before {
9191
content: normal;
9292
}
93-
}
93+
9494
}
9595
}
9696

@@ -122,10 +122,10 @@
122122
margin-left: -4px;
123123
background-color: $white;
124124

125-
@include media-breakpoint-up(lg) {
126-
left: 50%;
127-
margin-left: -4px;
128-
}
125+
//@include media-breakpoint-up(lg) {
126+
// left: 50%;
127+
// margin-left: -4px;
128+
//}
129129
}
130130
}
131131

@@ -164,31 +164,31 @@
164164
border-bottom-right-radius: $border-radius;
165165
background-color: #fafafa;
166166

167-
@include clearfix();
167+
//@include clearfix();
168+
168169

169-
:global {
170170
.thumb {
171171
margin-left: 10px;
172172
}
173-
}
174-
}
175-
176-
@include media-breakpoint-up(lg) {
177-
.timeline & {
178-
width: 45%;
179-
}
180173

181-
.timeline > li.onLeft & {
182-
float: left;
183-
184-
&::before {
185-
right: auto;
186-
left: 100%;
187-
border-right-color: rgba(0, 0, 0, 0);
188-
border-left-color: $white;
189-
}
190-
}
191174
}
175+
176+
//@include media-breakpoint-up(lg) {
177+
// .timeline & {
178+
// width: 45%;
179+
// }
180+
//
181+
// .timeline > li.onLeft & {
182+
// float: left;
183+
//
184+
// &::before {
185+
// right: auto;
186+
// left: 100%;
187+
// border-right-color: rgba(0, 0, 0, 0);
188+
// border-left-color: $white;
189+
// }
190+
// }
191+
//}
192192
}
193193

194194
.eventTime {
@@ -210,24 +210,24 @@
210210
}
211211
}
212212

213-
@include media-breakpoint-up(lg) {
214-
.timeline & {
215-
width: 46%;
216-
}
217-
218-
.timeline > li.onLeft & {
219-
float: right;
220-
text-align: left;
221-
}
222-
}
213+
//@include media-breakpoint-up(lg) {
214+
// .timeline & {
215+
// width: 46%;
216+
// }
217+
//
218+
// .timeline > li.onLeft & {
219+
// float: right;
220+
// text-align: left;
221+
// }
222+
//}
223223
}
224224

225225
.eventIcon {
226-
:global {
226+
227227
.glyphicon {
228228
top: -2px;
229229
}
230-
}
230+
231231

232232
.timeline & {
233233
position: absolute;
@@ -275,9 +275,9 @@
275275
color: $white;
276276
}
277277

278-
@include media-breakpoint-up(lg) {
279-
left: 50%;
280-
}
278+
//@include media-breakpoint-up(lg) {
279+
// left: 50%;
280+
//}
281281

282282
> img {
283283
width: 36px;

‎src/styles/_base.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@
109109
border: none;
110110
}
111111

112+
table.table tbody {
113+
border-top: 1px solid $border-color!important;
114+
}
115+
112116
table > thead > tr > th {
113117
border-top: none !important;
114118
border-bottom-width: 1px !important;

‎src/styles/_overrides.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ h6,
506506
.h4,
507507
.h5,
508508
.h6 {
509+
font-weight: $font-weight-normal;
509510
small,
510511
.small {
511512
font-weight: $font-weight-thin;

0 commit comments

Comments
 (0)