Merge lp:~linuxjedi/drizzle.org/linuxjedi-enhanced into lp:drizzle.org

Proposed by Andrew Hutchings
Status: Merged
Approved by: Lee Bieber
Approved revision: 6
Merged at revision: 6
Proposed branch: lp:~linuxjedi/drizzle.org/linuxjedi-enhanced
Merge into: lp:drizzle.org
Diff against target: 125 lines (+60/-10)
3 files modified
Home.html (+5/-5)
Home_files/Home.css (+41/-0)
feed.xml (+14/-5)
To merge this branch: bzr merge lp:~linuxjedi/drizzle.org/linuxjedi-enhanced
Reviewer Review Type Date Requested Status
Lee Bieber Pending
Review via email: mp+40913@code.launchpad.net

Description of the change

Update logo to a cleaner version
Strip out large header image and use SEO header instead
Add Documentation link in top
Change Development link to point to launchpad
Change name of Planet Drizzle to Blogs so new visitors understand what it is for

See http://drizzle.linuxjedi.co.uk/Drizzle.html for an example of how this looks.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Home.html'
2--- Home.html 2010-11-11 13:49:18 +0000
3+++ Home.html 2010-11-15 22:37:57 +0000
4@@ -47,14 +47,14 @@
5 </div>
6 </div>
7 <script type="text/javascript"><!--//--><![CDATA[//><!--
8-new NavBar('widget0', 'Scripts/Widgets/Navbar', 'Scripts/Widgets/SharedResources', '.', {"path-to-root": "", "navbar-css": ".navbar {\n\tfont-family: Arial, sans-serif;\n\tfont-size: 1em;\n\tcolor: #666;\n\tmargin: 9px 0px 6px 0px;\n\tline-height: 30px;\n}\n\n.navbar-bg {\n\ttext-align: center;\n}\n\n.navbar-bg ul {\n\tlist-style: none;\n\tmargin: 0px;\n\tpadding: 0px;\n}\n\n\nli {\n\tlist-style-type: none;\n\tdisplay: inline;\n\tpadding: 0px 10px 0px 10px;\n}\n\n\nli a {\n\ttext-decoration: none;\n\tcolor: #666;\n}\n\nli a:visited {\n\ttext-decoration: none;\n\tcolor: #666;\n}\n\nli a:hover\r{\r\n \tcolor: #463C3C;\n\ttext-decoration: none;\r}\n\n\nli.current-page a\r{\r\t color: #463C3C;\n\ttext-decoration: none;\n\tfont-weight: bold;\r\r}\n", "current-page-GUID": "52CF7D80-C54B-4DCF-A2E0-ED1AD4743119", "isCollectionPage": "NO"});
9+new NavBar('widget0', 'Scripts/Widgets/Navbar', 'Scripts/Widgets/SharedResources', '.', {"path-to-root": "", "navbar-css": ".navbar {\n\tfont-family: Arial, sans-serif;\n\tfont-size: 1em;\n\tcolor: #666;\n\tmargin: 9px 0px 6px 0px;\n\tline-height: 30px;\n}\n\n.navbar-bg {\n\ttext-align: center;\n}\n\n.navbar-bg ul {\n\tlist-style: none;\n\tmargin: 0px;\n\tpadding: 0px;\n}\n\n\nli {\n\tlist-style-type: none;\n\tdisplay: inline;\n\tpadding: 0px 10px 0px 10px;\n}\n\n\nli a {\n\ttext-decoration: none;\n\tcolor: #666;\n}\n\nli a:visited {\n\ttext-decoration: none;\n\tcolor: #666;\n}\n\nli a:hover\r{\r\n \tcolor: #463C3C;\n\ttext-decoration: none;\r}\n\n\nli.current-page a\r{\r\t color: #463C3C;\n\ttext-decoration: none;\n\tfont-weight: bold;\r\r}\n\n", "current-page-GUID": "52CF7D80-C54B-4DCF-A2E0-ED1AD4743119", "isCollectionPage": "NO"});
10 //--><!]]></script>
11 <div style="clear: both; height: 0px; line-height: 0px; " class="spacer"> </div>
12 </div>
13 <div style="height: 140px; margin-left: 0px; position: relative; width: 700px; z-index: 10; " id="header_layer">
14 <div style="height: 0px; line-height: 0px; " class="bumper"> </div>
15- <div class="tinyText" style="height: 120px; left: 154px; position: absolute; top: 20px; width: 546px; z-index: 1; ">
16- <img usemap="#map1" id="shapeimage_1" src="Home_files/shapeimage_1.png" style="border: none; height: 151px; left: -23px; position: absolute; top: -3px; width: 589px; z-index: 1; " alt=" Drizzle" title="" /><map name="map1" id="map1"><area href="http://drizzle.org" title="http://drizzle.org" onmouseover="IMmouseover('shapeimage_1', '0');" alt="http://drizzle.org" onmouseout="IMmouseout('shapeimage_1', '0');" shape="rect" coords="41, 36, 196, 91" /></map><img style="height: 55px; left: 18px; position: absolute; top: 33px; width: 155px; " id="shapeimage_1_link_0" alt="shapeimage_1_link_0" src="Home_files/shapeimage_1_link_0.png" />
17+ <div class="tinyText" style="height: 120px; left: 154px; position: absolute; top: 20px; width: 542px; z-index: 1; background-color: #d6d7fc; border-style:solid; border-width:2px; ">
18+ <h1><a href="http://www.drizzle.org/">Drizzle</a></h1>
19 </div>
20
21
22@@ -77,8 +77,8 @@
23
24
25
26- <div style="height: 107px; width: 111px; height: 107px; left: 25px; position: absolute; top: 26px; width: 111px; z-index: 1; " class="tinyText style_SkipStroke_1 stroke_0">
27- <img src="Home_files/drizzle.png" alt="" style="border: none; height: 107px; width: 111px; " />
28+ <div style="height: 107px; width: 124px; height: 107px; left: 12px; position: absolute; top: 26px; width: 124px; z-index: 1; " class="tinyText style_SkipStroke_1 stroke_0">
29+ <img src="Home_files/drizzle.png" alt="" style="border: none; height: 107px; width: 124px; " />
30 </div>
31 </div>
32 <div style="margin-left: 0px; position: relative; width: 700px; z-index: 5; " id="body_layer">
33
34=== modified file 'Home_files/Home.css'
35--- Home_files/Home.css 2010-08-16 03:32:24 +0000
36+++ Home_files/Home.css 2010-11-15 22:37:57 +0000
37@@ -489,3 +489,44 @@
38 li.full-width {
39 width: 100;
40 }
41+
42+h1 {
43+ color: #666;
44+ font-family: 'ArialMT', 'Arial', sans-serif;
45+ font-size: 45px;
46+ font-stretch: normal;
47+ font-style: normal;
48+ font-variant: normal;
49+ font-weight: bold;
50+ letter-spacing: 0;
51+ line-height: 47px;
52+ position: absolute;
53+ top: 50%;
54+ margin-bottom: 0px;
55+ margin-left: 30px;
56+ margin-right: 0px;
57+ margin-top: -23px;
58+ opacity: 1.00;
59+ padding-bottom: 0px;
60+ padding-top: 0px;
61+ text-align: left;
62+ text-decoration: none;
63+ text-indent: 0px;
64+ text-transform: none;
65+}
66+
67+h1 a
68+{
69+ text-decoration: none;
70+}
71+h1 a:visited {
72+ text-decoration: none;
73+ color: #666;
74+}
75+
76+h1 a:hover
77+{
78+ color: #463C3C;
79+ text-decoration: none;
80+}
81+
82
83=== modified file 'Home_files/drizzle.png'
84Binary files Home_files/drizzle.png 2010-08-15 21:50:31 +0000 and Home_files/drizzle.png 2010-11-15 22:37:57 +0000 differ
85=== modified file 'feed.xml'
86--- feed.xml 2010-11-11 13:49:18 +0000
87+++ feed.xml 2010-11-15 22:37:57 +0000
88@@ -8,23 +8,32 @@
89 <author>
90 <name>iWeb</name>
91 </author>
92+<entry>
93+ <id>urn:iweb:18F84135-89A2-4C9A-AF4C-AAF77590623E</id>
94+ <title>Documentation</title>
95+ <title xmlns="urn:iweb:">Documentation</title>
96+ <in-navbar xmlns="urn:iweb:">18F84135-89A2-4C9A-AF4C-AAF77590623E</in-navbar>
97+ <link rel="alternate" href="http://docs.drizzle.org/" />
98+ <updated>2010-08-15T15:22:46.002-07:00</updated>
99+ <content>Documentation</content>
100+</entry>
101 <entry>
102 <id>urn:iweb:18F84135-89A2-4C9A-AF4C-AAF77590623D</id>
103 <title>Development</title>
104 <title xmlns="urn:iweb:">Development</title>
105 <in-navbar xmlns="urn:iweb:">18F84135-89A2-4C9A-AF4C-AAF77590623D</in-navbar>
106- <link rel="alternate" href="http://wiki.drizzle.org/Developer_Documentation"/>
107- <updated>2010-08-14T15:22:46.002-07:00</updated>
108+ <link rel="alternate" href="http://launchpad.net/drizzle"/>
109+ <updated>2010-08-15T15:22:46.002-07:00</updated>
110 <content>Development</content>
111 </entry>
112 <entry>
113 <id>urn:iweb:2F5EF0CA-5C3B-4396-A85D-1BE1D6D665F1</id>
114- <title>Planet Drizzle</title>
115- <title xmlns="urn:iweb:">Planet Drizzle</title>
116+ <title>Blogs</title>
117+ <title xmlns="urn:iweb:">Blogs</title>
118 <in-navbar xmlns="urn:iweb:">2F5EF0CA-5C3B-4396-A85D-1BE1D6D665F1</in-navbar>
119 <link rel="alternate" href="http://planetdrizzle.org"/>
120 <updated>2010-08-14T15:22:46.003-07:00</updated>
121- <content>Planet Drizzle</content>
122+ <content>Blogs</content>
123 </entry>
124 <entry>
125 <id>urn:iweb:CCC81116-5DC2-4489-8B31-2AA3D58BBBC0</id>

Subscribers

People subscribed via source and target branches

to all changes: