Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'publisher-production' #8305

Merged
merged 29 commits into from
May 30, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3a871e7
Set default thumbnail for examples page for development (#8025)
katydecorah Mar 21, 2019
d0649cb
v0.54.0-beta.1 (#8084)
mourner Mar 26, 2019
9dd9f00
CP removeFeatureState fix (#8090)
Mar 29, 2019
1f38321
v0.54.0 (#8115)
mourner Apr 3, 2019
797527a
Example for `fill-pattern` (#8022)
hormesiel Apr 8, 2019
0438e5e
move docs dependencies to dev (#8121) (#8129)
mourner Apr 9, 2019
6e6a005
Mapbox-gl-geocoder v4 examples (#8053)
Apr 9, 2019
2b195dc
Studio does support rtl plugin (#8135)
samanpwbb Apr 9, 2019
b32d2ce
Update comment for setRTLTextPlugin (#8143)
HeyStenson Apr 12, 2019
8af8aca
update one more frame after canvas source paused (#8130) (#8163)
mourner Apr 17, 2019
2d9001e
Bugfix - removeFeatureState fails with target.id === 0 (#8150) (#8164)
mourner Apr 17, 2019
428480a
v0.54.0-beta.2 (#8166)
mourner Apr 18, 2019
2aaab27
[docs] meta updates for search (#8142)
katydecorah Apr 22, 2019
c6e1be7
[docs] token refactor in docs-page-shell (#8174)
katydecorah Apr 23, 2019
38e555e
[docs] token refactor in docs-page-shell (#8174) (#8181)
mourner Apr 24, 2019
c3f20b3
Fix disappearing controls in Safari 12+ (#8193) (#8194)
mourner Apr 25, 2019
48dce18
v0.54.0 (take two) (#8184)
mourner Apr 25, 2019
353dc34
Merge branch 'release-liquid' into publisher-production
mourner Apr 25, 2019
b26fcc5
fix imagery endpoint on WMS example (#8203)
Apr 26, 2019
9781993
mapbox-gl-geocoder@v4.2.0 (#8212)
May 1, 2019
1493081
[docs] add trailing slash to `pathname` so resolved URL matches the c…
May 8, 2019
229b71d
Update documentation.yml (#8230)
erictheise May 8, 2019
845433b
update mapbox-gl-geocoder to v4.3.0 (#8231)
May 17, 2019
2dbd0dd
@mapbox/mapbox gl style spec@13.7.0 (#8264)
tristen May 20, 2019
0b99b23
Add sku token to Mapbox API tile requests (#14) (#8276)
ryanhamley May 22, 2019
9fcf20e
v1.0.0 (#8277)
May 22, 2019
2b4713d
Merge branch 'release-mojito' into publisher-production
May 22, 2019
b5441bc
[docs] update docs-page-shell (#8254)
May 28, 2019
509fe2a
Merge branch 'publisher-production'
May 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[docs] meta updates for search (#8142)
* update docs-page-shell, update page-shell; update page meta

* Update react-page-shell.js

* remove contentType from examples page

* Update react-page-shell.js

* Update react-page-shell.js
  • Loading branch information
katydecorah authored Apr 22, 2019
commit 2aaab27ae5337678ffd9b90577cc7b9eabf0bade
2 changes: 2 additions & 0 deletions docs/components/example.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ ${html}

render() {
const {frontMatter} = this.props;
frontMatter.language = ['JavaScript'];
frontMatter.contentType = 'example';
return (
<PageShell meta={frontMatter}>
<div className='relative prose'>
Expand Down
3 changes: 3 additions & 0 deletions docs/components/markdown-page-shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class MarkdownPageshell extends React.Component {
if (!meta.pathname) {
meta.pathname = location.pathname;
}
if (frontMatter.contentType) meta.contentType = frontMatter.contentType;
if (frontMatter.language) meta.language = frontMatter.language;
if (frontMatter.level) meta.level = frontMatter.level;
return (
<PageShell meta={meta} {...this.props}>
<div className="prose">
Expand Down
2 changes: 1 addition & 1 deletion docs/components/page_shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class PageShell extends React.Component {
};

return (
<ReactPageShell darkHeaderText={true} includeFooter={false} {...this.props}>
<ReactPageShell site="Mapbox GL JS" darkHeaderText={true} includeFooter={false} {...this.props}>
<Helmet>
<link
rel="canonical"
Expand Down
6 changes: 4 additions & 2 deletions docs/pages/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import LinkerStack from 'documentation/src/output/util/linker_stack';
import ApiItem from '../components/api-item';

const meta = {
title: 'Mapbox GL JS API',
title: 'API Reference',
description: 'The Mapbox GL JS API documentation to render interactive maps from vector tiles and Mapbox styles.',
pathname: '/mapbox-gl-js/api'
pathname: '/mapbox-gl-js/api',
contentType: 'API',
lanaguage: ['JavaScript']
};

const linkerStack = new LinkerStack({})
Expand Down
5 changes: 3 additions & 2 deletions docs/pages/examples.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import AppropriateImage from '../components/appropriate-image';
import imageConfig from '../img/dist/image.config.json'; // eslint-disable-line

const meta = {
title: 'Mapbox GL JS Examples',
title: 'Examples',
description: 'Code examples for Mapbox GL JS.',
pathname: '/examples'
pathname: '/examples',
lanaguage: ['JavaScript']
};

class ExamplesLandingPage extends React.PureComponent {
Expand Down
1 change: 1 addition & 0 deletions docs/pages/overview/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ prependJs:
- "import Quickstart from '../../components/quickstart';"
- "import {version} from '../../../package.json';"
pathname: /mapbox-gl-js/overview/
contentType: API
---

{{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import entries from 'object.entries';
import IconText from '@mapbox/mr-ui/icon-text';

const meta = {
title: 'Mapbox GL JS Plugins',
title: 'Plugins',
description: 'Extend your Mapbox GL JS map with plugins.',
pathname: '/mapbox-gl-js/plugins'
};
Expand Down
5 changes: 3 additions & 2 deletions docs/pages/style-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import ref from '../../src/style-spec/reference/latest';
import Icon from '@mapbox/mr-ui/icon';

const meta = {
title: 'Mapbox Style Specification',
title: 'Style Specification',
description: 'This specification defines and describes the visual appearance of a map: what data to draw, the order to draw it in, and how to style the data when drawing it.',
pathname: '/mapbox-gl-js/style-spec'
pathname: '/mapbox-gl-js/style-spec',
contentType: 'specification'
};

const sourceTypes = ['vector', 'raster', 'raster-dem', 'geojson', 'image', 'video'];
Expand Down
2 changes: 1 addition & 1 deletion vendor/docs-page-shell/page-shell-script.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions vendor/docs-page-shell/page-shell-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@
color: #4264fb !important;
}
.shell-wrapper .shell-color-gray {
color: #607d9c !important;
color: #5b7897 !important;
}
.shell-wrapper .shell-color-gray-dark {
color: #273d56 !important;
Expand Down Expand Up @@ -555,7 +555,7 @@
color: #314ccd !important;
}
.shell-wrapper .shell-color-gray-dark-on-hover:hover {
color: #273d56 !important;
color: #23374d !important;
}

/* ========================================================================== */
Expand Down
Loading