mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-12-03 12:03:51 +08:00
Some work on the admin menu.
Still a work in progress. Also need to think about splitting the module-specific icons (and relevent CSS) into their own respective modules (not just to see how many CSS files we can get the admin to load on the initial request, BTW)... --HG-- branch : dev
This commit is contained in:
21
src/Orchard.Web/Core/Dashboard/styles/Web.config
Normal file
21
src/Orchard.Web/Core/Dashboard/styles/Web.config
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<configuration>
|
||||||
|
<appSettings>
|
||||||
|
<add key="webpages:Enabled" value="false" />
|
||||||
|
</appSettings>
|
||||||
|
<system.web>
|
||||||
|
<httpHandlers>
|
||||||
|
<!-- iis6 - for any request in this location, return via managed static file handler -->
|
||||||
|
<add path="*" verb="*" type="System.Web.StaticFileHandler" />
|
||||||
|
</httpHandlers>
|
||||||
|
</system.web>
|
||||||
|
<system.webServer>
|
||||||
|
<handlers accessPolicy="Script,Read">
|
||||||
|
<!--
|
||||||
|
iis7 - for any request to a file exists on disk, return it via native http module.
|
||||||
|
accessPolicy 'Script' is to allow for a managed 404 page.
|
||||||
|
-->
|
||||||
|
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
|
||||||
|
</handlers>
|
||||||
|
</system.webServer>
|
||||||
|
</configuration>
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#menu .menu-admin .section-dashboard h3 a {
|
||||||
|
background-image:url(images/menu-dashboard.png);
|
||||||
|
background-position:0 5px;
|
||||||
|
}
|
||||||
|
#menu .menu-admin .section-dashboard h3 a:hover {
|
||||||
|
background-position:0 -16px;
|
||||||
|
}
|
||||||
BIN
src/Orchard.Web/Core/Dashboard/styles/images/menu-dashboard.png
Normal file
BIN
src/Orchard.Web/Core/Dashboard/styles/images/menu-dashboard.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 224 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
BIN
src/Orchard.Web/Themes/TheAdmin/Styles/images/menu-all.png
Normal file
BIN
src/Orchard.Web/Themes/TheAdmin/Styles/images/menu-all.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
src/Orchard.Web/Themes/TheAdmin/Styles/images/menu-default.png
Normal file
BIN
src/Orchard.Web/Themes/TheAdmin/Styles/images/menu-default.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 212 B |
BIN
src/Orchard.Web/Themes/TheAdmin/Styles/images/menu-glyph.png
Normal file
BIN
src/Orchard.Web/Themes/TheAdmin/Styles/images/menu-glyph.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 427 B |
@@ -104,14 +104,14 @@ Pixels EMs Percent Points
|
|||||||
html, body { height:100%; }
|
html, body { height:100%; }
|
||||||
|
|
||||||
html {
|
html {
|
||||||
/*background:#f3f4f5 url("images/adminNavBackground.gif") repeat-y top left; */
|
background:#f3f4f5 url(images/adminNavBackground.gif) repeat-y top left;
|
||||||
color:#333;
|
color:#333;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-size: 81.3%;
|
font-size: 81.3%;
|
||||||
color: #333;
|
color: #333;
|
||||||
background:#f3f4f5 url("images/adminNavBackground.gif") repeat-y top left;
|
background:#f3f4f5 url(images/adminNavBackground.gif) repeat-y top left;
|
||||||
font-family: Segoe UI,Trebuchet,Arial,Sans-Serif;
|
font-family: Segoe UI,Trebuchet,Arial,Sans-Serif;
|
||||||
line-height:1.6em;
|
line-height:1.6em;
|
||||||
margin:0 auto;
|
margin:0 auto;
|
||||||
@@ -184,6 +184,7 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
|
|||||||
}
|
}
|
||||||
#layout-content {
|
#layout-content {
|
||||||
/*overflow:auto;*/
|
/*overflow:auto;*/
|
||||||
|
background:#f3f4f5 url(images/adminNavBackground.gif) repeat-y top left;
|
||||||
min-height:100%;
|
min-height:100%;
|
||||||
}
|
}
|
||||||
#layout-main {
|
#layout-main {
|
||||||
@@ -199,10 +200,10 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
|
|||||||
margin-right:20px;
|
margin-right:20px;
|
||||||
}
|
}
|
||||||
#menu {
|
#menu {
|
||||||
/*background:#323232;*/
|
background:#323232;
|
||||||
display:inline;
|
display:inline;
|
||||||
float:left;
|
float:left;
|
||||||
z-index:1;
|
position:relative;
|
||||||
width:240px;
|
width:240px;
|
||||||
}
|
}
|
||||||
.wrapper, .sections {
|
.wrapper, .sections {
|
||||||
@@ -238,10 +239,10 @@ form.link button:hover {
|
|||||||
***************************************************************/
|
***************************************************************/
|
||||||
#header {
|
#header {
|
||||||
height:50px;
|
height:50px;
|
||||||
/*background:#f3f4f5;*/
|
background:#f3f4f5;
|
||||||
}
|
}
|
||||||
#branding {
|
#branding {
|
||||||
/*background:#323232;*/
|
background:#323232;
|
||||||
/*width: 15.401%;*/
|
/*width: 15.401%;*/
|
||||||
width: 240px;
|
width: 240px;
|
||||||
height:50px;
|
height:50px;
|
||||||
@@ -300,10 +301,71 @@ form.link button:hover {
|
|||||||
border:0;
|
border:0;
|
||||||
margin:0 10px 0 10px;
|
margin:0 10px 0 10px;
|
||||||
}
|
}
|
||||||
#menu .menu-admin li h3 {
|
#menu .expando-glyph {
|
||||||
padding:0 0 0 20px;
|
background:transparent no-repeat 0 -19px;
|
||||||
background:url(images/defaultIcon.gif) no-repeat 4px 6px;
|
background-image:url(images/menu-glyph.png);
|
||||||
|
left:160px;
|
||||||
}
|
}
|
||||||
|
#menu .expando-glyph:hover {
|
||||||
|
background-image:url(images/menu-glyph.png);
|
||||||
|
}
|
||||||
|
#menu .expando-glyph-container.closed .expando-glyph {
|
||||||
|
background-image:url(images/menu-glyph.png);
|
||||||
|
background-position:0 3px;
|
||||||
|
}
|
||||||
|
#menu .expando-glyph-container.closed .expando-glyph:hover {
|
||||||
|
background-image:url(images/menu-glyph.png);
|
||||||
|
}
|
||||||
|
#menu .expando-glyph-container.closing .expando-glyph {
|
||||||
|
-webkit-transition:all .2s ease-in-out;
|
||||||
|
-moz-transition:all .2s ease-in-out;
|
||||||
|
transition:all .2s ease-in-out;
|
||||||
|
-webkit-transform:rotate(-90deg) translate(3px, -3px);
|
||||||
|
-moz-transform:rotate(-90deg) translate(3px, -3px);
|
||||||
|
transform:rotate(-90deg) translate(3px, -3px);
|
||||||
|
}
|
||||||
|
#menu .expando-glyph-container.opening .expando-glyph {
|
||||||
|
-webkit-transition:all .2s ease-in-out;
|
||||||
|
-moz-transition:all .2s ease-in-out;
|
||||||
|
transition:all .2s ease-in-out;
|
||||||
|
-webkit-transform:rotate(90deg) translate(3px, 3px);
|
||||||
|
-moz-transform:rotate(90deg) translate(3px, 3px);
|
||||||
|
transform:rotate(90deg) translate(3px, 3px);
|
||||||
|
}
|
||||||
|
#menu .menu-admin li h3 {
|
||||||
|
font-size:1.154em;
|
||||||
|
padding:0 0 0 10px;
|
||||||
|
}
|
||||||
|
#menu .menu-admin li h3 a {
|
||||||
|
background:url(images/menu-all.png) no-repeat 0 5px;
|
||||||
|
padding:0 0 0 16px;
|
||||||
|
}
|
||||||
|
/* todo: (heskew) pull out into the appropriate modules somehow when this is baked */
|
||||||
|
#menu .menu-admin .section-dashboard h3 a { background-position:0 -36px; }
|
||||||
|
#menu .menu-admin .section-dashboard h3 a:hover { background-position:0 -56px; }
|
||||||
|
/* todo: need to get the "New" sub items */
|
||||||
|
#menu .menu-admin .section-content h3 a { background-position:0 -247px; }
|
||||||
|
#menu .menu-admin .section-content h3 a:hover { background-position:0 -268px; }
|
||||||
|
/* todo: need an icon for "Blogs" */
|
||||||
|
#menu .menu-admin .section-comments h3 a { background-position:0 -539px; }
|
||||||
|
#menu .menu-admin .section-comments h3 a:hover { background-position:0 -559px; }
|
||||||
|
#menu .menu-admin .section-lists h3 a { background-position:0 -289px; }
|
||||||
|
#menu .menu-admin .section-lists h3 a:hover { background-position:0 -310px; }
|
||||||
|
#menu .menu-admin .section-widgets h3 a { background-position:0 -413px; }
|
||||||
|
#menu .menu-admin .section-widgets h3 a:hover { background-position:0 -433px; }
|
||||||
|
#menu .menu-admin .section-media h3 a { background-position:0 -374px; }
|
||||||
|
#menu .menu-admin .section-media h3 a:hover { background-position:0 -393px; }
|
||||||
|
#menu .menu-admin .section-navigation h3 a { background-position:0 -333px; }
|
||||||
|
#menu .menu-admin .section-navigation h3 a:hover { background-position:0 -354px; }
|
||||||
|
#menu .menu-admin .section-tags h3 a { background-position:0 -578px; }
|
||||||
|
#menu .menu-admin .section-tags h3 a:hover { background-position:0 -598px; }
|
||||||
|
#menu .menu-admin .section-modules h3 a { background-position:0 -454px; }
|
||||||
|
#menu .menu-admin .section-modules h3 a:hover { background-position:0 -475px; }
|
||||||
|
#menu .menu-admin .section-themes h3 a { background-position:0 -498px; }
|
||||||
|
#menu .menu-admin .section-themes h3 a:hover { background-position:0 -518px; }
|
||||||
|
#menu .menu-admin .section-users h3 a { background-position:0 -619px; }
|
||||||
|
#menu .menu-admin .section-users h3 a:hover { background-position:0 -640px; }
|
||||||
|
|
||||||
#menu .menu-admin li h3 a, #menu .menu-admin li h3 span {
|
#menu .menu-admin li h3 a, #menu .menu-admin li h3 span {
|
||||||
line-height:1.2em;
|
line-height:1.2em;
|
||||||
color:#aec3ce;
|
color:#aec3ce;
|
||||||
@@ -318,16 +380,11 @@ form.link button:hover {
|
|||||||
#menu .menu-admin ul a:hover, #menu .menu-admin ul a:active, #menu .menu-admin ul a:focus {
|
#menu .menu-admin ul a:hover, #menu .menu-admin ul a:active, #menu .menu-admin ul a:focus {
|
||||||
background:#656b55;
|
background:#656b55;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
/*CSS3 properties*/
|
/*CSS3 properties*/
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
-webkit-border-radius: 3px;
|
-webkit-border-radius: 3px;
|
||||||
-moz-border-radius: 3px;
|
-moz-border-radius: 3px;
|
||||||
}
|
}
|
||||||
#menu .menu-admin li.section-dashboard h3 {
|
|
||||||
/*padding:.4em 0 0 .4em;*/
|
|
||||||
font-size:1.308em;
|
|
||||||
}
|
|
||||||
.localmenu li {
|
.localmenu li {
|
||||||
display: inline;
|
display: inline;
|
||||||
font-size:1.308em;
|
font-size:1.308em;
|
||||||
@@ -386,7 +443,7 @@ form.link button:hover {
|
|||||||
cursor:pointer;
|
cursor:pointer;
|
||||||
display:block;
|
display:block;
|
||||||
height:17px;
|
height:17px;
|
||||||
left:160px;
|
left:-20px;
|
||||||
padding:0 !important;
|
padding:0 !important;
|
||||||
position:absolute;
|
position:absolute;
|
||||||
width:17px;
|
width:17px;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
@using Orchard.ContentManagement;
|
@using Orchard.ContentManagement;
|
||||||
|
|
||||||
@{
|
@{
|
||||||
|
SetMeta("X-UA-Compatible", "IE=edge,chrome=1");
|
||||||
Style.Include("site.css");
|
Style.Include("site.css");
|
||||||
Style.Include("ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection");
|
Style.Include("ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection");
|
||||||
Style.Include("ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection");
|
Style.Include("ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection");
|
||||||
|
|||||||
Reference in New Issue
Block a user