mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Updated the CSS for tables and fixed a font size issue on manage menu page.
--HG-- branch : dev
This commit is contained in:
@@ -7,7 +7,7 @@ namespace Orchard.Core.Navigation {
|
|||||||
public void GetNavigation(NavigationBuilder builder) {
|
public void GetNavigation(NavigationBuilder builder) {
|
||||||
builder.Add("Site", "12",
|
builder.Add("Site", "12",
|
||||||
menu => menu
|
menu => menu
|
||||||
.Add("Manage Main Menu", "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu)));
|
.Add("Manage Menu", "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ using (Html.BeginFormAntiForgeryPost()) { %>
|
|||||||
foreach (var menuPartEntry in Model.MenuItemEntries) {
|
foreach (var menuPartEntry in Model.MenuItemEntries) {
|
||||||
var i = menuPartEntryIndex; %>
|
var i = menuPartEntryIndex; %>
|
||||||
<tr>
|
<tr>
|
||||||
<td><input type="text" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Text) %>" value="<%=menuPartEntry.MenuItem.Text %>" /></td>
|
<td><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Text) %>" value="<%=menuPartEntry.MenuItem.Text %>" /></td>
|
||||||
<td><input type="text" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Position) %>" value="<%=menuPartEntry.MenuItem.Position %>" /></td>
|
<td><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Position) %>" value="<%=menuPartEntry.MenuItem.Position %>" /></td>
|
||||||
<td><% if (!menuPartEntry.IsMenuItem) { %><input type="text" disabled="disabled" value="<%=menuPartEntry.MenuItem.Url %>" /><% } else { %><input type="text" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Url) %>" value="<%=menuPartEntry.MenuItem.Url %>" /><% } %></td>
|
<td><% if (!menuPartEntry.IsMenuItem) { %><input type="text" class="text-box" disabled="disabled" value="<%=menuPartEntry.MenuItem.Url %>" /><% } else { %><input type="text" class="text-box" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItem.Url) %>" value="<%=menuPartEntry.MenuItem.Url %>" /><% } %></td>
|
||||||
<td><input type="hidden" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItemId) %>" value="<%=menuPartEntry.MenuItemId %>" /><a href="<%=Url.Action("Delete", new {id = menuPartEntry.MenuItemId, __RequestVerificationToken = Html.AntiForgeryTokenValueOrchard()}) %>" class="remove button">delete</a></td>
|
<td><input type="hidden" name="<%=Html.NameOf(m => m.MenuItemEntries[i].MenuItemId) %>" value="<%=menuPartEntry.MenuItemId %>" /><a href="<%=Url.Action("Delete", new {id = menuPartEntry.MenuItemId, __RequestVerificationToken = Html.AntiForgeryTokenValueOrchard()}) %>" class="remove button">delete</a></td>
|
||||||
</tr><%
|
</tr><%
|
||||||
++menuPartEntryIndex;
|
++menuPartEntryIndex;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
<ProductVersion>9.0.30729</ProductVersion>
|
<ProductVersion>9.0.21022</ProductVersion>
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
<ProjectGuid>{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}</ProjectGuid>
|
<ProjectGuid>{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}</ProjectGuid>
|
||||||
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
|
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
|
||||||
@@ -201,8 +201,6 @@
|
|||||||
<IISUrl>
|
<IISUrl>
|
||||||
</IISUrl>
|
</IISUrl>
|
||||||
<NTLMAuthentication>False</NTLMAuthentication>
|
<NTLMAuthentication>False</NTLMAuthentication>
|
||||||
<UseCustomServer>True</UseCustomServer>
|
|
||||||
<CustomServerUrl>http://orchard.codeplex.com/</CustomServerUrl>
|
|
||||||
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
||||||
</WebProjectProperties>
|
</WebProjectProperties>
|
||||||
</FlavorProperties>
|
</FlavorProperties>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace Orchard.Media {
|
|||||||
public void GetNavigation(NavigationBuilder builder) {
|
public void GetNavigation(NavigationBuilder builder) {
|
||||||
builder.Add("Media", "4",
|
builder.Add("Media", "4",
|
||||||
menu => menu
|
menu => menu
|
||||||
.Add("Manage Folders", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles))
|
.Add("Manage Media", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }).Permission(Permissions.ManageMediaFiles))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -148,14 +148,12 @@ h3 { font-size:1.8em; } /* 18px */
|
|||||||
h4 { font-size:1.6em; } /* 16px */
|
h4 { font-size:1.6em; } /* 16px */
|
||||||
h5 { font-size:1.4em; } /* 14px */
|
h5 { font-size:1.4em; } /* 14px */
|
||||||
|
|
||||||
h6, p, label, input, select, .button,
|
h6, p, label, /*input, select,*/ .button,
|
||||||
.message, .validation-summary-errors,
|
.message, .validation-summary-errors,
|
||||||
table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 14px */
|
table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 14px */
|
||||||
p .button { font-size:inherit; }
|
p .button { font-size:inherit; }
|
||||||
.meta, .hint { font-size:1.2em; } /* 12px */
|
.meta, .hint { font-size:1.2em; } /* 12px */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Links
|
/* Links
|
||||||
----------------------------------------------------------*/
|
----------------------------------------------------------*/
|
||||||
a, a:link, a:visited {
|
a, a:link, a:visited {
|
||||||
@@ -327,13 +325,8 @@ span.message {
|
|||||||
color:#fff;
|
color:#fff;
|
||||||
}
|
}
|
||||||
.info.message {
|
.info.message {
|
||||||
background:#e4ebef; /* blue */
|
background:#e6f1c9; /* green*/
|
||||||
border:1px solid #4687AD;
|
border:1px solid #d4deb9;
|
||||||
color:#062232;
|
|
||||||
}
|
|
||||||
.info.message {
|
|
||||||
background:#e6e7ef; /* blue */
|
|
||||||
border:1px solid #b5b9c4;
|
|
||||||
color:#062232;
|
color:#062232;
|
||||||
}
|
}
|
||||||
.debug.message {
|
.debug.message {
|
||||||
@@ -632,7 +625,8 @@ button.ibutton {
|
|||||||
----------------------------------------------------------*/
|
----------------------------------------------------------*/
|
||||||
table.items {
|
table.items {
|
||||||
background:#fff;
|
background:#fff;
|
||||||
border:1px solid #999;
|
border:1px solid #eaeaea;
|
||||||
|
border-bottom:none;
|
||||||
border-collapse:separate;
|
border-collapse:separate;
|
||||||
border-spacing:0;
|
border-spacing:0;
|
||||||
width:100%;
|
width:100%;
|
||||||
@@ -667,12 +661,19 @@ table.items tr.hover {
|
|||||||
table.items tr.critical {background:#e68585; border:inherit;}
|
table.items tr.critical {background:#e68585; border:inherit;}
|
||||||
table.items tr.warning {background:#fdf5bc; border:inherit;}
|
table.items tr.warning {background:#fdf5bc; border:inherit;}
|
||||||
table.items th, table.items td {
|
table.items th, table.items td {
|
||||||
border-bottom:1px solid #ccc;
|
border-bottom:1px solid #eaeaea;
|
||||||
border-spacing:0px;
|
border-spacing:0px;
|
||||||
display:table-cell;
|
display:table-cell;
|
||||||
padding:8px 12px;
|
padding:8px 12px;
|
||||||
vertical-align:middle;
|
vertical-align:middle;
|
||||||
}
|
}
|
||||||
|
/* todo: Find a better way to do this. These are a fix for buttons and label fonts becomming too large in a table.*/
|
||||||
|
table label {
|
||||||
|
font-size:1em;
|
||||||
|
}
|
||||||
|
table .button {
|
||||||
|
font-size:1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* MISC.
|
/* MISC.
|
||||||
|
|||||||
Reference in New Issue
Block a user