IAction icons update

This commit is contained in:
perploug
2013-09-03 14:24:26 +02:00
parent c40e4fed87
commit 0175bb0d9e
12 changed files with 27 additions and 33 deletions

View File

@@ -293,7 +293,7 @@ function iconHelper() {
{ oldIcon: ".sprTreeDoc4", newIcon: "icon-file-text-alt" },
{ oldIcon: ".sprTreeDoc5", newIcon: "icon-book" },
{ oldIcon: ".sprTreeDocPic", newIcon: "icon-picture" },
{ oldIcon: ".sprTreeFolder", newIcon: "icon-folder-close" },
{ oldIcon: ".sprTreeFolder", newIcon: "icon-folder" },
{ oldIcon: ".sprTreeFolder_o", newIcon: "icon-folder-open" },
{ oldIcon: ".sprTreeMediaFile", newIcon: "icon-music" },
{ oldIcon: ".sprTreeMediaMovie", newIcon: "icon-movie" },
@@ -332,17 +332,7 @@ function iconHelper() {
{ oldIcon: ".sprTreeDeveloperCacheTypes", newIcon: "icon-box" },
{ oldIcon: ".sprTreeDeveloperMacro", newIcon: "icon-cogs" },
{ oldIcon: ".sprTreeDeveloperRegistry", newIcon: "icon-windows" },
{ oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" },
//tray icons
{ oldIcon: ".traycontent", newIcon: "traycontent" },
{ oldIcon: ".traymedia", newIcon: "traymedia" },
{ oldIcon: ".traysettings", newIcon: "traysettings" },
{ oldIcon: ".traydeveloper", newIcon: "traydeveloper" },
{ oldIcon: ".trayusers", newIcon: "trayusers" },
{ oldIcon: ".traymember", newIcon: "traymember" },
{ oldIcon: ".traytranslation", newIcon: "traytranslation" }
{ oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }
];
return {
@@ -361,7 +351,12 @@ function iconHelper() {
}
return contentTypes;
},
formatContentTypeIcons: function (contentTypes) {
for (var i = 0; i < contentTypes.length; i++) {
contentTypes[i].icon = this.convertFromLegacyIcon(contentTypes[i].icon);
}
return contentTypes;
},
/** If the icon is file based (i.e. it has a file path) */
isFileBasedIcon: function (icon) {
//if it doesn't start with a '.' but contains one then we'll assume it's file based

View File

@@ -257,22 +257,26 @@ li.root > div > a.umb-options {
display: block;
margin: 0px;
}
.umb-actions-child li {
display: block;
width: 100%;
}
.umb-actions-child a.action {
.umb-actions-child a {
display: block;
clear: both;
text-decoration: none;
width: 100%;
padding-left: 10px;
}
.umb-actions-child li .menu-label {
font-size: 12px;
margin-bottom: 10px;
color: #000
color: #000;
margin-left: 20px;
}
.umb-actions-child li a:hover {
color: #fff;
background-color: #2E8AEA
@@ -291,16 +295,11 @@ li.root > div > a.umb-options {
.umb-actions-child li a:hover .menuLabel small {
text-decoration: none !important
}
.umb-actions-child li img {
height: 55px;
width: 55px;
float: left;
margin-left: 25px
}
.umb-actions-child i {
font-size: 24px;
font-size: 32px;
vertical-align: top;
line-height: 36px
}
.umb-actions-child li.add {

View File

@@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions
get
{
return "copy";
return "documents";
}
}

View File

@@ -65,7 +65,7 @@ namespace umbraco.BusinessLogic.Actions
{
get
{
return "remove";
return "delete";
}
}

View File

@@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions
get
{
return "move";
return "enter";
}
}

View File

@@ -63,7 +63,7 @@ namespace umbraco.BusinessLogic.Actions
{
get
{
return "plus";
return "add";
}
}

View File

@@ -67,7 +67,7 @@ namespace umbraco.BusinessLogic.Actions
{
get
{
return "envelope";
return "megaphone";
}
}

View File

@@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions
get
{
return "group";
return "vcard";
}
}

View File

@@ -65,7 +65,7 @@ namespace umbraco.BusinessLogic.Actions
{
get
{
return "envelope-alt";
return "chat";
}
}

View File

@@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions
get
{
return "sort";
return "navigation-vertical";
}
}

View File

@@ -65,7 +65,7 @@ namespace umbraco.BusinessLogic.Actions
{
get
{
return "mail-forward";
return "outbox";
}
}

View File

@@ -68,7 +68,7 @@ namespace umbraco.BusinessLogic.Actions
{
get
{
return "remove";
return "circle-dotted";
}
}