From 3bbd8c064d3750f18905caf0dc2ef0950436b8dd Mon Sep 17 00:00:00 2001 From: Phil Owen <19691521+PhillipsOwen@users.noreply.github.com> Date: Wed, 11 Jan 2023 14:30:19 -0500 Subject: [PATCH 1/3] making sure the close button on the observation dialog doesnt disappear. --- lib/Styles/variables.scss | 7 +++++++ lib/Views/global.scss | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/Styles/variables.scss b/lib/Styles/variables.scss index c7b5274f3..32234cefc 100644 --- a/lib/Styles/variables.scss +++ b/lib/Styles/variables.scss @@ -218,6 +218,13 @@ $focus-border-dark: solid $focus-border-width $focus-border-dark-color; cursor: initial; } + .tjs-feature-info-panel__btn--close-feature:hover svg, + .tjs-feature-info-panel__btn--close-feature:focus svg, + .tjs-feature-info-panel__btnToggleFeature:hover svg, + .tjs-feature-info-panel__btnToggleFeature:focus svg { + fill: white !important; + } + // To customise the look of your Terria Map, uncomment this section and make changes to your heart's content // You will also want to uncomment and change values in lib/Styles/variables.scss /* diff --git a/lib/Views/global.scss b/lib/Views/global.scss index a877cc336..67a6d9236 100644 --- a/lib/Views/global.scss +++ b/lib/Views/global.scss @@ -134,6 +134,13 @@ body { left: unset !important; } + .tjs-feature-info-panel__btn--close-feature:hover svg, + .tjs-feature-info-panel__btn--close-feature:focus svg, + .tjs-feature-info-panel__btnToggleFeature:hover svg, + .tjs-feature-info-panel__btnToggleFeature:focus svg { + fill: white !important; + } + // .ExperimentalFeatures__ControlsWrapper-sc-1xcqt5a-0 { // display: flex; // align-items: end; From 789a7076296a7d7b552d3123ac0dbc2345504189 Mon Sep 17 00:00:00 2001 From: Phil Owen <19691521+PhillipsOwen@users.noreply.github.com> Date: Wed, 11 Jan 2023 14:30:48 -0500 Subject: [PATCH 2/3] reconfiguring for this repo --- .github/workflows/image-push.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/image-push.yml b/.github/workflows/image-push.yml index 1a8a8847a..d7aea22ca 100644 --- a/.github/workflows/image-push.yml +++ b/.github/workflows/image-push.yml @@ -13,11 +13,11 @@ on: # working parameters that are specific to this script env: - REGISTRY: containers.renci.org/eds/apsviz-supervisor + REGISTRY: containers.renci.org/eds/apsviz-terria-map # job definition jobs: - pylint-build-and-push-image: + build-and-push-image: runs-on: ubuntu-latest permissions: contents: read @@ -28,12 +28,6 @@ jobs: - name: Checkout uses: actions/checkout@v1 - # install pylint and run it on the code - - name: Python Pylint GitHub Action - uses: fylein/python-pylint-github-action@v1 - with: - args: pip3 install -r requirements.txt && pylint --rcfile=.pylintrc --recursive=y ./ - # connect to the renci image registry - name: Login to containers.renci.org uses: docker/login-action@v2 From 6d546ca3eca89bc370e0cf47d01ea349f6ee6bdd Mon Sep 17 00:00:00 2001 From: Phil Owen <19691521+PhillipsOwen@users.noreply.github.com> Date: Wed, 11 Jan 2023 14:31:05 -0500 Subject: [PATCH 3/3] not needed in this project --- .github/workflows/ci.yml | 25 ------------------ .github/workflows/release.yml | 48 ----------------------------------- 2 files changed, 73 deletions(-) delete mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 739075746..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,25 +0,0 @@ -# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions - -name: CI - -on: [push, pull_request] - -jobs: - build: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x, 16.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: rm -rf node_modules && yarn install --frozen-lockfile - - run: yarn gulp lint release - env: - NODE_OPTIONS: --max_old_space_size=4096 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 743258ec8..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Release - -on: - release: - types: [published] - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -permissions: - packages: write - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to GHCR - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Tag image - id: meta - uses: docker/metadata-action@v3 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=semver,pattern={{version}} - - - name: Build and push - uses: docker/build-push-action@v2 - with: - platforms: linux/amd64,linux/arm64 - tags: ${{ steps.meta.outputs.tags }} - push: true