Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

All admin pages except the dashboard now use liquid page widths, exce…

…pt in IE5.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 233708fb683ae2c1cf3e4c00edc2e4842d99a42d 1 parent 4fd2b3e
Wilson Miner authored
View
3  django/contrib/admin/media/css/base.css
@@ -1,2 +1,3 @@
@import url(global.css);
-@import url(changelists.css);
+@import url(changelists.css);
+/*\*/ @import "patch-iewin.css"; /**/
View
42 django/contrib/admin/media/css/global.css
@@ -35,47 +35,31 @@ code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Couri
pre.literal-block { margin:10px; background:#eee; padding:6px 8px; }
code strong { color:#930; }
hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; }
-div.system-message { background: #ffc; margin: 10px; padding: 6px 8px; font-size: .8em; }
-div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0; color:red;background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; }
/* PAGE STRUCTURE */
-#container { position:relative; width:100%; min-width:720px; }
-#header { text-align:left; }
+#container { position:relative; width:100%; min-width:760px; }
#content { margin:10px 15px; }
-#content-main { float:left; }
-#content-related { float:right; }
+#header { width:100%; }
+#content-main { float:left; width:100%; }
+#content-related { float:right; width:220px; position:relative; margin-right:-230px; }
#footer { clear:both; padding:10px; }
/* COLUMN TYPES */
-.colMS, .colM, .colSM, .colM #content-main, .colM #content-main .xfull { width:758px; } /* master site width for fixed-width pages */
-.colMS #content-main, .colSM #content-main, .colMS #content-main .xfull, .colSM #content-main .xfull { width:519px; } /* main column width for 2-column pages */
-.colMS #content-related, .colSM #content-related, .colSMS #content-related { width:220px; } /* sidebar column width */
-.colSM #content-related { float:left; } .colSM #content-main { float:right; } /* swaps left and right columns */
-.colSMS #content-main { width:298px; }
+.colMS { margin-right:245px !important; }
+.colSM { margin-left:245px !important; }
+.colSM #content-related { float:left; margin-right:0; margin-left:-230px; }
+.colSM #content-main { float:right; }
.popup .colM { width:95%; }
-.popup #content-main, .flex #content-main, .flex .xfull { width:100% !important; } /* main column width for liquid-width pages */
-.popup .flex #content-main, .popup .colM #content-main { width:100% !important; }
.subcol { float:left; width:46%; margin-right:15px; }
-
-/* WIDTHS - DEPRECATED */
-.x50 { width:50px; }
-.x75 { width:75px; }
-.x100 { width:100px; }
-.x150 { width:150px; }
-.x200 { width:200px; }
-.x250 { width:250px; }
-.x300 { width:300px; }
-.x400 { width:400px; }
-.x500 { width:500px; }
+.dashboard #content { width:500px; }
/* HEADER */
-#header { background:#417690; color:#ffc; min-height:2.5em; _height:2.5em; }
+#header { background:#417690; color:#ffc; min-height:2.4em; overflow:hidden; }
#header a:link, #header a:visited { color:white; }
#header a:hover { text-decoration:underline; }
-#branding { float:left; width:18em; }
#branding h1 { padding:0.5em 10px 0 10px; font-size:18px; margin:0; font-weight:normal; color:#f4f379; }
-#branding h2 { padding:0 10px 0.5em 10px; font-size:14px; margin:0; font-weight:normal; color:#ffc; }
-#user-tools { padding:1.2em 10px; font-size:11px; text-align:right; }
+#branding h2 { padding:0 10px 0.8em 10px; font-size:14px; margin:0; font-weight:normal; color:#ffc; }
+#user-tools { position:absolute; top:0; right:0; padding:1.2em 10px; font-size:11px; text-align:right; }
/* SIDEBAR */
#content-related h3 { font-size:12px; color:#666; margin-bottom:3px; }
@@ -197,6 +181,8 @@ td ul.errorlist { margin:0 !important; padding:0 !important; }
td ul.errorlist li { margin:0 !important; }
.error { background:#ffc; }
.error input, .error select { border:1px solid red; }
+div.system-message { background: #ffc; margin: 10px; padding: 6px 8px; font-size: .8em; }
+div.system-message p.system-message-title { padding:4px 5px 4px 25px; margin:0; color:red; background:#ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat; }
/* ACTION ICONS */
.addlink { padding-left:12px; background:url(../img/admin/icon_addlink.gif) 0 .2em no-repeat; }
View
7 django/contrib/admin/media/css/patch-iewin.css
@@ -0,0 +1,7 @@
+* html #container { position:static; } /* keep header from flowing off the page */
+* html .colMS #content-related { margin-right:0; margin-left:10px; position:static; } /* put the right sidebars back on the page */
+* html .colSM #content-related { margin-right:10px; margin-left:-115px; position:static; } /* put the left sidebars back on the page */
+* html .dashboard #content { width:768px; } /* proper fixed width for dashboard in IE6 */
+* html .dashboard #content-main { width:535px; } /* proper fixed width for dashboard in IE6 */
+* html #content { width /**/: 768px; } /* fixed width for IE5 */
+* html #content-main { width /**/: 535px; } /* fixed width for IE5 */
Please sign in to comment.
Something went wrong with that request. Please try again.