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

Merge branch 'temp-maurice' of https://github.com/umbraco/Umbraco-CMS into temp-maurice

Browse Source
This commit is contained in:
Mads Rasmussen
2016-03-18 14:40:23 +01:00
parent fa4bdac78a e268945077
commit f252590a1c
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
+12
View File
@@ -31,6 +31,18 @@ angular.module("umbraco.directives")
},
{
name: "Finnish"
},
{
name: "Albanian"
},
{
name: "Russian"
},
{
name: "Norwegian"
},
{
name: "Swedish"
}
];
src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
+3
View File
@@ -105,6 +105,9 @@
font-size: 12px;
font-weight: normal;
max-height: 165px;
overflow-y: auto;
}
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="umb-panel umb-editor-wrapper animated -half-second fadeIn"
<div class="umb-panel umb-editor-wrapper"
ng-class="{
'-no-footer': footer === 'false'
}"
src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+11 -8
View File
@@ -19,15 +19,18 @@
</div>
<div class="umb-property-editor__dropdown shadow-depth-2" ng-if="showDropdown" on-outside-click="closeDropdown()">
<div class="umb-property-editor__dropdown-item">
<a class="umb-property-editor__dropdown-link -sync-off" ng-click="editContent()" href="">
<i class="icon-edit"></i>Edit content
</a>
</div>
<div class="umb-property-editor__dropdown-filter">
<input type="search"class="-full-width-input" placeholder="Search for variants" ng-model="searchTerm" umb-auto-focus>
</div>
<ul class="umb-property-editor__dropdown-items">
<li class="umb-property-editor__dropdown-item">
<a class="umb-property-editor__dropdown-link -sync-off" ng-click="editContent()" href="">
<i class="icon-edit"></i>Edit content
</a>
</li>
<li class="umb-property-editor__dropdown-filter">
<input type="search"class="-full-width-input" placeholder="Search for variants" ng-model="searchTerm" umb-auto-focus>
</li>
<li class="umb-property-editor__dropdown-item" ng-repeat="variation in variations | filter:searchTerm">
<a class="umb-property-editor__dropdown-link" ng-click="syncContent(variation)" href="">{{ variation.name }}</a>
</li>