From d65bdbbafc61b774c5bb4a5a457db8592b5b5c52 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Dec 2019 17:27:05 +0100 Subject: [PATCH 01/11] chore(gitlab-ci): debug ssh --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 009c1c0b4..0dd200843 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,8 @@ variables: POSTGRES_DB: uniworx_test POSTGRES_USER: uniworx POSTGRES_PASSWORD: uniworx - + GIT_SSH_COMMAND: "ssh -vv -F ~/.ssh/config" + stages: - setup - frontend:build @@ -82,7 +83,7 @@ yesod:build:dev: - apt-get update -y - apt-get install -y --no-install-recommends locales-all - ln -s $(which g++-7) $(dirname $(which g++-7))/g++ - - 'which ssh-agent || apt-get install openssh-client -y' + - apt-get install openssh-client -y - install -m 0700 -d ~/.ssh - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done From 9344b9338059b8cfb99cd1e8fdb77643f1b96db9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Dec 2019 17:31:44 +0100 Subject: [PATCH 02/11] chore(gitlab-ci): debug install --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dd200843..65f52e6ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,9 +35,9 @@ npm install: - npm install -g npm - hash -r - apt-get install openssh-client -y - - install -m 0700 -d ~/.ssh - - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - for keyVar in ${!SSH_PRIVATE_KEY_NPM_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done + - install -v -m 0700 -d ~/.ssh + - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts + - for keyVar in ${!SSH_PRIVATE_KEY_NPM_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done artifacts: paths: - node_modules/ @@ -84,9 +84,9 @@ yesod:build:dev: - apt-get install -y --no-install-recommends locales-all - ln -s $(which g++-7) $(dirname $(which g++-7))/g++ - apt-get install openssh-client -y - - install -m 0700 -d ~/.ssh - - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done + - install -v -m 0700 -d ~/.ssh + - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts + - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done artifacts: paths: - bin/ @@ -111,9 +111,9 @@ yesod:build: - apt-get install -y --no-install-recommends locales-all - ln -s $(which g++-7) $(dirname $(which g++-7))/g++ - apt-get install -y --no-install-recommends openssh-client - - install -m 0700 -d ~/.ssh - - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done + - install -v -m 0700 -d ~/.ssh + - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts + - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done artifacts: paths: - bin/ @@ -238,9 +238,9 @@ deploy:uniworx3: before_script: - apt-get update -y - apt-get install -y --no-install-recommends openssh-client - - install -m 0700 -d ~/.ssh - - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - install -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3; echo "IdentityFile ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3" >> ~/.ssh/config; + - install -v -m 0700 -d ~/.ssh + - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts + - install -v -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3; echo "IdentityFile ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3" >> ~/.ssh/config; dependencies: - yesod:build From c6ebe502eff41054d897573e7ee463b04a2019dd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Dec 2019 17:54:48 +0100 Subject: [PATCH 03/11] chore(gitlab-ci): use single deploy key --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65f52e6ed..a87c68b4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: POSTGRES_DB: uniworx_test POSTGRES_USER: uniworx POSTGRES_PASSWORD: uniworx - GIT_SSH_COMMAND: "ssh -vv -F ~/.ssh/config" + GIT_SSH_COMMAND: "ssh -v -F ~/.ssh/config" stages: - setup @@ -37,7 +37,7 @@ npm install: - apt-get install openssh-client -y - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - for keyVar in ${!SSH_PRIVATE_KEY_NPM_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done + - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; artifacts: paths: - node_modules/ @@ -86,7 +86,7 @@ yesod:build:dev: - apt-get install openssh-client -y - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done + - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; artifacts: paths: - bin/ @@ -113,7 +113,7 @@ yesod:build: - apt-get install -y --no-install-recommends openssh-client - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -v -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done + - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; artifacts: paths: - bin/ @@ -240,7 +240,7 @@ deploy:uniworx3: - apt-get install -y --no-install-recommends openssh-client - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - - install -v -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3; echo "IdentityFile ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3" >> ~/.ssh/config; + - install -v -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/uniworx3; echo "IdentityFile ~/.ssh/uniworx3" >> ~/.ssh/config; dependencies: - yesod:build From 85befe7a0c470bb3d7b473750469d84bc32adc3a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Dec 2019 18:10:24 +0100 Subject: [PATCH 04/11] chore(gitlab-ci): remove debug ssh settings --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a87c68b4a..e94fc27d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,6 @@ variables: POSTGRES_DB: uniworx_test POSTGRES_USER: uniworx POSTGRES_PASSWORD: uniworx - GIT_SSH_COMMAND: "ssh -v -F ~/.ssh/config" stages: - setup From 7192f01992ef0fb31d507cfa7a4a8e4ad5a9446a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Dec 2019 18:17:05 +0100 Subject: [PATCH 05/11] chore(karma): ignore sass --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 8f95f851a..a9efc3646 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -44,7 +44,7 @@ module.exports = function(config) { } }, { - test: /\.(css|scss)$/i, + test: /\.(css|scss|sass)$/i, loader:'null-loader', } ] From 2bdc2e7577d526193ec9edb951d60e21f4e625d6 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Dec 2019 18:17:35 +0100 Subject: [PATCH 06/11] chore(release): 10.0.0 --- CHANGELOG.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab2f8953a..dbb494a67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,56 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [10.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v9.0.3...v10.0.0) (2019-12-18) + + +### Bug Fixes + +* **allocation-list:** fix default sorting ([9eff3cf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9eff3cf)) +* **allocation-list:** fix sorting ([33d9bac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/33d9bac)) +* **datepicker:** fixes [#456](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/456) ([613426b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/613426b)) +* **hide-columns:** check for content div in isEmptyColumn ([615555e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/615555e)) +* **hide-columns:** correctly hide hiders of previously hidden columns ([364991c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/364991c)) +* **hide-columns:** fix crash if no row is present ([827cecd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/827cecd)) +* **hide-columns:** fix repositioning of table hiders onclick ([9d8ca38](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9d8ca38)) +* **hide-columns:** fix vertical positioning of hider and minor refactor ([3fbb4db](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3fbb4db)) +* **hide-columns:** improve positioning ([e371412](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e371412)) +* **hide-columns:** remove debug text from template ([9e449dd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9e449dd)) +* **pageaction:** fixes [#463](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/463) ([849c6c4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/849c6c4)) +* fix hlint ([37f0936](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/37f0936)) +* **submission:** allow not modifying submissionUsers ([030fd7a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/030fd7a)) + + +### Features + +* **default-layout:** save handler ident to main content ([ba846be](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ba846be)) +* **foundation:** move stuff out of Foundation ([e27beba](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e27beba)) +* **frontend:** use webpack more extensively ([5d8c2af](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5d8c2af)) +* **hide-columns:** better positioning of hiders ([761c6d3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/761c6d3)) +* **hide-columns:** correct storage keys ([610d13a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/610d13a)) +* **hide-columns:** fadein transformation ([506f94e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/506f94e)) +* **hide-columns:** first stub of hide-column util with manual styling ([111821d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/111821d)) +* **hide-columns:** get table wrapper ident for storage ident ([d55d3ef](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d55d3ef)) +* **hide-columns:** hide empty columns per default ([d1232ce](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d1232ce)) +* **hide-columns:** more (broken) styling; move hider elements in DOM ([e655bc6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e655bc6)) +* **hide-columns:** more styling ([4908702](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4908702)) +* **hide-columns:** refactor and auto-hide empty columns ([047c0a5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/047c0a5)) +* **hide-columns:** set attributes for hide-columns and extra-stuff div ([169a479](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/169a479)) +* **hide-columns:** styling stub with repositioning ([a9c17d7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a9c17d7)) +* **hide-columns:** support colspan & don't persist autohide ([0798d68](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0798d68)) +* **storage-manager:** add storage manager library ([1023240](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1023240)) +* **storage-manager:** location hierarchy ([80ff4ac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/80ff4ac)) +* **submission:** edit notifications ([98c0d69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/98c0d69)) +* **submission:** warn about deleting co-submissions ([e87f607](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e87f607)) + + +### BREAKING CHANGES + +* **hide-columns:** StorageManager version numbers +* **frontend:** Major frontend refactor + + + ### [9.0.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v9.0.2...v9.0.3) (2019-12-03) diff --git a/package-lock.json b/package-lock.json index 76cf43601..21b684567 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "9.0.3", + "version": "10.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a5108f480..ba1fe442d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "9.0.3", + "version": "10.0.0", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 41bc0d002..5ecf06a91 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 9.0.3 +version: 10.0.0 dependencies: - base >=4.9.1.0 && <5 From 8c9e24f2389232eef677ab7e3b15c1a114168f4e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 19 Dec 2019 10:39:24 +0100 Subject: [PATCH 07/11] chore: remove unused haskell deps --- package.yaml | 59 +++++++++++++++++++++++----------------------------- shell.nix | 2 +- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/package.yaml b/package.yaml index 5ecf06a91..8942c722c 100644 --- a/package.yaml +++ b/package.yaml @@ -2,40 +2,36 @@ name: uniworx version: 10.0.0 dependencies: - - base >=4.9.1.0 && <5 - - yesod >=1.6 && <1.7 - - yesod-core >=1.6 && <1.7 - - yesod-auth >=1.6 && <1.7 - - yesod-static >=1.6 && <1.7 - - yesod-form >=1.6 && <1.7 - - classy-prelude >=1.5 && <1.6 - - classy-prelude-conduit >=1.5 && <1.6 - - classy-prelude-yesod >=1.5 && <1.6 - - bytestring >=0.10 && <0.11 - - text >=0.11 && <2.0 - - persistent >=2.9 && <2.10 - - persistent-postgresql >=2.9 && <2.10 - - persistent-template >=2.5 && <2.9 - - persistent-qq >=2.9 && <2.10 + - base + - yesod + - yesod-core + - yesod-auth + - yesod-static + - yesod-form + - classy-prelude + - classy-prelude-yesod + - bytestring + - text + - persistent + - persistent-postgresql + - persistent-template + - persistent-qq - template-haskell - - shakespeare >=2.0 && <2.1 - - hjsmin >=0.1 && <0.3 - - monad-control >=0.3 && <1.1 - - wai-extra >=3.0 && <3.1 - - yaml >=0.11 && <0.12 - - http-conduit >=2.3 && <2.4 - - directory >=1.1 && <1.4 - - warp >=3.0 && <3.3 + - shakespeare + - monad-control + - wai-extra + - yaml + - http-conduit + - directory + - warp - data-default - - aeson >=1.4 && <1.5 - - conduit >=1.0 && <2.0 - - conduit-combinators - - monad-logger >=0.3 && <0.4 - - fast-logger >=2.2 && <2.5 - - wai-logger >=2.2 && <2.4 + - aeson + - conduit + - monad-logger + - fast-logger + - wai-logger - foreign-store - file-embed - - safe - unordered-containers - containers - vector @@ -67,7 +63,6 @@ dependencies: - binary - cereal - mtl - - sandi - esqueleto >=3.1.0 - mime-types - generic-deriving @@ -78,8 +73,6 @@ dependencies: - uuid - exceptions - stm - - stm-chans - - stm-conduit - lens - MonadRandom - email-validate diff --git a/shell.nix b/shell.nix index ce4fd9035..7079bd42a 100644 --- a/shell.nix +++ b/shell.nix @@ -19,7 +19,7 @@ let ''; override = oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-12_x postgresql openldap google-chrome ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]); + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-12_x postgresql openldap google-chrome ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install weeder ]); shellHook = '' export PROMPT_INFO="${oldAttrs.name}" From e7e7d2bc6b4a96ce3dc6735b4a869e0cfe2bf4fe Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 19 Dec 2019 11:00:22 +0100 Subject: [PATCH 08/11] fix: remove link icon on table sorting links --- frontend/src/app.sass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frontend/src/app.sass b/frontend/src/app.sass index 14460cf2a..e574b4d15 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -352,6 +352,9 @@ input[type="button"].btn-info:hover, content: fa-content($fa-var-link) margin-right: 0.25em + &.table__th-link::before + display: none + @media (max-width: 1200px) .table th padding: 4px 6px @@ -360,12 +363,6 @@ input[type="button"].btn-info:hover, max-height: 200px overflow-y: auto -.table__th-link - font-weight: bold - - &::before - display: none - .table--vertical th background-color: transparent From 3cb3dcdc9b5e20bc4a64ac787773fdd22edc3580 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 19 Dec 2019 11:08:55 +0100 Subject: [PATCH 09/11] fix: fix grid blowout on definition lists --- frontend/src/app.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app.sass b/frontend/src/app.sass index e574b4d15..68c9ae87e 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -431,7 +431,7 @@ ul.list--inline // DEFINITION LIST .deflist display: grid - grid-template-columns: 100% + grid-template-columns: minmax(0,100%) .deflist__dt, .deflist__dd @@ -449,7 +449,7 @@ ul.list--inline @media (min-width: 768px) .deflist - grid-template-columns: fit-content(25vw) 1fr + grid-template-columns: fit-content(25vw) minmax(0,1fr) .deflist margin-top: -10px From b3fb9ceb6a7ae3ac22f281e35d406badf4a12a8b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 19 Dec 2019 14:09:30 +0100 Subject: [PATCH 10/11] style: offset main content anchor by header height --- frontend/src/app.sass | 11 +++++++++-- stack.yaml.lock | 12 ++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/frontend/src/app.sass b/frontend/src/app.sass index 68c9ae87e..30095330d 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -157,12 +157,19 @@ h4 position: relative .main__content + --current-header-height: var(--header-height-collapsed) position: relative background-color: white transition: padding-left .2s ease-out - margin-top: var(--header-height-collapsed) + margin-top: var(--current-header-height) margin-left: 0 + :target::before + content: "" + display: block + height: var(--current-header-height) + margin: calc(-1 * var(--current-header-height)) 0 0 + > .container margin: 20px 0 @@ -185,8 +192,8 @@ h4 @media (min-width: 769px) .main__content + --current-header-height: var(--header-height) margin-left: var(--asidenav-width-lg, 20%) - margin-top: var(--header-height) @media (min-width: 1200px) .main__content diff --git a/stack.yaml.lock b/stack.yaml.lock index 3a7017a21..e67cca322 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -10,13 +10,13 @@ packages: sha256: 88537113b855381b8d70da2442ae644dc979ad6b32aaaec2ebf55306764c8f1a name: encoding version: 0.8.2 - git: https://github.com/uni2work/encoding.git + git: git@gitlab2.rz.ifi.lmu.de:uni2work/encoding.git pantry-tree: size: 5668 sha256: 57160d758802aba6a0d2cc88c53f2f0bb60df7d5e6822938351618b7eca0beab commit: 67bb87ceff53f0178c988dd4e15eeb2daee92b84 original: - git: https://github.com/uni2work/encoding.git + git: git@gitlab2.rz.ifi.lmu.de:uni2work/encoding.git commit: 67bb87ceff53f0178c988dd4e15eeb2daee92b84 - completed: cabal-file: @@ -24,13 +24,13 @@ packages: sha256: 7b25a0ef819e8a01b485d6d0865baa3445faa826ffb3876c94109dd2469ffbd3 name: memcached-binary version: 0.2.0 - git: https://github.com/uni2work/memcached-binary.git + git: git@gitlab2.rz.ifi.lmu.de:uni2work/memcached-binary.git pantry-tree: size: 1170 sha256: c466f91129410bae1f53e25aec4026f6984ce2dff0ada4516e2548048aba549a commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad original: - git: https://github.com/uni2work/memcached-binary.git + git: git@gitlab2.rz.ifi.lmu.de:uni2work/memcached-binary.git commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad - completed: cabal-file: @@ -38,13 +38,13 @@ packages: sha256: 49818ee0de2d55cbfbc15ca4de1761c3adac6ba3dfcdda960b413cad4f4fa47f name: conduit-resumablesink version: '0.3' - git: https://github.com/uni2work/conduit-resumablesink.git + git: git@gitlab2.rz.ifi.lmu.de:uni2work/conduit-resumablesink.git pantry-tree: size: 394 sha256: 0cccf4684bbd84f81d2d3d53dd81c46cb103b5322f1d8e89e9b222211281e1b7 commit: cbea6159c2975d42f948525e03e12fc390da53c5 original: - git: https://github.com/uni2work/conduit-resumablesink.git + git: git@gitlab2.rz.ifi.lmu.de:uni2work/conduit-resumablesink.git commit: cbea6159c2975d42f948525e03e12fc390da53c5 - completed: hackage: zip-stream-0.2.0.1@sha256:78cd3244efbfba99184d17f5923980282f7d1b8f6d71c6e8af14e516e4239691,1742 From badc325714d2bf27fd8bad0b01040a6221c40ae4 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 19 Dec 2019 14:38:34 +0100 Subject: [PATCH 11/11] chore(release): 10.0.1 --- CHANGELOG.md | 10 ++++++++++ package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbb494a67..1948967e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [10.0.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v10.0.0...v10.0.1) (2019-12-19) + + +### Bug Fixes + +* fix grid blowout on definition lists ([3cb3dcd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3cb3dcd)) +* remove link icon on table sorting links ([e7e7d2b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e7e7d2b)) + + + ## [10.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v9.0.3...v10.0.0) (2019-12-18) diff --git a/package-lock.json b/package-lock.json index 21b684567..6f290c0e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "10.0.0", + "version": "10.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ba1fe442d..b45896a1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "10.0.0", + "version": "10.0.1", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 8942c722c..8126ce7d9 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 10.0.0 +version: 10.0.1 dependencies: - base