|
From: <ge...@us...> - 2006-12-17 22:34:02
|
Revision: 3973
http://svn.sourceforge.net/winmerge/?rev=3973&view=rev
Author: gerundt
Date: 2006-12-17 14:33:59 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
PATCH: [ 1617585 ] Web: Rename all.css to screen.css
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
Added Paths:
-----------
trunk/Web/css/screen.css
Removed Paths:
-------------
trunk/Web/css/all.css
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-17 22:07:27 UTC (rev 3972)
+++ trunk/Web/Changes.txt 2006-12-17 22:33:59 UTC (rev 3973)
@@ -6,6 +6,9 @@
Web\css: all.css
PATCH: [ 1617578 ] Web: Move tabs code to own function
Web: page.inc
+ PATCH: [ 1617585 ] Web: Rename all.css to screen.css
+ Web: page.inc
+ Web\css: rename all.css to screen.css
2006-12-15 Tim
PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
Deleted: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-12-17 22:07:27 UTC (rev 3972)
+++ trunk/Web/css/all.css 2006-12-17 22:33:59 UTC (rev 3973)
@@ -1,175 +0,0 @@
-body {
- margin: 0;
- padding: 0;
- min-width: 40em;
- color: black;
- background: white;
- font-family: Verdana,Helvetica,Arial,sans-serif;
- font-size: small;
-}
-
-code,pre {
- font-family: "Courier New",Courier,monospace;
- font-size: 1em;
-}
-
-#head {
- margin: 0;
- padding: 5px 5px 0 15px;
- background: #FFCC00;
- border-bottom: 1px solid black;
-}
-
-#head h1 {
- margin: 0;
- padding: 0;
-}
-
-/* Based on "Updated Simple CSS Tabs" from silverorange labs:
- http://labs.silverorange.com/archives/2004/may/updatedsimple */
-#tabs {
- position: relative;
- width: 100%;
- height: 3em;
- width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
-}
-
-#tabs ul {
- margin: 0;
- padding: 0;
- position: absolute;
- bottom: -1px;
- width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
-}
-
-#tabs ul li {
- display: inline;
- list-style: none;
-}
-
-#tabs ul li a,#tabs ul li a.selected {
- width: 7em;
- display: block;
- float: left;
- padding: 4px 0;
- margin: 1px 8px 0 0;
- text-align: center;
- text-decoration: none;
- color: black;
-}
-
-#tabs ul li.selected a,#tabs ul li.selected a:hover {
- margin-top: 0;
- padding-bottom: 6px;
- background: white;
- border: 1px solid black;
- border-bottom: none;
-}
-
-#tabs ul li a {
- background: #FFFFCC;
- border: 1px solid #808080;
- border-bottom: none;
-}
-
-#tabs ul li a:hover {
- margin-top: 0;
- padding-bottom: 5px;
- background: white;
- border-color: black;
-}
-
-#ads {
- margin: 0;
- padding: 10px 5px 10px 5px;
- text-align: center;
-}
-
-#nav {
- float: left;
- margin: 0;
- margin-left: 5px;
- padding: 5px;
- width: 12em;
- background: #C0C0C0;
- border: 1px solid #808080;
-}
-
-#nav h2 {
- margin: 0;
- padding: 0 0 5px 0;
- font-size: medium;
-}
-
-#nav ul {
- margin-top: 0;
- padding-top: 0;
- margin-left: 0.5em;
- padding-left: 0.5em;
-}
-
-#content {
- margin: 0;
- margin-left: 14em;
- padding: 5px;
-}
-
-#content h2, p {
- margin-top: 0;
-}
-
-p.important {
- padding: 5px;
- background-color: #FFDDDD;
- border: 1px solid red;
- font-weight: bold;
-}
-
-p.note {
- padding: 5px;
- background-color: #DDDDFF;
- border: 1px solid blue;
-}
-
-pre.code {
- margin-left: 25px;
- margin-right: 25px;
- padding: 5px;
- background-color: #EEEEEE;
- border: 1px solid black;
-}
-
-img.thumbnail {
- padding-top: 2px;
- padding-bottom: 3px;
-}
-
-acronym {
- cursor: help;
- border-bottom: 1px dotted black;
-}
-
-/* Status of translations */
-#status {
- margin-bottom: 10px;
- border-collapse: collapse;
-}
-
-#status th {
- padding: 3px;
- border: 1px solid black;
-}
-
-#status td {
- padding: 3px;
- border: 1px solid black;
-}
-
-.left { text-align: left; }
-.center { text-align: center; }
-.right { text-align: right; }
-
-.actively { background-color: #CCFFCC; }
-.maintained { background-color: #CCCCFF; }
-.unmaintained { background-color: #FFCCCC; }
-.unknown { background-color: #FFFFCC; }
\ No newline at end of file
Copied: trunk/Web/css/screen.css (from rev 3971, trunk/Web/css/all.css)
===================================================================
--- trunk/Web/css/screen.css (rev 0)
+++ trunk/Web/css/screen.css 2006-12-17 22:33:59 UTC (rev 3973)
@@ -0,0 +1,175 @@
+body {
+ margin: 0;
+ padding: 0;
+ min-width: 40em;
+ color: black;
+ background: white;
+ font-family: Verdana,Helvetica,Arial,sans-serif;
+ font-size: small;
+}
+
+code,pre {
+ font-family: "Courier New",Courier,monospace;
+ font-size: 1em;
+}
+
+#head {
+ margin: 0;
+ padding: 5px 5px 0 15px;
+ background: #FFCC00;
+ border-bottom: 1px solid black;
+}
+
+#head h1 {
+ margin: 0;
+ padding: 0;
+}
+
+/* Based on "Updated Simple CSS Tabs" from silverorange labs:
+ http://labs.silverorange.com/archives/2004/may/updatedsimple */
+#tabs {
+ position: relative;
+ width: 100%;
+ height: 3em;
+ width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
+}
+
+#tabs ul {
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ bottom: -1px;
+ width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
+}
+
+#tabs ul li {
+ display: inline;
+ list-style: none;
+}
+
+#tabs ul li a,#tabs ul li a.selected {
+ width: 7em;
+ display: block;
+ float: left;
+ padding: 4px 0;
+ margin: 1px 8px 0 0;
+ text-align: center;
+ text-decoration: none;
+ color: black;
+}
+
+#tabs ul li.selected a,#tabs ul li.selected a:hover {
+ margin-top: 0;
+ padding-bottom: 6px;
+ background: white;
+ border: 1px solid black;
+ border-bottom: none;
+}
+
+#tabs ul li a {
+ background: #FFFFCC;
+ border: 1px solid #808080;
+ border-bottom: none;
+}
+
+#tabs ul li a:hover {
+ margin-top: 0;
+ padding-bottom: 5px;
+ background: white;
+ border-color: black;
+}
+
+#ads {
+ margin: 0;
+ padding: 10px 5px 10px 5px;
+ text-align: center;
+}
+
+#nav {
+ float: left;
+ margin: 0;
+ margin-left: 5px;
+ padding: 5px;
+ width: 12em;
+ background: #C0C0C0;
+ border: 1px solid #808080;
+}
+
+#nav h2 {
+ margin: 0;
+ padding: 0 0 5px 0;
+ font-size: medium;
+}
+
+#nav ul {
+ margin-top: 0;
+ padding-top: 0;
+ margin-left: 0.5em;
+ padding-left: 0.5em;
+}
+
+#content {
+ margin: 0;
+ margin-left: 14em;
+ padding: 5px;
+}
+
+#content h2, p {
+ margin-top: 0;
+}
+
+p.important {
+ padding: 5px;
+ background-color: #FFDDDD;
+ border: 1px solid red;
+ font-weight: bold;
+}
+
+p.note {
+ padding: 5px;
+ background-color: #DDDDFF;
+ border: 1px solid blue;
+}
+
+pre.code {
+ margin-left: 25px;
+ margin-right: 25px;
+ padding: 5px;
+ background-color: #EEEEEE;
+ border: 1px solid black;
+}
+
+img.thumbnail {
+ padding-top: 2px;
+ padding-bottom: 3px;
+}
+
+acronym {
+ cursor: help;
+ border-bottom: 1px dotted black;
+}
+
+/* Status of translations */
+#status {
+ margin-bottom: 10px;
+ border-collapse: collapse;
+}
+
+#status th {
+ padding: 3px;
+ border: 1px solid black;
+}
+
+#status td {
+ padding: 3px;
+ border: 1px solid black;
+}
+
+.left { text-align: left; }
+.center { text-align: center; }
+.right { text-align: right; }
+
+.actively { background-color: #CCFFCC; }
+.maintained { background-color: #CCCCFF; }
+.unmaintained { background-color: #FFCCCC; }
+.unknown { background-color: #FFFFCC; }
\ No newline at end of file
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-17 22:07:27 UTC (rev 3972)
+++ trunk/Web/page.inc 2006-12-17 22:33:59 UTC (rev 3973)
@@ -89,7 +89,7 @@
$temp .= " <meta http-equiv=\"content-type\" content=\"text/html; charset=" . $this->_charset . "\">\n";
$temp .= " <meta name=\"description\" content=\"" . $this->_description . "\">\n";
$temp .= " <meta name=\"keywords\" content=\"" . $this->_keywords . "\">\n";
- $temp .= " <style type=\"text/css\" media=\"screen\">@import \"/css/all.css\";</style>\n";
+ $temp .= " <style type=\"text/css\" media=\"screen\">@import \"/css/screen.css\";</style>\n";
$temp .= " <link rel=\"stylesheet\" type=\"text/css\" media=\"print\" href=\"/css/print.css\">\n";
$temp .= " <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/favicon.ico\">\n";
$temp .= "</head>\n\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
