Skip to content

Commit 82ce149

Browse files
committed
fix(ProductEdit): fixed input background color
1 parent 1ebda20 commit 82ce149

File tree

4 files changed

+47
-43
lines changed

4 files changed

+47
-43
lines changed

src/pages/maps/google/Google.js

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import React from 'react';
2+
import {
3+
Breadcrumb, BreadcrumbItem
4+
} from 'reactstrap'
25
import {
36
withGoogleMap,
47
withScriptjs,
58
GoogleMap,
69
Marker,
710
} from 'react-google-maps';
11+
import Widget from '../../../components/Widget';
812

913
import s from './Google.module.scss';
1014

@@ -22,18 +26,26 @@ class Maps extends React.Component {
2226
render() {
2327
return (
2428
<div>
25-
<h1 className={`${s.MapTitle} page-title`}>
29+
<Breadcrumb>
30+
<BreadcrumbItem>YOU ARE HERE</BreadcrumbItem>
31+
<BreadcrumbItem active>Google Maps</BreadcrumbItem>
32+
</Breadcrumb>
33+
<h1 className="page-title">
2634
Google <span className="fw-semi-bold">Maps</span>
2735
</h1>
28-
<div className={s.MapContainer}>
29-
<BasicMap
30-
googleMapURL="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=AIzaSyB7OXmzfQYua_1LEhRdqsoYzyJOPh9hGLg"
31-
loadingElement={<div style={{ height: 'inherit', width: 'inherit' }} />}
32-
containerElement={<div style={{ height: 'inherit' }} />}
33-
mapElement={<div style={{ height: 'inherit' }} />}
34-
/>
35-
</div>
36-
36+
<Widget
37+
title={<h4>Google Maps <small className="text-muted">Default and customized</small></h4>}
38+
collapse close
39+
>
40+
<div className={s.MapContainer}>
41+
<BasicMap
42+
googleMapURL="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=AIzaSyB7OXmzfQYua_1LEhRdqsoYzyJOPh9hGLg"
43+
loadingElement={<div style={{ height: 'inherit', width: 'inherit' }} />}
44+
containerElement={<div style={{ height: 'inherit' }} />}
45+
mapElement={<div style={{ height: 'inherit' }} />}
46+
/>
47+
</div>
48+
</Widget>
3749
</div>);
3850
}
3951

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
@import '../../../styles/app';
2-
31
.MapContainer {
4-
position: absolute;
5-
top: 0;
6-
left: 15px;
7-
bottom: 0;
8-
right: 0;
9-
height: 100%;
10-
}
11-
12-
.MapTitle {
13-
position: relative;
14-
z-index: 2;
15-
}
2+
width: 100%;
3+
height: 60vh;
4+
}

src/pages/maps/vector/Vector.js

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import React from 'react';
22
import $ from 'jquery';
3+
import {
4+
Breadcrumb, BreadcrumbItem
5+
} from 'reactstrap'
36
/* eslint-disable */
47
import 'imports-loader?jQuery=jquery,this=>window!jvectormap/jquery-jvectormap.min.js';
58
import 'imports-loader?jQuery=jquery,this=>window!./jvector-world.js';
69
/* eslint-enable */
710

11+
import Widget from '../../../components/Widget';
12+
813
import s from './Vector.module.scss';
914

1015
const mapData = {
@@ -84,18 +89,24 @@ class VectorMap extends React.Component {
8489
render() {
8590
return (
8691
<div>
87-
<div
88-
className={`${s.contentMap} vector-map`} ref={(r) => {
89-
this.vectorMap = r;
90-
}}
91-
/>
92+
<Breadcrumb>
93+
<BreadcrumbItem>YOU ARE HERE</BreadcrumbItem>
94+
<BreadcrumbItem active>Vector Maps</BreadcrumbItem>
95+
</Breadcrumb>
96+
9297
<header className="page-title">
9398
<h1 className="m-0 mb-sm">Vector <span className="fw-semi-bold">Maps</span></h1>
94-
<p className="page-title fs-sm m-0">
95-
<span className="fw-semi-bold">1 656 843</span>
96-
<span className="ml-xs circle bg-gray"><i className="text-gray-lighter fa fa-circle" /></span>
97-
</p>
9899
</header>
100+
<Widget
101+
title={<h4>Vector Maps <small className="text-muted">Default and customized</small></h4>}
102+
collapse close
103+
>
104+
<div
105+
className={`${s.contentMap} vector-map`} ref={(r) => {
106+
this.vectorMap = r;
107+
}}
108+
/>
109+
</Widget>
99110
</div>);
100111
}
101112

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
@import '../../../styles/app';
22

33
.contentMap {
4-
position: absolute;
5-
top: 0;
6-
bottom: 0;
7-
left: 15px;
8-
right: 0;
9-
10-
+ :global(.page-title) {
11-
position: relative;
12-
z-index: 2;
13-
}
4+
height: 60vh;
5+
width: 100%;
146
}

0 commit comments

Comments
 (0)