Skip to content

Commit 9d6262a

Browse files
helllthhelllth
committed
Merge branch 'feature/014-external-development-sprint' into dev
2 parents 1230777 + cdb98b4 commit 9d6262a

File tree

171 files changed

+59400
-7268
lines changed

Some content is hidden

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

171 files changed

+59400
-7268
lines changed

‎.gitpod.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
tasks:
2+
- init: yarn install
3+
command: yarn start-cra
4+
5+
ports:
6+
- port: 3000
7+
onOpen: open-preview

‎.prettierrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"printWidth": 100,
33
"parser": "flow"
4-
}
4+
}

‎.storybook/addons.js‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.storybook/config.js‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.storybook/index.css‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
body {
2+
margin: 0;
3+
padding: 0;
4+
font-family: sans-serif;
5+
}
6+
7+
.customGeoJSONFeatureTooltipClass {
8+
background: none;
9+
border: none;
10+
box-shadow: none;
11+
}
12+
13+
.leaflet-tooltip-left.customGeoJSONFeatureTooltipClass::before {
14+
border-left-color: none;
15+
}
16+
17+
.leaflet-tooltip-right.customGeoJSONFeatureTooltipClass::before {
18+
border-right-color: none;
19+
}
20+
21+
a:hover {
22+
cursor: pointer;
23+
}
24+
25+
.well {
26+
margin-bottom: 0px;
27+
border: 0px;
28+
}
29+
30+
.form-group {
31+
margin-bottom: 0px;
32+
}
33+
34+
.leaflet-bottom {
35+
margin-bottom: 5px !important;
36+
37+
}
38+
39+
.leaflet-control {
40+
margin-bottom: 0px !important;
41+
}
42+
43+
44+
.leaflet-control-scale {
45+
margin-bottom: 10px !important;
46+
margin-left: 11px !important;
47+
}
48+
49+
50+
.pos-select .Select-value{
51+
52+
}
53+
54+
.neg-select .Select-value{
55+
color: rgba(255, 90, 0, 0.68);
56+
background-color: rgba(255, 90, 0, 0.28);
57+
}
58+
59+
/* .Select-menu { max-height: 350px;} */
60+
61+
/* fixes an issue on mac os where no scrollbars beeing shown and a mousewheel action is translated in a zoom command */
62+
/* Just a test to make sure that we have the right element*/
63+
/*
64+
.dropdown-menu {
65+
background-color: #f00;
66+
}
67+
*/
68+
69+
.dropdown-menu::-webkit-scrollbar {
70+
-webkit-appearance: none;
71+
}
72+
73+
.dropdown-menu::-webkit-scrollbar:vertical {
74+
width: 11px;
75+
}
76+
77+
.dropdown-menu::-webkit-scrollbar:horizontal {
78+
height: 11px;
79+
}
80+
81+
.dropdown-menu::-webkit-scrollbar-thumb {
82+
border-radius: 8px;
83+
border: 2px solid white; /* should match background, can't be transparent */
84+
background-color: rgba(0, 0, 0, .5);
85+
}
86+
87+
.dropdown-menu::-webkit-scrollbar-track {
88+
background-color: #fff;
89+
border-radius: 8px;
90+
}
91+
92+
93+
/*
94+
fix for https://github.com/cismet/wupp/issues/1477
95+
*/
96+
97+
.rbt-input-wrapper>div>div {
98+
width: 100% !important;
99+
}
100+
.rbt-input-hint {
101+
width: 100% !important;
102+
}
103+
104+
105+
106+
107+
108+
/*
109+
https://stackoverflow.com/questions/27028927/fade-in-leaflet-markers-when-added
110+
111+
.leaflet-marker-icon,
112+
.leaflet-marker-shadow {
113+
-webkit-animation: fadein 1s;
114+
-moz-animation: fadein 1s;
115+
-ms-animation: fadein 1s;
116+
-o-animation: fadein 1s;
117+
animation: fadein 1s;
118+
}
119+
*/
120+
121+
/*
122+
.cismap-hauptnutzung-highlighter {
123+
opacity: 0.5;
124+
animation-name: fadeInOpacity;
125+
animation-iteration-count: 1;
126+
animation-timing-function: ease-in;
127+
animation-duration: 2s;
128+
} */
129+
@keyframes fadeInOpacity {
130+
0% {
131+
opacity: 1;
132+
}
133+
100% {
134+
opacity: 0.5;
135+
}
136+
}
137+
/* .cismap-hauptnutzung-highlighter {
138+
-webkit-animation: fadeout 3s;
139+
-moz-animation: fadeout 3s;
140+
-ms-animation: fadeout 3s;
141+
-o-animation: fadeout 3s;
142+
animation: fadeout 3s;
143+
} */
144+
145+
@keyframes fadein {
146+
from { opacity: 0; }
147+
to { opacity: 1; }
148+
}
149+
150+
/* Firefox < 16 */
151+
@-moz-keyframes fadein {
152+
from { opacity: 0; }
153+
to { opacity: 1; }
154+
}
155+
156+
/* Safari, Chrome and Opera > 12.1 */
157+
@-webkit-keyframes fadein {
158+
from { opacity: 0; }
159+
to { opacity: 1; }
160+
}
161+
162+
/* Internet Explorer */
163+
@-ms-keyframes fadein {
164+
from { opacity: 0; }
165+
to { opacity: 1; }
166+
}
167+
168+
/* Opera < 12.1 */
169+
@-o-keyframes fadein {
170+
from { opacity: 0; }
171+
to { opacity: 1; }
172+
}
173+
174+
175+
@keyframes fadeout {
176+
from { opacity: 1; }
177+
to { opacity: 0; }
178+
}
179+
180+
/* Firefox < 16 */
181+
@-moz-keyframes fadeout {
182+
from { opacity: 1; }
183+
to { opacity: 0; }
184+
}
185+
186+
/* Safari, Chrome and Opera > 12.1 */
187+
@-webkit-keyframes fadeout {
188+
from { opacity: 1; }
189+
to { opacity: 0; }
190+
}
191+
192+
/* Internet Explorer */
193+
@-ms-keyframes fadeout {
194+
from { opacity: 1; }
195+
to { opacity: 0; }
196+
}
197+
198+
/* Opera < 12.1 */
199+
@-o-keyframes fadeout {
200+
from { opacity: 1; }
201+
to { opacity: 0; }
202+
}

‎.storybook/main.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// module.exports = {
2+
// // stories: [ '../**/*.stories.js' ],
3+
// stories: [ '../src/lib/**/*.stories.js' ],
4+
5+
// addons: [
6+
// '@storybook/preset-create-react-app',
7+
// '@storybook/addon-knobs',
8+
// '@storybook/addon-actions',
9+
// '@storybook/addon-links'
10+
// ],
11+
// webpackFinal: (webpackConfig) => {
12+
// const scopePluginIndex = webpackConfig.resolve.plugins.findIndex(
13+
// ({ constructor }) => constructor && constructor.name === 'ModuleScopePlugin'
14+
// );
15+
16+
// webpackConfig.resolve.plugins.splice(scopePluginIndex, 1);
17+
// return webpackConfig;
18+
// }
19+
// };
20+
21+
module.exports = {
22+
stories: [ '../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)' ],
23+
addons: [
24+
'@storybook/addon-links',
25+
'@storybook/addon-essentials',
26+
'@storybook/preset-create-react-app',
27+
// '@storybook/addon-knobs',
28+
'@storybook/addon-controls',
29+
// '@storybook/addon-info', //problems with version
30+
'@storybook/addon-docs',
31+
'@storybook/addon-actions'
32+
],
33+
webpackFinal: (webpackConfig) => {
34+
const scopePluginIndex = webpackConfig.resolve.plugins.findIndex(
35+
({ constructor }) => constructor && constructor.name === 'ModuleScopePlugin'
36+
);
37+
38+
webpackConfig.resolve.plugins.splice(scopePluginIndex, 1);
39+
return webpackConfig;
40+
},
41+
devtool: 'source-map'
42+
};

‎.storybook/preview-head.html‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,7 @@
11

2-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
3-
<!-- Optional theme -->
4-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css">
5-
2+
63
<!-- Leaflet Styling -->
7-
<link rel="stylesheet" href="https://npmcdn.com/[email protected]/dist/leaflet.css" />
4+
<!-- <link rel="stylesheet" href="https://npmcdn.com/[email protected]/dist/leaflet.css" />
85
96
<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.12.0/css/all.css">
10-
11-
12-
13-
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
14-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
15-
-->
16-
<!-- <link rel="stylesheet" href="//use.fontawesome.com/releases/v5.12.0/css/all.css"> -->
17-
18-
19-
<style>
20-
/* html *
21-
{
22-
font-size: 1em !important;
23-
color: #000 !important;
24-
font-family: Arial !important;
25-
} */
26-
27-
.customGeoJSONFeatureTooltipClass {
28-
background: none;
29-
border: none;
30-
box-shadow: none;
31-
}
32-
</style>
7+
-->

‎.storybook/preview.js‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
1-
import { withInfo } from '@storybook/addon-info';
1+
import 'react-bootstrap-typeahead/css/Typeahead.css';
2+
import 'bootstrap/dist/css/bootstrap.min.css';
3+
import 'leaflet/dist/leaflet.css';
4+
import './index.css';
5+
// import { withInfo } from '@storybook/addon-info';
26

3-
addDecorator(
4-
withInfo({
5-
header: false
6-
})
7-
);
7+
// addDecorator(
8+
// withInfo({
9+
// header: false
10+
// })
11+
// );
12+
13+
export const parameters = {
14+
// controls: { expanded: true },
15+
controls: { hideNoControlsWarning: true },
16+
actions: { argTypesRegex: '^on[A-Z].*' },
17+
options: {
18+
storySort: {
19+
order: [
20+
'Mapping Components',
21+
'TopicMap Components',
22+
'Common Components',
23+
'Storybook Testing',
24+
'Deprecated'
25+
]
26+
}
27+
}
28+
};

0 commit comments

Comments
 (0)