From 8c3ee2a094686c4cd9f87f51e6a957d67be2be26 Mon Sep 17 00:00:00 2001 From: Joy Cheng Date: Fri, 20 Aug 2021 23:40:12 +0800 Subject: [PATCH] [edit] payment info --- app/assets/style/all.scss | 1 - app/assets/style/helpers/_helpers.scss | 9 + app/assets/style/helpers/_mixin.scss | 15 - app/layout.ejs | 2 +- app/order-info.html | 840 ++++++++++++------------ app/payment-info.html | 841 +++++++++++++------------ 6 files changed, 879 insertions(+), 829 deletions(-) delete mode 100644 app/assets/style/helpers/_mixin.scss diff --git a/app/assets/style/all.scss b/app/assets/style/all.scss index f3fd277..5cb4ae9 100644 --- a/app/assets/style/all.scss +++ b/app/assets/style/all.scss @@ -9,7 +9,6 @@ @import './helpers/base'; @import './helpers/helpers'; //rwd heights and widths -@import './helpers/mixin'; //vh @import './utilities/sizing'; @import './utilities/spacing'; diff --git a/app/assets/style/helpers/_helpers.scss b/app/assets/style/helpers/_helpers.scss index f94ea79..749f40a 100644 --- a/app/assets/style/helpers/_helpers.scss +++ b/app/assets/style/helpers/_helpers.scss @@ -40,4 +40,13 @@ @include media-breakpoint-up(md) { margin-bottom: 42px; } +} + +/* vh */ + +.vh-100-minus-header { + height: calc(100vh - 60px); + @include media-breakpoint-up(md) { + height: calc(100vh - 90px); + } } \ No newline at end of file diff --git a/app/assets/style/helpers/_mixin.scss b/app/assets/style/helpers/_mixin.scss deleted file mode 100644 index eea47a7..0000000 --- a/app/assets/style/helpers/_mixin.scss +++ /dev/null @@ -1,15 +0,0 @@ -/* vh */ - -.vh-100-minus-header { - height: calc(100vh - 60px); - @include media-breakpoint-up(md) { - height: calc(100vh - 82px); - } -} - -.vh-100-minus-header-navbar { - height: calc(100vh - 115px); - @include media-breakpoint-up(md) { - height: calc(100vh - 135px); - } -} diff --git a/app/layout.ejs b/app/layout.ejs index c1865a4..4a7ac55 100644 --- a/app/layout.ejs +++ b/app/layout.ejs @@ -498,12 +498,12 @@ +