From 9685d7d9dcd4e9b0dc6fa31c682cefd431cd3cc0 Mon Sep 17 00:00:00 2001 From: Vanessa Stoiber <52395160+dvvanessastoiber@users.noreply.github.com> Date: Thu, 4 Aug 2022 16:19:00 +0200 Subject: [PATCH] Release 6.1.0 (#101) * prepare next development version 6.0.1-SNAPSHOT * Fix LineUp data type icons in comparison The issue is present since we use Font Awesome from tdp_core for LineUp and disable the lu-font. This change imports the lu-font from the LineUp assets. It also fixes the icons for the numerical data type. * Prepare github changes * Update README.md * Remove circleci * prepare release 6.1.0 Co-authored-by: Holger Stitz Co-authored-by: anita-steiner <> Co-authored-by: Anita Steiner --- .circleci/config.yml | 59 ----------------------- .github/CODEOWNERS | 1 + .github/ISSUE_TEMPLATE/bug-report.md | 36 ++++++++++++++ .github/ISSUE_TEMPLATE/feature-request.md | 17 +++++++ .github/pull_request_template.md | 45 +++++++++++++++++ .github/workflows/build.yml | 8 +++ .github/workflows/publish.yml | 8 +++ .github/workflows/release.yml | 8 +++ README.md | 1 - dist/scss/components/_tourdino_panel.scss | 21 +++++++- package.json | 4 +- src/scss/components/_tourdino_panel.scss | 21 +++++++- 12 files changed, 163 insertions(+), 66 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/publish.yml create mode 100644 .github/workflows/release.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 016dff5..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,59 +0,0 @@ -version: 2.1 - -executors: - node-executor: - working_directory: ~/phovea - docker: - - image: circleci/node:14.17-buster - -jobs: - build: - executor: node-executor - steps: - - checkout - - run: - name: Show Node.js and npm version - command: | - node -v - npm -v - - restore_cache: - key: deps1-{{ .Branch }}-{{ checksum "package.json" }} - - run: - name: Install npm dependencies - command: npm install - - run: - name: Remove npm dependencies installed from git repositories (avoid caching of old commits) - command: | - (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf - - save_cache: - key: deps1-{{ .Branch }}-{{ checksum "package.json" }} - paths: ./node_modules - - run: - name: Install npm dependencies from git repositories (always get latest commit) - command: npm install - - run: - name: Show installed npm dependencies - command: npm list --depth=1 || true - - run: - name: Build - command: npm run dist - - store_artifacts: - path: dist -workflows: - version: 2.1 -# build-nightly: -# triggers: -# - schedule: -# cron: "15 1 * * 1-5" # "At 01:15 on every day-of-week from Monday through Friday.โ€, see: https://crontab.guru/#15_1_*_*_1-5 -# filters: -# branches: -# only: -# - develop -# jobs: -# - build - build-branches-and-tags: - jobs: - - build: - filters: - tags: - only: /.*/ diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9836a90..4c1e8fa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,2 @@ * @thinkh + diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md new file mode 100644 index 0000000..d39e18b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -0,0 +1,36 @@ +--- +name: ๐Ÿ›Bug Report +about: Create a bug report to help us improve +title: "" +labels: ["type: bug"] +assignees: "" + +--- + +### Environment + + * Release number or git hash: + * Browser: + * Deployed / Local: +--- + +### Steps to reproduce the bug + +1. Open a list of ... / Search ... +2. Do something else + +### Observed Behavior + +> Please provide a short description of the actual behavior you observed +> If applicable, add screenshots to help explain your problem. +> - Any unexpected output or action (or lack of expected output or action) +> - Web browser console errors (including tracebacks) +> - Server errors (relevant messages and tracebacks) +> - Static or animated images showing the UI behavior + +### Expected Behavior + +> Please provide a short description which behavior you expected from your steps + +Thanks for taking the time to fill out this bug report ๐Ÿค— +Make sure there aren't any open/closed issues for this topic ๐Ÿ˜ƒ diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 0000000..1be6f2c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,17 @@ +--- +name: โœจFeature Request +about: Request a new feature or enhancement +title: "" +labels: ["type: feature"] +--- + +## Short description + +Please provide a short description which summarizes the idea behind this feature request and why this is useful. + +## User stories + +* As a *user*, I want to ... so that ... + + +Please make sure this feature request hasn't been already submitted by someone by looking through other open/closed issues ๐Ÿ˜ƒ diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..266c6ef --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,45 @@ +Closes *list issues numbers here* + +### Developer Checklist (Definition of Done) + +**Issue** + +- [ ] All acceptance criteria from the issue are met +- [ ] Tested in latest Chrome/Firefox + +**UI/UX/Vis** + +- [ ] Requires UI/UX/Vis review + - [ ] Reviewer(s) are notified (_tag assignees_) + - [ ] Review has occurred (_link to notes_) + - [ ] Feedback is included in this PR + - [ ] Reviewer(s) approve of concept and design + +**Code** + +- [ ] Branch is up-to-date with the branch to be merged with, i.e., develop +- [ ] Code is cleaned up and formatted +- [ ] Unit tests are written (frontend/backend if applicable) +- [ ] Integration tests are written (if applicable) + +**PR** + +- [ ] Descriptive title for this pull request is provided (will be used for release notes later) +- [ ] Reviewer and assignees are defined +- [ ] Add type label (e.g., *bug*, *feature*) to this pull request +- [ ] Add release label (e.g., `release: minor`) to this PR following [semver](https://semver.org/) +- [ ] The PR is connected to the corresponding issue (via `Closes #...`) +- [ ] [Summary of changes](#summary-of-changes) is written + + +### Summary of changes + +- + +### Screenshots + + +### Additional notes for the reviewer(s) + +- +Thanks for creating this pull request ๐Ÿค— diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..cf5fb43 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,8 @@ +name: build + +on: [push, workflow_dispatch] + +jobs: + build: + uses: datavisyn/github-workflows/.github/workflows/build-node.yml@main + secrets: inherit diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..eeccead --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,8 @@ +name: publish + +on: workflow_dispatch + +jobs: + publish: + uses: datavisyn/github-workflows/.github/workflows/publish-node.yml@main + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..1720aab --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,8 @@ +name: release + +on: workflow_dispatch + +jobs: + release: + uses: datavisyn/github-workflows/.github/workflows/release-source.yml@main + secrets: inherit diff --git a/README.md b/README.md index d331838..391d3c1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ E.g.,` [Lockjaw, Captain Marvel, Black Widow]` and `[Captain Marvel, Black Widow `Work in progress` - ### Attribute Similarity E.g., *Species* and *Has Superpowers* diff --git a/dist/scss/components/_tourdino_panel.scss b/dist/scss/components/_tourdino_panel.scss index 1359bcf..5e82b00 100644 --- a/dist/scss/components/_tourdino_panel.scss +++ b/dist/scss/components/_tourdino_panel.scss @@ -597,11 +597,28 @@ div.touring { } } + @at-root { + @font-face { + font-family: lu-font; + src: url('~lineupjs/src/assets/font/lu-font.eot'); + src: url('~lineupjs/src/assets/font/lu-font.eot') format('embedded-opentype'), + url('~lineupjs/src/assets/font/lu-font.woff2') format('woff2'), url('~lineupjs/src/assets/font/lu-font.woff') format('woff'), + url('~lineupjs/src/assets/font/lu-font.ttf') format('truetype'), url('~lineupjs/src/assets/font/lu-font.svg') format('svg'); + font-weight: normal; + font-style: normal; + } + } + [data-type]::before { display: inline-block; // so that the width property works width: 1.2em; // to have some space between icon and the text in the td - font-family: lu-font; // some icon font color: #999; // #515151 is to dark + + font: normal normal normal 14px/1 lu-font, serif; // shortening font declaration + font-size: inherit; // can't have font-size inherit on line above, so need to override + text-rendering: auto; // optimizelegibility throws things off #1094 + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } [data-type="categorical"]::before { @@ -609,6 +626,6 @@ div.touring { } [data-type="number"]::before { - content: "\e811"; + content: "\e80f"; } } diff --git a/package.json b/package.json index ba8ee7b..c284212 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tourdino", "description": "Calculate and visualize similarity measures.", "homepage": "https://phovea.caleydo.org", - "version": "6.0.0", + "version": "6.1.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -90,7 +90,7 @@ "worker-loader": "^2.0.0" }, "dependencies": { - "tdp_core": "^15.0.0", + "tdp_core": "^15.1.0", "d3": "~3.5.17", "d3.parsets": "git+ssh://git@github.com:jasondavies/d3-parsets#v1.2.4", "jstat": "^1.9.4", diff --git a/src/scss/components/_tourdino_panel.scss b/src/scss/components/_tourdino_panel.scss index 1359bcf..5e82b00 100644 --- a/src/scss/components/_tourdino_panel.scss +++ b/src/scss/components/_tourdino_panel.scss @@ -597,11 +597,28 @@ div.touring { } } + @at-root { + @font-face { + font-family: lu-font; + src: url('~lineupjs/src/assets/font/lu-font.eot'); + src: url('~lineupjs/src/assets/font/lu-font.eot') format('embedded-opentype'), + url('~lineupjs/src/assets/font/lu-font.woff2') format('woff2'), url('~lineupjs/src/assets/font/lu-font.woff') format('woff'), + url('~lineupjs/src/assets/font/lu-font.ttf') format('truetype'), url('~lineupjs/src/assets/font/lu-font.svg') format('svg'); + font-weight: normal; + font-style: normal; + } + } + [data-type]::before { display: inline-block; // so that the width property works width: 1.2em; // to have some space between icon and the text in the td - font-family: lu-font; // some icon font color: #999; // #515151 is to dark + + font: normal normal normal 14px/1 lu-font, serif; // shortening font declaration + font-size: inherit; // can't have font-size inherit on line above, so need to override + text-rendering: auto; // optimizelegibility throws things off #1094 + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } [data-type="categorical"]::before { @@ -609,6 +626,6 @@ div.touring { } [data-type="number"]::before { - content: "\e811"; + content: "\e80f"; } }