Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Release 6.1.0 #150

Merged
14 commits merged into from
Jun 4, 2021
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ jobs:
- run:
name: Authentication
command: |
echo -e "registry=https://$NPM_REPOSITORY" >> ~/.npmrc
echo -e "//$NPM_REPOSITORY:authToken=$NPM_TOKEN" >> ~/.npmrc
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
- run:
name: Publish package
command: npm publish
Expand Down Expand Up @@ -90,4 +89,4 @@ workflows:
branches:
ignore: /.*/
tags:
only: /^v.*/
only: /^v.*/
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @thinkh
* @anita-steiner
2 changes: 1 addition & 1 deletion dist/components/dialogs.d.ts

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

2 changes: 1 addition & 1 deletion dist/layout/builder.js

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

2 changes: 1 addition & 1 deletion dist/layout/builder.js.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/scss/abstracts/_variables.scss

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

2 changes: 1 addition & 1 deletion dist/scss/base/_base.scss

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

21 changes: 14 additions & 7 deletions dist/scss/components/_header_navbar.scss

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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "phovea_ui",
"description": "Wrapper for integration of Bootstrap and FontAwesome along with a common header for Phovea apps",
"version": "6.0.0",
"version": "6.1.0",
"author": {
"name": "The Caleydo Team",
"email": "[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion src/layout/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export abstract class AParentBuilder extends ABuilder {

constructor(children: IBuildAbleOrViewLike[]) {
super();
this._name = 'Container';
this._name = '';
children.forEach((c) => this.push(c));
}

Expand Down
12 changes: 6 additions & 6 deletions src/scss/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ $fa-font-path: '~@fortawesome/fontawesome-free/webfonts' !default;
$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/' !default;

$phovea-loading-icon-url: url('~phovea_ui/dist/assets/caleydo_c_anim.svg') !default;
$phovea-loading-icon-background: rgba(255, 255, 255, 0.26) #{$phovea-loading-icon-url} no-repeat fixed center !default;
$phovea-loading-icon: $phovea-loading-icon-background !default; // @deprecated use $phovea-loading-icon-background instead

$phovea-brand-logo-url: url('~phovea_ui/dist/assets/caleydo_c.svg') !default;
$phovea-brand-logo-width: 50px !default;
$phovea-brand-logo-background: transparent #{$phovea-brand-logo-url} no-repeat 0.6em 45% !default;
$phovea-brand-logo: $phovea-brand-logo-background !default; // @deprecated use $phovea-brand-logo-background instead
$phovea-navbar-icon-url: url('~phovea_ui/dist/assets/caleydo_c.svg') !default;
$phovea-navbar-icon-width: 20px !default;
$phovea-navbar-icon-top: center !default;

$phovea-about-dialog-icon-url: url('~phovea_ui/dist/assets/caleydo_c.svg') !default;
$phovea-about-dialog-icon-height: unset !default;

// header navbar color (the inverse colors will be computed using sass `invert($color)`)
$header-bg-color: #f0f0f0 !default;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/base/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body, html {
position: fixed;
width: 100%;
height: 100%;
background: $phovea-loading-icon;
background: rgba(255, 255, 255, 0.26) $phovea-loading-icon-url no-repeat fixed center;
z-index: 999;
top: 0;
bottom: 0;
Expand Down
21 changes: 14 additions & 7 deletions src/scss/components/_header_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,19 @@ nav.navbar-inverse {

// caleydo logo for the app link
.caleydo_app {
padding-left: 2.1em;
background: $phovea-brand-logo-background;
background-size: 20px;
background-origin: border-box;
display: flex;
align-items: center;
gap: 1rem;

&::before {
content: '';
display: block;
background: $phovea-navbar-icon-url no-repeat center $phovea-navbar-icon-top;
background-size: contain;
height: 100%;
width: $phovea-navbar-icon-width;
transform: scale(1.2);
}
}
}

Expand Down Expand Up @@ -97,10 +104,10 @@ nav.navbar-inverse {
&::before {
display: block;
content: '';
background: transparent #{$phovea-brand-logo-url} no-repeat top center;
background: $phovea-about-dialog-icon-url no-repeat center top;
background-size: contain;
flex-basis: $phovea-brand-logo-width;
min-height: $phovea-brand-logo-width;
flex-basis: 40px;
min-height: $phovea-about-dialog-icon-height;
}

p {
Expand Down