diff --git a/zh_CN.GB2312/htdocs/layout/css/Makefile b/zh_CN.GB2312/htdocs/layout/css/Makefile
index fef5694f58..39bc32e2e2 100644
--- a/zh_CN.GB2312/htdocs/layout/css/Makefile
+++ b/zh_CN.GB2312/htdocs/layout/css/Makefile
@@ -11,6 +11,6 @@
.include "../Makefile.inc"
.endif
-DATA= fixed.css fixed_large.css global.css iefixes.css layout.css navigation.css table.css text.css query-pr.css
+DATA= fixed.css fixed_large.css global.css layout.css navigation.css text.css
.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/layout/css/fixed.css b/zh_CN.GB2312/htdocs/layout/css/fixed.css
index 628ac107b1..272e4f8ded 100644
--- a/zh_CN.GB2312/htdocs/layout/css/fixed.css
+++ b/zh_CN.GB2312/htdocs/layout/css/fixed.css
@@ -18,6 +18,6 @@
@import url("layout.css");
@import url("text.css");
@import url("navigation.css");
-@import url("table.css");
+@import url("../../../layout/css/table.css");
-@import url("iefixes.css");
+@import url("../../../layout/css/iefixes.css");
diff --git a/zh_CN.GB2312/htdocs/layout/css/global.css b/zh_CN.GB2312/htdocs/layout/css/global.css
index a140390208..a4ea4b4380 100644
--- a/zh_CN.GB2312/htdocs/layout/css/global.css
+++ b/zh_CN.GB2312/htdocs/layout/css/global.css
@@ -7,86 +7,12 @@
* $FreeBSD$
*/
-body {
- margin: 0;
- padding: 0;
- font-family: verdana, sans-serif;
- font-size: 69%;
- color: #000;
- background: #fff url("../../../layout/images/hdr_fill.png") repeat-x;
-}
-
-h1 {
- font-size: 1.4em;
- font-weight: bold;
- margin: 0em 0em 1.2em 0em;
-}
-
-h2 {
- font-size: 1.2em;
- margin: 1.2em 0em 1.2em 0em;
- font-weight: bold;
-}
-
-h3 {
- font-size: 1.0em;
- margin: 1.2em 0em 1.2em 0em;
- font-weight: bold;
-}
-
-h4 {
- font-size: 0.95em;
- margin: 1.2em 0em 1.2em 0em;
- font-weight: bold;
-}
+@import url("../../../layout/css/global.css");
h5 {
font-size: 1.09em;
- margin: 1.2em 0em 1.2em 0em;
- font-weight: bold;
}
h6 {
font-size: 1.09em;
- margin: 1.2em 0em 1.2em 0em;
- font-weight: bold;
-}
-
-img {
- border: 0;
-}
-
-ol, ul, li {
- font-size: 1.0em;
- line-height: 1.2em;
- margin-top: 0.2em;
- margin-bottom: 0.1em;
-}
-
-p {
- font-size: 1.0em;
- line-height: 1.2em;
- margin: 1.2em 0em 1.2em 0em;
-}
-
-li > p {
- margin-top: 0.2em;
-}
-
-pre {
- font-family: monospace;
- font-size: 1.4em;
-}
-
-tt {
- font-family: monospace;
- font-size: 1.4em;
-}
-
-strong, b {
- font-weight: bold;
-}
-
-form textarea {
- text-align: left;
}
diff --git a/zh_CN.GB2312/htdocs/layout/css/iefixes.css b/zh_CN.GB2312/htdocs/layout/css/iefixes.css
deleted file mode 100644
index fe045e12e8..0000000000
--- a/zh_CN.GB2312/htdocs/layout/css/iefixes.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * FreeBSD.org - Fixes for Internet Explorer
- *
- * The FreeBSD Simplified Chinese Project
- * Original Revision: 1.3
- *
- * $FreeBSD$
- */
-
-/*Win IE fix \*/
-
-* html #TOPNAVLIST li { margin: 0 0.5em 0 -0.5em; }
-* html #topnavlist li { margin: 0 0.5em 0 -0.5em; }
-
-* html #languagenavlist li { padding: 0 0.1em 0 0.4em; }
-* html #languagenavlist li.last-child { padding: 0 0em 0 0.4em; }
-
-* html #searchnavlist li { padding: 0 0.4em 0 0.8em; }
-* html #searchnavlist li.last-child { padding: 0 0 0 0.8em; }
-* html #SEARCHNAVLIST li { padding: 0 0.4em 0 0.8em; }
-* html #SEARCHNAVLIST li.last-child { padding: 0 0 0 0.8em; }
-
-* html #SEARCH, #search { height: 1%; }
-
-* html #MIRROR, #mirror { height: 1%; }
-
-/*End Win IE fix*/
-
-/*Win IE fix \*/
-
-* html pre { font-size: 1.0em; }
-
-* html tt { font-size: 1.0em; }
-
-/*End Win IE fix*/
-
-/*Win IE fix \*/
-
-* html #FRONTSHORTCUTS, #frontshortcuts { height: 1%; }
-
-* html #FRONTSHORTCUTSWRAP, #frontshortcutswrap { height: 1%; }
-
-* html #FRONTSHORTCUTSCONTENT, #frontshortcutscontent { height: 1%; }
-
-* html #FRONTSHORTCUTSLIST, #frontshortcutslist { height: 1%; }
-
-* html #FRONTRELEASES, #frontreleases { height: 1%; }
-
-* html #FRONTRELEASESWRAP, #frontreleaseswrap { height: 1%; }
-
-* html #FRONTRELEASESCONTENT, #frontreleasescontent { height: 1%; }
-
-* html #FRONTRELEASESLIST, #frontreleaseslist { height: 1%; }
-
-/*End Win IE fix*/
diff --git a/zh_CN.GB2312/htdocs/layout/css/layout.css b/zh_CN.GB2312/htdocs/layout/css/layout.css
index 91b1d8e968..201f415356 100644
--- a/zh_CN.GB2312/htdocs/layout/css/layout.css
+++ b/zh_CN.GB2312/htdocs/layout/css/layout.css
@@ -7,496 +7,56 @@
* $FreeBSD$
*/
+@import url("../../../layout/css/layout.css");
+
/* Container Definitions */
-/* Page Container */
-
-#CONTAINERWRAP, #containerwrap {
- text-align: center; /* Win IE5 */
-}
-
-#CONTAINER, #container {
- margin: 0em auto;
- width: 775px;
- padding: 0;
- padding-top: 0px;
- padding-bottom: 15px;
- text-align: left; /* Win IE5 */
-}
-
-/* Header */
-
-#HEADERCONTAINER, #headercontainer {
- padding-bottom: 2px;
-}
-
-#HEADER, #header {
- position: relative;
- height: 76px;
- margin: 0;
- padding: 0;
- clear: both;
-}
-
-#HEADERLOGOLEFT, #headerlogoleft {
- position: relative;
- border: 0px;
- padding: 0px;
- top: 0px;
- margin: 0px;
- float: left;
-}
-
-#HEADERLOGOLEFT img, #headerlogoleft img {
- border: 0px;
-}
-
-#HEADERLOGORIGHT, #headerlogoright {
- position: relative;
- border: 0px;
- padding: 0px;
- margin: 0px;
- float: right;
-}
-
-#HEADERLOGORIGHT img, #headerlogoright img {
- border: 0px;
-}
-
/* Search */
-#SEARCH, #search {
- position: relative;
- text-align: right;
- padding: 0;
- margin: 0;
- margin-top: 6px;
- color: #666;
-}
-
-#SEARCH form, #search form {
- position: relative;
- top: 5px;
- right: 0;
- margin: 0; /* need for IE Mac */
- text-align: right; /* need for IE Mac */
- white-space: nowrap; /* for Opera */
-}
-
-#SEARCH form label, #search form label {
- color: #666;
+#search form input {
font-size: 1.09em;
}
-#SEARCH form input, #search form input {
+#search form #submit {
font-size: 1.09em;
}
-#SEARCH form #SUBMIT, #search form #submit {
- font-size: 1.09em;
- background: transparent;
- color: #fff;
- border-right: 1px solid #DADADA;
- border-bottom: 1px solid #DADADA;
- border-top: 1px solid #DADADA;
- border-left: 1px solid #DADADA;
- padding: 1px 5px 1px 5px;
-}
-
-#SEARCH form #WORDS, #search form #words {
+#search form #words {
font-size: 1.0em;
- width: 120px;
- border: 1px solid #DADADA;
- background: #FFFFFF;
- color: #666;
- padding: 2px 2px 2px 5px;
}
/* Mirror Select */
-#MIRROR, #mirror {
- text-align: right;
- padding: 0;
- margin: 0;
- margin-top: 6px;
- color: #666;
-}
-
-#MIRROR form, #mirror form {
- padding-top: 5px;
- right: 0;
- margin: 0; /* need for IE Mac */
- text-align: right; /* need for IE Mac */
- white-space: nowrap; /* for Opera */
-}
-
-#MIRROR form label, #mirror form label {
- color: #666;
+#mirror form label {
font-size: 1.09em;
}
-#MIRROR form select, #mirror form select {
+#mirror form select {
font-size: 1.09em;
}
-#MIRROR form #mirrorsel, #mirror form #mirrorsel {
+#mirror form #mirrorsel {
font-size: 1.09em;
- width: 150px;
- border: 1px solid #DADADA;
- background: #FFFFFF;
- color: #666;
}
-#MIRROR input, #mirror input {
+#mirror input {
font-size: 1.09em;
- background: transparent;
- color: #666;
- border: 1px solid #DADADA;
}
/* Content */
-#CONTENT, #content {
- clear: both;
- display: block;
-}
-
-#FRONTCONTAINER, #frontcontainer {
- width: 100%;
- float: left;
-}
-
-#FRONTFEATURECONTAINER, #frontfeaturecontainer {
- clear: both;
-}
-
-#FRONTFEATURELEFT, #frontfeatureleft{
- width: 273px;
- margin: 0;
- padding: 0;
- float: left;
-}
-
-#FRONTFEATURELEFT h2, #frontfeatureleft h2 {
- border: none;
- margin-top: 0;
-}
-
-#FRONTFEATURELEFT p, #frontfeatureleft p {
- margin: 0 0 1em 0;
-}
-
- #FRONTFEATURECONTENT, #frontfeaturecontent {
- margin: 10px 10px 10px 13px;
- }
-
-#FRONTFEATUREMIDDLE, #frontfeaturemiddle {
- float: left;
- margin-top: 20px;
- background: url(../../../layout/images/beastie.png) no-repeat top left;
- min-height: 196px;
-}
-
-#FRONTFEATURERIGHT, #frontfeatureright {
- position: relative;
- border: 0px;
- padding: 0px;
- margin: 0px;
- width: 162px;
- float: right;
-}
-
-/* News/Events/Media/Security Box */
-
-#FRONTNEMSCONTAINER, #frontnemscontainer {
- background: #eee;
- display: inline;
- float: left;
- margin-top: 8px;
- margin-bottom: 8px;
-}
-
-#FRONTNEWS, #frontnews {
- width: 191px;
- margin: 0;
- padding: 0;
- float: left;
-}
-
-#FRONTNEWSCONTENT, #frontnewscontent {
- margin: 17px 15px 24px 18px;
-}
-
-#FRONTEVENTS, #frontevents {
- width: 189px;
- margin: 0;
- padding: 0;
- float: left;
-}
-
-#FRONTEVENTSCONTENT, #fronteventscontent {
- margin: 17px 15px 24px 14px;
-}
-
-#FRONTMEDIA, #frontmedia {
- width: 189px;
- margin: 0;
- padding: 0;
- float: left;
-}
-
-#FRONTMEDIACONTENT, #frontmediacontent {
- margin: 17px 15px 24px 14px;
-}
-
-#FRONTSECURITY, #frontsecurity {
- width: 190px;
- margin: 0;
- padding: 0;
- float: left;
-}
-
-#FRONTSECURITYCONTENT, #frontsecuritycontent {
- margin: 17px 15px 24px 14px;
-}
-
-/* No way to get equal columns in pure CSS - setting height is a temporary hack */
-.frontseparator {
- width: 1px;
- height: 317px;
- margin: 0;
- padding: 0;
- background-color: #fff;
- float: left;
-}
-
-.newseventswrap {
- padding-left: 5px;
-}
-
-.newseventslist {
- list-style: none;
- margin: 0;
- padding: 0;
- display: inline;
-}
-
-.newseventslist img.rssimage {
- display: inline;
- border: 0;
- vertical-align: bottom;
-}
-
-.newseventslist li {
- padding: 0 0.3em 0 0.5em;
- display: inline;
- border-right: 1px solid #E1E1E1;
-}
-
-.newseventslist li a {
-}
-
-.newseventslist li.last-child {
- border-right: 0;
- padding-right: 0;
-}
-
-.newseventslist li.first-child {
- padding-left: 0;
-}
-
-.newseventslist li.only-child {
- border-right: 0;
- padding-left: 0;
-}
-
-/* Shortcuts */
-
-#FRONTSHORTCUTS, #frontshortcuts {
- margin: 0;
- padding: 0;
- color: #666;
-}
-
-#FRONTSHORTCUTSCONTENT, #frontshortcutscontent {
- margin: 0;
- padding: 0;
- padding-left: 15px;
- padding-top: 20px;
-}
-
-#FRONTSHORTCUTSLIST, #frontshortcutslist {
- margin: 0;
- padding: 0;
- margin-left: 5px;
- margin-top: 5px;
- list-style: none;
-}
-
-#FRONTSHORTCUTSLIST li, #frontshortcutslist li {
- margin: 0;
- padding-left: 12px;
- background-image: url(../../../layout/images/blt_red_arrow.png);
- background-repeat: no-repeat;
- background-position: 0px 0.5em;
-}
-
-/* Latest Releases */
-
-#FRONTRELEASES, #frontreleases {
- padding: 0;
- margin: 0;
- margin-left: 162px;
- margin-top: 15px;
- padding-bottom: 20px;
- color: #666;
- width: 155px;
-}
-
-#FRONTRELEASESCONTENT, #frontreleasescontent {
- margin: 0;
- padding: 0;
-}
-
-#FRONTRELEASESLIST, #frontreleaseslist {
- margin: 0;
- padding: 0;
- margin-left: 5px;
- margin-top: 5px;
- list-style: none;
-}
-
-#FRONTRELEASESLIST li, #frontreleaseslist li {
- margin: 0;
- padding-left: 12px;
- background-image: url(../../../layout/images/blt_red_arrow.png);
- background-repeat: no-repeat;
- background-position: 0px 0.5em;
-}
-
-/* New User Box */
-
- /* set background images for corners */
-.frontnewroundbox { background: url(../../../layout/images/front_new_back.png) repeat; }
-.frontnewtop div { background: url(../../../layout/images/front_new_tl.png) no-repeat top left; }
-.frontnewtop { background: url(../../../layout/images/front_new_tr.png) no-repeat top right; }
-.frontnewbot div { background: url(../../../layout/images/front_new_bl.png) no-repeat bottom left; }
-.frontnewbot { background: url(../../../layout/images/front_new_br.png) no-repeat bottom right; }
-
- /* height and width details */
-.frontnewtop div, .frontnewtop, .frontnewbot div, .frontnewbot {
- width: 100%;
- height: 12px;
- font-size: 1px;
-}
-
.frontnewcontent {
- margin: 0;
- padding: 0;
- margin-top: -4px;
- margin-bottom: -4px;
- text-align: center;
font-size: 1.1em;
- font-weight: bold;
-}
-
-.frontnewcontent a, .frontnewcontent a:link, .frontnewcontent a:visited, .frontnewcontent a:hover, .frontnewcontent a:active {
- color: #990000;
- text-decoration: none;
-}
-
-.frontnewroundbox {
- margin: 0;
- padding: 0;
- margin-top: 30px;
- width: 150px;
}
/* Get FreeBSD Box */
- /* set background images for corners */
-.frontgetroundbox { background: url(../../../layout/images/front_get_back.png) repeat; }
-.frontgettop div { background: url(../../../layout/images/front_get_tl.png) no-repeat top left; }
-.frontgettop { background: url(../../../layout/images/front_get_tr.png) no-repeat top right; }
-.frontgetbot div { background: url(../../../layout/images/front_get_bl.png) no-repeat bottom left; }
-.frontgetbot { background: url(../../../layout/images/front_get_br.png) no-repeat bottom right; }
-
- /* height and width details */
-.frontgettop div, .frontgettop, .frontgetbot div, .frontgetbot {
- width: 100%;
- height: 18px;
- font-size: 1px;
-}
-
.frontgetcontent {
- margin: 0;
- padding: 0;
- margin-top: -8px;
- margin-bottom: -8px;
- text-align: center;
font-size: 1.4em;
- font-weight: bold;
-}
-
-.frontgetcontent a, .frontgetcontent a:link, .frontgetcontent a:visited, .frontgetcontent a:hover, .frontgetcontent a:active {
- color: #990000;
- text-decoration: none;
-}
-
-.frontgetroundbox {
- margin: 0;
- padding: 0;
- margin-top: 50px;
- margin-left: 140px;
- width: 190px;
-}
-
-/* Secondary Pages */
-
-#SIDEWRAP, #sidewrap {
- float: left;
- width: 166px;
- margin-top: 15px;
- margin-right: -170px;
-}
-
-#RIGHTWRAP, #rightwrap {
- float: right;
- width: 166px;
- margin-left: 15px;
-}
-
-#CONTENTWRAP, #contentwrap {
- margin-left: 170px;
- padding-top: 15px;
}
/* Footer */
-#FOOTER, #footer {
+#footer {
font-size: 1.09em;
- color: #737373;
- line-height: 1.3em;
- padding-top: 5px;
- clear: both;
-}
-
-/* Misc Classes */
-
-.clearboth {
- clear: both;
- margin: 0;
- padding: 0;
-}
-
-.blockhide {
- display: none;
- height: 0;
- width: 0;
- overflow: hidden;
- position: absolute; /* IE5 Mac */
-}
-
-img {
- border: 0;
}
diff --git a/zh_CN.GB2312/htdocs/layout/css/navigation.css b/zh_CN.GB2312/htdocs/layout/css/navigation.css
index b65f5b5742..859e5d5155 100644
--- a/zh_CN.GB2312/htdocs/layout/css/navigation.css
+++ b/zh_CN.GB2312/htdocs/layout/css/navigation.css
@@ -6,291 +6,34 @@
* $FreeBSD$
*/
+@import url("../../../layout/css/navigation.css");
+
/* Site Navigation */
-#TOPNAV, #topnav {
- text-align: left;
- color: #666;
+#topnav {
font-size: 1.09em;
- margin: 0;
- padding: 0;
- height: 29px;
- overflow: visible;
- margin-top: 7px;
-}
-
-#TOPNAVLEFT, #topnavleft {
- width: 7px;
- height: 29px;
- border: 0px;
- padding-right: 10px;
- margin: 0px;
- float: left;
-}
-
-#TOPNAVLEFT img, #topnavleft img {
- border: 0px;
- margin: 0;
- padding: 0;
-}
-
-#TOPNAVRIGHT, #topnavright {
- width: 7px;
- height: 29px;
- border: 0px;
- padding: 0px;
- margin: 0px;
- float: right;
-}
-
-#TOPNAVRIGHT img, #topnavright img {
- border: 0px;
- margin: 0;
- padding: 0;
-}
-
-#TOPNAVLIST, #topnavlist {
- list-style: none;
- margin: 0;
- padding: 0;
- height: 29px;
-}
-
-#TOPNAVLIST li, #topnavlist li {
- padding: 0 1em 0 1.2em;
- display: inline;
- border-left: 1px solid #B4B4B4;
-}
-
-#TOPNAVLIST li a, #topnavlist li a {
- color: #666;
- font-weight: bold;
- text-decoration: none;
-}
-
-#TOPNAVLIST li:first-child, #topnavlist li:first-child {
- border-left: 0;
- padding-left: 0;
}
/* Language selection */
-#LANGUAGENAV, #languagenav {
- text-align: right;
- color: #666;
+#languagenav {
font-size: 1.09em;
- margin: 0px 0px 0px 0px;
- right: 0px;
- padding: 0;
-}
-
-#LANGUAGENAVLIST, #languagenavlist {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-#LANGUAGENAVLIST li, #languagenavlist li {
- padding: 0 0.5em 0 0.2em;
- display: inline;
- border-right: 1px solid #B6B6B6;
-}
-
-#LANGUAGENAVLIST li.last-child, #languagenavlist li.last-child {
- padding: 0 0em 0 0.2em;
- border-right: 0;
-}
-
-#LANGUAGENAVLIST li a, #languagenavlist li a {
- text-decoration: underline;
-}
-
-#LANGUAGENAVLIST li a:hover, #languagenavlist li a:hover {
}
/* The search navigation is the list of links above the search box. */
-#SEARCHNAV, #searchnav {
- position: relative;
- text-align: right;
- color: #fff;
+#searchnav {
font-size: 1.09em;
- margin: 0px 0px 0px 0px;
- margin-top: 8px;
- right: 0px;
- padding: 0;
-}
-
-#SEARCHNAVLIST, #searchnavlist {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-#SEARCHNAVLIST li, #searchnavlist li {
- padding: 0 0.6em 0 0.3em;
- display: inline;
- border-right: 1px solid #fff;
-}
-
-#SEARCHNAVLIST li.last-child, #searchnavlist li.last-child {
- padding: 0 0 0 0.3em;
- border-right: 0;
-}
-
-#SEARCHNAVLIST li a, #searchnavlist li a {
- color: #FFCC66;
- text-decoration: underline;
-}
-
-#SEARCHNAVLIST li a:hover, #searchnavlist li a:hover {
- color: #fff;
}
/* Category Navigation */
-#SIDENAV, #SIDENAV ul, #SIDENAV ul ul, #sidenav, #sidenav ul, #sidenav ul ul {
- margin: 0;
- padding: 0;
- list-style: none;
+#sidenav, #sidenav ul, #sidenav ul ul {
font-size: 1.0em;
}
-#SIDENAV, #sidenav {
- width: 150px;
- background-color: #eee;
- border: 1px solid #D4D4D4;
-}
-
-#SIDENAV ul, #sidenav ul {
- padding: 8px 4px 12px 4px;
-}
-
-#SIDENAV ul ul, #sidenav ul ul {
- background: none;
- background-color: #eee;
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-#SIDENAV ul ul li, #sidenav ul ul li {
- background: none;
- border: none;
-}
-
-#SIDENAV ul li, #sidenav ul li {
- border-bottom: 1px solid #eee;
- margin: 0;
- padding-left: 12px;
- background-image: url(../../../layout/images/blt_red_arrow.png);
- background-repeat: no-repeat;
- background-position: 12px 0.65em;
-}
-
-#SIDENAV ul li.active, #sidenav ul li.active {
- font-weight: bold;
-}
-
-#SIDENAV ul li.active span, #sidenav ul li.active span {
- display: none;
-}
-
-#SIDENAV ul li a, #sidenav ul li a {
- display: block;
- color: #990000;
- text-decoration: underline;
- padding: 3px 5px 3px 12px;
- margin: 0;
-}
-
-#SIDENAV ul ul li a.active, #sidenav ul ul li a.active {
- font-weight: bold;
-}
-
-#SIDENAV ul ul li a, #sidenav ul ul li a {
- display: block;
- padding-left: 12px;
- margin: 0;
-}
-
-#SIDENAV ul li a:hover, #sidenav ul li a:hover {
- color: #000;
-}
-
/* Right Navigation */
-.RIGHTNAV, .RIGHTNAV ul, .RIGHTNAV ul ul, .rightnav, .rightnav ul, .rightnav ul ul {
- margin: 0;
- padding: 0;
- list-style: none;
+.rightnav, .rightnav ul, .rightnav ul ul {
font-size: 1.0em;
}
-
-.RIGHTNAV, .rightnav {
- width: 150px;
- background-color: #eee;
- border: 1px solid #D4D4D4;
-}
-
-.RIGHTNAV ul, .rightnav ul {
- padding: 8px 4px 12px 4px;
-}
-
-.RIGHTNAV ul ul, .rightnav ul ul {
- background: none;
- background-color: #eee;
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-.RIGHTNAV ul ul li, .rightnav ul ul li {
- background: none;
- border: none;
-}
-
-.RIGHTNAV ul li, .rightnav ul li {
- border-bottom: 1px solid #eee;
- margin: 0;
- padding-left: 12px;
- background-image: url(../../../layout/images/blt_red_arrow.png);
- background-repeat: no-repeat;
- background-position: 12px 0.65em;
-}
-
-.RIGHTNAV ul li.active, .rightnav ul li.active {
- font-weight: bold;
-}
-
-.RIGHTNAV ul li.active span, .rightnav ul li.active span {
- display: none;
-}
-
-.RIGHTNAV ul li a, .rightnav ul li a {
- display: block;
- color: #990000;
- text-decoration: underline;
- padding: 3px 5px 3px 12px;
- margin: 0;
-}
-
-.RIGHTNAV ul ul li a.active, .rightnav ul ul li a.active {
- font-weight: bold;
-}
-
-.RIGHTNAV ul ul li a, .rightnav ul ul li a {
- display: block;
- padding-left: 12px;
- margin: 0;
-}
-
-.RIGHTNAV ul li a:hover, .rightnav ul li a:hover {
- color: #000;
-}
-
-.RIGHTNAV h1, .RIGHTNAV h2, .RIGHTNAV h3, .RIGHTNAV h4, .RIGHTNAV h5, .RIGHTNAV h6, .RIGHTNAV p,
-.rightnav h1, .rightnav h2, .rightnav h3, .rightnav h4, .rightnav h5, .rightnav h6, .rightnav p {
- padding-left: 10px;
- padding-right: 10px;
-}
diff --git a/zh_CN.GB2312/htdocs/layout/css/query-pr.css b/zh_CN.GB2312/htdocs/layout/css/query-pr.css
deleted file mode 100644
index a54061a6f4..0000000000
--- a/zh_CN.GB2312/htdocs/layout/css/query-pr.css
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * CSS stylesheet for the new query-pr interface.
- *
- * Copyright (C) 2006, Shaun Amott <shaun@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Original Revision: 1.3
- * $FreeBSD$
- */
-
-pre {
- font-family: Courier New;
- font-size: 100%;
- white-space: pre;
- margin-top: 0px;
- margin-bottom: 0px;
- overflow: scroll;
- max-height: 600px;
-}
-
-/* Fields */
-
-td {
- vertical-align: top;
-}
-
-.mfield {
- padding: 10px;
- width: 100%;
-}
-
-.headtable {
- border-left: 1px solid #999999;
- border-bottom: 1px solid #999999;
- width: 100%;
-}
-
-.headtable .key {
- font-weight: bold;
- width: 12em;
-}
-
-.headtable .val {
-}
-
-.headtable .blkhead {
- font-weight: bold;
-}
-
-
-/* Patch block */
-
-.patchblock {
- margin-left: auto;
- margin-right: auto;
- border: 1px solid #999999;
- background-color: #EFEFBB;
- width: 90%;
-}
-.patchblock .info { background-color: #ACACAA; }
-.patchblock .content {
- font-family: Courier New;
- white-space: pre;
-}
-
-
-/* Audit block */
-
-.auditblock {
- margin-left: auto;
- margin-right: auto;
- border: 1px solid #999999;
- background-color: #EFEFEF;
- width: 90%;
-}
-.auditblock .key { font-weight: bold; width: 60px; }
-.auditblock .info { background-color: #ACACAA; }
-
-
-/* Reply block */
-
-.replyblock {
- margin-left: auto;
- margin-right: auto;
- border: 1px solid #999999;
- background-color: #EFEFEF;
- width: 90%;
-}
-.replyblock .info { background-color: #AA9900; }
-.replyblock .key { background-color: #CCCCCC; font-weight: bold; width: 60px; }
-.replyblock .val { background-color: #CCCCCC; }
-
-
-/* Unexpected (manually inserted) text block */
-
-.unexpectedblock {
- width: 100%;
-}
-
-.quote0 { color: #DD0000; }
-.quote1 { color: #0000DD; }
-
-.patch_plusline { color: #FF0000; }
-.patch_minusline { color: #0000FF; }
-.patch_contextline { color: #00AA00; }
-.patch_revinfo { font-weight: bold; }
-.patch_hunkinfo { font-weight: bold; }
-
-.mimeboundary { border-top: 1px #DD0000 dashed; border-bottom: 0px; }
diff --git a/zh_CN.GB2312/htdocs/layout/css/table.css b/zh_CN.GB2312/htdocs/layout/css/table.css
deleted file mode 100644
index 2bb31cc9fb..0000000000
--- a/zh_CN.GB2312/htdocs/layout/css/table.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * FreeBSD.org - Table Styles
- *
- * The FreeBSD Simplified Chinese Project
- * Original Revision: 1.3
- *
- * $FreeBSD$
- */
-
-.tblbasic {
- background-color: #eee;
- border-spacing: 0px;
- border: 1px solid #CACACA;
- border-bottom: 0;
- border-collapse: collapse;
-}
-
-.tblbasic thead {
- font-weight: bold;
-}
-
-.tblbasic th {
- font-weight: bold;
- padding: 8px;
- border-bottom: 1px solid #D4D4D4;
-}
-
-.tblbasic td {
- padding: 8px;
- border-bottom: 1px solid #D4D4D4;
-}
-
-.tblbasic td+td, .tblbasic th+th {
- border-left: 1px solid #D4D4D4;
-}
diff --git a/zh_CN.GB2312/htdocs/layout/css/text.css b/zh_CN.GB2312/htdocs/layout/css/text.css
index fccc769362..dfeac5b5de 100644
--- a/zh_CN.GB2312/htdocs/layout/css/text.css
+++ b/zh_CN.GB2312/htdocs/layout/css/text.css
@@ -7,123 +7,22 @@
* $FreeBSD$
*/
-/* Heading Definitions */
-
-h1 {
- color: #990000;
-}
-
-h2 {
- color: #990000;
-}
-
-h3 {
- color: #990000;
-}
-
-h4 {
- color: #990000;
-}
+@import url("../../../layout/css/text.css");
/* Text Styles */
-.txtcolumn1 {
- width: 50%;
- line-height: 1.3em;
-}
-
-.txtcolumn2 {
- width: 50%;
- line-height: 1.5em;
-}
-
-.txtcurrentlocation {
- font-weight: bold;
-}
-
.txtdivider {
font-size: 1.09em;
- color: #E1E1E1;
- padding-left: 4px;
- padding-right: 4px;
}
.txtnewsevent {
font-size: 1.09em;
- color: #000000;
}
.txtshortcuts {
font-size: 1.09em;
- color: #000000;
}
.txtdate {
font-size: 1.09em;
- color: #666;
-}
-
-.txtmediumgrey {
- color: #666;
-}
-
-.txtformlabel {
- color: #666;
- font-weight: bold;
- text-align: right;
- vertical-align: top;
-}
-
-.txtrequiredfield {
- color: #EC5800;
-}
-
-.txtimportant {
- color: #EC5800;
-}
-
-.txtoffscreen {
- position: absolute;
- left: -1999px;
- width: 1990px;
-}
-
-#TXTFRONTFEATUREHEADING, #txtfrontfeatureheading {
- padding-bottom: 0em;
-}
-
-#TXTFRONTFEATURELINK a, #txtfrontfeaturelink a {
- font-size: 1.2em;
- font-weight: bold;
- padding-left: 5px;
-}
-
-/* Link Styles */
-
-a:link { color:#990000; text-decoration: underline; }
-a:visited { color:#990000; text-decoration: underline; }
-a:hover { color:#000000; text-decoration: underline; }
-a:active { color:#990000; text-decoration: underline; }
-
-#FOOTER a:link, #footer a:link { color:#666; text-decoration: underline; }
-#FOOTER a:visited, #footer a:visited { color:#666; text-decoration: underline; }
-#FOOTER a:hover, #footer a:hover { color:#000000; text-decoration: underline; }
-#FOOTER a:active, #footer a:active { color:#666; text-decoration: underline; }
-
-#FRONTNEMSCONTAINER h2, #frontnemscontainer h2 {
- margin: 0;
- padding: 0;
- font-size: 1.1em;
-}
-
-#FRONTSHORTCUTS h2, #frontshortcuts h2 {
- margin: 0;
- padding: 0;
- font-size: 1.1em;
-}
-
-#FRONTRELEASES h2, #frontreleases h2 {
- margin: 0;
- padding: 0;
- font-size: 1.1em;
}