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

Ep 1786 safari bugs #3

Merged
merged 5 commits into from
Jul 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"@loadable/component": "^5.6.1",
"@natgeosociety/marapp-uikit": "^1.0.6",
"@natgeosociety/marapp-uikit": "^1.0.7",
"assert": "^2.0.0",
"axios": "^0.18.0",
"axios-cache-adapter": "^2.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function DashboardEdit(props: DashboardProps) {
return (
<div>
<div className="ng-flex ng-flex-space-between">
<h2 className="ng-text-display-m">
<h2 className="ng-text-display-m ng-c-flex-grow-1">
{newDashboard ? 'Add dashboard' : `Edit Dashboard - ${name}`}
</h2>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default function LayerEdit(props: LayerProps) {
return (
<div>
<div className="ng-flex ng-flex-space-between">
<h2 className="ng-text-display-m">{ newLayer ? 'Add Layer' : `Edit Layer - ${name}` }</h2>
<h2 className="ng-text-display-m ng-c-flex-grow-1">{ newLayer ? 'Add Layer' : `Edit Layer - ${name}` }</h2>

<span>
Last updated at: {formatDate(updatedAt)}; Created at: {formatDate(createdAt)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default function LocationEdit(props: LocationProps) {
return (
<div>
<div className="ng-flex ng-flex-space-between">
<h2 className="ng-text-display-m">{ newLocation ? 'Add Location' : `Edit Location - ${name}` }</h2>
<h2 className="ng-text-display-m ng-c-flex-grow-1">{ newLocation ? 'Add Location' : `Edit Location - ${name}` }</h2>

<span>
Last updated at: {formatDate(updatedAt)}; Created at: {formatDate(createdAt)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const OrgSwitcher = (props) => {
'ng-ep-dropdown-selected': selectedGroup === g,
})}
>
<LinkWithOrg to="/" switchOrgTo={g}>
<LinkWithOrg to="/" switchOrgTo={g} className="ng-display-block ng-border-remove">
<span
className="ng-text-display-s ng-display-block ng-dropdown-item"
onClick={(e) => handleOrgSwitch(g)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default function WidgetEdit(props: WidgetProps) {
return (
<div>
<div className="ng-flex ng-flex-space-between">
<h2 className="ng-text-display-m">{newWidget ? 'Add Widget' : `Edit Widget - ${name}`}</h2>
<h2 className="ng-text-display-m ng-c-flex-grow-1">{newWidget ? 'Add Widget' : `Edit Widget - ${name}`}</h2>

<span>
Last updated at: {formatDate(updatedAt)}; Created at: {formatDate(createdAt)}
Expand Down
2 changes: 1 addition & 1 deletion packages/earth-map/src/components/layers/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class LayersComponent extends React.PureComponent<ILayers, ILayersState> {
<>
{loading && <Spinner />}
<div className="ng-flex ng-flex-space-between ng-flex-center ng-margin-medium-bottom">
<h4 className="ng-text-display-m ng-color-ultraltgray ng-margin-remove">Select layers</h4>
<h4 className="ng-text-display-m ng-color-ultraltgray ng-margin-remove ng-c-flex-grow-1">Select layers</h4>
<button
className="ng-unstyled ng-c-icon-with-label"
onClick={() => this.handleToggleClick()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const SearchBoxComponent = (props: ISearchbox) => {
{!!search && (
<Link to={{ type: 'EARTH' }} className="ng-c-panel-link ng-unstyled ng-flex">
<div onClick={() => handleResetLocation()}>
<i className="ng-color-mdgray ng-margin-small-right ng-icon-small ng-icon-close"></i>
<i className="ng-color-mdgray ng-margin-small-right ng-icon-small ng-icon-close ng-display-block"></i>
</div>
</Link>
)}
Expand Down