Skip to content

Commit d2948c4

Browse files
muratcakirmuratcakir
committed
Minor css & script fixes
1 parent bf36fa4 commit d2948c4

9 files changed

Lines changed: 15 additions & 48 deletions

File tree

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ td.adminData {
307307

308308
.t-grid-header .t-header {
309309
font-size: 12px;
310-
x-font-weight: bold;
311310
text-transform: uppercase;
312311
}
313312

@@ -977,7 +976,6 @@ table.dashboard td.rightcol {
977976
vertical-align: top;
978977
}
979978
table.stats {
980-
x-margin-top: 20px;
981979
width: 100%;
982980
}
983981
table.stats td.orderaveragereport {
@@ -1106,7 +1104,6 @@ table.order-edit td {
11061104
margin-top: 2px;
11071105
}
11081106
td.cell-data .plugin-description {
1109-
x-font-style: italic;
11101107
margin: 4px 0;
11111108
}
11121109
td.cell-data .plugin-actions {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
}
4545

4646
.page-title {
47-
48-
x-padding-bottom: 8px;
49-
x-border-bottom: 1px solid @grayLighter;
5047
margin: 0 0 18px 0;
5148

5249
h1, h2, h3, h4, h5, h6 {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Source: https://github.com/ivaynberg/select2
181181
}
182182

183183
.select2-search input.select2-active {
184-
@bg1: url('images/spinner.gif') no-repeat 100%;
184+
@bg1: url('images/spinner.gif') 100% 0 no-repeat;
185185
@bg2: linear-gradient(center bottom, white 85%, #eeeeee 99%);
186186
background: #fff @bg1;
187187
background: @bg1, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
@@ -207,7 +207,7 @@ Source: https://github.com/ivaynberg/select2
207207
.box-shadow(0 1px 0 #fff inset);
208208
#gradient > .vertical(#eee, #fff);
209209
color: @grayDark !important;
210-
text-shadow: none: important;
210+
text-shadow: none !important;
211211
}
212212

213213
.select2-dropdown-open .select2-choice div {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Version: 1, Timestamp: 18.08.2012
4242
font-size: @baseFontSize;
4343
line-height: @baseLineHeight;
4444
vertical-align: middle;
45-
x-max-width: 250px;
4645
padding-left: 24px;
4746
background: url('images/throbber-progress-white-32.gif') 0 6px no-repeat;
4847
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ body {
132132
}
133133

134134
.install-icon {
135-
x-color: #ddd;
136135
font-size: 32px;
137136
line-height: 32px;
138137
vertical-align: bottom;

‎src/Presentation/SmartStore.Web/Infrastructure/DefaultBundleProvider.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ private void RegisterScripts(BundleCollection bundles)
8888

8989
// jquery validation
9090
bundles.Add(new ScriptBundle("~/bundles/jquery-val").Include(
91-
"~/Scripts/jquery.unobtrusive*",
92-
"~/Scripts/jquery.validate*"));
91+
"~/Scripts/jquery.unobtrusive-ajax.js",
92+
"~/Scripts/jquery.validate.js",
93+
"~/Scripts/jquery.validate.unobtrusive.js"));
9394

9495
// system (underscore, core helpers, utils etc.)
9596
bundles.Add(new ScriptBundle("~/bundles/system").Include(

‎src/Presentation/SmartStore.Web/Scripts/jquery.unobtrusive-ajax.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
/*!
2-
** Unobtrusive Ajax support library for jQuery
3-
** Copyright (C) Microsoft Corporation. All rights reserved.
4-
*/
5-
6-
/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
7-
/*global window: false, jQuery: false */
8-
1+

92
(function ($) {
103
var data_click = "unobtrusiveAjaxClick",
114
data_validation = "unobtrusiveValidation";

‎src/Presentation/SmartStore.Web/Scripts/jquery.unobtrusive-ajax.min.js‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ nav ul, nav li {
167167
}
168168

169169
#shopbar {
170-
x-luma: lightness(@shopBarBackgroundColor);
171170
overflow: visible;
172171
position: fixed;
173172
top: 0;
@@ -753,7 +752,7 @@ form.form-search {
753752
margin: 0 2px;
754753
//color: #888;
755754
text-align: center;
756-
vertical-align: center;
755+
vertical-align: middle;
757756
text-decoration: none;
758757
font-family: Arial, sans-serif;
759758
}
@@ -1180,12 +1179,6 @@ form.form-search {
11801179
.store-closed-page .page-title{}
11811180
.store-closed-page .page-body{}
11821181

1183-
/* COPYRIGHT INFO */
1184-
/*
1185-
.copyright{float:right;padding-right:10px;x-font-family:Verdana, Arial, Helvetica, sans-serif;font-size:10px;}
1186-
.copyright a{color:#3664A5;background-color:inherit;}
1187-
*/
1188-
11891182
/* SITEMAP */
11901183
.sitemap-page{margin-left:auto;margin-right:auto;width:100%;}
11911184
.sitemap-page .entity{margin:5px 0 30px;}
@@ -1238,13 +1231,11 @@ form.form-search {
12381231
fieldset > legend {
12391232
font-family: @pageTitleFontFamily;
12401233
font-weight: @pageTitleFontWeight;
1241-
//color: #999; //@pageTitleColor;
1242-
font-size: 20px; //25px; //18px;
1243-
line-height: 28px; //40px; //20px;
1234+
font-size: 20px;
1235+
line-height: 28px;
12441236
margin-bottom: 12px;
12451237
padding-bottom: 8px;
12461238
border-bottom: 1px solid @var_SimpleBoxHeaderColor;
1247-
color: 1px solid @var_SimpleBoxHeaderColor;
12481239

12491240
& > * {
12501241
// probably h1-h6
@@ -1587,11 +1578,11 @@ table.cart .cart-item-row .qty-input {
15871578
.opacity(75);
15881579
}
15891580
.order-progress .order-progress-step.step-cart:before { }
1590-
.order-progress .order-progress-step.step-address:before { content: '\f015' /* icon-home */; x-content: '\f040' /* icon-pencil */; }
1591-
.order-progress .order-progress-step.step-shipping:before { content: '\f0d1' /* icon-truck */; x-content: '\f072' /* icon-plane */ }
1581+
.order-progress .order-progress-step.step-address:before { content: '\f015' /* icon-home */; }
1582+
.order-progress .order-progress-step.step-shipping:before { content: '\f0d1' /* icon-truck */; }
15921583
.order-progress .order-progress-step.step-payment:before { content: '\f09d' /* icon-creditcard */ }
1593-
.order-progress .order-progress-step.step-confirm:before { content: '\f087' /* icon-thumbs-up */; x-content: '\f046' /* icon-check */ }
1594-
.order-progress .order-progress-step.step-complete:before { x-content: '\f087' /* icon-thumbs-up */; x-content: '\f00c' /* icon-ok */; x-content: '\f05d' /* icon-ok-circle */; content: '\f058' /* icon-ok-sign */ }
1584+
.order-progress .order-progress-step.step-confirm:before { content: '\f087' /* icon-thumbs-up */; }
1585+
.order-progress .order-progress-step.step-complete:before { content: '\f058' /* icon-ok-sign */ }
15951586

15961587
.order-summary-page #content-body {
15971588
margin-top: 0;
@@ -1721,11 +1712,6 @@ table.cart .cart-item-row .qty-input {
17211712
margin: 10px 0;
17221713
}
17231714

1724-
.checkout-data .use-reward-points {
1725-
xmargin: 12px 0;
1726-
xcolor: @successText;
1727-
}
1728-
17291715
.checkout-data a.change-checkout-data {
17301716
font-weight: normal;
17311717
text-transform: none;
@@ -2614,11 +2600,9 @@ table.cart .cart-item-row .qty-input {
26142600
margin-bottom: 10px;
26152601
}
26162602
#content-center.omega .page.product-details-page {
2617-
x-margin: 0;
26182603
}
26192604
.product-details-page .product-data,
26202605
.product-details-page .bottom-content {
2621-
x-margin-right: @gridGutterWidth;
26222606
}
26232607
.product-details-page .price-details .legal-info {
26242608
text-align: center;
@@ -3102,7 +3086,7 @@ table.cart .cart-item-row .qty-input {
31023086

31033087
/* BBCODES */
31043088
pre{white-space:pre-wrap;/* css-3 */white-space:0;/* Mozilla, since 1999 */white-space:0;/* Opera 4-6 */white-space:0;/* Opera 7 */word-wrap:break-word;/* Internet Explorer 5.5+ */}
3105-
.csharpcode,.csharpcode pre{font-size:small;color:#000;x-font-family:Consolas, "Courier New", Courier, Monospace;background-color:#fff;}
3089+
.csharpcode,.csharpcode pre{font-size:small;color:#000;background-color:#fff;}
31063090
.csharpcode pre{margin:0;}
31073091
.csharpcode .rem{color:green;}
31083092
.csharpcode .kwrd{color:#00f;}
@@ -3250,15 +3234,13 @@ pre{white-space:pre-wrap;/* css-3 */white-space:0;/* Mozilla, since 1999 */white
32503234
}
32513235

32523236
.checkout-confirm-page .order-summary-content form {
3253-
x-background: #f7f7f7;
32543237
border: 1px solid @var_ContainerBorder;
32553238
border-bottom: none;
32563239
margin: 0 !important;
32573240
padding-bottom: 20px;
32583241
.border-radius(@baseBlockRadius @baseBlockRadius 0 0);
32593242
}
32603243
.checkout-confirm-page .checkout-data > .confirm-order {
3261-
x-background: #f7f7f7;
32623244
border: 1px solid @var_ContainerBorder;
32633245
border-top: none;
32643246
padding: 20px;

0 commit comments

Comments
 (0)