Skip to content

Commit bf901da

Browse files
michaeldainekamichaeldaineka
committed
fix: design edits
1 parent 63abcf8 commit bf901da

File tree

96 files changed

+2688
-1284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+2688
-1284
lines changed

‎src/components/BreadcrumbHistory/BreadcrumbHistory.module.scss

+2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
background: #fff;
55
margin-right: 32px;
66
box-shadow: 4px 4px 25px rgba(109, 105, 105, 0.25) !important;
7+
font-size: 14px;
78
}
89

910
.btnShadow {
1011
box-shadow: 4px 4px 25px rgba(109, 105, 105, 0.25) !important;
1112
text-transform: initial;
13+
font-size: 14px;
1214
}
1315

1416
.dashboardButtons {

‎src/components/ColorPicker/ColorPicker.module.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
flex-wrap: wrap;
66

77
.colorBox {
8-
min-width: 25px;
9-
height: 25px;
8+
min-width: 38px;
9+
height: 38px;
1010
border: 1px solid $border-color;
1111
border-radius: 4px;
1212
cursor: pointer;

‎src/components/Helper/Helper.js

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ class Helper extends Component {
113113
checked={navbarType === NavbarTypes.FLOATING}
114114
name="navbar-type"
115115
id="navbar_floating"
116-
className={s.radio}
117116
/>
118117
<label htmlFor="navbar_floating">Floating</label>
119118
</div>

‎src/components/Helper/Helper.module.scss

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../styles/app';
1+
@import "../../styles/app";
22

33
.themeHelper {
44
width: $helper-width;
@@ -22,11 +22,19 @@
2222
@include transition(right $sidebar-transition-time ease-in-out);
2323

2424
& :global {
25-
.abc-radio-secondary input[type="radio"]:not(:checked)+label::before {
25+
.abc-radio-secondary input[type="radio"]:not(:checked) + label::before {
2626
background-color: #798892;
2727
}
2828

2929
.abc-radio {
30+
& input:not(:checked) {
31+
& + label {
32+
&:before {
33+
border: 2px solid $input-border-color;
34+
}
35+
}
36+
}
37+
3038
& > label {
3139
padding-left: 30px;
3240

@@ -40,21 +48,19 @@
4048

4149
&:before {
4250
border: 2px solid var(--main-color);
43-
&:not(:checked) {
44-
border: 2ox solid $input-border-color;
45-
}
4651
}
47-
48-
&:before, &:after {
52+
53+
&:before,
54+
&:after {
4955
outline: none !important;
5056
transition: $transition-base;
5157
margin-left: 4px;
5258
}
5359
}
5460
}
5561

56-
.abc-radio-warning input[type="radio"]:not(:checked)+label::before {
57-
background-color: theme-color('warning');
62+
.abc-radio-warning input[type="radio"]:not(:checked) + label::before {
63+
background-color: theme-color("warning");
5864
}
5965
}
6066

@@ -87,7 +93,7 @@
8793
border: 1px solid $input-border-color;
8894
padding: 3px;
8995
border-radius: $border-radius;
90-
transition: background-color .2s ease-in-out;
96+
transition: background-color 0.2s ease-in-out;
9197
cursor: pointer;
9298
display: block;
9399

@@ -125,6 +131,7 @@
125131
padding: $spacer * 0.8 $spacer / 2 $spacer * 0.8 $spacer;
126132
display: flex;
127133
justify-content: center;
134+
box-shadow: -1px 0 8px rgba(0,0,0,0.2);
128135

129136
img {
130137
animation-duration: 6500ms;

‎src/components/Layout/Layout.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class Layout extends React.Component {
9393
}
9494

9595
handleResize() {
96-
if (window.innerWidth <= 768) {
96+
if (window.innerWidth < 768) {
9797
this.props.dispatch(toggleSidebar());
9898
} else if (window.innerWidth >= 768) {
9999
this.props.dispatch(openSidebar());

‎src/components/Sidebar/LinksGroup/LinksGroup.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ class LinksGroup extends Component {
115115
s.headerLink,
116116
this.props.className
117117
)}
118-
onClick={() => this.closeSidebarOnClick()}
118+
onClick={() => {
119+
this.closeSidebarOnClick();
120+
this.togglePanelCollapse(this.props.link)
121+
}}
119122
>
120123
<NavLink
121124
to={this.props.link}
@@ -229,7 +232,10 @@ class LinksGroup extends Component {
229232
childrenLinks={child.childrenLinks}
230233
deep={this.props.deep + 1}
231234
key={ind} // eslint-disable-line
232-
onClick={() => this.closeSidebarOnClick()}
235+
onClick={() => {
236+
this.closeSidebarOnClick()
237+
if (child.onClick) child.onClick()
238+
}}
233239
/>
234240
))}
235241
</ul>

‎src/components/Sidebar/LinksGroup/LinksGroup.module.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,18 @@
7474

7575
.badge {
7676
float: right;
77-
line-height: 16px;
77+
line-height: 15px;
7878
margin-top: 5px;
7979
margin-right: 35px;
8080
background: var(--badge-background-color);
8181
color: var(--badge-item-color);
8282
border: 1px solid var(--badge-border-color);
8383
font-weight: 400;
84-
width: 24px;
85-
height: 24px;
86-
font-size: 10px;
84+
width: 20px;
85+
height: 20px;
86+
font-size: 11px;
87+
border-radius: 50%;
88+
padding: 0.22em 0.5em;
8789
@media (min-width: map_get($grid-breakpoints, lg)) and (min-height: $screen-lg-height), (max-width: map_get($grid-breakpoints, md) - 1px) {
8890
margin-top: 12px;
8991
}

‎src/components/Sidebar/Sidebar.js

+15-16
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import darkUIDanger from "../../images/theme-icons/red/ui elements_filled.svg";
5050
import logoDanger from "../../images/theme-icons/red/Logo.svg";
5151
import settingsOutlinedDanger from "../../images/theme-icons/red/Settings_outlined.svg";
5252
import settingsFilledDanger from "../../images/theme-icons/red/Settings_outlined.svg";
53-
import logoutIconDanger from "../../images/logout.svg";
53+
import logoutIconDanger from "../../images/theme-icons/red/Logout_outlined.svg";
5454
import eCommerceOutlinedDanger from "../../images/theme-icons/red/E-commerce_outlined.svg";
5555
import eCommerceFilledDanger from "../../images/theme-icons/red/E-commerce_filled.svg";
5656
import packageOutlinedDanger from "../../images/theme-icons/red/Package_outlined.svg";
@@ -73,8 +73,8 @@ import tablesOutlinedDanger from "../../images/theme-icons/red/Tables_outlined.s
7373
import tablesFilledDanger from "../../images/theme-icons/red/Tables_filled.svg";
7474
import mapsOutlinedDanger from "../../images/theme-icons/red/Maps_outlined.svg";
7575
import mapsFilledDanger from "../../images/theme-icons/red/Maps_filled.svg";
76-
import extraOutlinedDanger from "../../images/light-extra.svg";
77-
import extraFilledDanger from "../../images/dark-extra.svg";
76+
import extraOutlinedDanger from "../../images/theme-icons/red/Extra_outlined.svg";
77+
import extraFilledDanger from "../../images/theme-icons/red/Extra_filled.svg";
7878

7979
// success
8080
import lightDashboardIconSuccess from "../../images/theme-icons/green/Dashboard_outlined.svg";
@@ -84,7 +84,7 @@ import darkUISuccess from "../../images/theme-icons/green/ui elements_filled.svg
8484
import logoSuccess from "../../images/theme-icons/green/Logo.svg";
8585
import settingsOutlinedSuccess from "../../images/theme-icons/green/Settings_outlined.svg";
8686
import settingsFilledSuccess from "../../images/theme-icons/green/Settings_outlined.svg";
87-
import logoutIconSuccess from "../../images/logout.svg";
87+
import logoutIconSuccess from "../../images/theme-icons/green/Logout_outlined.svg";
8888
import eCommerceOutlinedSuccess from "../../images/theme-icons/green/E-commerce_outlined.svg";
8989
import eCommerceFilledSuccess from "../../images/theme-icons/green/E-commerce_filled.svg";
9090
import packageOutlinedSuccess from "../../images/theme-icons/green/Package_outlined.svg";
@@ -107,8 +107,8 @@ import tablesOutlinedSuccess from "../../images/theme-icons/green/Tables_outline
107107
import tablesFilledSuccess from "../../images/theme-icons/green/Tables_filled.svg";
108108
import mapsOutlinedSuccess from "../../images/theme-icons/green/Maps_outlined.svg";
109109
import mapsFilledSuccess from "../../images/theme-icons/green/Maps_filled.svg";
110-
import extraOutlinedSuccess from "../../images/light-extra.svg";
111-
import extraFilledSuccess from "../../images/dark-extra.svg";
110+
import extraOutlinedSuccess from "../../images/theme-icons/green/Extra_outlined.svg";
111+
import extraFilledSuccess from "../../images/theme-icons/green/Extra_filled.svg";
112112

113113
// info
114114
import lightDashboardIconBlue from "../../images/theme-icons/blue/Dashboard_outlined.svg";
@@ -118,7 +118,7 @@ import darkUIBlue from "../../images/theme-icons/blue/ui elements_filled.svg";
118118
import logoBlue from "../../images/theme-icons/blue/Logo.svg";
119119
import settingsOutlinedBlue from "../../images/theme-icons/blue/Settings_outlined.svg";
120120
import settingsFilledBlue from "../../images/theme-icons/blue/Settings_outlined.svg";
121-
import logoutIconBlue from "../../images/logout.svg";
121+
import logoutIconBlue from "../../images/theme-icons/blue/Logout_outlined.svg";
122122
import eCommerceOutlinedBlue from "../../images/theme-icons/blue/E-commerce_outlined.svg";
123123
import eCommerceFilledBlue from "../../images/theme-icons/blue/E-commerce_filled.svg";
124124
import packageOutlinedBlue from "../../images/theme-icons/blue/Package_outlined.svg";
@@ -141,8 +141,8 @@ import tablesOutlinedBlue from "../../images/theme-icons/blue/Tables_outlined.sv
141141
import tablesFilledBlue from "../../images/theme-icons/blue/Tables_filled.svg";
142142
import mapsOutlinedBlue from "../../images/theme-icons/blue/Maps_outlined.svg";
143143
import mapsFilledBlue from "../../images/theme-icons/blue/Maps_filled.svg";
144-
import extraOutlinedBlue from "../../images/light-extra.svg";
145-
import extraFilledBlue from "../../images/dark-extra.svg";
144+
import extraOutlinedBlue from "../../images/theme-icons/blue/Extra_outlined.svg";
145+
import extraFilledBlue from "../../images/theme-icons/blue/Extra_filled.svg";
146146

147147
//dark sidebar
148148
import darkSidebarDashboardOutlined from "../../images/theme-icons/dark sidebar/yellow/Dashboard_outlined.svg";
@@ -396,7 +396,7 @@ class Sidebar extends React.Component {
396396
? darkSidebarSettingsFilledDanger
397397
: darkSidebarSettingsOutlinedDanger;
398398
case "logout":
399-
return darkSidebarLogout;
399+
return darkSidebarLogoutDanger;
400400
case "email":
401401
return window.location.href.includes(currentPage)
402402
? darkSidebarEmailFilledDanger
@@ -461,7 +461,7 @@ class Sidebar extends React.Component {
461461
? darkSidebarSettingsFilledSuccess
462462
: darkSidebarSettingsOutlinedSuccess;
463463
case "logout":
464-
return darkSidebarLogout;
464+
return darkSidebarLogoutSuccess;
465465
case "email":
466466
return window.location.href.includes(currentPage)
467467
? darkSidebarEmailFilledSuccess
@@ -526,7 +526,7 @@ class Sidebar extends React.Component {
526526
? darkSidebarSettingsFilledBlue
527527
: darkSidebarSettingsOutlinedBlue;
528528
case "logout":
529-
return darkSidebarLogout;
529+
return darkSidebarLogoutBlue;
530530
case "email":
531531
return window.location.href.includes(currentPage)
532532
? darkSidebarEmailFilledBlue
@@ -1274,10 +1274,9 @@ class Sidebar extends React.Component {
12741274
{
12751275
header: "Login Page",
12761276
link: "/app/login",
1277-
},
1278-
{
1279-
header: "Error Page",
1280-
link: "/app/extra/error",
1277+
onClick: () => {
1278+
this.doLogout()
1279+
}
12811280
},
12821281
{
12831282
header: "Gallery",

0 commit comments

Comments
 (0)