From 1f31c29552daba5a4a5238eb323d9712e82310f1 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 8 Apr 2019 11:39:39 +0200 Subject: [PATCH 1/5] make post sticky - fixes https://github.com/Human-Connection/Human-Connection/issues/385 --- webapp/pages/post/_id.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/webapp/pages/post/_id.vue b/webapp/pages/post/_id.vue index 21dd4b292..7a495cecc 100644 --- a/webapp/pages/post/_id.vue +++ b/webapp/pages/post/_id.vue @@ -2,15 +2,12 @@
- - + + - +
@@ -79,3 +76,11 @@ export default { } } + + From 42e39a697324cea8c22ed3bb657c940289a7bc3b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 8 Apr 2019 12:32:42 +0200 Subject: [PATCH 2/5] fixed disabled red border z-index in order not to cross the menu in profile, refactored css of postCard --- webapp/components/PostCard.vue | 67 ++++++++++++---------------------- 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/webapp/components/PostCard.vue b/webapp/components/PostCard.vue index 767835f74..1fe303fec 100644 --- a/webapp/components/PostCard.vue +++ b/webapp/components/PostCard.vue @@ -4,20 +4,11 @@ :image="post.image" :class="{'post-card': true, 'disabled-content': post.disabled}" > - - {{ post.title }} - + {{ post.title }} -
+
@@ -26,20 +17,12 @@ align="right" size="small" color="soft" - > - {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }} - + >{{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }} - + - + @@ -118,27 +99,25 @@ export default { .post-card { cursor: pointer; position: relative; + z-index: 1; - .ds-card-footer { - z-index: 1; - } + /*.ds-card-footer { + }*/ .content-menu { display: inline-block; margin-left: $space-xx-small; margin-right: -$space-x-small; - z-index: 1; + } + + .post-link { + display: block; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + text-indent: -999999px; } } - -.post-link { - display: block; - position: absolute; - z-index: 1; - top: 0; - left: 0; - width: 100%; - height: 100%; - text-indent: -999999px; -} From 5b64ba1dd1e577af6f0157c818b802d10661e012 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 9 Apr 2019 04:52:26 +0000 Subject: [PATCH 3/5] Bump nodemon from 1.18.10 to 1.18.11 in /backend Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.10 to 1.18.11. - [Release notes](https://github.com/remy/nodemon/releases) - [Commits](https://github.com/remy/nodemon/compare/v1.18.10...v1.18.11) Signed-off-by: dependabot[bot] --- backend/package.json | 2 +- backend/yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/package.json b/backend/package.json index 49fd7426c..d03f35114 100644 --- a/backend/package.json +++ b/backend/package.json @@ -92,7 +92,7 @@ "eslint-plugin-standard": "~4.0.0", "graphql-request": "~1.8.2", "jest": "~24.7.1", - "nodemon": "~1.18.10", + "nodemon": "~1.18.11", "supertest": "~4.0.2" } } diff --git a/backend/yarn.lock b/backend/yarn.lock index 441caacac..a491398fc 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2144,10 +2144,10 @@ cheerio@~1.0.0-rc.3: lodash "^4.15.0" parse5 "^3.0.1" -chokidar@^2.0.3, chokidar@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0" - integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ== +chokidar@^2.0.3, chokidar@^2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d" + integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A== dependencies: anymatch "^2.0.0" async-each "^1.0.1" @@ -2159,7 +2159,7 @@ chokidar@^2.0.3, chokidar@^2.1.0: normalize-path "^3.0.0" path-is-absolute "^1.0.0" readdirp "^2.2.1" - upath "^1.1.0" + upath "^1.1.1" optionalDependencies: fsevents "^1.2.7" @@ -5672,12 +5672,12 @@ node-releases@^1.1.13: dependencies: semver "^5.3.0" -nodemon@~1.18.10: - version "1.18.10" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe" - integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ== +nodemon@~1.18.11: + version "1.18.11" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.11.tgz#d836ab663776e7995570b963da5bfc807e53f6b8" + integrity sha512-KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw== dependencies: - chokidar "^2.1.0" + chokidar "^2.1.5" debug "^3.1.0" ignore-by-default "^1.0.1" minimatch "^3.0.4" @@ -7638,10 +7638,10 @@ unzip-response@^2.0.1: resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= -upath@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" - integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== +upath@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068" + integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q== update-notifier@^2.5.0: version "2.5.0" From b235c640c5181754e8f3390be0090ae664c125cf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 9 Apr 2019 11:09:03 +0200 Subject: [PATCH 4/5] lint fix --- webapp/components/PostCard.vue | 35 ++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/webapp/components/PostCard.vue b/webapp/components/PostCard.vue index 1fe303fec..87f56e7e3 100644 --- a/webapp/components/PostCard.vue +++ b/webapp/components/PostCard.vue @@ -4,11 +4,18 @@ :image="post.image" :class="{'post-card': true, 'disabled-content': post.disabled}" > - {{ post.title }} + {{ post.title }} -
+
@@ -17,12 +24,20 @@ align="right" size="small" color="soft" - >{{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }} + > + {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }} + - + - + From 5e28ef32ab452b79be2c91ca92801c830617914d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 9 Apr 2019 11:14:41 +0200 Subject: [PATCH 5/5] lint fixes --- webapp/pages/post/_id.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/webapp/pages/post/_id.vue b/webapp/pages/post/_id.vue index 7a495cecc..d9e8beb01 100644 --- a/webapp/pages/post/_id.vue +++ b/webapp/pages/post/_id.vue @@ -2,12 +2,18 @@
- - + + - +