diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
commit | df7a6aa620af6a165bdacd755757f8cb1179331c (patch) | |
tree | 384b4c62d1f50d8effb733d81d2a810666807624 /sitestatic/archnavbar | |
parent | 94f972bb892dbf9a86f089f1872ae6d849c0cd0e (diff) | |
parent | a22557811a24b68ef85d4271787c48d8d1e4fc99 (diff) |
Merge branch 'archweb-generic2'
Conflicts:
README.BRANDING
local_settings.py.example
packages/templatetags/package_extras.py
public/views.py
releng/views.py
settings.py
sitestatic/archnavbar/archnavbar.css
sitestatic/silhouette.png
templates/base.html
templates/packages/differences.html
templates/packages/opensearch.xml
templates/packages/search.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'sitestatic/archnavbar')
-rw-r--r-- | sitestatic/archnavbar/archlogo.gif | bin | 1845 -> 0 bytes | |||
-rw-r--r-- | sitestatic/archnavbar/archnavbar.css | 7 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sitestatic/archnavbar/archlogo.gif b/sitestatic/archnavbar/archlogo.gif Binary files differdeleted file mode 100644 index e1852a06..00000000 --- a/sitestatic/archnavbar/archlogo.gif +++ /dev/null diff --git a/sitestatic/archnavbar/archnavbar.css b/sitestatic/archnavbar/archnavbar.css index f83b8544..20cd2ac9 100644 --- a/sitestatic/archnavbar/archnavbar.css +++ b/sitestatic/archnavbar/archnavbar.css @@ -1,17 +1,12 @@ /* * ARCH GLOBAL NAVBAR - * * We're forcing all generic selectors with !important * to help prevent other stylesheets from interfering. - * */ /* container for the entire bar */ #archnavbar { height: 40px !important; padding: 10px 15px !important; background: #000 !important; border-bottom: 5px #787DAB solid !important; } - -#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 50px !important; width: 397px !important; } -/* and use a proper PNG for all other modern browsers */ -html > body #archnavbarlogo { background: url('parabolabw.png') no-repeat !important; } +#archnavbarlogo { background: url('parabolabw.png') no-repeat !important; } /* move the heading/paragraph text offscreen */ #archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } |