Merge branch 'master' of git+ssh://www-static.zrh.internetputzen.com/home/www/wiki.starship-factory.ch/wiki

4 files changed, 109 insertions, 0 deletions

diff --git a/Vereinsgruendung/Logo/index.mdwn b/Vereinsgruendung/Logo/index.mdwn
new file mode 100644
index 00000000..284e32a3
--- /dev/null
+++ b/Vereinsgruendung/Logo/index.mdwn
@@ -0,0 +1,7 @@
+#Logo Ideen
+
+[[!table class="mycsstableclass" data="""
+Logo|Autor|Kommentar
+[[!img logoplatzhalter.png size="" alt="logo platzhalter"]] |Juliane|Dies ist kein Logovorschlag sondern ein praktischer Platzhalter und ein Beispiel für's Einbinden ins wiki.
+[[!img logoplatzhalter.png size="" alt="logo platzhalter"]] |Juliane|Dies ist kein Logovorschlag sondern ein praktischer Platzhalter und ein Beispiel für's Einbinden ins wiki.
+"""]]
diff --git a/Vereinsgruendung/Logo/logoplatzhalter.png b/Vereinsgruendung/Logo/logoplatzhalter.png
new file mode 100644
index 00000000..059148c0
--- /dev/null
+++ b/Vereinsgruendung/Logo/logoplatzhalter.png
diff --git a/Vereinsgruendung/Logo/logoplatzhalter.svg b/Vereinsgruendung/Logo/logoplatzhalter.svg
new file mode 100644
index 00000000..05cc11af
--- /dev/null
+++ b/Vereinsgruendung/Logo/logoplatzhalter.svg
@@ -0,0 +1,101 @@
+<?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="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="logoplatzhalter.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="466.60714"
+     inkscape:cy="326.3"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1596"
+     inkscape:window-height="861"
+     inkscape:window-x="0"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3011"
+       transform="matrix(0.91027379,0,0,0.91027379,-109.79519,-266.75305)"
+       inkscape:export-filename="/home/juliane/Makerspace/logoplatzhalter.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <path
+         transform="matrix(0.76867531,0,0,0.76867531,51.39983,191.63874)"
+         d="m 668.57143,435.21933 c 0,138.86017 -112.56841,251.42857 -251.42858,251.42857 -138.86016,0 -251.42857,-112.5684 -251.42857,-251.42857 0,-138.86017 112.56841,-251.42857 251.42857,-251.42857 138.86017,0 251.42858,112.5684 251.42858,251.42857 z"
+         sodipodi:ry="251.42857"
+         sodipodi:rx="251.42857"
+         sodipodi:cy="435.21933"
+         sodipodi:cx="417.14285"
+         id="path2985"
+         style="fill:#ff3484;fill-opacity:1;stroke:#000000;stroke-width:3.54299998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2987"
+         y="515.00922"
+         x="371.93787"
+         style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+         xml:space="preserve"><tspan
+           y="515.00922"
+           x="371.93787"
+           id="tspan2997"
+           sodipodi:role="line">Starship-Factory</tspan><tspan
+           y="555.00922"
+           x="371.93787"
+           id="tspan2999"
+           sodipodi:role="line">Makerspace Basel</tspan><tspan
+           y="595.00922"
+           x="371.93787"
+           id="tspan3001"
+           sodipodi:role="line"></tspan></text>
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3003"
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:20px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:Sans;font-stretch:normal;font-variant:normal;text-anchor:middle;text-align:center;writing-mode:lr"><flowRegion
+         id="flowRegion3005"><rect
+           id="rect3007"
+           width="134.28572"
+           height="148.57143"
+           x="242.85715"
+           y="263.79074" /></flowRegion><flowPara
+         id="flowPara3009"></flowPara></flowRoot>  </g>
+</svg>
diff --git a/Vereinsgruendung/index.mdwn b/Vereinsgruendung/index.mdwn
index f2785ca6..69bc6ed2 100644
--- a/Vereinsgruendung/index.mdwn
+++ b/Vereinsgruendung/index.mdwn
@@ -7,3 +7,4 @@
 # Bereits erledigt
 
 * [[Namensvorschläge und Wahl|Vereinsgruendung/Namensvorschlaege]]
+* [[Logo Ideen|Vereinsgruendung/Logo]]