Skip to content

Commit 525dd1b

Browse files
committed
Theming: slightly increased modal-dialog padding
1 parent 25d8f64 commit 525dd1b

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ public static MvcHtmlString DeleteConfirmation<T>(this HtmlHelper<T> helper, str
146146

147147
helper.SmartStore().Window().Name(modalId)
148148
.Title(EngineContext.Current.Resolve<ILocalizationService>().GetResource("Admin.Common.AreYouSure"))
149+
.AddCssClass("modal-confirm-delete")
150+
.BodyHtmlAttributes(new { @class = "pt-0" })
149151
.Content(helper.Partial("Delete", deleteConfirmationModel).ToHtmlString())
150152
.Show(false)
151153
.Render();

src/Presentation/SmartStore.Web/Administration/Content/_variables.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ $h6-font-size: 1rem;
111111
$small-font-size: 90%;
112112
$headings-font-weight: 400;
113113

114+
$border-radius: 0.25rem;
115+
$border-radius-sm: 0.2rem;
116+
$border-radius-lg: 0.3rem;
117+
114118

115119
// Shadows
116120

@@ -144,11 +148,12 @@ $input-btn-line-height: 1.5;
144148
$input-box-shadow: none;
145149
$input-focus-border-color: lighten($sm-blue2, 30%);
146150
$input-focus-box-shadow: none;
147-
$input-border-radius: 2px;
148-
$input-border-radius-lg: 3px;
149-
$input-border-radius-sm: 2px;
151+
$input-border-radius: 0.2rem;
152+
$input-border-radius-lg: 0.25rem;
153+
$input-border-radius-sm: 0.2rem;
150154
$input-transition: none;
151155
$input-group-addon-bg: $gray-100;
156+
$input-border-color: $gray-300;
152157

153158
$btn-font-weight: 600;
154159
$btn-focus-width: 0; //$input-btn-focus-width;
@@ -189,7 +194,10 @@ $component-active-bg: lighten($primary, 36%);
189194
$component-active-color: inherit;
190195

191196

197+
$modal-inner-padding: 1.25rem;
198+
$modal-header-padding: 1.25rem;
192199
$modal-content-border-width: 0;
200+
$modal-content-border-radius: $border-radius;
193201
$modal-backdrop-opacity: .75;
194202
$modal-content-box-shadow-xs: 0 12px 26px rgba(#32325d, .12), 0 3px 10px rgba(#000, .08);
195203
$modal-content-box-shadow-sm-up: 0 50px 100px rgba(#32325d, .12), 0 15px 35px rgba(#32325d, .27), 0 5px 15px rgba(#000, .25);
@@ -205,14 +213,6 @@ $embed-responsive-aspect-ratios: (
205213
);
206214

207215

208-
/*$custom-control-indicator-bg: $gray-200;
209-
$custom-control-indicator-disabled-bg: $gray-100;
210-
$custom-control-indicator-checked-color: #fff;
211-
$custom-control-indicator-checked-bg: $primary;
212-
$custom-control-indicator-active-color: #fff;
213-
$custom-control-indicator-active-bg: $component-active-bg;
214-
$custom-checkbox-indicator-indeterminate-bg:$primary;*/
215-
216216
$custom-control-indicator-bg: $gray-200;
217217
$custom-control-indicator-disabled-bg: $gray-100;
218218
$custom-control-indicator-checked-color: #fff;

src/Presentation/SmartStore.Web/Themes/Flex/Content/_variables.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,10 @@ $dropdown-link-active-bg: darken($dropdown-link-hover-bg, 4%);
207207

208208
// Modal
209209

210+
$modal-inner-padding: 1.25rem;
211+
$modal-header-padding: 1.25rem;
210212
$modal-content-border-width: 0;
213+
$modal-content-border-radius: $border-radius;
211214
$modal-backdrop-opacity: .75;
212215
$modal-content-box-shadow-xs: 0 12px 26px rgba(#32325d, .12), 0 3px 10px rgba(#000, .08);
213216
$modal-content-box-shadow-sm-up: 0 50px 100px rgba(#32325d, .1), 0 15px 35px rgba(#32325d, .15), 0 5px 15px rgba(#000, .1);

0 commit comments

Comments
 (0)