Skip to content

Commit 73d9d14

Browse files
committed
feat: desing fixixes
1 parent cfb9278 commit 73d9d14

File tree

15 files changed

+251
-177
lines changed

15 files changed

+251
-177
lines changed

src/components/Header/Header.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Header extends React.Component {
4444
};
4545

4646
state = { isOpen: false };
47-
47+
4848
toggleDropdown = () => {
4949
this.setState(prevState => ({
5050
isOpen: !prevState.isOpen,
@@ -61,7 +61,7 @@ class Header extends React.Component {
6161
<Navbar className={s.root}>
6262
<Nav>
6363
<NavItem
64-
className={cx('visible-xs', s.headerIcon)}
64+
className={cx('visible-xs mr-4 d-sm-up-none', s.headerIcon, s.sidebarToggler)}
6565
href="#"
6666
onClick={this.props.sidebarToggle}
6767
>
@@ -71,12 +71,29 @@ class Header extends React.Component {
7171
<InputGroup>
7272
<Input placeholder="Search for..." />
7373
<InputGroupAddon addonType="append" className="px-2">
74-
<i className="fa fa-search text-muted" />
74+
<i className="fa fa-search" />
7575
</InputGroupAddon>
7676
</InputGroup>
7777
</NavItem>
7878
</Nav>
7979
<Nav className="ml-auto">
80+
<NavItem className={cx('', s.headerIcon)}>
81+
<Button>
82+
<Icon glyph="mail"/>
83+
<span>8</span>
84+
</Button>
85+
</NavItem>
86+
<NavItem className={cx('', s.headerIcon)}>
87+
<Button>
88+
<Icon glyph="notification"/>
89+
<span>13</span>
90+
</Button>
91+
</NavItem>
92+
<NavItem className={cx('', s.headerIcon)}>
93+
<Button>
94+
<Icon glyph="settings"/>
95+
</Button>
96+
</NavItem>
8097
<Dropdown isOpen={isOpen} toggle={this.toggleDropdown}>
8198
<DropdownToggle nav>
8299
<img className={cx('rounded-circle mr-sm', s.adminPhoto)} src={photo} alt="administrator" />
@@ -95,23 +112,6 @@ class Header extends React.Component {
95112
</DropdownItem>
96113
</DropdownMenu>
97114
</Dropdown>
98-
<NavItem className={cx('', s.headerIcon)}>
99-
<Button>
100-
<Icon glyph="mail"/>
101-
<span>8</span>
102-
</Button>
103-
</NavItem>
104-
<NavItem className={cx('', s.headerIcon)}>
105-
<Button>
106-
<Icon glyph="notification"/>
107-
<span>13</span>
108-
</Button>
109-
</NavItem>
110-
<NavItem className={cx('', s.headerIcon)}>
111-
<Button>
112-
<Icon glyph="settings"/>
113-
</Button>
114-
</NavItem>
115115
</Nav>
116116
</Navbar>
117117
);
@@ -123,4 +123,4 @@ function mapStateToProps(state) {
123123
init: state.runtime.initialNow,
124124
};
125125
}
126-
export default connect(mapStateToProps)(withStyles(s)(Header));
126+
export default connect(mapStateToProps)(withStyles(s)(Header));

src/components/Header/Header.scss

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,19 @@
3333
width: 175px;
3434
}
3535

36+
&::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
37+
color: $gray-300;
38+
opacity: 1; /* Firefox */
39+
}
40+
41+
&:-ms-input-placeholder { /* Internet Explorer 10-11 */
42+
color: $gray-300;
43+
}
44+
45+
&::-ms-input-placeholder { /* Microsoft Edge */
46+
color: $gray-300;
47+
}
48+
3649
&:hover,
3750
&:active,
3851
&:focus {
@@ -49,6 +62,7 @@
4962

5063
i {
5164
font-size: 1.25rem;
65+
color: theme-color('light');
5266
}
5367
}
5468
}
@@ -102,6 +116,10 @@
102116
align-items: center;
103117
position: relative;
104118

119+
@include media-breakpoint-down(sm) {
120+
display: none;
121+
}
122+
105123
:global .btn {
106124
background: $white;
107125
border: none;
@@ -118,14 +136,12 @@
118136

119137
&:nth-child(n + 2) {
120138
margin-left: 0.5rem;
121-
122-
@include media-breakpoint-down(sm) {
123-
display: none;
124-
}
125139
}
126140

127-
&:first-child {
128-
margin-right: 1.25rem;
141+
&:nth-child(2) {
142+
span {
143+
right: -1px;
144+
}
129145
}
130146

131147
img {
@@ -142,9 +158,17 @@
142158
right: -6px;
143159
color: $white;
144160
font-size: 0.55rem;
145-
width: 12px;
146-
height: 12px;
161+
width: 15px;
162+
height: 15px;
147163
border-radius: 50%;
148164
background-color: theme-color('danger');
149165
}
150166
}
167+
168+
.sidebarToggler {
169+
display: flex;
170+
171+
@include media-breakpoint-up(md) {
172+
display: none !important;
173+
}
174+
}

src/components/Sidebar/LinksGroup/LinksGroup.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.headerLink {
44
a {
55
display: flex;
6-
color: $sidebar-color;
6+
color: $gray-500;
77
align-items: center;
88
text-decoration: none;
99
cursor: pointer;

src/components/Widget/Widget.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
margin-bottom: 30px;
77
padding: $widget-padding-y $widget-padding-x;
88
background: $widget-bg;
9-
border-radius: 3px;
109
}
1110

1211
.title {

src/images/tables/1.jpg

1.12 MB
Loading

src/images/tables/2.jpg

2.42 MB
Loading

src/images/tables/3.jpg

2.84 MB
Loading

src/images/tables/4.jpg

1.87 MB
Loading

src/images/tables/5.jpg

3.43 MB
Loading

0 commit comments

Comments
 (0)