From 598d27f6b85843ea994b68b93796f1be6f7b6195 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Thu, 4 Jul 2019 20:55:33 +0900 Subject: [PATCH 1/4] Revert "Merge pull request #153 from shikorism/fix/140" This reverts commit d044b6db20b2910c1355eb74ef7cbe2978dce731. --- resources/assets/sass/_bootstrap-custom.scss | 10 ---------- resources/views/components/link-card.blade.php | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/resources/assets/sass/_bootstrap-custom.scss b/resources/assets/sass/_bootstrap-custom.scss index bafdd03..a56818a 100644 --- a/resources/assets/sass/_bootstrap-custom.scss +++ b/resources/assets/sass/_bootstrap-custom.scss @@ -6,14 +6,4 @@ .card-img-right { width: 100%; @include border-right-radius($card-inner-border-radius); -} - -.card-img-top-to-left { - width: 100%; - @include media-breakpoint-down(md) { - @include border-top-radius($card-inner-border-radius); - } - @include media-breakpoint-up(lg) { - @include border-left-radius($card-inner-border-radius); - } } \ No newline at end of file diff --git a/resources/views/components/link-card.blade.php b/resources/views/components/link-card.blade.php index a10d707..5ce16d0 100644 --- a/resources/views/components/link-card.blade.php +++ b/resources/views/components/link-card.blade.php @@ -2,7 +2,7 @@
- Thumbnail + Thumbnail
From c4768ded3871024acd67f6bf72e9fe7c67925b4b Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 10 Mar 2019 17:33:29 +0900 Subject: [PATCH 2/4] Revert "Merge pull request #138 from eai04191/feature/bootstrap-custom" This reverts commit 077731495c735c7ae5b1de068f9e8d8e983f6d5d. --- resources/assets/sass/_bootstrap-custom.scss | 9 --------- resources/assets/sass/app.scss | 1 - resources/assets/sass/tissue.css | 12 ++++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 resources/assets/sass/_bootstrap-custom.scss diff --git a/resources/assets/sass/_bootstrap-custom.scss b/resources/assets/sass/_bootstrap-custom.scss deleted file mode 100644 index a56818a..0000000 --- a/resources/assets/sass/_bootstrap-custom.scss +++ /dev/null @@ -1,9 +0,0 @@ -.card-img-left { - width: 100%; - @include border-left-radius($card-inner-border-radius); -} - -.card-img-right { - width: 100%; - @include border-right-radius($card-inner-border-radius); -} \ No newline at end of file diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 928bd95..0fe2b4f 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -3,7 +3,6 @@ $primary: #e53fb1; // Bootstrap @import "~bootstrap/scss/bootstrap"; -@import "bootstrap-custom"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap"; diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css index c8d5f15..e98a42f 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -76,4 +76,16 @@ #navbarAccountDropdownSp { max-width: calc(100vw - 5em); +} + +.card-img-left { + width: 100%; + border-top-left-radius: calc(.25rem - 1px); + border-bottom-left-radius: calc(.25rem - 1px); +} + +.card-img-right { + width: 100%; + border-top-right-radius: calc(.25rem - 1px); + border-bottom-right-radius: calc(.25rem - 1px); } \ No newline at end of file From 733e97bc5858b495a6dcf3afe1bda59bea4c4bd7 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Thu, 4 Jul 2019 21:28:26 +0900 Subject: [PATCH 3/4] =?UTF-8?q?card-img=E9=A1=9E=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=80=81.card=E3=81=ABoverflow=E4=BB=98=E4=B8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/components/_link-card.scss | 2 ++ resources/assets/sass/tissue.css | 11 ----------- resources/views/components/link-card.blade.php | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/resources/assets/sass/components/_link-card.scss b/resources/assets/sass/components/_link-card.scss index d572ca2..a154454 100644 --- a/resources/assets/sass/components/_link-card.scss +++ b/resources/assets/sass/components/_link-card.scss @@ -1,4 +1,6 @@ .link-card { + overflow: hidden; + .row > div { max-height: 400px; overflow: hidden; diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css index e98a42f..6c3ebf4 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -78,14 +78,3 @@ max-width: calc(100vw - 5em); } -.card-img-left { - width: 100%; - border-top-left-radius: calc(.25rem - 1px); - border-bottom-left-radius: calc(.25rem - 1px); -} - -.card-img-right { - width: 100%; - border-top-right-radius: calc(.25rem - 1px); - border-bottom-right-radius: calc(.25rem - 1px); -} \ No newline at end of file diff --git a/resources/views/components/link-card.blade.php b/resources/views/components/link-card.blade.php index 5ce16d0..f0d7de3 100644 --- a/resources/views/components/link-card.blade.php +++ b/resources/views/components/link-card.blade.php @@ -2,7 +2,7 @@
- Thumbnail + Thumbnail
From 4f5595dae093b0125c9b0d4519f1bed6dc48930a Mon Sep 17 00:00:00 2001 From: eai04191 Date: Thu, 4 Jul 2019 21:28:54 +0900 Subject: [PATCH 4/4] =?UTF-8?q?vue=E5=81=B4=E3=82=82=E8=BF=BD=E5=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/components/MetadataPreview.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/MetadataPreview.vue b/resources/assets/js/components/MetadataPreview.vue index eeada94..cbce097 100644 --- a/resources/assets/js/components/MetadataPreview.vue +++ b/resources/assets/js/components/MetadataPreview.vue @@ -11,7 +11,7 @@
- Thumbnail + Thumbnail
@@ -90,10 +90,7 @@