Commit graph

689 commits

Author SHA1 Message Date
orangemug
aa92e9da02 Merge remote-tracking branch 'upstream/master' into feature/load-from-url 2017-10-12 15:15:20 +01:00
Orange Mug
232b48ff62 Merge pull request #165 from gregorywolanski/master
Modal scrolling #156
2017-10-12 10:29:07 +01:00
Grzegorz Wolański
a95b2932db Modal scrolling #156: Issue fixed 2017-10-11 23:11:40 +02:00
Orange Mug
aa288a1e11 Merge pull request #161 from pjsier/feature/data-driven-styles
Add data-driven styling
2017-10-11 16:55:04 +01:00
Orange Mug
7e6efcb9b9 Merge pull request #169 from orangemug/feature/comments-field-docs
Added comments field doc and updated react-collapse to fix styling
2017-10-11 14:37:43 +01:00
Orange Mug
817d0a7e63 Merge pull request #170 from orangemug/fix/maputnik-logo-stretch
Fixes logo styling in toolbar
2017-10-11 14:34:43 +01:00
pjsier
fa0067ce7b Update mapbox deps, clarify data prop scope 2017-10-11 08:01:55 -05:00
orangemug
9beacf7ef3 Fixed image path in test 2017-10-11 13:16:04 +01:00
pjsier
b4292028c2 Fix default field bug 2017-10-11 05:58:32 -05:00
orangemug
d7c099bcbb Fixed logo stying in toolbar, also switched to the logo in github:maputnik/design. 2017-10-11 11:17:02 +01:00
Orange Mug
36cd15f4f1 Merge pull request #168 from orangemug/feature/issue-114-boolean-types
Added true/false conversion to filter field
2017-10-11 10:27:43 +01:00
orangemug
92ff1a8499 Added comments field doc and updated react-collapse to fix styling. 2017-10-10 22:34:16 +01:00
pjsier
4af7a71220 Rename ZoomSpecField to FunctionSpecField 2017-10-10 14:23:20 -05:00
orangemug
611e170b5e Added true/false conversion to filter fields. Fixes #114 2017-10-10 18:41:54 +01:00
pjsier
148f64c261 Restrict data function types, reorder buttons
Checking the Mapbox style spec properties to see whether or not
exponential should be allowed as the property type, defaulting to
categorical which appears to work for either type. Also re-orders zoom
and data function buttons, aligning zoom right if data not supplied.
2017-10-10 10:30:06 -05:00
orangemug
2c3f47d3cb Added 'Load from URL' option in open modal. Fixes #120 2017-10-10 16:27:16 +01:00
Gregory Wolanski
8a6e24e5e7 Modal scrolling #156 2017-10-08 21:42:04 +02:00
pjsier
1d29f67065 Check for property-function support on data styles 2017-10-05 06:08:55 -05:00
pjsier
2ffb3e73e1 Re-add default field after style update 2017-10-05 05:50:47 -05:00
pjsier
bba7aa3177 Merge branch 'master' into feature/data-driven-styles 2017-10-05 05:42:17 -05:00
Orange Mug
c950a33031 Merge pull request #124 from orangemug/fix/issue-110-update-mapbox-style-spec
Update style spec
2017-10-05 06:16:04 +01:00
Orange Mug
c9ab3bdbfc Merge pull request #163 from chriswhong/patch-1
Add related projects section
2017-10-05 06:00:36 +01:00
Chris Whong
e32c2e865c Add 2017-10-04 22:42:04 -04:00
pjsier
9e52b0b7dc Remove default from data properties
It looks like default is not supported in this version of the style
spec, so pending the PR to update it I'm removing it as an input.
2017-10-01 21:07:55 -05:00
pjsier
d731fb2cae Fix scss linter errors 2017-10-01 19:17:43 -05:00
pjsier
e057fcaea1 Add data-driven styling to editor
Builds off of the ZoomSpecField component with separate options for
handling data-driven properties. Reuses most of the zoom field
functionality with tweaks that I tried to keep as small as possible, and
the layout is based off of comments on the existing issue.
2017-10-01 18:20:57 -05:00
Orange Mug
fff1363134 Merge pull request #152 from orangemug/feature/circle-ci-artifact-builds
Per branch / commit builds
2017-07-22 13:43:47 +01:00
orangemug
4bbfe1040e Fixed regexp for windows. 2017-07-11 06:30:37 +01:00
Orange Mug
bc6e2dc81b Merge pull request #149 from bartvde/proptype-warnings
Make sure propTypes accept what gets passed in
2017-07-07 09:07:25 +01:00
orangemug
0005698c10 Added build to post test step. 2017-07-06 19:59:12 +01:00
orangemug
53711966d2 Added circleci build artifacts. 2017-07-06 19:53:39 +01:00
Orange Mug
d3b991aad4 Merge pull request #146 from bartvde/babel-preset
Add transform-class-properties plugin to babel config
2017-07-06 19:34:26 +01:00
Orange Mug
4ef19c321d Merge pull request #151 from bartvde/key-warning
Put key on the right element
2017-07-05 19:32:28 +01:00
bartvde
a3e3b9dfe3 Put key on the right element 2017-06-29 10:20:24 -05:00
bartvde
abbce3e9d1 Make sure propTypes accept what gets passed in 2017-06-26 16:54:46 -05:00
bartvde
0edbfd89ff Add transform-class-properties plugin to babel config 2017-06-26 16:24:07 -05:00
Orange Mug
040d585d57 Merge pull request #133 from tschaub/loader
Animated loading indicator
2017-06-23 17:46:05 +01:00
Orange Mug
c74ef7b0d3 Merge pull request #134 from tschaub/close-open-dialog
Close the "open" dialog after choosing a new style
2017-06-23 17:38:07 +01:00
Orange Mug
23ef937100 Merge pull request #139 from tbarsballe/dynamic-arrays
Add DynamicArrayInput for handling variable-length array fields
2017-06-23 17:35:42 +01:00
Orange Mug
5157742009 Merge pull request #141 from tbarsballe/autocomplete-style
Improve autocomplete styling
2017-06-23 17:22:02 +01:00
Orange Mug
96d96edc9e Merge pull request #145 from bartvde/style-warning
Prevent warning for ColorField
2017-06-23 17:03:53 +01:00
Orange Mug
2a10edcc25 Merge pull request #144 from bartvde/babelrc
Move babel config out of package.json
2017-06-23 16:47:47 +01:00
bartvde
e4477db413 Prevent warning for ColorField 2017-06-23 16:00:43 +02:00
bartvde
b32d926b56 Move babel config out of package.json 2017-06-23 15:47:15 +02:00
Lukas Martinelli
6b3b5a8b6f Merge pull request #142 from tbarsballe/ol
Improved OpenLayers support
2017-06-09 13:19:36 -04:00
Tim Schaub
a7df8afd6e Animated loading indicator 2017-06-02 15:12:21 -06:00
Tim Schaub
b8205f4c38 Close the "open" dialog after choosing a new style 2017-06-02 15:11:29 -06:00
Torben Barsballe
2adb1bf917 Add DynamicArrayInput for handling variable-length array fields 2017-05-29 14:32:05 -07:00
Torben Barsballe
2825dd7e04 Improve autocomplete styling
Use "position: absolute" so that autocomplete follows the field when you scroll.
2017-05-29 13:22:50 -07:00
Torben Barsballe
df04064e81 Improved OpenLayers support
Added support for gejson sources
Fix toVectorLayer map callback (this was undefined)
Improved ol css; show map controls
2017-05-29 13:18:09 -07:00