r91673 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r91672‎ | r91673 | r91674 >
Date:19:59, 7 July 2011
Author:diebuche
Status:reverted (Comments)
Tags:
Comment:
Moving cologneblue.css and nostalgia.css into their own folder
Modified paths:
  • /trunk/phase3/resources/Resources.php (modified) (history)
  • /trunk/phase3/skins/cologneblue (added) (history)
  • /trunk/phase3/skins/cologneblue/main.css (added) (history)
  • /trunk/phase3/skins/common/cologneblue.css (deleted) (history)
  • /trunk/phase3/skins/common/nostalgia.css (deleted) (history)
  • /trunk/phase3/skins/nostalgia (added) (history)
  • /trunk/phase3/skins/nostalgia/main.css (added) (history)

Diff [purge]

Index: trunk/phase3/skins/nostalgia/main.css
@@ -0,0 +1,51 @@
 2+body {
 3+ /* Background color is set separately on page type */
 4+ color: black;
 5+}
 6+
 7+#specialform {
 8+ display: inline;
 9+}
 10+
 11+#powersearch {
 12+ background: #DDEEFF;
 13+ border-style: solid;
 14+ border-width: 1px;
 15+ padding: 2px;
 16+}
 17+
 18+a.interwiki, a.external {
 19+ color: #3366BB;
 20+}
 21+
 22+a.printable {
 23+ text-decoration: underline;
 24+}
 25+
 26+a.stub {
 27+ color: #772233;
 28+ text-decoration: none;
 29+}
 30+
 31+h1.pagetitle {
 32+ padding-top: 0;
 33+ margin-top: 0;
 34+ padding-bottom: 0;
 35+ margin-bottom: 0;
 36+}
 37+
 38+h2, h3, h4, h5, h6 {
 39+ margin-bottom: 0;
 40+}
 41+
 42+textarea {
 43+ overflow: auto;
 44+}
 45+
 46+p.subtitle {
 47+ padding-top: 0;
 48+ margin-top: 0;
 49+}
 50+div.sitenotice {
 51+ clear: both;
 52+}
Property changes on: trunk/phase3/skins/nostalgia/main.css
___________________________________________________________________
Added: svn:eol-style
153 + native
Index: trunk/phase3/skins/common/cologneblue.css
@@ -1,220 +0,0 @@
2 -body {
3 - margin: 0px;
4 - padding: 0px;
5 - color: black;
6 -}
7 -
8 -#specialform {
9 - display: inline;
10 -}
11 -
12 -#content {
13 - top: 0;
14 - margin: 0;
15 - padding: 0;
16 -}
17 -
18 -#mw-data-after-content {
19 - font-family: Verdana, Arial, sans-serif;
20 - color: black;
21 - font-size: 8pt;
22 -}
23 -
24 -#topbar {
25 - padding: 0px;
26 -}
27 -
28 -#powersearch {
29 - background: #DDEEFF;
30 - border-style: solid;
31 - border-width: 1px;
32 - padding: 2px;
33 -}
34 -
35 -#quickbar {
36 - width: 140px;
37 - top: 18ex;
38 - padding: 2px;
39 - visibility: visible;
40 - z-index: 99;
41 -}
42 -
43 -#article, #article td, #article th, #article p {
44 - font-family: Verdana, Arial, sans-serif;
45 - font-size: 10pt;
46 - color: black;
47 -}
48 -
49 -#article p {
50 - padding-top: 0;
51 - padding-bottom: 0;
52 - margin-top: 1ex;
53 - margin-bottom: 0;
54 -}
55 -
56 -p, pre, td, th, li, dd, dt {
57 - line-height: 12pt;
58 -}
59 -
60 -textarea {
61 - overflow: auto;
62 -}
63 -
64 -#footer {
65 - padding: 4px;
66 -}
67 -
68 -#footer form {
69 - display: inline;
70 -}
71 -
72 -#sitetitle {
73 - font-family: Times, serif;
74 - color: white;
75 - font-weight: normal;
76 - font-size: 32pt;
77 - line-height: 32pt;
78 -}
79 -
80 -td.top {
81 - background-color: #6688AA;
82 - color: white;
83 - margin-top: 4px;
84 - margin-bottom: 4px;
85 - padding-top: 0;
86 - padding-bottom: 0;
87 - text-transform: uppercase;
88 - font-family: Verdana, Arial, sans-serif;
89 - font-size: 8pt;
90 -}
91 -
92 -td.top a {
93 - font-family: Verdana, Arial, sans-serif;
94 - background-color: #6688AA;
95 - color: white;
96 - text-decoration: none;
97 - font-size: 10pt;
98 -}
99 -
100 -td#top-syslinks {
101 - text-align: right;
102 - vertical-align: bottom;
103 -}
104 -td.top-linkcollection {
105 - text-align: right;
106 -}
107 -
108 -td.bottom {
109 - font-family: Verdana, Arial, sans-serif;
110 - font-size: 10pt;
111 - padding: 0;
112 - text-align: center;
113 - vertical-align: bottom;
114 -}
115 -
116 -#pagestats {
117 - font-family: Verdana, Arial, sans-serif;
118 - color: black;
119 - font-size: 9pt;
120 -}
121 -
122 -#sitesub {
123 - font-family: Verdana, Arial, sans-serif;
124 - font-size: 9pt; font-weight: bold;
125 - color: black;
126 - padding-top: 0;
127 -}
128 -
129 -#quickbar {
130 - font-family: Verdana, Arial, sans-serif;
131 - font-size: 8pt;
132 - font-weight: bold;
133 - line-height: 9.5pt;
134 - text-decoration: none;
135 - color: black;
136 - padding: 0;
137 - margin-top: 0;
138 -}
139 -
140 -#quickbar a {
141 - color: #446688;
142 -}
143 -
144 -#quickbar h6 {
145 - font-family: Verdana, Arial, sans-serif;
146 - font-size: 10pt;
147 - font-weight: bold;
148 - line-height: 12pt;
149 - text-decoration: none;
150 - color: #666666;
151 - padding: 0;
152 - margin-bottom: 2px;
153 - margin-top: 6px;
154 -}
155 -
156 -#quickbar form {
157 - padding: 0;
158 - margin-top: 0;
159 -}
160 -
161 -h1 {
162 - color: #666666;
163 - font-family: Verdana, Arial, sans-serif;
164 - font-size: 180%;
165 - line-height: 21pt;
166 -}
167 -
168 -h1 .editsection {
169 - font-size: 55.6%;
170 -}
171 -
172 -h1.pagetitle {
173 - padding-bottom: 0;
174 - margin-bottom: 0;
175 -}
176 -
177 -#article p.subtitle {
178 - color: #666666;
179 - font-size: 11pt;
180 - font-weight: bold;
181 - padding-top: 0;
182 - margin-top: 0;
183 - padding-bottom: 1ex;
184 -}
185 -
186 -a {
187 - color: #223366;
188 -}
189 -
190 -a.external {
191 - color: #336644;
192 -}
193 -
194 -a:visited {
195 - color: #8D0749;
196 -}
197 -
198 -a.printable {
199 - text-decoration: underline;
200 -}
201 -
202 -a.stub, #quickbar a.stub {
203 - color: #772233;
204 - text-decoration: none;
205 -}
206 -
207 -a.new, #quickbar a.new {
208 - color: #CC2200;
209 -}
210 -
211 -h2, h3, h4, h5, h6 {
212 - margin-bottom: 0;
213 -}
214 -
215 -small {
216 - font-size: 75%;
217 -}
218 -
219 -input.mw-searchInput {
220 - width: 106px;
221 -}
Index: trunk/phase3/skins/common/nostalgia.css
@@ -1,51 +0,0 @@
2 -body {
3 - /* Background color is set separately on page type */
4 - color: black;
5 -}
6 -
7 -#specialform {
8 - display: inline;
9 -}
10 -
11 -#powersearch {
12 - background: #DDEEFF;
13 - border-style: solid;
14 - border-width: 1px;
15 - padding: 2px;
16 -}
17 -
18 -a.interwiki, a.external {
19 - color: #3366BB;
20 -}
21 -
22 -a.printable {
23 - text-decoration: underline;
24 -}
25 -
26 -a.stub {
27 - color: #772233;
28 - text-decoration: none;
29 -}
30 -
31 -h1.pagetitle {
32 - padding-top: 0;
33 - margin-top: 0;
34 - padding-bottom: 0;
35 - margin-bottom: 0;
36 -}
37 -
38 -h2, h3, h4, h5, h6 {
39 - margin-bottom: 0;
40 -}
41 -
42 -textarea {
43 - overflow: auto;
44 -}
45 -
46 -p.subtitle {
47 - padding-top: 0;
48 - margin-top: 0;
49 -}
50 -div.sitenotice {
51 - clear: both;
52 -}
Index: trunk/phase3/skins/cologneblue/main.css
@@ -0,0 +1,220 @@
 2+body {
 3+ margin: 0px;
 4+ padding: 0px;
 5+ color: black;
 6+}
 7+
 8+#specialform {
 9+ display: inline;
 10+}
 11+
 12+#content {
 13+ top: 0;
 14+ margin: 0;
 15+ padding: 0;
 16+}
 17+
 18+#mw-data-after-content {
 19+ font-family: Verdana, Arial, sans-serif;
 20+ color: black;
 21+ font-size: 8pt;
 22+}
 23+
 24+#topbar {
 25+ padding: 0px;
 26+}
 27+
 28+#powersearch {
 29+ background: #DDEEFF;
 30+ border-style: solid;
 31+ border-width: 1px;
 32+ padding: 2px;
 33+}
 34+
 35+#quickbar {
 36+ width: 140px;
 37+ top: 18ex;
 38+ padding: 2px;
 39+ visibility: visible;
 40+ z-index: 99;
 41+}
 42+
 43+#article, #article td, #article th, #article p {
 44+ font-family: Verdana, Arial, sans-serif;
 45+ font-size: 10pt;
 46+ color: black;
 47+}
 48+
 49+#article p {
 50+ padding-top: 0;
 51+ padding-bottom: 0;
 52+ margin-top: 1ex;
 53+ margin-bottom: 0;
 54+}
 55+
 56+p, pre, td, th, li, dd, dt {
 57+ line-height: 12pt;
 58+}
 59+
 60+textarea {
 61+ overflow: auto;
 62+}
 63+
 64+#footer {
 65+ padding: 4px;
 66+}
 67+
 68+#footer form {
 69+ display: inline;
 70+}
 71+
 72+#sitetitle {
 73+ font-family: Times, serif;
 74+ color: white;
 75+ font-weight: normal;
 76+ font-size: 32pt;
 77+ line-height: 32pt;
 78+}
 79+
 80+td.top {
 81+ background-color: #6688AA;
 82+ color: white;
 83+ margin-top: 4px;
 84+ margin-bottom: 4px;
 85+ padding-top: 0;
 86+ padding-bottom: 0;
 87+ text-transform: uppercase;
 88+ font-family: Verdana, Arial, sans-serif;
 89+ font-size: 8pt;
 90+}
 91+
 92+td.top a {
 93+ font-family: Verdana, Arial, sans-serif;
 94+ background-color: #6688AA;
 95+ color: white;
 96+ text-decoration: none;
 97+ font-size: 10pt;
 98+}
 99+
 100+td#top-syslinks {
 101+ text-align: right;
 102+ vertical-align: bottom;
 103+}
 104+td.top-linkcollection {
 105+ text-align: right;
 106+}
 107+
 108+td.bottom {
 109+ font-family: Verdana, Arial, sans-serif;
 110+ font-size: 10pt;
 111+ padding: 0;
 112+ text-align: center;
 113+ vertical-align: bottom;
 114+}
 115+
 116+#pagestats {
 117+ font-family: Verdana, Arial, sans-serif;
 118+ color: black;
 119+ font-size: 9pt;
 120+}
 121+
 122+#sitesub {
 123+ font-family: Verdana, Arial, sans-serif;
 124+ font-size: 9pt; font-weight: bold;
 125+ color: black;
 126+ padding-top: 0;
 127+}
 128+
 129+#quickbar {
 130+ font-family: Verdana, Arial, sans-serif;
 131+ font-size: 8pt;
 132+ font-weight: bold;
 133+ line-height: 9.5pt;
 134+ text-decoration: none;
 135+ color: black;
 136+ padding: 0;
 137+ margin-top: 0;
 138+}
 139+
 140+#quickbar a {
 141+ color: #446688;
 142+}
 143+
 144+#quickbar h6 {
 145+ font-family: Verdana, Arial, sans-serif;
 146+ font-size: 10pt;
 147+ font-weight: bold;
 148+ line-height: 12pt;
 149+ text-decoration: none;
 150+ color: #666666;
 151+ padding: 0;
 152+ margin-bottom: 2px;
 153+ margin-top: 6px;
 154+}
 155+
 156+#quickbar form {
 157+ padding: 0;
 158+ margin-top: 0;
 159+}
 160+
 161+h1 {
 162+ color: #666666;
 163+ font-family: Verdana, Arial, sans-serif;
 164+ font-size: 180%;
 165+ line-height: 21pt;
 166+}
 167+
 168+h1 .editsection {
 169+ font-size: 55.6%;
 170+}
 171+
 172+h1.pagetitle {
 173+ padding-bottom: 0;
 174+ margin-bottom: 0;
 175+}
 176+
 177+#article p.subtitle {
 178+ color: #666666;
 179+ font-size: 11pt;
 180+ font-weight: bold;
 181+ padding-top: 0;
 182+ margin-top: 0;
 183+ padding-bottom: 1ex;
 184+}
 185+
 186+a {
 187+ color: #223366;
 188+}
 189+
 190+a.external {
 191+ color: #336644;
 192+}
 193+
 194+a:visited {
 195+ color: #8D0749;
 196+}
 197+
 198+a.printable {
 199+ text-decoration: underline;
 200+}
 201+
 202+a.stub, #quickbar a.stub {
 203+ color: #772233;
 204+ text-decoration: none;
 205+}
 206+
 207+a.new, #quickbar a.new {
 208+ color: #CC2200;
 209+}
 210+
 211+h2, h3, h4, h5, h6 {
 212+ margin-bottom: 0;
 213+}
 214+
 215+small {
 216+ font-size: 75%;
 217+}
 218+
 219+input.mw-searchInput {
 220+ width: 106px;
 221+}
Property changes on: trunk/phase3/skins/cologneblue/main.css
___________________________________________________________________
Added: svn:eol-style
1222 + native
Index: trunk/phase3/resources/Resources.php
@@ -45,12 +45,12 @@
4646 'localBasePath' => $GLOBALS['wgStyleDirectory'],
4747 ),
4848 'skins.cologneblue' => array(
49 - 'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
 49+ 'styles' => array( 'cologneblue/main.css' => array( 'media' => 'screen' ) ),
5050 'remoteBasePath' => $GLOBALS['wgStylePath'],
5151 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5252 ),
5353 'skins.nostalgia' => array(
54 - 'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
 54+ 'styles' => array( 'nostalgia/main.css' => array( 'media' => 'screen' ) ),
5555 'remoteBasePath' => $GLOBALS['wgStylePath'],
5656 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5757 ),

Follow-up revisions

RevisionCommit summaryAuthorDate
r91714revert r91673 : lost of historyhashar06:52, 8 July 2011
r91754redoing r91673 . I need to commit in two steps to preserve the file's historydiebuche20:10, 8 July 2011
r91755redoing r91673 . Second step: Actually moving the filesdiebuche20:17, 8 July 2011

Comments

#Comment by Nikerabbit (talk | contribs)   20:12, 7 July 2011

svn move please?

#Comment by DieBuche (talk | contribs)   20:20, 7 July 2011

"svn move is equivalent to an svn copy followed by svn delete." ( http://svnbook.red-bean.com/en/1.0/re18.html ) AFAIK there's no clean move command like in git

#Comment by Reedy (talk | contribs)   20:22, 7 July 2011

Indeed.

But you've lost the history on these files

So it's more like you've done cp, svn delete old, svn add new

#Comment by DieBuche (talk | contribs)   08:32, 8 July 2011

How can I see whether I moved something correctly?

#Comment by Reedy (talk | contribs)   16:07, 8 July 2011

Not sure how you can directly from svn.

reedy@reedy-laptop:~/mediawiki/trunk/phase3$ svn mv index.php indextest.php
A         indextest.php
D         index.php
reedy@reedy-laptop:~/mediawiki/trunk/phase3$ svn status
A  +    indextest.php
D       index.php
reedy@reedy-laptop:~/mediawiki/trunk/phase3$
#Comment by DieBuche (talk | contribs)   18:02, 8 July 2011

I figured it out myself: It's moved correctly if svn blame is still working on the new file..

Status & tagging log