Skip to content

Commit 98f9982

Browse files
committed
Removed checkbox.less (was applied only in Chrome anyway)
1 parent 482a9f3 commit 98f9982

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

src/Presentation/SmartStore.Web/Administration/Content/admin.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,11 @@ td.adminData {
254254
}
255255
}
256256

257+
td.adminData > input[type="radio"],
258+
td.adminData > input[type="checkbox"] {
259+
margin-top: -1px;
260+
}
261+
257262

258263
/* "select2" ui tweaks for admin
259264
-------------------------------------------------------------- */

src/Presentation/SmartStore.Web/Administration/Content/theme.less

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
@import "~/Content/bootstrap/navs.less";
5050
@import "~/Content/bootstrap/navbar.less";
5151
@import "~/Content/bootstrap/breadcrumbs.less";
52-
//@import "~/Content/bootstrap/pagination.less";
53-
//@import "~/Content/bootstrap/pager.less";
5452

5553
// Components: Popovers
5654
@import "~/Content/bootstrap/modals.less";
@@ -62,12 +60,8 @@
6260
@import "~/Content/bootstrap/media.less";
6361
@import "~/Content/bootstrap/labels-badges.less";
6462
@import "~/Content/bootstrap/progress-bars.less";
65-
//@import "~/Content/bootstrap/accordion.less";
66-
//@import "~/Content/bootstrap/carousel.less";
67-
//@import "~/Content/bootstrap/hero-unit.less";
6863

6964
// (MC) extra 3rd party or own components
70-
@import "~/Content/bootstrap/custom/checkbox.less";
7165
@import "~/Content/bootstrap/custom/throbber.less";
7266
@import "~/Content/bootstrap/custom/select2.less";
7367
@import "~/Content/bootstrap/custom/datepicker.less";

src/Presentation/SmartStore.Web/Administration/Views/Discount/_CreateOrUpdate.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
dataType: "html",
286286
success: function (result) {
287287
$(placeholderName).html(result);
288-
$(placeholderName).find('select').selectWrapper();@*codehint: sm-add*@
288+
$(placeholderName).find('select').selectWrapper();
289289
},
290290
error:function (xhr, ajaxOptions, thrownError) {
291291
$(placeholderName).html('Failed to load requirement content.');

src/Presentation/SmartStore.Web/Content/bootstrap/custom/custom.less

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,12 @@ select {
233233
min-width: 120px; // ...but too small is also bad
234234
}
235235

236+
select,
237+
input[type="file"] {
238+
height: 30px;
239+
line-height: 30px;
240+
}
241+
236242
// FORMS (PROMPTS)
237243
// ---------------
238244
// (MC): add neat shadow and hover effect to prompts
@@ -269,6 +275,14 @@ input[type="color"],
269275

270276
}
271277

278+
// FORMS (CHECKBOX / RADIO)
279+
// ------------------------
280+
input[type="radio"],
281+
input[type="checkbox"] {
282+
margin-top: 4px;
283+
margin-top: 1px \9;
284+
}
285+
272286

273287
// NAV STYLES
274288
// ------------

src/Presentation/SmartStore.Web/Content/install/install.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@
5252
@import "~/Content/bootstrap/progress-bars.less";
5353

5454
// (MC) extra 3rd party or own components
55-
@import "~/Content/bootstrap/custom/checkbox.less";
5655
@import "~/Content/bootstrap/custom/throbber.less";
57-
@import "~/Content/bootstrap/custom/select2.less";
5856

5957
// (MC) extra tweaks and corrections
6058
@import "~/Content/bootstrap/custom/custom.less";

src/Presentation/SmartStore.Web/Themes/Alpha/Content/theme.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,9 @@
6868
@import "~/Content/bootstrap/media.less";
6969
@import "~/Content/bootstrap/labels-badges.less";
7070
@import "~/Content/bootstrap/progress-bars.less";
71-
//@import "~/Content/bootstrap/accordion.less";
7271
@import "~/Content/bootstrap/carousel.less";
73-
//@import "~/Content/bootstrap/hero-unit.less";
7472

7573
// (MC) extra 3rd party or own components
76-
@import "~/Content/bootstrap/custom/checkbox.less";
7774
@import "~/Content/bootstrap/custom/throbber.less";
7875
@import "~/Content/bootstrap/custom/select2.less";
7976
@import "~/Content/bootstrap/custom/datepicker.less";

src/Presentation/SmartStore.Web/Views/Install/Index.cshtml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
toggleSqlConnectionInfo();
5656
toggleSqlAuthenticationType();
5757
toggleCollation();
58-
59-
$("#language").selectWrapper();
6058
});
6159
6260
function hide(el, thenShow) {
@@ -94,10 +92,10 @@
9492
function toggleSqlAuthenticationType() {
9593
var selectedProvider = $("input[name=SqlAuthenticationType]:checked").attr('id');
9694
if (selectedProvider == 'sqlauthenticationtype_sql') {
97-
$('#pnlSqlAuth input[type=text]').removeAttr("disabled");
95+
$('#pnlSqlAuth input').removeAttr("disabled");
9896
}
9997
else if (selectedProvider == 'sqlauthenticationtype_windows') {
100-
$('#pnlSqlAuth input[type=text]').attr("disabled", "disabled");
98+
$('#pnlSqlAuth input').attr("disabled", "disabled");
10199
}
102100
}
103101
@@ -335,8 +333,6 @@
335333

336334
<script src='~/Scripts/jquery.transit.js' type='text/javascript'></script>
337335
<script src='~/Scripts/jquery.addeasing.js' type='text/javascript'></script>
338-
<script src='~/Scripts/select2.min.js' type='text/javascript'></script>
339-
<script src='~/Scripts/smartstore.selectwrapper.js' type='text/javascript'></script>
340336
<script src='~/Scripts/smartstore.throbber.js' type='text/javascript'></script>
341337
<script src='~/Scripts/jquery.scrollTo.js' type='text/javascript'></script>
342338
<script src='~/Scripts/jquery.serialScroll.js' type='text/javascript'></script>

0 commit comments

Comments
 (0)