From 4c47b4d7e3a74e81b97c1338cd90030b62574905 Mon Sep 17 00:00:00 2001
From: knittl <knittl@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Sun, 29 Mar 2015 19:02:26 +0000
Subject: Import stylesheets, move some pixels, align padlocks

git-svn-id: https://svn.neo-layout.org@2464 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 grafik/flat/tastatur_base.svg | 125 +++++++++++++++++++++++-------------------
 grafik/flat/tastatur_e1.svg   |  39 ++-----------
 grafik/flat/tastatur_e2.svg   |  43 ++-------------
 grafik/flat/tastatur_e3.svg   |  48 +++-------------
 grafik/flat/tastatur_e4.svg   |  43 ++-------------
 grafik/flat/tastatur_e5.svg   |  58 +++-----------------
 grafik/flat/tastatur_e6.svg   |  53 ++----------------
 www/tastatur.css              |  25 ++++-----
 8 files changed, 113 insertions(+), 321 deletions(-)

diff --git a/grafik/flat/tastatur_base.svg b/grafik/flat/tastatur_base.svg
index 36c8fe9..94191b3 100644
--- a/grafik/flat/tastatur_base.svg
+++ b/grafik/flat/tastatur_base.svg
@@ -33,62 +33,75 @@
 
 <defs id="defs">
 <style type="text/css" id="style46661">
-      text.mod, text.dead {
-        fill:#222;
-        fill-opacity:1;
-        stroke:none;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:10px;
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        text-align:start;
-        line-height:125%;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:16px;
-        text-align:center;
-        line-height:125%;
-        text-anchor:middle;
-      }
-
-      .key {
-        stroke-width:1.25;
-      }
-
-      .grey { fill:#949494; stroke:#696969; }
-      .grey { fill:#9f9f9f; stroke:#747474; }
-
-      /* bootstrap colors */
-      .l2, .r2 { fill:#337ab7; }
-      .l3, .r3 { fill:#5cb85c; }
-      .l4, .r4 { fill:#d9534f; }
-      .l5, .r5 { fill:#f0ad4e; }
-
-      /* btn bg hover */
-      .l2, .r2 { stroke:#3071a9; }
-      .l3, .r3 { stroke:#449d44; }
-      .l4, .r4 { stroke:#c9302c; }
-      .l5, .r5 { stroke:#ec971f; }
-
-      /* btn border hover */
-      .l2, .r2 { stroke:#204d74; }
-      .l3, .r3 { stroke:#398439; }
-      .l4, .r4 { stroke:#ac2925; }
-      .l5, .r5 { stroke:#d58512; }
+text.mod, text.key, text.dead {
+	fill:#111;
+	fill-opacity:1;
+	stroke:none;
+	font-style:normal;
+	font-variant:normal;
+	font-weight:normal;
+	font-stretch:normal;
+	display:inline;
+	font-family:DejaVu Sans;
+	writing-mode:lr-tb;
+}
+
+text.key {
+	font-family:Linux Libertine O,Linux Libertine;
+}
+
+text.mod {
+	text-align:start;
+	text-anchor:start;
+}
+
+text.deadcircle, text.dead, text.center, text.key {
+	text-align:center;
+	text-anchor:middle;
+}
+
+text.key { font-size:20px; }
+text.dead { font-size:20px; }
+text.deadcircle { font-size:16px; }
+text.mod { font-size:10px; }
+text.big { font-size:14px; }
+
+.key {
+	stroke-width:1.25;
+}
+
+.grey { fill:#949494; stroke:#696969; }
+.grey { fill:#9f9f9f; stroke:#747474; }
+
+/* bootstrap colors */
+.l2, .r2 { fill:#337ab7; }
+.l3, .r3 { fill:#5cb85c; }
+.l4, .r4 { fill:#d9534f; }
+.l5, .r5 { fill:#f0ad4e; }
+
+/* btn bg hover, unused */
+.l2, .r2 { stroke:#3071a9; }
+.l3, .r3 { stroke:#449d44; }
+.l4, .r4 { stroke:#c9302c; }
+.l5, .r5 { stroke:#ec971f; }
+
+/* btn border hover */
+.l2, .r2 { stroke:#204d74; }
+.l3, .r3 { stroke:#398439; }
+.l4, .r4 { stroke:#ac2925; }
+.l5, .r5 { stroke:#d58512; }
+
+text.nubkey { fill:#eee; }
+
+.pressed {
+	opacity:0.5;
+	fill:#555;
+}
     </style>
 
     <g id="basekey">
         <rect width="32" height="32" rx="4" class="key" />
+	<!--rect width="20" height="20" x="6" y="6" /-->
         <!--rect width="2" height="2" fill="#000" x="15" y="15" /-->
     </g>
 
@@ -205,7 +218,7 @@
      id="return"
      class="key grey"/>
 
-<rect y="99" x="181" width="14" height="2" rx="1" id="nub" style="fill:#eee;" />
+<rect y="101" x="181" width="14" height="1" rx="1" id="nub" style="fill:#eee;" />
 <use y="0" x="108" xlink:href="#nub" />
 </g>
 
@@ -214,10 +227,10 @@
 <text y="133" x="10" class="mod big" id="shiftltxt">⇧</text>
 <text y="168" x="10" class="mod" id="ctrlltxt">Strg</text>
 
-<text y="132" x="54" class="mod" id="m4ltxt">M4</text>
+<text y="132" x="56" class="mod" id="m4ltxt">M4</text>
 <text y="168" x="135" class="mod" id="altltxt">Alt</text>
 
-<text y="96" x="470" class="mod" id="m3rtxt">M3</text>
+<text y="96" x="472" class="mod" id="m3rtxt">M3</text>
 <text y="133" x="450" class="mod big" id="shiftrtxt">⇧</text>
 <text y="168" x="490" class="mod" id="ctrlrtxt">Strg</text>
 <text y="168" x="357" class="mod" id="m4rtxt">Mod4</text>
@@ -225,7 +238,7 @@
 <text y="62" x="495" class="mod big" id="returntxt">↲</text>
 <text y="23" x="480" class="mod" id="backspacetxt">⌫</text>
 
-<text y="25" x="20" class="dead" id="deadcircletxt">◌</text>
+<text y="25" x="20" class="deadcircle" id="deadcircletxt">◌</text>
 <use y="0" x="432" xlink:href="#deadcircletxt" id="t2" />
 <use y="36" x="450" xlink:href="#deadcircletxt" id="t3" />
 </g>
diff --git a/grafik/flat/tastatur_e1.svg b/grafik/flat/tastatur_e1.svg
index 1b38aed..cc99857 100644
--- a/grafik/flat/tastatur_e1.svg
+++ b/grafik/flat/tastatur_e1.svg
@@ -30,41 +30,10 @@
     </rdf:RDF>
   </metadata>
 <defs id="defs">
-<style type="text/css" id="style46661">
-      text.mod, text.key, text.dead {
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        stroke:none;
-        fill:#222;
-        fill-opacity:1;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:14px;
-        text-align:start;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:20px;
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.key {
-        font-size:24px;
-        text-align:center;
-        text-anchor:middle;
-        /*font-family: 'Linux Libertine O', 'Linux Libertine';*/
-        font-family:"Linux Libertine O";
-      }
-      text.nubkey { fill:#eee; }
-    </style></defs><sodipodi:namedview
+<style type="text/css">
+@import url('tastatur.css');
+</style>
+</defs><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
diff --git a/grafik/flat/tastatur_e2.svg b/grafik/flat/tastatur_e2.svg
index e7621bb..d007419 100644
--- a/grafik/flat/tastatur_e2.svg
+++ b/grafik/flat/tastatur_e2.svg
@@ -30,45 +30,10 @@
     </rdf:RDF>
   </metadata>
 <defs id="defs">
-<style type="text/css" id="style46661">
-      text.mod, text.key, text.dead {
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        stroke:none;
-        fill:#222;
-        fill-opacity:1;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:14px;
-        text-align:start;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:20px;
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.key {
-        font-size:24px;
-        text-align:center;
-        text-anchor:middle;
-        font-family:Linux Libertine O,Linux Libertine;
-      }
-      text.nubkey { fill:#eee; }
-
-      .pressed {
-        opacity:0.5;
-        fill:#555;
-      }
-    </style></defs><sodipodi:namedview
+<style type="text/css">
+@import url('tastatur.css');
+</style>
+</defs><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
diff --git a/grafik/flat/tastatur_e3.svg b/grafik/flat/tastatur_e3.svg
index 141f74e..28e9692 100644
--- a/grafik/flat/tastatur_e3.svg
+++ b/grafik/flat/tastatur_e3.svg
@@ -30,45 +30,11 @@
     </rdf:RDF>
   </metadata>
 <defs id="defs">
-<style type="text/css" id="style46661">
-      text.mod, text.key, text.dead {
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        stroke:none;
-        fill:#222;
-        fill-opacity:1;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:14px;
-        text-align:start;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:20px;
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.key {
-        font-size:24px;
-        text-align:center;
-        text-anchor:middle;
-        font-family:Linux Libertine O,Linux Libertine;
-      }
-      text.nubkey { fill:#eee; }
-
-      .pressed {
-        opacity:0.5;
-        fill:#555;
-      }
-    </style></defs><sodipodi:namedview
+<style type="text/css">
+@import url('tastatur.css');
+</style>
+</defs>
+<sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -107,7 +73,7 @@
 </g>
 
 
-<text x="10" y="62" class="mod big">♫</text>
+<text x="10" y="60" class="mod big">♫</text>
 
 <g transform="translate(73,62)">
 	<text x="0" class="key">…</text>
@@ -157,7 +123,7 @@
 
 <text x="20" y="28" class="dead" id="t1">↻</text>
 <text x="452" y="26" class="dead" id="t2">˚</text>
-<text x="470" y="62" class="dead" id="t3">/</text>
+<text x="470" y="63" class="dead" id="t3">/</text>
 
 <!-- highlighted mods -->
 <g transform="translate(3.5,3.5)">
diff --git a/grafik/flat/tastatur_e4.svg b/grafik/flat/tastatur_e4.svg
index d1fbfd7..beb4e5f 100644
--- a/grafik/flat/tastatur_e4.svg
+++ b/grafik/flat/tastatur_e4.svg
@@ -31,44 +31,9 @@
   </metadata>
 <defs id="defs">
 <style type="text/css" id="style46661">
-      text.mod, text.key, text.dead {
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        stroke:none;
-        fill:#222;
-        fill-opacity:1;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:14px;
-        text-align:start;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:20px;
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.key {
-        font-size:24px;
-        text-align:center;
-        text-anchor:middle;
-        font-family:Linux Libertine O,Linux Libertine;
-      }
-      text.nubkey { fill:#eee; }
-
-      .pressed {
-        opacity:0.5;
-        fill:#555;
-      }
-    </style></defs><sodipodi:namedview
+@import url('tastatur.css');
+</style>
+</defs><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -107,7 +72,7 @@
 </g>
 
 
-<text x="10" y="62" class="mod big">⇥</text>
+<text x="10" y="60" class="mod big">⇥</text>
 
 <g transform="translate(72,62)">
 	<text x="0" class="key">⇞</text>
diff --git a/grafik/flat/tastatur_e5.svg b/grafik/flat/tastatur_e5.svg
index 5a2f05b..cf4c79a 100644
--- a/grafik/flat/tastatur_e5.svg
+++ b/grafik/flat/tastatur_e5.svg
@@ -30,51 +30,9 @@
     </rdf:RDF>
   </metadata>
 <defs id="defs">
-<style type="text/css" id="style46661">
-      text.mod, text.key, text.dead {
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        stroke:none;
-        fill:#222;
-        fill-opacity:1;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:12px;
-        text-align:start;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:20px;
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.key {
-        font-size:24px;
-        font-family:Linux Libertine O,Linux Libertine;
-      }
-      text.center, text.key {
-        text-align:center;
-        text-anchor:middle;
-        writing-mode:lr-tb;
-      }
-      text.nubkey { fill:#eee; }
-
-      .grey { fill:#788; }
-      .yellow { fill:#f0c40a; }
-
-      .pressed {
-        opacity:0.5;
-        fill:#555;
-      }
-    </style>
+<style type="text/css">
+@import url('tastatur.css');
+</style>
 
     <g id="padlock">
       <g>
@@ -126,10 +84,10 @@
 	<text x="324" class="key">₀</text>
 	<text x="360" y="3" class="key">‑</text>
 </g>
-<use xlink:href="#padlock" class="yellow" x="415" y="12" />
+<use xlink:href="#padlock" class="r5 yellow" x="415" y="12" />
 
 
-<text x="10" y="62" class="mod big">⇥</text>
+<text x="10" y="60" class="mod big">⇥</text>
 
 <g transform="translate(72,62)">
 	<text x="0" class="key">ξ</text>
@@ -177,10 +135,10 @@
 	<text x="324" class="key">θ</text>
 </g>
 
-<text x="264" y="170" class="mod center" id="spacetxt">geschütztes Leerz. ⍽</text>
-<use xlink:href="#padlock" class="grey" x="322" y="158" />
+<text x="264.5" y="168" class="mod center" id="spacetxt">geschütztes Leerz. ⍽</text>
+<use xlink:href="#padlock" class="grey" x="313" y="156" />
 
-<text x="20" y="20" class="dead" id="t1">˞</text>
+<text x="28" y="25" class="dead" id="t1">˞</text>
 <text x="452" y="26" class="dead" id="t2">῾</text>
 <text x="470" y="62" class="dead" id="t3">᾿</text>
 
diff --git a/grafik/flat/tastatur_e6.svg b/grafik/flat/tastatur_e6.svg
index 3f7d096..e7f0e7d 100644
--- a/grafik/flat/tastatur_e6.svg
+++ b/grafik/flat/tastatur_e6.svg
@@ -30,50 +30,9 @@
     </rdf:RDF>
   </metadata>
 <defs id="defs">
-<style type="text/css" id="style46661">
-      text.mod, text.key, text.dead {
-        font-style:normal;
-        font-variant:normal;
-        font-weight:normal;
-        font-stretch:normal;
-        stroke:none;
-        fill:#222;
-        fill-opacity:1;
-        display:inline;
-        font-family:DejaVu Sans;
-        writing-mode:lr-tb;
-      }
-      text.mod {
-        font-size:12px;
-        text-align:start;
-        text-anchor:start;
-      }
-      text.big {
-        font-size:14px;
-      }
-      text.dead {
-        font-size:20px;
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.key {
-        font-size:24px;
-        font-family:Linux Libertine O,Linux Libertine;
-      }
-      text.center, text.key {
-        text-align:center;
-        text-anchor:middle;
-      }
-      text.nubkey { fill:#eee; }
-
-      .grey { fill:#788; }
-      .yellow { fill:#f0c40a; }
-
-      .pressed {
-        opacity:0.5;
-        fill:#555;
-      }
-    </style>
+<style type="text/css">
+@import url('tastatur.css');
+</style>
 
     <g id="padlock">
       <g>
@@ -127,7 +86,7 @@
 </g>
 
 
-<text x="10" y="62" class="mod big">⇥</text>
+<text x="10" y="60" class="mod big">⇥</text>
 
 <g transform="translate(72,62)">
 	<text x="0" class="key">Ξ</text>
@@ -175,8 +134,8 @@
 	<text x="324" class="key">Θ</text>
 </g>
 
-<text x="264" y="170" class="mod center" id="spacetxt">schmales gesch. Leerz. ⍽</text>
-<use xlink:href="#padlock" class="grey" x="336" y="158" />
+<text x="264.5" y="168" class="mod center" id="spacetxt">schmales gesch. Leerz. ⍽</text>
+<use xlink:href="#padlock" class="grey" x="324" y="156" />
 
 <text x="28" y="28" class="dead" id="t1"> ̣   </text>
 <text x="452" y="26" class="dead" id="t2">¯</text>
diff --git a/www/tastatur.css b/www/tastatur.css
index de054f7..9b2289a 100644
--- a/www/tastatur.css
+++ b/www/tastatur.css
@@ -11,29 +11,26 @@ text.mod, text.key, text.dead {
 	writing-mode:lr-tb;
 }
 
-text.deadcircle, text.dead, text.center, text.key {
-	text-align:center;
-	text-anchor:middle;
-}
-
 text.key {
-	font-size:20px;
 	font-family:Linux Libertine O,Linux Libertine;
 }
 
-text.dead { font-size:20px; }
-text.deadcircle { font-size:16px; }
-
-text.big {
-	font-size:14px;
-}
-
 text.mod {
-	font-size:10px;
 	text-align:start;
 	text-anchor:start;
 }
 
+text.deadcircle, text.dead, text.center, text.key {
+	text-align:center;
+	text-anchor:middle;
+}
+
+text.key { font-size:22px; }
+text.dead { font-size:20px; }
+text.deadcircle { font-size:14px; }
+text.mod { font-size:10px; }
+text.big { font-size:14px; }
+
 .key {
 	stroke-width:1.25;
 }
-- 
cgit v1.2.3