From: Andy Spencer Date: Sun, 6 May 2012 00:14:52 +0000 (+0000) Subject: Update icons and misc formatting X-Git-Url: http://pileus.org/git/?p=~andy%2Faweather-web;a=commitdiff_plain;h=eaf055841ad55905978111e7e5d9b2ea58a09bff Update icons and misc formatting --- diff --git a/data/global.css b/data/global.css index 9c299e8..8268c15 100644 --- a/data/global.css +++ b/data/global.css @@ -90,8 +90,8 @@ body { /* Header stuff */ .top { - height: 80px; - margin-top: 15px; + height: 75px; + margin-top: 20px; border-collapse: collapse; position: relative; } @@ -101,11 +101,11 @@ body { } .logo { - width: 130px; z-index: 1; + margin-right: 10px; } -.title { +.title, .title a { font-size: 22pt; font-weight: bold; font-style: italic; @@ -114,7 +114,7 @@ body { .nav { position: absolute; - top: 45px; + top: 42px; left: 135px; right: 0px; z-index: 1; @@ -212,13 +212,13 @@ body { margin-bottom: 10px; } -.download { +.download, a.download { position: relative; display: block; z-index: 1; height: 62px; width: 150px; - color: white; + color: #eee; font-size: 11pt; text-decoration: none; padding: 8px 25px 8px 25px; @@ -234,9 +234,11 @@ body { } .download:first-line { + color: #fff; + font-size: 1.3em; font-weight: bold; - font-style: italic; - line-height: 2em; + line-height: 1.9em; + text-shadow: 1px 1px 1px #666; } .download img { diff --git a/html.ct b/html.ct index 8746424..dafd2dd 100644 --- a/html.ct +++ b/html.ct @@ -33,7 +33,7 @@ Content-Type: text/html; charset=UTF-8 <% } %> - +
@@ -514,20 +514,23 @@ Content-Type: text/html; charset=UTF-8 see the about page for more details.

- +
+

Features:

+
    +
  • Detailed Level-II NEXRAD radar
      +
    • 3D volume rendering
      • +
    • Dual-pole support
      • +
    • +
  • Online and offline modes
      +
    • Data caching
      • +
    • Automatic updating
      • +
    • +
  • Warning/Watch/Advisory display
    • +
  • GPS tracking and logging
    • +
  • Surface and map overlays
    • +
  • Terrain rendering
    • +
+
<% print_screen("stormbased"); %>
@@ -536,8 +539,8 @@ Content-Type: text/html; charset=UTF-8
- Download - AWeather <%= VERSION %> + AWeather + Download Version <%= VERSION %> Download

<%= VERSION_DESC %>

diff --git a/images/aweather.ico b/images/aweather.ico index e092072..e1edd57 100644 Binary files a/images/aweather.ico and b/images/aweather.ico differ diff --git a/images/logo.png b/images/logo.png index 6975378..7f21960 100644 Binary files a/images/logo.png and b/images/logo.png differ diff --git a/mkfile b/mkfile index 4968365..d03ee6d 100644 --- a/mkfile +++ b/mkfile @@ -1,7 +1,7 @@ CT=/scratch/ct/ct CFLAGS='--std=c99 -Wall' -all:V: index.cgi manual.inc +all:V: index.cgi manual.inc images/aweather.ico images/logo.png index.cgi: index.o html.o gcc $CFLAGS -o $target $prereq $PKG_LIBS @@ -16,6 +16,12 @@ manual.inc: ../aweather/docs/userguide.ad asciidoc -s -a toc -a numbered -b xhtml11 -o- $prereq \ | awk -f toc.awk > $target +images/aweather.ico: ../aweather/data/icons/16x16/aweather.png + icotool -c $prereq -o $target + +images/logo.png: ../aweather/data/icons/scalable/aweather.svg + rsvg -w 130 -h 130 $prereq $target + clean:V: rm -f *.o *.cgi html.c