yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7-U4-9186' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-9186

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
This commit is contained in:
Sebastiaan Janssen
2018-07-26 10:53:40 +02:00
parent 0eddf6b755 e501f0f612
commit 7d76e2efbc
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/less/hacks.less
View File

@@ -20,12 +20,17 @@
} }
.thumbnail { .thumbnail {
border-radius: 0px; border-radius: 0;
} min-width: 150px;
.thumbnail img { > a {
max-width: 100% !important; display: block;
width: 100%; }
img {
max-width: 100% !important;
width: 100%;
}
} }
#mapCanvas img { #mapCanvas img {

37
src/Umbraco.Web.UI.Client/src/less/property-editors.less
View File

@@ -518,6 +518,7 @@ ul.color-picker li a {
.gravity-container .viewport { .gravity-container .viewport {
max-width: 600px; max-width: 600px;
min-width: 250px;
} }
.gravity-container .viewport:hover { .gravity-container .viewport:hover {
@@ -809,28 +810,38 @@ ul.color-picker li a {
padding-top: 27px; padding-top: 27px;
} }
.umb-fileupload .file-icon { .umb-fileupload .file-icon-wrap {
text-align: center; text-align: center;
display: block; display: block;
position: relative; position: relative;
padding: 5px 0; padding: 5px 0;
> .icon { /* fit text within container */
font-size: 70px; & + span {
line-height: 110%; word-wrap: break-word;
color: @gray-4;
text-align: center;
} }
> span { .file-icon {
position: relative;
display: inline-block;
> .icon {
font-size: 70px;
line-height: 110%;
color: @gray-4;
text-align: center;
}
> span {
color: @white; color: @white;
background: @gray-4; background: @gray-4;
padding: 1px 3px; padding: 1px 3px;
font-size: 12px; font-size: 12px;
line-height: 130%; line-height: 130%;
position: absolute; position: absolute;
top: 45px; top: 40px;
left: 110px; left: 35px;
}
} }
} }

8
src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
View File

@@ -6,9 +6,11 @@
<a href="{{file.file}}" target="_blank" ng-switch on="file.isImage"> <a href="{{file.file}}" target="_blank" ng-switch on="file.isImage">
<img ng-src="{{file.thumbnail}}" ng-switch-when="true" alt="{{file.file}}" /> <img ng-src="{{file.thumbnail}}" ng-switch-when="true" alt="{{file.file}}" />
<img ng-src="{{file.file}}" ng-switch-when="false" ng-if="file.extension == 'svg'" alt="{{file.file}}" /> <img ng-src="{{file.file}}" ng-switch-when="false" ng-if="file.extension == 'svg'" alt="{{file.file}}" />
<span class="file-icon" ng-if="!file.isImage && file.extension != 'svg'"> <span class="file-icon-wrap" ng-if="!file.isImage && file.extension != 'svg'">
<i class="icon icon-document"></i> <span class="file-icon">
<span>.{{file.extension}}</span> <i class="icon icon-document"></i>
<span>.{{file.extension}}</span>
</span>
</span> </span>
<span ng-switch-default>{{file.file}}</span> <span ng-switch-default>{{file.file}}</span>
</a> </a>