From feaaaa89a5591cf181bea45a0257ba0c8b40c9d7 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sun, 14 Apr 2019 15:30:43 +0530 Subject: [PATCH] fixed some style issues --- .../views/catalog/attributes/create.blade.php | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 19 ++++++------------- .../views/layouts/header/index.blade.php | 4 ++-- .../src/Resources/assets/sass/_variables.scss | 1 + .../Ui/src/Resources/assets/sass/app.scss | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 30bf27afe..d68f4d2d2 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -302,7 +302,7 @@ - diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index ce06c037e..ad2a342cb 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -421,7 +421,7 @@ input { display: grid; grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); grid-auto-rows: auto; - grid-column-gap: 48px; + grid-column-gap: 30px; grid-row-gap: 15px; justify-items: end; } @@ -827,7 +827,6 @@ section.slider-block { border-top-right-radius: 0px; border-bottom-right-radius: 0px; padding-left: 12px; - font-family: "Montserrat", sans-serif; font-size: 14px; } @@ -854,9 +853,8 @@ section.slider-block { > li { display: inline-block; border-right: 2px solid $border-color; - cursor: pointer; padding: 0 15px; - min-height: 26px; + min-height: 15px; padding-top: 3px; &:first-child { @@ -1362,14 +1360,6 @@ section.slider-block { .control-group { .subscribe-field { width: 100%; - - &::-webkit-input-placeholder { - font-family: "montserrat", sans-serif; - } - - &::-moz-placeholder { - font-family: "montserrat", sans-serif; - } } .btn-primary { @@ -2483,8 +2473,11 @@ section.cart { padding-top: 20px; .form-header { + display: inline-flex; + align-items: center; + justify-content: space-between; width: 100%; - display: inline-block; + height: 30px; .checkout-step-heading { font-size: 24px; diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index f86c3eb55..567663e5f 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -97,11 +97,11 @@
- + {{ __('shop::app.header.sign-in') }} - + {{ __('shop::app.header.sign-up') }}
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss index 84cca50f7..a3342a9cc 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss @@ -1,5 +1,6 @@ $font-color: #3a3a3a; $brand-color: #0041FF; +$selection-color: rgba(0, 64, 255, 0.6); $info-color: #204d74; $danger-color: #FC6868; $success-color: #4CAF50; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 6f6b96123..cb118e4ce 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -15,6 +15,11 @@ outline: none; } +body { + letter-spacing: -0.26px; + line-height: 19px; +} + a:link, a:hover, a:visited, @@ -24,6 +29,11 @@ a:active { color: $brand-color; } +::selection { + background-color: $selection-color; + color: $color-white; + } + textarea { resize: none; } @@ -145,6 +155,10 @@ h5 { } } +.dropdown-toggle { + cursor: pointer; +} + .dropdown-open { position: relative; }