diff --git a/OurUmbraco.Client/gulpfile.js b/OurUmbraco.Client/gulpfile.js index 85086803..be5ac996 100644 --- a/OurUmbraco.Client/gulpfile.js +++ b/OurUmbraco.Client/gulpfile.js @@ -10,7 +10,7 @@ var gulp = require('gulp'), imageMin = require('gulp-imagemin'), clean = require('gulp-clean'), svgmin = require('gulp-svgmin'), - cmq = require('gulp-group-css-media-queries'); + cmq = require('gulp-combine-media-queries'); rename = require('gulp-rename'); var settings = { diff --git a/OurUmbraco.Site/Assets/images/down.svg b/OurUmbraco.Site/Assets/images/down.svg index 55a3f2cc..0011de86 100644 --- a/OurUmbraco.Site/Assets/images/down.svg +++ b/OurUmbraco.Site/Assets/images/down.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/OurUmbraco.Site/Assets/images/selectdown.svg b/OurUmbraco.Site/Assets/images/selectdown.svg index 1d00afc3..18499d94 100644 --- a/OurUmbraco.Site/Assets/images/selectdown.svg +++ b/OurUmbraco.Site/Assets/images/selectdown.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/OurUmbraco.Site/Assets/images/selectdown_our.svg b/OurUmbraco.Site/Assets/images/selectdown_our.svg index 8e3bbb8c..1e39d3c3 100644 --- a/OurUmbraco.Site/Assets/images/selectdown_our.svg +++ b/OurUmbraco.Site/Assets/images/selectdown_our.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg b/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg index a8657c91..348b2e8b 100644 --- a/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg +++ b/OurUmbraco.Site/Assets/images/selectdown_unfocus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj index f58cf420..3c0b2a1b 100644 --- a/OurUmbraco/OurUmbraco.csproj +++ b/OurUmbraco/OurUmbraco.csproj @@ -584,13 +584,6 @@ __EventEditor.ascx.cs - - FileDownloadProxy.ascx - ASPXCodeBehind - - - FileDownloadProxy.ascx.cs - __Forgotpassword.ascx ASPXCodeBehind @@ -802,9 +795,6 @@ ASPXCodeBehind - - ASPXCodeBehind - ASPXCodeBehind