Tidy up SCSS and coffeescript

This commit is contained in:
Matt-Yorkley
2018-03-15 20:39:44 +00:00
parent d9c720e89a
commit 6f6db9384f
2 changed files with 3 additions and 25 deletions

View File

@@ -4,9 +4,9 @@ angular.module("admin.variantOverrides").filter "importDate", ($filter, variantO
return $filter('filter')(products, (product) ->
return true if date == 0 or date == undefined or date == '0' or date == ''
for variant in product.variants
for vo in variantOverrides
angular.forEach product.variants (variant) ->
angular.forEach variantOverrides (vo) ->
if vo.variant_id == variant.id and vo.import_date == date
return true
false
, true)
, true)

View File

@@ -50,9 +50,7 @@ div.panel-section {
div.panel-header {
width: 100%;
//font-size: 1.5em;
clear: both;
//border: 1px solid #ccc;
float: left;
padding: 0.5em;
@@ -103,7 +101,6 @@ div.panel-section {
div.panel-content {
width: 100%;
clear: both;
//border: 1px solid #ccc;
margin-bottom: 0.5em;
background-color: #f9f9f9;
padding: 1.5em;
@@ -122,8 +119,6 @@ div.panel-section {
white-space: nowrap;
}
tr.error {
//background-color: #ffe6e4;
//color: #ee4728;
color: #c84C4c;
}
tr:hover td.invalid {
@@ -154,9 +149,7 @@ div.panel-section {
margin-bottom: 0.2em;
}
}
}
}
br.panels.clearfix {
@@ -167,12 +160,6 @@ table.import-settings {
background-color: transparent !important;
width: auto;
//select {
// width: 100%;
//}
tr {
}
tbody tr:hover td {
background-color: #f3f3f3;
}
@@ -194,11 +181,9 @@ table.import-settings {
padding-right: 2.5em;
}
tr:first-child td {
//border-top: 1px solid #eee;
border-top: 0;
}
tr:last-child td {
//border-top: 1px solid #eee;
border-bottom: 0;
}
div.select2-container {
@@ -215,7 +200,6 @@ table.import-settings {
border-color: transparent;
color: white !important;
}
}
.panel-section.import-settings {
@@ -238,8 +222,6 @@ table.import-settings {
}
}
.post-save-results {
p {
font-size: 1.25em;
@@ -296,10 +278,6 @@ div.import-wrapper {
text-align: center;
transition: all linear 0.25s;
button {
}
button:disabled {
background: #ccc !important;
}