Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 113 insertions, 0 deletions

diff --git a/extensions/WikiEditor/modules/images/toolbar/format-big.svg b/extensions/WikiEditor/modules/images/toolbar/format-big.svg
new file mode 100644
index 00000000..68d0193a
--- /dev/null
+++ b/extensions/WikiEditor/modules/images/toolbar/format-big.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg11148"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="format-big.svg">
+  <defs
+     id="defs11150">
+    <filter
+       inkscape:collect="always"
+       id="filter11711">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.40047554"
+         id="feGaussianBlur11713" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter11735">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.22248641"
+         id="feGaussianBlur11737" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627418"
+     inkscape:cx="3.4653374"
+     inkscape:cy="10.767942"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata11153">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-823.28571,-707.07648)">
+    <text
+       xml:space="preserve"
+       style="font-size:10.12465572px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#969795;fill-opacity:1;stroke:#2e3436;stroke-width:0.70751727;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="835.85748"
+       y="718.30353"
+       id="text11171"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan11173"
+         x="835.85748"
+         y="718.30353"
+         style="font-weight:bold;fill:#969795;fill-opacity:1;stroke:#2e3436;stroke-width:0.70751727;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:DejaVu Serif Bold">+</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text11693"
+       y="725.07898"
+       x="825.39417"
+       style="font-size:18.17164040000000114px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#212222;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       xml:space="preserve"><tspan
+         style="font-weight:normal;fill:#212222;fill-opacity:1;-inkscape-font-specification:DejaVu Serif"
+         y="725.07898"
+         x="825.39417"
+         id="tspan11695"
+         sodipodi:role="line">A</tspan></text>
+    <path
+       style="font-size:19.56149483px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter11735);font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       d="m 831.84511,710.73333 4.90625,12.71875 0.28125,0 -4.875,-12.71875 -0.3125,0 z m -1.5,1.8125 -2.59375,6.78125 0.6875,0 2.25,-5.875 -0.34375,-0.90625 z m -3,7.78125 -1.1875,3.125 0.6875,0 1,-2.625 5.6875,0 -0.1875,-0.5 -6,0 z m 0.375,3.65625 0,0.5 -3.5,0 0,0.5 4,0 0,-1 -0.5,0 z m 10.40625,0 0,0.5 -4.65625,0 0,0.5 5.15625,0 0,-1 -0.5,0 z"
+       id="text11167"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.92894952,0,0,0.92894952,59.652113,51.58086)" />
+    <path
+       style="font-size:19.56149483000000089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter11711);font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif;opacity:0.6918239"
+       d="m 830.51875,710.76366 -5.0625,13.21875 -1.25,0 0,1.03125 0.5,0 0,-0.5 1.25,0 5.0625,-13.25 1.3125,0 -0.1875,-0.5 -1.625,0 z m 0.8125,2.8125 -0.15625,0.40625 2.28125,5.875 -4.53125,0 -0.1875,0.5 5.21875,0 -2.625,-6.78125 z m 2.6875,7.78125 1,2.625 -1.5625,0 0,1.03125 0.5,0 0,-0.5 1.5625,0 -1.1875,-3.15625 -0.3125,0 z m -6.6875,2.625 -0.1875,0.53125 1.0625,0 0,-0.53125 -0.875,0 z m 10.1875,0 0.21875,0.53125 0.875,0 0,-0.53125 -1.09375,0 z"
+       id="text11683"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.92894952,0,0,0.92894952,59.652113,51.58086)" />
+  </g>
+</svg>