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.

Sign up for GitHub

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

js 4.29 and more calcite 2.0.0 #453

Merged
merged 4 commits into from
Dec 6, 2023
Merged

js 4.29 and more calcite 2.0.0 #453

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3ae5c3
js 4.29 and more calcite 2.0.0
jmhauck Dec 6, 2023
0de4730
Merge branch 'develop' into upgrade-components
jmhauck Dec 6, 2023
d67a187
Merge branch 'develop' into upgrade-components
jmhauck Dec 6, 2023
e64f9e3
Merge branch 'develop' into upgrade-components
jmhauck Dec 6, 2023
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
72 changes: 43 additions & 29 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@esri/arcgis-rest-service-admin": "^3.4.2",
"@esri/calcite-components": "2.0.0",
"@esri/calcite-design-tokens": "2.0.0",
"@esri/instant-apps-components": "1.0.0-beta.157",
"@esri/instant-apps-components": "1.0.0-beta.162",
"@esri/hub-common": "^12.37.1",
"@esri/hub-initiatives": "^12.4.1",
"@esri/hub-sites": "^12.6.0",
Expand Down
8 changes: 0 additions & 8 deletions src/assets/styles/calcite-web.min.css
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/assets/styles/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* limitations under the License.
*/

@import "calcite-web.min";

/*#region Basic Overrides*/

html, body {
Expand All @@ -24,6 +22,7 @@ html, body {
flex
overflow-y-hidden;
background-color: $solutions-background-color;
margin: 0px;
}

h1 {
Expand Down
10 changes: 5 additions & 5 deletions src/components/crowdsource-manager/crowdsource-manager.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
:host {
display: block;
--calcite-label-margin-bottom: 0px;
--solutions-theme-foreground-color: var(--calcite-ui-foreground-1);
--solutions-theme-foreground-color: var(--calcite-color-foreground-1);
}

.padding-1-2 {
Expand Down Expand Up @@ -78,16 +78,16 @@
}

.border {
border: 1px solid var(--calcite-ui-border-3);
border: 1px solid var(--calcite-color-border-3);
}

.border-bottom {
border-bottom: 1px solid var(--calcite-ui-border-3);
border-bottom: 1px solid var(--calcite-color-border-3);
}

.border-sides {
border-left: 1px solid var(--calcite-ui-border-3);
border-right: 1px solid var(--calcite-ui-border-3);
border-left: 1px solid var(--calcite-color-border-3);
border-right: 1px solid var(--calcite-color-border-3);
}

.position-relative {
Expand Down
1 change: 1 addition & 0 deletions src/components/crowdsource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ graph TD;
instant-apps-social-share --> calcite-popover
instant-apps-social-share --> calcite-button
instant-apps-social-share --> calcite-icon
instant-apps-social-share --> calcite-action
calcite-modal --> calcite-scrim
calcite-modal --> calcite-icon
instant-apps-filter-list --> calcite-panel
Expand Down
6 changes: 3 additions & 3 deletions src/components/edit-card/edit-card.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

#feature-form {
--calcite-ui-background: none;
--calcite-color-background: none;
padding-top: 0px;
}

Expand All @@ -50,11 +50,11 @@
.esri-editor__prompt--danger {
position: relative !important;
width: 100% !important;
background-color: var(--calcite-ui-foreground-1) !important;
background-color: var(--calcite-color-foreground-1) !important;
}

.esri-feature__content-node {
background-color: var(--calcite-ui-foreground-1) !important;
background-color: var(--calcite-color-foreground-1) !important;
}

.esri-editor__panel-toolbar {
Expand Down
4 changes: 2 additions & 2 deletions src/components/info-card/info-card.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}

.top-border {
border-top: 1px solid var(--calcite-ui-border-1);
border-top: 1px solid var(--calcite-color-border-1);
}

.min-width-100 {
Expand All @@ -63,6 +63,6 @@

.esri-features__container {
padding: 0.5rem !important;
background-color: var(--calcite-ui-foreground-1) !important;
background-color: var(--calcite-color-foreground-1) !important;
height: 100% !important;
}
16 changes: 8 additions & 8 deletions src/components/layer-table/layer-table.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
}

.table-border {
border: 1px solid var(--calcite-ui-border-2);
border: 1px solid var(--calcite-color-border-2);
}

.border-end {
border-inline-end: 1px solid var(--calcite-ui-border-2);
border-inline-end: 1px solid var(--calcite-color-border-2);
}

.border-bottom {
border-bottom: 1px solid var(--calcite-ui-border-2);
border-bottom: 1px solid var(--calcite-color-border-2);
}

.padding-5 {
Expand Down Expand Up @@ -81,28 +81,28 @@ html[dir="rtl"] .bottom-left {
}

.background {
background-color: var(--calcite-ui-background);
background-color: var(--calcite-color-background);
}

.text-color {
color: var(--calcite-ui-text-1);
color: var(--calcite-color-text-1);
}

.align-center {
align-items: center;
}

.danger-color {
color: var(--calcite-ui-danger);
color: var(--calcite-color-status-danger);
}

.esri-feature-table vaadin-grid {
border: none !important;
}

vaadin-grid-cell-content {
padding: var(--lumo-space-xs) var(--lumo-space-m) !important;
font-size: 14px !important;
color: var(--calcite-color-text-3) !important;
}

.share-action {
Expand All @@ -120,7 +120,7 @@ html[dir="rtl"] .share-action {
.disabled {
cursor: default !important;
user-select: none;
opacity: var(--calcite-ui-opacity-disabled);
opacity: var(--calcite-opacity-disabled);
pointer-events: none;
}

Expand Down
1 change: 1 addition & 0 deletions src/components/layer-table/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ graph TD;
instant-apps-social-share --> calcite-popover
instant-apps-social-share --> calcite-button
instant-apps-social-share --> calcite-icon
instant-apps-social-share --> calcite-action
calcite-modal --> calcite-scrim
calcite-modal --> calcite-icon
instant-apps-filter-list --> calcite-panel
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout-manager/layout-manager.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

.icon-color {
--calcite-ui-icon-color: var(--calcite-ui-brand);
--calcite-color-icon-color: var(--calcite-color-brand);
}

.icon {
Expand All @@ -45,7 +45,7 @@
.tooltip-message {
padding: 5px 8px;
font-weight: var(--calcite-font-weight-normal);
color: var(--calcite-ui-text-2);
color: var(--calcite-color-text-2);
}

.header-text {
Expand Down
2 changes: 1 addition & 1 deletion src/components/map-draw-tools/map-draw-tools.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.border {
outline: 1px solid var(--calcite-ui-border-input);
outline: 1px solid var(--calcite-color-border-input);
}

.div-visible {
Expand Down
8 changes: 5 additions & 3 deletions src/components/map-layer-picker/map-layer-picker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@

.map-layer-picker-container {
width: 100%;
height: 100%;
}

.map-layer-picker {
position: relative;
width: 100%;
display: inline-block;
height: 100%;
}

.padding-bottom-1 {
Expand All @@ -50,7 +48,7 @@
.disabled {
cursor: default !important;
user-select: none;
opacity: var(--calcite-ui-opacity-disabled);
opacity: var(--calcite-opacity-disabled);
pointer-events: none;
}

Expand All @@ -69,3 +67,7 @@
.padding-start-1 {
padding-inline-start: 1rem;
}

.cursor-default {
cursor: default;
}
2 changes: 1 addition & 1 deletion src/components/map-layer-picker/map-layer-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ export class MapLayerPicker {
*/
protected _getSingleLayerPlaceholder(): VNode {
return (
<div class="layer-picker-label-container">
<div class="layer-picker-label-container cursor-default">
<calcite-icon icon="layers" scale="s"/>
<calcite-label class="no-bottom-margin padding-start-1">
{this.selectedName}
Expand Down
Loading
Loading