Mercurial Mercurial > py_tasks_melange / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app/django/contrib/admin/media/css/base.css
author Sverre Rabbelier <srabbelier@gmail.com>
Mon, 13 Apr 2009 15:31:39 +0000
changeset 2177 e2c193e1f631
parent 54 03e267d67478
permissions -rw-r--r--
Do not rely on dicts.merge to change target Also make dicts.merge actually not touch target. This is much cleaner than modifying in place, especially since we assign the result of the dicts.merge call to target most of the time anyway. Patch by: Sverre Rabbelier
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
54
03e267d67478 Major reorganization of the soc svn repo, to merge into a single App Engine
Todd Larsen <tlarsen@google.com>
parents:
diff changeset 
     1
 
/*
03e267d67478 Major reorganization of the soc svn repo, to merge into a single App Engine
Todd Larsen <tlarsen@google.com>
parents:
diff changeset 
     2
 
    DJANGO Admin
03e267d67478 Major reorganization of the soc svn repo, to merge into a single App Engine
Todd Larsen <tlarsen@google.com>
parents:
diff changeset 
     3
 
    by Wilson Miner wilson@lawrence.com
03e267d67478 Major reorganization of the soc svn repo, to merge into a single App Engine
Todd Larsen <tlarsen@google.com>
parents:
diff changeset 
     4
 
*/
03e267d67478 Major reorganization of the soc svn repo, to merge into a single App Engine
Todd Larsen <tlarsen@google.com>
parents:
diff changeset 
     5
 












03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




     6


/* Block IE 5 */













03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




     7


@import "null.css?\"\{";













03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




     8














03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




     9


/* Import other styles */













03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




    10


@import url('global.css');













03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




    11


@import url('layout.css');













03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




    12














03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




    13


/* Import patch for IE 6 Windows */













03e267d67478
Major reorganization of the soc svn repo, to merge into a single App Engine



Todd Larsen <tlarsen@google.com>


parents: 

diff
changeset




    14


/*\*/ @import "patch-iewin.css"; /**/















py_tasks_melange