Skip to content

Commit

Permalink
Release 6.1.0 (#101)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Anita Steiner <[email protected]>
  • Loading branch information
3 people authored Aug 4, 2022
1 parent 0769a70 commit 9685d7d
Show file tree
Hide file tree
Showing 12 changed files with 163 additions and 66 deletions.
59 changes: 0 additions & 59 deletions .circleci/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @thinkh

36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -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 😃
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -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 😃
45 changes: 45 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -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 🤗
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: build

on: [push, workflow_dispatch]

jobs:
build:
uses: datavisyn/github-workflows/.github/workflows/build-node.yml@main
secrets: inherit
8 changes: 8 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: publish

on: workflow_dispatch

jobs:
publish:
uses: datavisyn/github-workflows/.github/workflows/publish-node.yml@main
secrets: inherit
8 changes: 8 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: release

on: workflow_dispatch

jobs:
release:
uses: datavisyn/github-workflows/.github/workflows/release-source.yml@main
secrets: inherit
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
21 changes: 19 additions & 2 deletions dist/scss/components/_tourdino_panel.scss

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]",
Expand Down Expand Up @@ -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://[email protected]:jasondavies/d3-parsets#v1.2.4",
"jstat": "^1.9.4",
Expand Down
21 changes: 19 additions & 2 deletions src/scss/components/_tourdino_panel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -597,18 +597,35 @@ 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 {
content: "\e810";
}

[data-type="number"]::before {
content: "\e811";
content: "\e80f";
}
}

0 comments on commit 9685d7d

Please sign in to comment.