Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev
# Conflicts: # src/Umbraco.Abstractions/IImageUrlGenerator.cs # src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs # src/Umbraco.Core/Composing/Current.cs # src/Umbraco.Core/Models/UserExtensions.cs # src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs # src/Umbraco.Core/Umbraco.Core.csproj # src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs # src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs # src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs # src/Umbraco.Tests/Runtimes/StandaloneTests.cs # src/Umbraco.Tests/Testing/UmbracoTestBase.cs # src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs # src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs # src/Umbraco.Web/Runtime/WebInitialComposer.cs # src/Umbraco.Web/Templates/TemplateUtilities.cs
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* @ngdoc service
|
||||
* @name umbraco.resources.imageUrlGeneratorResource
|
||||
* @function
|
||||
*
|
||||
* @description
|
||||
* Used by the various controllers to get an image URL formatted correctly for the current image URL generator
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
function imageUrlGeneratorResource($http, umbRequestHelper) {
|
||||
|
||||
function getCropUrl(mediaPath, width, height, imageCropMode, animationProcessMode) {
|
||||
|
||||
return umbRequestHelper.resourcePromise(
|
||||
$http.get(
|
||||
umbRequestHelper.getApiUrl(
|
||||
"imageUrlGeneratorApiBaseUrl",
|
||||
"GetCropUrl",
|
||||
{ mediaPath, width, height, imageCropMode, animationProcessMode })),
|
||||
'Failed to get crop URL');
|
||||
}
|
||||
|
||||
|
||||
var resource = {
|
||||
getCropUrl: getCropUrl
|
||||
};
|
||||
|
||||
return resource;
|
||||
|
||||
}
|
||||
|
||||
angular.module('umbraco.resources').factory('imageUrlGeneratorResource', imageUrlGeneratorResource);
|
||||
|
||||
})();
|
||||
@@ -41,13 +41,13 @@ ul.sections {
|
||||
|
||||
&:focus .section__name {
|
||||
.tabbing-active & {
|
||||
border: 1px solid;
|
||||
border-color: @gray-9;
|
||||
border: 1px solid @gray-9;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.section__name {
|
||||
border: 1px solid transparent;
|
||||
border-radius: 3px;
|
||||
margin-top: 1px;
|
||||
padding: 3px 10px 4px 10px;
|
||||
@@ -75,9 +75,9 @@ ul.sections {
|
||||
opacity: 0.6;
|
||||
transition: opacity .1s linear;
|
||||
}
|
||||
|
||||
|
||||
&:hover i {
|
||||
opacity:1;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user