Skip to content

Instantly share code, notes, and snippets.

diff --git a/design/backend/templates/views/static_data/components/multi_list.tpl b/design/backend/templates/views/static_data/components/multi_list.tpl
index b35e38e..8554113 100644
--- a/design/backend/templates/views/static_data/components/multi_list.tpl
+++ b/design/backend/templates/views/static_data/components/multi_list.tpl
@@ -1,18 +1,18 @@
-{if $items|count == 0}
- <thead>
- <tr>
- <th class="left" width="5%"></th>
- <th width="10%">{__("position_short")}</th>
diff --git a/_tools/migration/migrations/20160118144318_core_change_file_size_type.php b/_tools/migration/migrations/20160118144318_core_change_file_size_type.php
new file mode 100644
index 0000000..0442e2b
--- /dev/null
+++ b/_tools/migration/migrations/20160118144318_core_change_file_size_type.php
@@ -0,0 +1,48 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
diff --git a/js/tygh/core.js b/js/tygh/core.js
index 8a9c75c..8024d74 100644
--- a/js/tygh/core.js
+++ b/js/tygh/core.js
@@ -1191,15 +1191,12 @@ var Tygh = {
frms.addClass('cm-processed-form');
frms.ceFormValidator();
- if (_.area == 'A') {
- frms.filter('[method=post]:not(.cm-disable-check-changes)').addClass('cm-check-changes');
deleted file mode 100644
index c2eafc6..0000000
--- a/design/themes/responsive/css/tygh/grid_940.less
+++ /dev/null
@@ -1,29 +0,0 @@
-// Fixed (940px)
-#grid > .core(@gridColumnWidth, @gridGutterWidth);
-
-// Fluid (940px)
-#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
diff --git a/_tools/unit_tests/data/language_values.xml b/_tools/unit_tests/data/language_values.xml
index 17cb62f..ae00295 100644
--- a/_tools/unit_tests/data/language_values.xml
+++ b/_tools/unit_tests/data/language_values.xml
@@ -16137,7 +16137,7 @@
/>
<cscart_language_values
lang_code = "en"
- name = "warning_https_is_disabled"
+ name = "warning_https_disabled"
diff --git a/design/themes/responsive/css/tygh/grid.less b/design/themes/responsive/css/tygh/grid.less
index 17cef5a..818e285 100644
--- a/design/themes/responsive/css/tygh/grid.less
+++ b/design/themes/responsive/css/tygh/grid.less
@@ -33,34 +33,3 @@ Grid system
// 768px-979px
@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
-
-
diff --git a/design/themes/responsive/css/styles.less b/design/themes/responsive/css/styles.less
index ddfb677..beb6220 100644
--- a/design/themes/responsive/css/styles.less
+++ b/design/themes/responsive/css/styles.less
@@ -182,8 +182,8 @@ Buttons
position: absolute;
top: 1px;
right: 1px;
- padding: 0 10px;
- min-width: 32px;
diff --git a/design/backend/css/styles.less b/design/backend/css/styles.less
index 659e2f5..c48c95b 100644
--- a/design/backend/css/styles.less
+++ b/design/backend/css/styles.less
@@ -3983,6 +3983,12 @@ th.upgrade-center_actions .btn {
margin-right: 15px;
}
+.form-horizontal {
+ .radio, .checkbox {
@amelekesov
amelekesov / gist:4c7a99a0e236b4536d5f
Created July 30, 2015 14:53
Angularjs form-urlencode transform
$httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8';
/**
* The workhorse; converts an object to x-www-form-urlencoded serialization.
* @param {Object} obj
* @return {String}
*/
var param = function(obj) {
var query = '', name, value, fullSubName, subName, subValue, innerObj, i;
diff --git a/design/themes/responsive/css/styles.less b/design/themes/responsive/css/styles.less
index 3a0c6ba..beb6220 100644
--- a/design/themes/responsive/css/styles.less
+++ b/design/themes/responsive/css/styles.less
@@ -3223,8 +3223,12 @@ input.ty-search-block__input {
/*
* Template: templates/views/categories/view.tpl
*/
+
.ty-subcategories-block {