redoing r91673 . Second step: Actually moving the files

diff --git a/resources/Resources.php b/resources/Resources.php
index c7be2f2..f2692dc 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -45,12 +45,12 @@ return array(
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.cologneblue' => array(
-               'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
+               'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.nostalgia' => array(
-               'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
+               'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),

diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
new file mode 100644 (file)
index 0000000..d5ed280
--- /dev/null
+++ b/skins/cologneblue/screen.css
@@ -0,0 +1,220 @@
+body {
+       margin: 0px;
+       padding: 0px;
+       color: black;
+}
+
+#specialform {
+       display: inline;
+}
+
+#content {
+       top: 0;
+       margin: 0;
+       padding: 0;
+}
+
+#mw-data-after-content {
+       font-family: Verdana, Arial, sans-serif;
+       color: black;
+       font-size: 8pt;
+}
+
+#topbar {
+       padding: 0px;
+}
+
+#powersearch {
+       background: #DDEEFF;
+       border-style: solid;
+       border-width: 1px;
+       padding: 2px;
+}
+
+#quickbar {
+       width: 140px;
+       top: 18ex;
+       padding: 2px;
+       visibility: visible;
+       z-index: 99;
+}
+
+#article, #article td, #article th, #article p {
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 10pt;
+       color: black;
+}
+
+#article p {
+       padding-top: 0;
+       padding-bottom: 0;
+       margin-top: 1ex;
+       margin-bottom: 0;
+}
+
+p, pre, td, th, li, dd, dt {
+       line-height: 12pt;
+}
+
+textarea {
+       overflow: auto;
+}
+
+#footer {
+       padding: 4px;
+}
+
+#footer form {
+       display: inline;
+}
+
+#sitetitle {
+       font-family: Times, serif;
+       color: white;
+       font-weight: normal;
+       font-size: 32pt;
+       line-height: 32pt;
+}
+
+td.top {
+       background-color: #6688AA;
+       color: white;
+       margin-top: 4px;
+       margin-bottom: 4px;
+       padding-top: 0;
+       padding-bottom: 0;
+       text-transform: uppercase;
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 8pt;
+}
+
+td.top a {
+       font-family: Verdana, Arial, sans-serif;
+       background-color: #6688AA;
+       color: white;
+       text-decoration: none;
+       font-size: 10pt;
+}
+
+td#top-syslinks {
+       text-align: right;
+       vertical-align: bottom;
+}
+td.top-linkcollection {
+       text-align: right;
+}
+
+td.bottom {
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 10pt;
+       padding: 0;
+       text-align: center;
+       vertical-align: bottom;
+}
+
+#pagestats {
+       font-family: Verdana, Arial, sans-serif;
+       color: black;
+       font-size: 9pt;
+}
+
+#sitesub {
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 9pt; font-weight: bold;
+       color: black;
+       padding-top: 0;
+}
+
+#quickbar {
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 8pt;
+       font-weight: bold;
+       line-height: 9.5pt;
+       text-decoration: none;
+       color: black;
+       padding: 0;
+       margin-top: 0;
+}
+
+#quickbar a {
+       color: #446688;
+}
+
+#quickbar h6 {
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 10pt;
+       font-weight: bold;
+       line-height: 12pt;
+       text-decoration: none;
+       color: #666666;
+       padding: 0;
+       margin-bottom: 2px;
+       margin-top: 6px;
+}
+
+#quickbar form {
+       padding: 0;
+       margin-top: 0;
+}
+
+h1 {
+       color: #666666;
+       font-family: Verdana, Arial, sans-serif;
+       font-size: 180%;
+       line-height: 21pt;
+}
+
+h1 .editsection {
+       font-size: 55.6%;
+}
+
+h1.pagetitle {
+       padding-bottom: 0;
+       margin-bottom: 0;
+}
+
+#article p.subtitle {
+       color: #666666;
+       font-size: 11pt;
+       font-weight: bold;
+       padding-top: 0;
+       margin-top: 0;
+       padding-bottom: 1ex;
+}
+
+a {
+       color: #223366;
+}
+
+a.external {
+       color: #336644;
+}
+
+a:visited {
+       color: #8D0749;
+}
+
+a.printable {
+       text-decoration: underline;
+}
+
+a.stub, #quickbar a.stub {
+       color: #772233;
+       text-decoration: none;
+}
+
+a.new, #quickbar a.new {
+       color: #CC2200;
+}
+
+h2, h3, h4, h5, h6 {
+       margin-bottom: 0;
+}
+
+small {
+       font-size: 75%;
+}
+
+input.mw-searchInput {
+       width: 106px;
+}

diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
deleted file mode 100644 (file)
index d5ed280..0000000
--- a/skins/common/cologneblue.css
+++ /dev/null
@@ -1,220 +0,0 @@
-body {
-       margin: 0px;
-       padding: 0px;
-       color: black;
-}
-
-#specialform {
-       display: inline;
-}
-
-#content {
-       top: 0;
-       margin: 0;
-       padding: 0;
-}
-
-#mw-data-after-content {
-       font-family: Verdana, Arial, sans-serif;
-       color: black;
-       font-size: 8pt;
-}
-
-#topbar {
-       padding: 0px;
-}
-
-#powersearch {
-       background: #DDEEFF;
-       border-style: solid;
-       border-width: 1px;
-       padding: 2px;
-}
-
-#quickbar {
-       width: 140px;
-       top: 18ex;
-       padding: 2px;
-       visibility: visible;
-       z-index: 99;
-}
-
-#article, #article td, #article th, #article p {
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 10pt;
-       color: black;
-}
-
-#article p {
-       padding-top: 0;
-       padding-bottom: 0;
-       margin-top: 1ex;
-       margin-bottom: 0;
-}
-
-p, pre, td, th, li, dd, dt {
-       line-height: 12pt;
-}
-
-textarea {
-       overflow: auto;
-}
-
-#footer {
-       padding: 4px;
-}
-
-#footer form {
-       display: inline;
-}
-
-#sitetitle {
-       font-family: Times, serif;
-       color: white;
-       font-weight: normal;
-       font-size: 32pt;
-       line-height: 32pt;
-}
-
-td.top {
-       background-color: #6688AA;
-       color: white;
-       margin-top: 4px;
-       margin-bottom: 4px;
-       padding-top: 0;
-       padding-bottom: 0;
-       text-transform: uppercase;
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 8pt;
-}
-
-td.top a {
-       font-family: Verdana, Arial, sans-serif;
-       background-color: #6688AA;
-       color: white;
-       text-decoration: none;
-       font-size: 10pt;
-}
-
-td#top-syslinks {
-       text-align: right;
-       vertical-align: bottom;
-}
-td.top-linkcollection {
-       text-align: right;
-}
-
-td.bottom {
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 10pt;
-       padding: 0;
-       text-align: center;
-       vertical-align: bottom;
-}
-
-#pagestats {
-       font-family: Verdana, Arial, sans-serif;
-       color: black;
-       font-size: 9pt;
-}
-
-#sitesub {
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 9pt; font-weight: bold;
-       color: black;
-       padding-top: 0;
-}
-
-#quickbar {
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 8pt;
-       font-weight: bold;
-       line-height: 9.5pt;
-       text-decoration: none;
-       color: black;
-       padding: 0;
-       margin-top: 0;
-}
-
-#quickbar a {
-       color: #446688;
-}
-
-#quickbar h6 {
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 10pt;
-       font-weight: bold;
-       line-height: 12pt;
-       text-decoration: none;
-       color: #666666;
-       padding: 0;
-       margin-bottom: 2px;
-       margin-top: 6px;
-}
-
-#quickbar form {
-       padding: 0;
-       margin-top: 0;
-}
-
-h1 {
-       color: #666666;
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 180%;
-       line-height: 21pt;
-}
-
-h1 .editsection {
-       font-size: 55.6%;
-}
-
-h1.pagetitle {
-       padding-bottom: 0;
-       margin-bottom: 0;
-}
-
-#article p.subtitle {
-       color: #666666;
-       font-size: 11pt;
-       font-weight: bold;
-       padding-top: 0;
-       margin-top: 0;
-       padding-bottom: 1ex;
-}
-
-a {
-       color: #223366;
-}
-
-a.external {
-       color: #336644;
-}
-
-a:visited {
-       color: #8D0749;
-}
-
-a.printable {
-       text-decoration: underline;
-}
-
-a.stub, #quickbar a.stub {
-       color: #772233;
-       text-decoration: none;
-}
-
-a.new, #quickbar a.new {
-       color: #CC2200;
-}
-
-h2, h3, h4, h5, h6 {
-       margin-bottom: 0;
-}
-
-small {
-       font-size: 75%;
-}
-
-input.mw-searchInput {
-       width: 106px;
-}

diff --git a/skins/common/nostalgia.css b/skins/common/nostalgia.css
deleted file mode 100644 (file)
index 1cac7a7..0000000
--- a/skins/common/nostalgia.css
+++ /dev/null
@@ -1,51 +0,0 @@
-body {
-       /* Background color is set separately on page type */
-       color: black;
-}
-
-#specialform {
-       display: inline;
-}
-
-#powersearch {
-       background: #DDEEFF;
-       border-style: solid;
-       border-width: 1px;
-       padding: 2px;
-}
-
-a.interwiki, a.external {
-       color: #3366BB;
-}
-
-a.printable {
-       text-decoration: underline;
-}
-
-a.stub {
-       color: #772233;
-       text-decoration: none;
-}
-
-h1.pagetitle {
-       padding-top: 0;
-       margin-top: 0;
-       padding-bottom: 0;
-       margin-bottom: 0;
-}
-
-h2, h3, h4, h5, h6 {
-       margin-bottom: 0;
-}
-
-textarea {
-       overflow: auto;
-}
-
-p.subtitle {
-       padding-top: 0;
-       margin-top: 0;
-}
-div.sitenotice {
-       clear: both;
-}

diff --git a/skins/nostalgia/screen.css b/skins/nostalgia/screen.css
new file mode 100644 (file)
index 0000000..1cac7a7
--- /dev/null
+++ b/skins/nostalgia/screen.css
@@ -0,0 +1,51 @@
+body {
+       /* Background color is set separately on page type */
+       color: black;
+}
+
+#specialform {
+       display: inline;
+}
+
+#powersearch {
+       background: #DDEEFF;
+       border-style: solid;
+       border-width: 1px;
+       padding: 2px;
+}
+
+a.interwiki, a.external {
+       color: #3366BB;
+}
+
+a.printable {
+       text-decoration: underline;
+}
+
+a.stub {
+       color: #772233;
+       text-decoration: none;
+}
+
+h1.pagetitle {
+       padding-top: 0;
+       margin-top: 0;
+       padding-bottom: 0;
+       margin-bottom: 0;
+}
+
+h2, h3, h4, h5, h6 {
+       margin-bottom: 0;
+}
+
+textarea {
+       overflow: auto;
+}
+
+p.subtitle {
+       padding-top: 0;
+       margin-top: 0;
+}
+div.sitenotice {
+       clear: both;
+}