' + '
' + '
' + '{% } %}' + '' + '{% if (!file.error && file.id) { %}' + '' + '{% } %}' + '{% if (!file.error && file.filename) { %}' + '' + '' + '' + '{% } %}' + '' + '{% if (file.error) { %}' + '
' + '{% if (!file.error) { %}' + '' + '{% } %}' + '' + '{% } %}');
});
\ No newline at end of file
diff --git a/javascript/dist/UploadField_select.js b/javascript/dist/UploadField_select.js
index b9f595f12..8ab77cedd 100644
--- a/javascript/dist/UploadField_select.js
+++ b/javascript/dist/UploadField_select.js
@@ -1,3 +1,5 @@
+'use strict';
+
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define('ss.UploadField_select', ['./jQuery'], factory);
@@ -11,8 +13,6 @@
global.ssUploadField_select = mod.exports;
}
})(this, function (_jQuery) {
- 'use strict';
-
var _jQuery2 = _interopRequireDefault(_jQuery);
function _interopRequireDefault(obj) {
diff --git a/javascript/dist/UploadField_uploadtemplate.js b/javascript/dist/UploadField_uploadtemplate.js
index 876b5494f..95b6c2362 100644
--- a/javascript/dist/UploadField_uploadtemplate.js
+++ b/javascript/dist/UploadField_uploadtemplate.js
@@ -1,3 +1,5 @@
+'use strict';
+
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define('ss.UploadField_uploadtemplate', [], factory);
@@ -11,7 +13,5 @@
global.ssUploadField_uploadtemplate = mod.exports;
}
})(this, function () {
- 'use strict';
-
window.tmpl.cache['ss-uploadfield-uploadtemplate'] = tmpl('{% for (var i=0, files=o.files, l=files.length, file=files[0]; i' + '' + '
' + '{% } else { %}' + '{% print(file.buttons, true); %}
' + '{% } %}' + '' + '
' + '' + '
' + '' + '{% } %}');
});
\ No newline at end of file
diff --git a/javascript/dist/i18n.js b/javascript/dist/i18n.js
index 33a796344..9ce1a041f 100644
--- a/javascript/dist/i18n.js
+++ b/javascript/dist/i18n.js
@@ -1,3 +1,5 @@
+'use strict';
+
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define('ss.i18n', ['exports'], factory);
@@ -11,8 +13,6 @@
global.ssI18n = mod.exports;
}
})(this, function (exports) {
- 'use strict';
-
Object.defineProperty(exports, "__esModule", {
value: true
});
diff --git a/javascript/dist/i18nx.js b/javascript/dist/i18nx.js
index f426a3a9e..f9437111a 100644
--- a/javascript/dist/i18nx.js
+++ b/javascript/dist/i18nx.js
@@ -1,3 +1,5 @@
+'use strict';
+
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define('ss.i18nx', ['exports'], factory);
@@ -11,8 +13,6 @@
global.ssI18nx = mod.exports;
}
})(this, function (exports) {
- 'use strict';
-
Object.defineProperty(exports, "__esModule", {
value: true
});
diff --git a/javascript/dist/jQuery.js b/javascript/dist/jQuery.js
index bc10bbbfd..efc0c6409 100644
--- a/javascript/dist/jQuery.js
+++ b/javascript/dist/jQuery.js
@@ -1,3 +1,5 @@
+'use strict';
+
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define('ss.jQuery', ['exports'], factory);
@@ -11,8 +13,6 @@
global.ssJQuery = mod.exports;
}
})(this, function (exports) {
- 'use strict';
-
Object.defineProperty(exports, "__esModule", {
value: true
});
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 56f0c02b1..334f6714f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4,39 +4,39 @@
"dependencies": {
"blueimp-file-upload": {
"version": "6.0.3",
- "from": "blueimp-file-upload@6.0.3",
+ "from": "https://registry.npmjs.org/blueimp-file-upload/-/blueimp-file-upload-6.0.3.tgz",
"resolved": "https://registry.npmjs.org/blueimp-file-upload/-/blueimp-file-upload-6.0.3.tgz",
"dependencies": {
"jquery": {
"version": "2.1.4",
- "from": "jquery@>=1.6.0",
+ "from": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz"
},
"jquery.ui.widget": {
"version": "1.10.3",
- "from": "jquery.ui.widget@>=1.8.0",
+ "from": "https://registry.npmjs.org/jquery.ui.widget/-/jquery.ui.widget-1.10.3.tgz",
"resolved": "https://registry.npmjs.org/jquery.ui.widget/-/jquery.ui.widget-1.10.3.tgz"
},
"blueimp-load-image": {
"version": "2.1.0",
- "from": "blueimp-load-image@>=1.1.3",
+ "from": "https://registry.npmjs.org/blueimp-load-image/-/blueimp-load-image-2.1.0.tgz",
"resolved": "https://registry.npmjs.org/blueimp-load-image/-/blueimp-load-image-2.1.0.tgz"
},
"blueimp-tmpl": {
"version": "3.1.0",
- "from": "blueimp-tmpl@>=1.0.2",
+ "from": "https://registry.npmjs.org/blueimp-tmpl/-/blueimp-tmpl-3.1.0.tgz",
"resolved": "https://registry.npmjs.org/blueimp-tmpl/-/blueimp-tmpl-3.1.0.tgz"
}
}
},
"blueimp-load-image": {
"version": "1.1.3",
- "from": "blueimp-load-image@1.1.3",
+ "from": "https://registry.npmjs.org/blueimp-load-image/-/blueimp-load-image-1.1.3.tgz",
"resolved": "https://registry.npmjs.org/blueimp-load-image/-/blueimp-load-image-1.1.3.tgz"
},
"blueimp-tmpl": {
"version": "1.0.2",
- "from": "blueimp-tmpl@1.0.2",
+ "from": "https://registry.npmjs.org/blueimp-tmpl/-/blueimp-tmpl-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/blueimp-tmpl/-/blueimp-tmpl-1.0.2.tgz"
},
"isomorphic-fetch": {
@@ -72,12 +72,12 @@
},
"jquery-sizes": {
"version": "0.33.0",
- "from": "jquery-sizes@0.33.0",
+ "from": "https://registry.npmjs.org/jquery-sizes/-/jquery-sizes-0.33.0.tgz",
"resolved": "https://registry.npmjs.org/jquery-sizes/-/jquery-sizes-0.33.0.tgz",
"dependencies": {
"jquery": {
"version": "2.1.4",
- "from": "jquery@latest",
+ "from": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz"
}
}
diff --git a/package.json b/package.json
index 31f8467fc..2e272d641 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
"scripts": {
"build": "gulp build",
"sanity": "gulp sanity",
- "thirdparty": "gulp thirdparty"
+ "thirdparty": "gulp thirdparty",
+ "css": "gulp css",
+ "sprites": "gulp sprites"
},
"repository": {
"type": "git",
@@ -39,10 +41,15 @@
"gulp": "^3.9.0",
"gulp-babel": "^6.1.1",
"gulp-diff": "^1.0.0",
+ "gulp-if": "^2.0.0",
"gulp-notify": "^2.2.0",
+ "gulp-sass": "^2.1.1",
+ "gulp-sourcemaps": "^1.6.0",
"gulp-uglify": "^1.5.1",
"gulp-util": "^3.0.7",
"semver": "^5.1.0",
+ "sprity": "^1.0.8",
+ "sprity-sass": "^1.0.4",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.7.0"
diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss
index d4d63a87b..d1aed359e 100644
--- a/scss/AssetUploadField.scss
+++ b/scss/AssetUploadField.scss
@@ -1,6 +1,3 @@
-@import "compass/css3";
-
-
// TODO we need a seperated file for styles that are used in both cms and front end (such as buttons)
@import "../admin/scss/themes/default.scss";
@import "../admin/scss/_mixins";
@@ -82,13 +79,13 @@ body.cms.ss-uploadfield-edit-iframe {
.ss-assetuploadfield {
border-bottom: 0;
- @include box-shadow(none);
+ box-shadow: none;
margin: 0;
padding: 0;
h3 {
border-bottom: 1px solid $color-shadow-light;
- @include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
+ box-shadow: 0 1px 0 lighten($color-shadow-light, 95%);
margin: 0 0 8px;
padding: 0 0 7px;
clear: both;
@@ -124,7 +121,7 @@ body.cms.ss-uploadfield-edit-iframe {
padding:0;
background: none;
border: 0;
- @include box-shadow(none);
+ box-shadow: none;
color: $color-text;
&:hover{
@@ -141,8 +138,8 @@ body.cms.ss-uploadfield-edit-iframe {
.ss-uploadfield-item {
border: 1px solid lighten($color-medium-separator, 20%);
- @include border-radius(5px);
- @include background-clip(padding-box);
+ border-radius: 5px;
+ background-clip: padding-box;
margin: 0 0 5px;
padding: 0;
overflow: hidden;
@@ -173,12 +170,12 @@ body.cms.ss-uploadfield-edit-iframe {
line-height: 30px;
overflow: hidden;
background-color: #5db4df;
- @include background-image(linear-gradient(top, #5db4df 0%,#5db1dd 8%,#439bcb 50%,#3f99cd 54%,#207db6 96%,#1e7cba 100%));
+ background-image: linear-gradient(top, #5db4df 0%,#5db1dd 8%,#439bcb 50%,#3f99cd 54%,#207db6 96%,#1e7cba 100%);
}
.ui-state-error .ss-uploadfield-item-info {
background-color: #c11f1d;
padding-right:130px;
- @include background-image(linear-gradient(top, #c11f1d 0%,#bf1d1b 4%,#b71b1c 8%,#b61e1d 15%,#b11d1d 27%,#ab1d1c 31%,#a51b1b 42%,#9f1b19 46%,#9f1b19 50%,#991c1a 54%,#971a18 58%,#911b1b 62%,#911b1b 65%,#7e1816 88%,#771919 92%,#731817 100%));
+ background-image: linear-gradient(top, #c11f1d 0%,#bf1d1b 4%,#b71b1c 8%,#b61e1d 15%,#b11d1d 27%,#ab1d1c 31%,#a51b1b 42%,#9f1b19 46%,#9f1b19 50%,#991c1a 54%,#971a18 58%,#911b1b 62%,#911b1b 65%,#7e1816 88%,#771919 92%,#731817 100%);
.ss-uploadfield-item-name {
width:100%;
@@ -193,15 +190,14 @@ body.cms.ss-uploadfield-edit-iframe {
}
.ui-state-warning .ss-uploadfield-item-info {
background-color: $color-warning;
- @include background-image(
- linear-gradient(
- top,
- desaturate(lighten($color-warning, 10%), 20%) 0%,
- desaturate(lighten($color-warning, 5%), 20%) 8%,
- desaturate($color-warning, 20%) 50%,
- desaturate(darken(mix($color-warning, $color-button-destructive, 99%),0%), 20%) 54%,
- desaturate(darken(mix($color-warning, $color-button-destructive, 80%),1%), 20%) 96%,
- desaturate(darken(mix($color-warning, $color-button-destructive, 70%),2%), 20%) 100%)
+ background-image: linear-gradient(
+ top,
+ desaturate(lighten($color-warning, 10%), 20%) 0%,
+ desaturate(lighten($color-warning, 5%), 20%) 8%,
+ desaturate($color-warning, 20%) 50%,
+ desaturate(darken(mix($color-warning, $color-button-destructive, 99%),0%), 20%) 54%,
+ desaturate(darken(mix($color-warning, $color-button-destructive, 80%),1%), 20%) 96%,
+ desaturate(darken(mix($color-warning, $color-button-destructive, 70%),2%), 20%) 100%
);
}
@@ -213,7 +209,7 @@ body.cms.ss-uploadfield-edit-iframe {
color:lighten($color-text, 10%);
background:$color-button-disabled; //for browsers that don't support rgba
background: rgba(#fff, 0.8);
- @include border-radius(3px);
+ border-radius: 3px;
line-height: 24px;
height: 22px;
padding: 0 5px;
@@ -267,7 +263,7 @@ body.cms.ss-uploadfield-edit-iframe {
width: 100%;
div {
- @include border-radius(5px);
+ border-radius: 5px;
height: 30px;
padding: 0;
margin: 0;
@@ -276,7 +272,7 @@ body.cms.ss-uploadfield-edit-iframe {
}
.ss-uploadfield-item-progressbar {
background-color: #92a6b3;
- @include background-image(linear-gradient(top, #92a6b3 0%,#90aab8 11%,#96b1bf 22%,#9eb4c1 33%,#a7bac7 44%,#c1d5dc 100%));
+ background-image: linear-gradient(top, #92a6b3 0%,#90aab8 11%,#96b1bf 22%,#9eb4c1 33%,#a7bac7 44%,#c1d5dc 100%);
}
.ss-uploadfield-item-progressbarvalue {
width: 0;
diff --git a/scss/GridField.scss b/scss/GridField.scss
index 91e85dce8..207a76ae9 100644
--- a/scss/GridField.scss
+++ b/scss/GridField.scss
@@ -6,22 +6,10 @@
* @todo Add radial gradient to default delete button state
* @todo Create SASS mixin-function to simply swap the from/to, to to/from colours in grsdient mixins?
*/
-
-@import "compass/css3";
-@import "compass/css3/images";
-@import "compass/css3/text-shadow";
-@import "compass/css3/border-radius";
@import "../admin/scss/themes/default";
@import "../admin/scss/_mixins";
@import "_elementMixins";
-//$experimental-support-for-svg variable comes from
-//imported compass/support file and enables svg gradients in IE9.
-//This is needed for the background gradients to work as desired with
-//multiple images.
-$experimental-support-for-svg: true;
-
-
$gf_colour_gradient_dark: darken($color-base, 8%);
$gf_colour_header_border: $gf_colour_gradient_dark;
$gf_colour_subheader: saturate(lighten($color-base, 15%),5%);
@@ -90,7 +78,7 @@ $gf_grid_x: 16px;
font-size: 1.0em;
padding: 6px 3px 6px 0;
color: $color-text-light;
- @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0);
+ text-shadow: 0 -1px 0 $gf_colour_text_shadow;
font-weight: normal;
}
}
@@ -107,7 +95,8 @@ $gf_grid_x: 16px;
.add-existing-autocompleter {
span {
float: left;
- @include inline-block(top);
+ display: inline-block;
+ vertical-align: top;
}
input.relation-search {
width: 270px; height: 32px;
@@ -126,7 +115,7 @@ $gf_grid_x: 16px;
.grid-csv-button, .grid-print-button {
margin-bottom: 0;
font-size: $font-base-size;
- @include inline-block();
+ display: inline-block;
}
}
table.ss-gridfield-table {
@@ -151,10 +140,10 @@ $gf_grid_x: 16px;
}
tr:first-child { //sets 7px border-radius on the top row in the thead - accounts for edgecase where there is no title row.
th:first-child {
- @include border-top-left-radius($gf_border_radius);
+ border-top-left-radius: $gf_border_radius;
}
th:last-child {
- @include border-top-right-radius($gf_border_radius);
+ border-top-right-radius: $gf_border_radius;
}
}
}
@@ -204,7 +193,7 @@ $gf_grid_x: 16px;
margin-left: 10px;
margin-right: 6px;
margin-top: -1px;
- @include border-radius(2px, 2px);
+ border-radius: 2px, 2px;
}
span.badge.status-modified {
@@ -270,10 +259,10 @@ $gf_grid_x: 16px;
vertical-align: middle;
}
a.view-link {
- background: url(../admin/images/btn-icon/magnifier.png) no-repeat 0 1px;
+ background: url(../admin/images/sprites/src/btn-icon/magnifier.png) no-repeat 0 1px;
}
a.edit-link {
- background: url(../admin/images/btn-icon/document--pencil.png) no-repeat 2px 0px;
+ background: url(../admin/images/sprites/src/btn-icon/document--pencil.png) no-repeat 2px 0px;
}
}
}
@@ -297,8 +286,8 @@ $gf_grid_x: 16px;
border-bottom: 1px solid darken($gf_colour_gradient_dark,5%);
padding: 5px;
min-height: 40px; //this is to accomodate the add new button.
- @include background-image(linear-gradient($color-base, $gf_colour_gradient_dark));
- @include single-text-shadow($gf_colour_text_shadow_dark, 0px, -1px, 0);
+ background-image: linear-gradient($color-base, $gf_colour_gradient_dark);
+ text-shadow: 0px -1px 0 $gf_colour_text_shadow_dark;
h2{
padding: 0px;
font-size: $gf_grid_y*1.4;
@@ -381,7 +370,7 @@ $gf_grid_x: 16px;
background: $gf_colour_gradient_dark;
border-bottom: 1px solid $gf_colour_border;
span{
- @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0);
+ text-shadow: 0 -1px 0 $gf_colour_text_shadow;
padding-left: $gf_grid_x/2;
padding-right: $gf_grid_x/2;
@include hide-text-overflow; // Add ellipses to overflowing text
@@ -413,7 +402,7 @@ $gf_grid_x: 16px;
@include box-shadow-none;
position: relative;
border-bottom-width: 0;
- @include border-radius(2px, 2px);
+ border-radius: 2px, 2px;
}
select {
@@ -421,10 +410,10 @@ $gf_grid_x: 16px;
}
}
&.first {
- @include border-top-left-radius($gf_border_radius);
+ border-top-left-radius: $gf_border_radius;
}
&.last {
- @include border-top-right-radius($gf_border_radius);
+ border-top-right-radius: $gf_border_radius;
}
@@ -446,9 +435,9 @@ $gf_grid_x: 16px;
width:100%;
text-align: left;
padding: 2px 8px 2px 0; // Doesn't need to be so big now that filter has moved
- @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0);
+ text-shadow: 0 -1px 0 $gf_colour_text_shadow;
color: #fff;
- @include border-radius(0);
+ border-radius: 0;
&:hover {
background-position: right -34px;
}
@@ -465,29 +454,28 @@ $gf_grid_x: 16px;
$bgImage: url(../images/icons/filter-icons.png) no-repeat;
background-color:lighten($color-menu-button,10%);
@include gridFieldButtons;
- @include background(
+ background:
$bgImage -15px 4px,
linear-gradient(
$color-menu-button,
darken($color-menu-button, 10%)
- )
- );
+ );
width: 26px;
border-top: 1px solid lighten($color-menu-button, 5%);
&.hover-alike:active, &:active, &.hover-alike, &:hover {
- @include background (
- $bgImage -15px 4px,
- linear-gradient(
- lighten($color-menu-button, 10%),
- $color-menu-button
- ));
+ background:
+ $bgImage -15px 4px,
+ linear-gradient(
+ lighten($color-menu-button, 10%),
+ $color-menu-button
+ );
}
&.trigger{ //The magnifying glass before filter is opened
margin-left: $gf_grid_y;
border:none;
- @include background ($bgImage -17px 6px);
+ background: $bgImage -17px 6px;
padding-right: 46px;
margin: 0 $gf_grid_y/2;
@@ -500,7 +488,7 @@ $gf_grid_x: 16px;
background: url(../admin/images/btn_arrow_down_grey.png) no-repeat 0px 0px;
}
&:hover{
- @include background ($bgImage -17px -38px);
+ background: $bgImage -17px -38px;
@include box-shadow-none;
span{//dropdown arrow
opacity:0.9;
@@ -511,20 +499,19 @@ $gf_grid_x: 16px;
}
&.ss-gridfield-button-close{
$bgImage: url(../images/icons/filter-icons.png) no-repeat;
- @include background ($bgImage 8px -17px);
+ background: $bgImage 8px -17px;
@include gridFieldButtons;
width:25px;
opacity:0.8;
margin-right:-5px; //For IE
&.hover-alike:active, &:active, &.hover-alike, &:hover {
opacity:1;
- @include background (
+ background:
$bgImage 8px -17px,
linear-gradient(
rgba(#fff,0.1),
rgba(#fff,0.1)
- )
- );
+ );
}
}
@@ -539,8 +526,7 @@ $gf_grid_x: 16px;
&.filtered{
display:block;
-
- background: url(../admin/images/btn-icon/cross.png) no-repeat 0px 0px;
+ background: url(../admin/images/sprites/src/btn-icon/cross.png) no-repeat 0px 0px;
opacity:0.5;
&:hover{
opacity:0.8;
@@ -588,8 +574,8 @@ $gf_grid_x: 16px;
padding: $gf_grid_x/2 $gf_grid_x/2;
color: $gf_colour_font;
&.bottom-all {
- @include border-bottom-radius($gf_border_radius);
- @include background-image(linear-gradient($color-base, $gf_colour_gradient_dark));
+ border-bottom-radius: $gf_border_radius;
+ background-image: linear-gradient($color-base, $gf_colour_gradient_dark);
padding: $gf_grid_x/4 $gf_grid_y;
.datagrid-footer-message {
@@ -605,7 +591,7 @@ $gf_grid_x: 16px;
.pagination-page-number {
color:$color-text-light;
text-align: center;
- @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0);
+ text-shadow: 0 -1px 0 $gf_colour_text_shadow;
input {
width:35px; //exact width so that a four digit number can be entered
height:18px;
@@ -627,16 +613,16 @@ $gf_grid_x: 16px;
text-indent:-9999em;
}
&.ss-gridfield-previouspage {
- @include background (url(../images/icons/pagination-arrows.png) no-repeat -23px 8px);
+ background: url(../images/icons/pagination-arrows.png) no-repeat -23px 8px;
}
&.ss-gridfield-nextpage {
- @include background (url(../images/icons/pagination-arrows.png) no-repeat -47px 8px);
+ background: url(../images/icons/pagination-arrows.png) no-repeat -47px 8px;
}
&.ss-gridfield-firstpage {
- @include background (url(../images/icons/pagination-arrows.png) no-repeat 0px 8px);
+ background: url(../images/icons/pagination-arrows.png) no-repeat 0px 8px;
}
&.ss-gridfield-lastpage {
- @include background (url(../images/icons/pagination-arrows.png) no-repeat -73px 8px);
+ background: url(../images/icons/pagination-arrows.png) no-repeat -73px 8px;
}
&.ssui-button-disabled{
z-index:-1;
@@ -647,7 +633,7 @@ $gf_grid_x: 16px;
float:right;
padding:6px 0;
color:$color-text-light;
- @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0);
+ text-shadow: 0 -1px 0 $gf_colour_text_shadow;
}
}
}
diff --git a/scss/TreeDropdownField.scss b/scss/TreeDropdownField.scss
index 30e158a63..8a7ae9e10 100755
--- a/scss/TreeDropdownField.scss
+++ b/scss/TreeDropdownField.scss
@@ -1,4 +1,3 @@
-@import 'compass';
@import "../admin/scss/_mixins";
div.TreeDropdownField {
@@ -34,11 +33,10 @@ div.TreeDropdownField {
$bgImage: '../admin/thirdparty/chosen/chosen/chosen-sprite.png';
background:url($bgImage) no-repeat 100% -22px; //For browers that only support 1 background
- @include background(
+ background:
url($bgImage) no-repeat 100% -22px,
- linear-gradient(top, #eeeeee 1%, #ffffff 15%)
- );
- @include box-sizing(border-box);
+ linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+ box-sizing: border-box;
position:relative;
z-index:1100; //Needed to work within modales in chrome
border: 1px solid #aaa;
diff --git a/scss/UploadField.scss b/scss/UploadField.scss
index ef1d77ce3..23db0f8e3 100644
--- a/scss/UploadField.scss
+++ b/scss/UploadField.scss
@@ -1,5 +1,3 @@
-@import "compass/css3";
-
// TODO we need a seperated file for styles that are used in both cms and front end (such as buttons)
@import "../admin/scss/themes/default.scss";
@import "../admin/scss/_mixins";
@@ -25,8 +23,8 @@
padding: 0;
background: #fff;
border: 1px solid lighten($color-medium-separator, 20%);
- @include border-radius(4px);
- @include background-image(linear-gradient(#efefef, #fff 10%, #fff 90%, #efefef));
+ border-radius: 4px;
+ background-image: linear-gradient(#efefef, #fff 10%, #fff 90%, #efefef);
}
.ss-uploadfield-item {
margin: 0;
@@ -43,7 +41,7 @@
overflow: hidden;
&.ss-uploadfield-dropzone {
- @include box-shadow($color-medium-separator 0 0 4px 0 inset);
+ box-shadow: 0 0 4px 0 $color-medium-separator inset;
border: 2px dashed $color-medium-separator;
background: $color-light-separator;
margin-right: 15px;
@@ -190,7 +188,7 @@
height: 15px;
div {
- @include border-radius(25px);
+ border-radius: 25px;
height: 13px;
padding: 0;
margin: 0;
@@ -200,7 +198,7 @@
.ss-uploadfield-item-progressbar {
border: 1px solid $color-medium-separator;
background-color: #92a6b3;
- @include background-image(linear-gradient(top, #92a6b3 0%,#90aab8 11%,#96b1bf 22%,#9eb4c1 33%,#a7bac7 44%,#c1d5dc 100%));
+ background-image: linear-gradient(top, #92a6b3 0%,#90aab8 11%,#96b1bf 22%,#9eb4c1 33%,#a7bac7 44%,#c1d5dc 100%);
}
.ss-uploadfield-item-progressbarvalue {
border: 0;
@@ -223,7 +221,7 @@
width: 16px;
height: 16px;
cursor: pointer;
- @include single-box-shadow(none);
+ box-shadow: none;
position: relative;
// background: sprite($sprites16, cross-circle) no-repeat;
diff --git a/scss/_elementMixins.scss b/scss/_elementMixins.scss
index 2d2a0e2e1..2fd146714 100644
--- a/scss/_elementMixins.scss
+++ b/scss/_elementMixins.scss
@@ -20,8 +20,8 @@
.ss-ui-button {
background: none;
border: 0;
- @include box-shadow(none);
- @include text-shadow(none);
+ box-shadow: none;
+ text-shadow: none;
color: $color-text-light;
float: right;
@@ -30,7 +30,7 @@
display: none;
}
&.ss-uploadfield-item-cancel, &.ss-uploadfield-item-overwrite-warning {
- @include border-radius(0);
+ border-radius: 0;
border-left:1px solid rgba(#fff, 0.2);
margin-top:0px;
cursor: pointer;
@@ -60,7 +60,7 @@
padding-top: 1px;
padding-bottom: 0;
height:100%;
- @include border-radius(0);
+ border-radius: 0;
&.ui-state-hover{
background:none;
opacity:1;
diff --git a/scss/debug.scss b/scss/debug.scss
index 783da102f..77b12a9dc 100644
--- a/scss/debug.scss
+++ b/scss/debug.scss
@@ -1,11 +1,9 @@
-@import "compass/css3";
-
body {
- background: #eee !important;
- margin:0;
- overflow-x: hidden;
- padding:0;
- font-family: Helvetica,Arial,sans-serif;
+ background: #eee !important;
+ margin:0;
+ overflow-x: hidden;
+ padding:0;
+ font-family: Helvetica,Arial,sans-serif;
}
.info {
@@ -16,9 +14,7 @@ body {
line-height: 24px;
color: #fff;
- @include background-image(
- linear-gradient(darken(#003050, 5%), #003050 10%, #003050 90%, darken(#003050, 5%))
- );
+ background-image: linear-gradient(darken(#003050, 5%), #003050 10%, #003050 90%, darken(#003050, 5%));
// try to get the info above the template with z-index
z-index: 9999;
@@ -108,8 +104,8 @@ pre {
padding: 11px;
overflow: auto;
- @include border-radius(4px);
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+ border-radius: 4px;
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
span {
color:#999;
' + '{% if (!file.error) { %}' + '
' + '' + '{% if (!o.options.autoUpload) { %}' + '' + '{% } %}' + '{% } %}' + '
' + '' + '
' + '' + '