diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d14809..33c8f57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -90,4 +89,4 @@ workflows: branches: ignore: /.*/ tags: - only: /^v.*/ + only: /^v.*/ \ No newline at end of file diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9836a90..725f3b4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @thinkh +* @anita-steiner diff --git a/dist/components/dialogs.d.ts b/dist/components/dialogs.d.ts index e5ef0db..9d6fd8d 100644 --- a/dist/components/dialogs.d.ts +++ b/dist/components/dialogs.d.ts @@ -1,5 +1,5 @@ /// -/// +/// /// /// /** diff --git a/dist/layout/builder.js b/dist/layout/builder.js index 05608e6..01dee4f 100644 --- a/dist/layout/builder.js +++ b/dist/layout/builder.js @@ -153,7 +153,7 @@ export class AParentBuilder extends ABuilder { constructor(children) { super(); this.children = []; - this._name = 'Container'; + this._name = ''; children.forEach((c) => this.push(c)); } push(view) { diff --git a/dist/layout/builder.js.map b/dist/layout/builder.js.map index 9d286b3..bf82738 100644 --- a/dist/layout/builder.js.map +++ b/dist/layout/builder.js.map @@ -1 +1 @@ -{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/layout/builder.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/layout/builder.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/scss/abstracts/_variables.scss b/dist/scss/abstracts/_variables.scss index 4dc6c34..d2519c6 100644 --- a/dist/scss/abstracts/_variables.scss +++ b/dist/scss/abstracts/_variables.scss @@ -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; diff --git a/dist/scss/base/_base.scss b/dist/scss/base/_base.scss index 749c726..ebf4035 100644 --- a/dist/scss/base/_base.scss +++ b/dist/scss/base/_base.scss @@ -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; diff --git a/dist/scss/components/_header_navbar.scss b/dist/scss/components/_header_navbar.scss index d66f90e..ccbd18c 100644 --- a/dist/scss/components/_header_navbar.scss +++ b/dist/scss/components/_header_navbar.scss @@ -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); + } } } @@ -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 { diff --git a/package.json b/package.json index 31f401b..c26e22c 100644 --- a/package.json +++ b/package.json @@ -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": "contact@caleydo.org", diff --git a/src/layout/builder.ts b/src/layout/builder.ts index c3719fc..47acfd7 100644 --- a/src/layout/builder.ts +++ b/src/layout/builder.ts @@ -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)); } diff --git a/src/scss/abstracts/_variables.scss b/src/scss/abstracts/_variables.scss index 4dc6c34..d2519c6 100644 --- a/src/scss/abstracts/_variables.scss +++ b/src/scss/abstracts/_variables.scss @@ -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; diff --git a/src/scss/base/_base.scss b/src/scss/base/_base.scss index 749c726..ebf4035 100644 --- a/src/scss/base/_base.scss +++ b/src/scss/base/_base.scss @@ -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; diff --git a/src/scss/components/_header_navbar.scss b/src/scss/components/_header_navbar.scss index d66f90e..ccbd18c 100644 --- a/src/scss/components/_header_navbar.scss +++ b/src/scss/components/_header_navbar.scss @@ -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); + } } } @@ -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 {