From ed1cfe94f0fb7ed1ad819c01b8a74af959011357 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sat, 9 Mar 2019 03:42:45 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Bootstrap=E3=81=AE=E3=82=AB=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=83=A0=E3=82=92=E5=88=A5=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AB=E7=A7=BB=E5=8B=95=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/app.scss | 1 + resources/assets/sass/boostrap-custom.scss | 11 +++++++++++ resources/assets/sass/tissue.css | 12 ------------ 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 resources/assets/sass/boostrap-custom.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 42fa070..1584650 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,5 +1,6 @@ // Bootstrap @import "~bootstrap/scss/bootstrap"; +@import "boostrap-custom.scss"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap"; diff --git a/resources/assets/sass/boostrap-custom.scss b/resources/assets/sass/boostrap-custom.scss new file mode 100644 index 0000000..cd03a90 --- /dev/null +++ b/resources/assets/sass/boostrap-custom.scss @@ -0,0 +1,11 @@ +.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/assets/sass/tissue.css b/resources/assets/sass/tissue.css index f7dfd0c..fa57ff3 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -84,16 +84,4 @@ #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 e983a3da0b1d48680d52e2823dd9b3452101cf09 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sat, 9 Mar 2019 03:49:47 +0900 Subject: [PATCH 2/4] =?UTF-8?q?border-radius=E3=81=AEmixin=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/boostrap-custom.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/sass/boostrap-custom.scss b/resources/assets/sass/boostrap-custom.scss index cd03a90..a56818a 100644 --- a/resources/assets/sass/boostrap-custom.scss +++ b/resources/assets/sass/boostrap-custom.scss @@ -1,11 +1,9 @@ .card-img-left { width: 100%; - border-top-left-radius: calc(.25rem - 1px); - border-bottom-left-radius: calc(.25rem - 1px); + @include border-left-radius($card-inner-border-radius); } .card-img-right { width: 100%; - border-top-right-radius: calc(.25rem - 1px); - border-bottom-right-radius: calc(.25rem - 1px); + @include border-right-radius($card-inner-border-radius); } \ No newline at end of file From b430ba71628a87f46a8bced4549b80fd8f57564e Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 10 Mar 2019 15:36:55 +0900 Subject: [PATCH 3/4] =?UTF-8?q?partial=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/sass/{boostrap-custom.scss => _boostrap-custom.scss} | 0 resources/assets/sass/app.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/assets/sass/{boostrap-custom.scss => _boostrap-custom.scss} (100%) diff --git a/resources/assets/sass/boostrap-custom.scss b/resources/assets/sass/_boostrap-custom.scss similarity index 100% rename from resources/assets/sass/boostrap-custom.scss rename to resources/assets/sass/_boostrap-custom.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 1584650..63484cc 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,6 +1,6 @@ // Bootstrap @import "~bootstrap/scss/bootstrap"; -@import "boostrap-custom.scss"; +@import "boostrap-custom"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap"; From 7c70e6db7e735648c5633064425953ee3120914c Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 10 Mar 2019 15:41:34 +0900 Subject: [PATCH 4/4] =?UTF-8?q?typo=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sass/{_boostrap-custom.scss => _bootstrap-custom.scss} | 0 resources/assets/sass/app.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/assets/sass/{_boostrap-custom.scss => _bootstrap-custom.scss} (100%) diff --git a/resources/assets/sass/_boostrap-custom.scss b/resources/assets/sass/_bootstrap-custom.scss similarity index 100% rename from resources/assets/sass/_boostrap-custom.scss rename to resources/assets/sass/_bootstrap-custom.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 63484cc..097ddd0 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,6 +1,6 @@ // Bootstrap @import "~bootstrap/scss/bootstrap"; -@import "boostrap-custom"; +@import "bootstrap-custom"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap";