diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css
index 412197e55..c6d3f5d77 100644
--- a/src/Orchard.Web/Content/Admin/css/base.css
+++ b/src/Orchard.Web/Content/Admin/css/base.css
@@ -28,12 +28,6 @@ q:before, q:after {
content:'';
content:none;
}
-:focus {
- outline:0;
-}
-button::-moz-focus-inner, input.button::-moz-focus-inner {
- border:0;
-}
ins {
text-decoration:none;
}
@@ -46,6 +40,9 @@ table {
}
/* end: reset */
+
+/* Base setup
+----------------------------------------------------------*/
html {
background:#8a8f7a;
color:#525e50;
@@ -66,6 +63,7 @@ body#preview {
background:#f9faf5;
}
+
/* Layout
number of columns: 24; actual width: 946; column width: 26; gutter width:14
@@ -136,6 +134,7 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
width:23.629%;
}
+
/* Headings and defaults
----------------------------------------------------------*/
h1, h2, h3, h4, h5, legend {
@@ -144,22 +143,23 @@ h1, h2, h3, h4, h5, legend {
font-style: normal;
font-weight:normal;
}
-
h1 { font-size:2.8em; } /* 28px */
h2 { font-size:2.4em; } /* 24px */
h3 { font-size:2.1em; } /* 21px */
+h3 span { font-size:.57em; } /* 12px */
h4 { font-size:1.8em; } /* 18px */
h5 { font-size:1.6em; } /* 16px */
-h6, p, legend, label, input, select, .button, .cancel /* todo: (heskew) need to do something better with cancel */,
-.message, .validation-summary-errors, th, td { font-size:1.5em; line-height:1.5em; } /* 15px */
-p .button,
-td *, .mceLayout td { font-size:inherit; }
-.meta { font-size:1.2em; }
+h6, p, legend, label, input, select, .button,
+.message, .validation-summary-errors,
+table.items th, table.items td, table.items caption { font-size:1.5em; line-height:1.5em; } /* 15px */
+p .button { font-size:inherit; }
+.meta { font-size:1.2em; } /* 12px */
-h3 span { font-size:.57em; } /* 12px */
-/* ---------- Links ---------- */
+
+/* Links
+----------------------------------------------------------*/
a, a:link, a:visited {
color:#1e5d7d;
text-decoration:none;
@@ -169,6 +169,7 @@ a:hover, a:active, a:focus {
text-decoration:underline;
}
+
/* Header - Branding and Login
----------------------------------------------------------*/
#header {
@@ -186,11 +187,9 @@ a:hover, a:active, a:focus {
text-indent:-9999px;
width:105px;
}
-
#site, #login {
font-size:1.5em;
}
-
#site a, #site a:visited, #site a:active {
color:#e2e4dd;
float:left;
@@ -198,8 +197,7 @@ a:hover, a:active, a:focus {
padding:14px 0 0 12px;
position:relative;
}
-
-#login{
+#login {
color:#1a1505;
display:block;
float:right;
@@ -214,6 +212,7 @@ a:hover, a:active, a:focus {
color:#ffea9b;
}
+
/* Navigation
----------------------------------------------------------*/
#navshortcut {
@@ -262,6 +261,7 @@ a:hover, a:active, a:focus {
text-decoration:underline;
}
+
/* Content
----------------------------------------------------------*/
#main h2 {
@@ -289,6 +289,7 @@ a:hover, a:active, a:focus {
border-bottom:1px solid #e4e7dc;
}
+
/* Confirmations, Messages and the like
----------------------------------------------------------*/
.message, .validation-summary-errors {
@@ -334,6 +335,7 @@ span.message {
content:"DEBUG ยป ";
}
+
/* Forms
----------------------------------------------------------*/
fieldset.bulk.actions {
@@ -358,7 +360,7 @@ label input {
}
/* todo: (heskew) try to get .text on stuff like #PublishLaterDate and .text-box */
-select, textarea, input.text, input.text-box, #PublishLaterDate {
+select, textarea, input.text, input.text-box {
padding:2px;
border:1px solid #d2d6c6;
color:#5a5b32;
@@ -366,7 +368,7 @@ select, textarea, input.text, input.text-box, #PublishLaterDate {
input.text, input.text-box {
line-height:1.2em;
}
-select:focus, textarea:focus, input.text:focus, input.text-box:focus, #PublishLaterDate:focus {
+select:focus, textarea:focus, input.text:focus, input.text-box:focus {
border-color:#666d51;
}
@@ -402,7 +404,7 @@ button, .button, .button:link, .button:visited {
color:#5a5b32;
cursor:pointer;
height:26px;
- padding:0 8px;
+ padding:0 8px 3px;
text-align:center;
}
button.remove, .remove.button, .remove.button:link, .remove.button:visited {
@@ -423,6 +425,9 @@ button:focus, .button:focus {
color:#f6faea;
text-decoration:none;
}
+button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
+ border-color:#8a8f7a;
+}
button.remove:hover, .remove.button:hover,
button.remove:active, .remove.button:active,
button.remove:focus, .remove.button:focus {
@@ -430,8 +435,8 @@ button.remove:focus, .remove.button:focus {
border-color:#6e5551;
color:#faedeb;
}
-.button {
- line-height:26px;
+button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
+ border-color:#8f7c79;
}
.delete.button {
float:right;
@@ -464,6 +469,7 @@ button.remove:focus, .remove.button:focus {
padding-top:.3em;
}
+
/* Icon buttons
----------------------------------------------------------*/
a.ibutton, a.ibutton:link, a.ibutton:visited {
@@ -534,20 +540,7 @@ input.large.text {
#Revision_Slug{
width:245px;
}
-/* ---------- Sidebar forms ---------- */
-.sideBar fieldset {margin:0px; border:none;}
-#Date {width:80px; margin:4px 4px 4px 16px;}
-#Hour, #Minutes {width:30px;}
-/* ---------- Actions form elements and filtering ---------- */
-ol.actions {margin:20px 0 0 0;}
-ol.actions .button {margin:4px 4px 4px -8px;}
-ol.actions label {
- margin:9px 0 0;
-}
-.filterActions {
- float:right;
- margin:10px 2px 0 0;
-}
+
/* Content item lists
----------------------------------------------------------*/
@@ -593,74 +586,52 @@ ol.actions label {
#main .contentItems li:hover a.ibutton.publish { background-position:-100px 0; }
#main .contentItems li:hover a.ibutton.blog { background-position:-120px 0; }
-/* Tables
+
+/* (Items) Tables
----------------------------------------------------------*/
-table {
+table.items {
background:#fff;
border:1px solid #B0B083;
border-collapse:separate;
border-spacing:0;
width:100%;
}
-tbody
+table.items caption {
+ padding:8px 0;
+ text-indent:0;
+}
+table.items col {
+ border-spacing:0;
+ display:table-column;
+}
+table.items colgroup
{
+ border-spacing:0;
+ display:table-column-group;
+}
+table.items tbody {
border-spacing:0;
vertical-align:middle;
}
-thead, th {
+table.items thead, table.items th {
background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
font-weight:700;
overflow:hidden;
text-align:left;
}
/* todo: (heskew) hook back up */
-.trhover{background-color:#f0f3d6;}
-th, td {
+table.items tr.hover {
+ background-color:#f0f3d6;
+}
+table.items tr.critical {background:#e68585; border:inherit;}
+table.items tr.warning {background:#fdf5bc; border:inherit;}
+table.items th, table.items td {
border-bottom:1px solid #EAE9D9;
border-spacing:0px;
display:table-cell;
padding:8px 12px;
vertical-align:middle;
}
-caption {
- font-size:110%;
- padding:8px 0 8px 0;
- text-indent:0;
-}
-col {
- border-spacing:0;
- display:table-column;
-}
-colgroup
-{
- border-spacing:0;
- display:table-column-group;
-}
-
-tr.critical {background:#e68585; border:inherit;}
-tr.warning {background:#fdf5bc; border:inherit;}
-
-
-
-
-/* todo: (heskew) needs attention */
-/* Horizontal lists
-----------------------------------------------------------*/
-ul.horizontal, ol.horizontal {
- margin:0;
- padding:0;
- list-style:none;
-}
-ul.horizontal li, ol.horizontal li {
- float:left;
- margin:0 4px;
-}
-ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.horizontal li a, ol.horizontal li a:visited, ol.horizontal li a:active {
- display:block;
- text-decoration: none;
-}
-
-
/* MISC.
@@ -687,22 +658,10 @@ todo: (heskew) pull out into relevant modules where appropriate
width:70%;
}
-/* todo: (heskew) needs attention */
-/* Extensions;
+/* Rounded borders and other "works in some browsers" additions
----------------------------------------------------------*/
-.floatLeft {float: left;} /*Use this class to float anything to the left*/
-.floatRight {float: right;} /*Use this class to float anything to the right*/
-.alignRight {text-align: right;}
-.Inline {display: inline;}
-.center {margin:0 auto;} /*Center*/
-.clearLayout {clear:both;} /*Use this class clear layout*/
-.disabled {color:#CCC;}
-.topSpacer{margin-top: 20px;}
-.bottomSpacer{margin-bottom: 20px;}
-.displayText {display:none;}
-
#content, #navigation li, button, .button,
-table, textarea, input.text, input.text-box,
+table.items, textarea, input.text, input.text-box,
.contentItems, .message, .validation-summary-errors {
-moz-border-radius:4px;
-webkit-border-radius:4px;
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
index b9e5481e7..93be07868 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
@@ -14,10 +14,10 @@
<%
} %>
- <%
+ <%
} %>
<% Html.Include("AdminFoot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
index a5cd11227..3d86248cd 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
@@ -31,7 +31,7 @@
<%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %>
-
+
-
+
-
+
-
+
<%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
-
+
<%=packageName%> Module
-
+
<%=packageName%> Module
-
+
<%=Html.ActionLink("Add a role", "Create", new {}, new { @class = "button" }) %>
-
+
<%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%>
-
+
-
+