swcs/OurUmbraco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More merge fixing

Browse Source
This commit is contained in:
Sebastiaan Janssen
2017-01-21 19:52:20 +01:00
parent b3b01021d7
commit 7ba2060238
6 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OurUmbraco.Client/gulpfile.js
+1 -1
View File
@@ -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 = {
OurUmbraco.Site/Assets/images/down.svg
+1 -1
View File
@@ -1 +1 @@
<svg height="50" viewBox="0 0 50 50" width="50" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h50v50H0z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M35.891 30.054L25 40.943l-10.89-10.89M25 9v31.445"/></svg>
<svg height="50" viewBox="0 0 50 50" width="50" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h50v50H0z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M35.89 30.054L25 40.944l-10.89-10.89M25 9v31.445"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 275 B

OurUmbraco.Site/Assets/images/selectdown.svg
+1 -1
View File
@@ -1 +1 @@
<svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M396.6 160l19.4 20.7L256 352 96 180.7l19.3-20.7L256 310.5z"/></svg>
<svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M396.6 160l19.4 20.7L256 352 96 180.7l19.3-20.7L256 310.5"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 162 B

OurUmbraco.Site/Assets/images/selectdown_our.svg
+1 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#98D768" d="M-267 316l8-5v-8l14-17h-36l14 17z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#98D768" d="M-267 316l8-5v-8l14-17h-36l14 17"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 130 B

OurUmbraco.Site/Assets/images/selectdown_unfocus.svg
+1 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#191919" d="M-267 316l8-5v-8l14-17h-36l14 17z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-281 286 36 30"><path fill="#191919" d="M-267 316l8-5v-8l14-17h-36l14 17"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 130 B

OurUmbraco/OurUmbraco.csproj
-10
View File
@@ -584,13 +584,6 @@
<Compile Include="Our\usercontrols\__EventEditor.ascx.designer.cs">
<DependentUpon>__EventEditor.ascx.cs</DependentUpon>
</Compile>
<Compile Include="Our\usercontrols\FileDownloadProxy.ascx.cs">
<DependentUpon>FileDownloadProxy.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Our\usercontrols\FileDownloadProxy.ascx.designer.cs">
<DependentUpon>FileDownloadProxy.ascx.cs</DependentUpon>
</Compile>
<Compile Include="Our\usercontrols\__Forgotpassword.ascx.cs">
<DependentUpon>__Forgotpassword.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -802,9 +795,6 @@
<Content Include="Our\usercontrols\__EventEditor.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="Our\usercontrols\FileDownloadProxy.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="Our\usercontrols\__Forgotpassword.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>