From 6d31976fcb29f4477a4b3690f3927195ef9e704b Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 22 Jun 2012 01:35:06 +0200 Subject: [PATCH 01/22] datenspuren: ds12 style by payload --- .../datenspuren/2012/images/battery.png | Bin 0 -> 1024 bytes .../static/datenspuren/2012/images/btn.svg | 103 + .../datenspuren/2012/images/c3d2_wlan.png | Bin 0 -> 5865 bytes .../datenspuren/2012/images/calendar.svg | 127 + .../static/datenspuren/2012/images/feed.svg | 18 + .../datenspuren/2012/images/filmstrip.svg | 102 + .../static/datenspuren/2012/images/map.svg | 621 +++ .../static/datenspuren/2012/images/marker.svg | 112 + .../static/datenspuren/2012/images/osm.png | Bin 0 -> 25285 bytes .../static/datenspuren/2012/images/osm.svg | 3336 +++++++++++++++++ .../static/datenspuren/2012/images/video.svg | 135 + .../static/datenspuren/2012/style/style.css | 433 +-- xsl/datenspuren/xhtml5.xsl | 212 +- 13 files changed, 4749 insertions(+), 450 deletions(-) create mode 100644 content/static/datenspuren/2012/images/battery.png create mode 100644 content/static/datenspuren/2012/images/btn.svg create mode 100644 content/static/datenspuren/2012/images/c3d2_wlan.png create mode 100644 content/static/datenspuren/2012/images/calendar.svg create mode 100644 content/static/datenspuren/2012/images/feed.svg create mode 100644 content/static/datenspuren/2012/images/filmstrip.svg create mode 100644 content/static/datenspuren/2012/images/map.svg create mode 100644 content/static/datenspuren/2012/images/marker.svg create mode 100644 content/static/datenspuren/2012/images/osm.png create mode 100644 content/static/datenspuren/2012/images/osm.svg create mode 100644 content/static/datenspuren/2012/images/video.svg diff --git a/content/static/datenspuren/2012/images/battery.png b/content/static/datenspuren/2012/images/battery.png new file mode 100644 index 0000000000000000000000000000000000000000..580b60e5509aea8e5224e3efc54e60f37b33b7fe GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^mw-5!gAGW&Dvh)UQY^(zo*^7SP{WbZ0pxQQctjR6 zFz6|RFk{71`!b-QWQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc|`>%(b2_ zjv*Cu-rluc9}+5Z?BoAOix`E3rFC7Ll0N8uWWJ%fs6{Tm;a-?)b-Xlpd|or_{f7Jk zVeSQ=vu^|iPJXe?;yVl1m%i_7Y^&cJ|BpAin==2Z&B>YR*XD38PM^4C=v?w)fTy@2<kW$AWec#dh6$!m~#YPhV^HIDXN4LV}juzKs$J-Ud1m24EO7Th3md5T-qC z3-WqJfOZEgcjKNU&Hw6BhGUbaPq^}fF_kCL@?@FAogk|= + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/content/static/datenspuren/2012/images/c3d2_wlan.png b/content/static/datenspuren/2012/images/c3d2_wlan.png new file mode 100644 index 0000000000000000000000000000000000000000..079a292e84c0fda147a7d47aaf239c532ad7384a GIT binary patch literal 5865 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 + + + + + image/svg+xml + + + + + + + + + + + + + + + + + 13 + Samstag + diff --git a/content/static/datenspuren/2012/images/feed.svg b/content/static/datenspuren/2012/images/feed.svg new file mode 100644 index 000000000..b32514942 --- /dev/null +++ b/content/static/datenspuren/2012/images/feed.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/content/static/datenspuren/2012/images/filmstrip.svg b/content/static/datenspuren/2012/images/filmstrip.svg new file mode 100644 index 000000000..b666c48bd --- /dev/null +++ b/content/static/datenspuren/2012/images/filmstrip.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + 1 + 1 + + diff --git a/content/static/datenspuren/2012/images/map.svg b/content/static/datenspuren/2012/images/map.svg new file mode 100644 index 000000000..7041215dd --- /dev/null +++ b/content/static/datenspuren/2012/images/map.svg @@ -0,0 +1,621 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/content/static/datenspuren/2012/images/marker.svg b/content/static/datenspuren/2012/images/marker.svg new file mode 100644 index 000000000..febaa9b54 --- /dev/null +++ b/content/static/datenspuren/2012/images/marker.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/content/static/datenspuren/2012/images/osm.png b/content/static/datenspuren/2012/images/osm.png new file mode 100644 index 0000000000000000000000000000000000000000..c444b5550ef6c6f34607ad35efe56e6c095fe1e1 GIT binary patch literal 25285 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%0D>R@ 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 literal 0 HcmV?d00001 diff --git a/content/static/datenspuren/2012/images/osm.svg b/content/static/datenspuren/2012/images/osm.svg new file mode 100644 index 000000000..2919c1441 --- /dev/null +++ b/content/static/datenspuren/2012/images/osm.svg @@ -0,0 +1,3336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 010110010011010110010011 + 010110010011010110010011 + + + diff --git a/content/static/datenspuren/2012/images/video.svg b/content/static/datenspuren/2012/images/video.svg new file mode 100644 index 000000000..bde1641d7 --- /dev/null +++ b/content/static/datenspuren/2012/images/video.svg @@ -0,0 +1,135 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + 1 + 1 + + diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 51b338fa8..3f0b34b3c 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -1,357 +1,120 @@ + +/* placement */ body { - font-family: sans-serif; - margin: 12pt auto; - background: white; + display: table; + width: 100%; } -#cloudy { - background: url("../images/cloudy.png"); - position: relative; - height: 231px; - width: 264px; - margin-right: -44.400000000000006pt; - margin-top: -60pt; - float: right; -} -#cloudy-sun { - background-color: #eec73e; - opacity: 0; - -webkit-transition-property: opacity; - -webkit-transition-duration: 0.5s; - -moz-transition-property: opacity; - -moz-transition-duration: 0.5s; - -ms-transition-property: opacity; - -ms-transition-duration: 0.5s; - -o-transition-property: opacity; - -o-transition-duration: 0.5s; - transition-property: opacity; - transition-duration: 0.5s; - width: 200px; - height: 200px; - margin-right: 3px; - margin-left: auto; - border-radius: 100%; - cursor: pointer; -} -#cloudy-sun:hover { - opacity: 0.6; - -webkit-transition-property: opacity; - -webkit-transition-duration: 2s; - -moz-transition-property: opacity; - -moz-transition-duration: 2s; - -ms-transition-property: opacity; - -ms-transition-duration: 2s; - -o-transition-property: opacity; - -o-transition-duration: 2s; - transition-property: opacity; - transition-duration: 2s; -} -#aussicht { - background: url("../images/aussicht.png"); - height: 63px; - width: 191px; - display: inline-block; -} -#aussicht * { - display: none; -} -#header { - text-align: center; -} -#content { - border: 12pt solid #65b8ff; - border-radius: 24pt; - background: rgba(255,255,255,0.65); - min-height: 400px; - display: inline-block; -} -#ct0, #ct1, #ct2 { - display: table-cell; -} -#ct0 { - width: 50%; -} -#ct1 { - width: auto; -} -#ct2 { - width: 50%; -} -.leftSideBar { - float: left; - border-right: 12pt solid #65b8ff; - border-bottom: 12pt solid #65b8ff; - border-radius: 0 0 24pt 0; - margin: 0 24pt 24pt 0; -} -.leftSideBar > div { - margin: 12pt; -} -.leftSideBar > div > h2 { - font-size: 12pt; - margin-bottom: 0; -} -.leftSideBar > div > ul { - margin-top: 0; - list-style-type: none; - padding: 0; - font-size: 9.600000000000001pt; -} -a { - color: #980101; - font-weight: bold; - text-decoration: none; -} -.feedlinks { - font-size: 8pt; - font-weight: bold; - color: #888; -} -#bodyText { - padding: 0 24pt 24pt; -} -#bodyText > div { - min-width: 800px; -} -#bodyText > .schedule { - width: auto; -} -h1, h2, h3, dt { - font-weight: bolder; -} -h3.summary { - margin-top: 2em; -} -.date { - padding-left: 12pt; - font-size: x-small; - font-weight: normal; - color: #888; -} -.notice.feed { - font-size: 9.600000000000001pt; -} -.url { - text-decoration: underline; -} -#footer { - text-align: center; - margin-top: 6pt; - font-size: 9.600000000000001pt; -} -#oldds { - margin: 0; -} -#oldds > li { - display: inline; - margin: 0 0.3em; +body > * { + display: table-cell; } -dl dt { - font-weight: bold; - margin-top: 1em; - font-size: 110%; +#device { + width: 800px; + padding: 5pt; } -dl dd { - margin-left: 2em; +#nav { + float: left; + margin-right: 0.5em; } +#screen { + margin-top: 1em; + margin-bottom: 45pt; +} +#content, #device-2 { + padding: 0.5em; +} +/**/ -#solar { - background-image: url('../images/sun.svg'); - z-index: -1000; - overflow: hidden; - clip: auto; - position: absolute; - top: -3900px; - right: -3900px; - width: 8000px; - height: 8000px; - -webkit-animation: rotate 230s infinite linear; - -moz-animation: rotate 230s infinite linear; - -o-animation: rotate 230s infinite linear; - -ms-animation: rotate 230s infinite linear; - animation: rotate 230s infinite linear; +/* borders */ +#device { + border: 0pt solid #CCC; + border-radius: 3.5em; } -@-webkit-keyframes rotate { - 0% { - -webkit-transform:rotate(0deg); - } - 100% { - -webkit-transform:rotate(-360deg); - } +#device-2 { + border: 10pt solid black; + border-radius: 3em; } -@-moz-keyframes rotate { - 0% { - -moz-transform:rotate(0deg); - } - 100% { - -moz-transform:rotate(-360deg); - } +#screen { + border: 2pt solid black; } -@-o-keyframes rotate { - 0% { - -o-transform:rotate(0deg); - } - 100% { - -o-transform:rotate(-360deg); - } -} -@-ms-keyframes rotate { - 0% { - -ms-transform:rotate(0deg); - } - 100% { - -ms-transform:rotate(-360deg); - } -} -@keyframes rotate { - 0% { - transform:rotate(0deg); - } - 100% { - transform:rotate(-360deg); - } +#nav { + margin: 0.5em; + padding: 0em 0.5em 0em 0em; + border-right: 1pt solid black; + border-bottom: 1pt solid black; } +/**/ -.backgroundcloud { - position: absolute; - width: 72px; - height: 40px; - z-index: -7; +/* font */ +* { + font-family: sans-serif; } -.backgroundflash { - position: absolute; - z-index: -5; +#head > * { + text-align: center; } -.backgroundraindrop { - position: absolute; - z-index: -8; - color: #65b8ff; +#head h1, #head h2 { + margin: 0px; +} +/**/ + +/* menu */ +#menu { + display: table; + width: 100%; +} +#menu > * { + display: table-cell; + padding: 5pt; + vertical-align: top; +} +#battery, #c3d2 { width: 25%; } +#c3d2 { text-align: right; } +#buttons { text-align: center; } +#buttons > * { display: inline; } +/**/ + +/* polish */ +#device { + background: #bbb; + box-shadow: 0em -0.1em 0.4em #CCC; +} +#device-2 { + background: #222; + background: -moz-linear-gradient( + 20deg, + rgb(10, 8, 9) 0%, + rgb(26, 30, 26) 79.9%, + rgb(110, 119, 116) 80%, + rgb(174, 188, 191) 100%) + repeat scroll 0% 0% transparent; +} +#screen { background: white; } +#nav * { font-family: monospace; - font-size: 50%; - font-weight: bold; -} - -/* -- Schedule -- */ -.scheduletitle:nth-child(1) { - margin-top: 130px; -} -.schedule { - border-radius: 30px; - background-color: #65B8FF; - border-spacing: 2px; - width: 610px; -} -.schedule .schedulehead { - color: white; - padding: 0.2em 0; - font-weight: bold; -} -.schedule .timeslot { - color: white; - padding: 0.2em 0.8em 0.2em 1em; text-align: right; + list-style: none; + padding-left: 0px; } -.schedule .timeslot.odd { - font-size: 9.600000000000001pt; +.date { float: right; } +#content p { text-align: justify; } +a { + text-decoration: none; + color: #335; } -.schedule td.event { - border-radius: 15px; - background-color: white; - padding: 1em 0.5em; +#head > * { + color: #CCC; + font-weight: 300; } -.schedule ul { - display: block; - margin: 0; - padding: 0; - list-style-type: none; - font-size: 9.600000000000001pt; -} -.schedule ul li { +/**/ + +/* footer */ +#footer { text-align: center; } +#oldds { padding-left: 0px; } +#oldds li { + list-style: none; display: inline; - padding-right: 1em; } -/* -- Video Resource -- */ - -.resource { - display: inline-block; - margin: 2px 2px; - width: 392px; - text-align: center; - position: relative; - background-color: #65B8FF; - border-top-right-radius: 12pt; - border-top-left-radius: 12pt; - border-bottom-right-radius: 24pt; - border-bottom-left-radius: 24pt; - padding: 0.2em 0; -} - -.resource h4 { - font-weight: bold; - margin: 0 auto; - vertical-align: bottom; -} -.resource h4 a { - color: white; -} - -.resource img, .resource video { - width: 384px; - border-radius: 2px; -} -.resource .video-js-box { - margin: 0 auto; - padding: 0; - background-color: black; - border-radius: 2px; -} -.resource .video-js-box div.vjs-big-play-button { - /* We use autoplay */ - display: none !important; -} -.resource ul { - list-style-type: none; - font-size: 90%; - margin: 0 auto; - padding: 0; -} -.resource li { - display: inline-block; - margin: 0 0.5em; -} -.resource li .size { - padding-left: 0.5em; - font-size: 75%; - color: #333; -} -.resource .play { - position: absolute; - text-align: center; - right: 0; - left: 0; - top: 35%; - bottom: 50%; - font-size: 400%; - font-weight: bold; - color: white; - text-shadow: black 2px 2px 0; - z-index: 10; - margin: 0; -} -.resource .play:hover { - color: #ffff7f; - text-shadow: black 2px 2px 0; - opacity: 0; - -webkit-transition: opacity 2s ease-in; - -moz-transition: opacity 2s ease-in; - -o-transition: opacity 2s ease-in; - -ms-transition: opacity 2s ease-in; - transition: opacity 2s ease-in; -} -.resource img, .resource .play { - cursor: pointer; -} -.resource .feedback { - display: block; -} +/* debug */ +nothing { display: none; } +nothing { border: 1px solid red; } \ No newline at end of file diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index 4f20ae20c..6398a5e81 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -35,30 +35,104 @@ - -
-
-
-
-
- -
+

+
+
+ + + +
+ - - - -
- -
-
-
-
- + + + +
+ +
+ + +
+
+

+
+ @@ -179,98 +253,6 @@ - - - - - - - - - - - active - - - - - - - - - - - From 6212ddd3662fd1c6c9782c2f8d10aea2de87bfb2 Mon Sep 17 00:00:00 2001 From: payload Date: Mon, 25 Jun 2012 23:18:19 +0200 Subject: [PATCH 02/22] [ds12] centered stuff again --- content/static/datenspuren/2012/style/style.css | 6 ++---- xsl/datenspuren/xhtml5.xsl | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 3f0b34b3c..a5c00ea6d 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -1,16 +1,14 @@ /* placement */ body { - display: table; width: 100%; } -body > * { - display: table-cell; -} #device { width: 800px; padding: 5pt; + margin-left: auto; + margin-right: auto; } #nav { float: left; diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index 6398a5e81..e36773e35 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -35,7 +35,6 @@ -

@@ -130,7 +129,6 @@
-

From da28ca6e96320d03d5d603a53a93a79430671dd8 Mon Sep 17 00:00:00 2001 From: payload Date: Tue, 26 Jun 2012 00:06:32 +0200 Subject: [PATCH 03/22] [ds12] info button --- .../static/datenspuren/2012/images/info.svg | 127 ++++++++++++++++++ xsl/datenspuren/xhtml5.xsl | 2 +- 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 content/static/datenspuren/2012/images/info.svg diff --git a/content/static/datenspuren/2012/images/info.svg b/content/static/datenspuren/2012/images/info.svg new file mode 100644 index 000000000..a55757d1b --- /dev/null +++ b/content/static/datenspuren/2012/images/info.svg @@ -0,0 +1,127 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index e36773e35..3f6729017 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -65,7 +65,7 @@
- +
From e4e74e87ea8267d4cdeb9971108c82cf440b1bde Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 15:16:43 +0200 Subject: [PATCH 04/22] [ds12] calendar symbol got a red day --- content/static/datenspuren/2012/images/calendar.svg | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/content/static/datenspuren/2012/images/calendar.svg b/content/static/datenspuren/2012/images/calendar.svg index 9a6e9ceca..6c3f41335 100644 --- a/content/static/datenspuren/2012/images/calendar.svg +++ b/content/static/datenspuren/2012/images/calendar.svg @@ -40,8 +40,8 @@ id="namedview4372" showgrid="false" inkscape:zoom="3.1841033" - inkscape:cx="57.601189" - inkscape:cy="66.659442" + inkscape:cx="58.172445" + inkscape:cy="67.709776" inkscape:window-x="-3" inkscape:window-y="-3" inkscape:window-maximized="1" @@ -112,6 +112,11 @@ x="36.808594" y="216.37212" style="font-size:140px">13 + Date: Wed, 27 Jun 2012 15:17:11 +0200 Subject: [PATCH 05/22] [ds12] video symbol is more playful --- .../static/datenspuren/2012/images/video.svg | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/content/static/datenspuren/2012/images/video.svg b/content/static/datenspuren/2012/images/video.svg index bde1641d7..41bd7c5ef 100644 --- a/content/static/datenspuren/2012/images/video.svg +++ b/content/static/datenspuren/2012/images/video.svg @@ -22,7 +22,7 @@ image/svg+xml - + @@ -132,4 +132,22 @@ x="63.557953" y="1051.4449">1 + From 88f748ec94be9afcc98e51826891fa46d8f16b43 Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 15:17:28 +0200 Subject: [PATCH 06/22] [ds12] correct and fixed glass gradient --- content/static/datenspuren/2012/style/style.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index a5c00ea6d..1338b3f16 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -79,11 +79,11 @@ body { #device-2 { background: #222; background: -moz-linear-gradient( - 20deg, - rgb(10, 8, 9) 0%, - rgb(26, 30, 26) 79.9%, - rgb(110, 119, 116) 80%, - rgb(174, 188, 191) 100%) + 200deg, + rgb(174, 188, 191) 0, + rgb(110, 119, 116) 230pt, + rgb(26, 30, 26) 231pt, + rgb(10, 8, 9) 100%) repeat scroll 0% 0% transparent; } #screen { background: white; } From 609d99d532337f8815c752f5f4da15a5dfb70bd3 Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 15:25:09 +0200 Subject: [PATCH 07/22] [ds12] margin between buttons --- content/static/datenspuren/2012/style/style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 1338b3f16..fdb7e73bc 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -65,10 +65,14 @@ body { padding: 5pt; vertical-align: top; } -#battery, #c3d2 { width: 25%; } +#battery, #c3d2 { width: auto; } #c3d2 { text-align: right; } #buttons { text-align: center; } -#buttons > * { display: inline; } +#buttons > * { + display: inline; + margin-left: 10pt; + margin-right: 10pt; +} /**/ /* polish */ From b93a381c1e51ab81b8dbec6f14bd1f99822cdf2b Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 17:06:15 +0200 Subject: [PATCH 08/22] [ds12] styled resources in content; these are embedded videos --- .../static/datenspuren/2012/style/style.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index fdb7e73bc..a570d254d 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -119,4 +119,21 @@ a { /* debug */ nothing { display: none; } -nothing { border: 1px solid red; } \ No newline at end of file +nothing { border: 1px solid red; } + +/* videos, at least */ +section.resource { + border: 2pt solid black; + border-radius: 8pt; + padding: 10pt; + margin-bottom: 5pt; + display: inline-block; + width: 45.25%; +} +section.resource > h4 { + margin: 0pt; + text-align: center; +} +section.resource > p.play { + text-align: center !important; +} \ No newline at end of file From fc3458de9e9582bc599cabe67e1ae2f7d8da293d Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 17:07:46 +0200 Subject: [PATCH 09/22] [ds12] added nice battery and wlan icons --- .../datenspuren/2012/images/battery.svg | 222 ++++++++++++++++++ .../static/datenspuren/2012/images/wlan.svg | 201 ++++++++++++++++ xsl/datenspuren/xhtml5.xsl | 4 +- 3 files changed, 425 insertions(+), 2 deletions(-) create mode 100644 content/static/datenspuren/2012/images/battery.svg create mode 100644 content/static/datenspuren/2012/images/wlan.svg diff --git a/content/static/datenspuren/2012/images/battery.svg b/content/static/datenspuren/2012/images/battery.svg new file mode 100644 index 000000000..c68406685 --- /dev/null +++ b/content/static/datenspuren/2012/images/battery.svg @@ -0,0 +1,222 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/content/static/datenspuren/2012/images/wlan.svg b/content/static/datenspuren/2012/images/wlan.svg new file mode 100644 index 000000000..7a7e4e4a5 --- /dev/null +++ b/content/static/datenspuren/2012/images/wlan.svg @@ -0,0 +1,201 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index 3f6729017..26e75d304 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -46,7 +46,7 @@
+
From 56f70969d0c3b9b45fbc410c9bf2946c1ffd928d Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 18:17:21 +0200 Subject: [PATCH 13/22] [ds12] bold links --- content/static/datenspuren/2012/style/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index ff19f14d5..9dc2cd482 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -103,6 +103,7 @@ body { a { text-decoration: none; color: #335; + font-weight: bold; } #head * { color: #CCC; From bbe8717426944202ba6129b670fe7a72f9e5e024 Mon Sep 17 00:00:00 2001 From: john stone Date: Wed, 27 Jun 2012 19:22:38 +0200 Subject: [PATCH 14/22] added Makefile fix. This fix is to allow an automatic build from fresh clone. build dir hasn't been created --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 36a6ed515..b3fc8f448 100644 --- a/Makefile +++ b/Makefile @@ -101,6 +101,7 @@ export: www $(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(DESTDIR)/ $(DATESTAMP): + mkdir -p build $(RM) $(wildcard build/.stamp-*) touch $@ From 929598c42cb1b0defd4a9fb16ff8120d190d1196 Mon Sep 17 00:00:00 2001 From: john stone Date: Wed, 27 Jun 2012 19:54:57 +0200 Subject: [PATCH 15/22] decreased corner radius for 2 objects --- .../datenspuren/2012/images/battery.svg | 24 +++++++++---------- .../static/datenspuren/2012/images/wlan.svg | 18 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/content/static/datenspuren/2012/images/battery.svg b/content/static/datenspuren/2012/images/battery.svg index c68406685..b69968c09 100644 --- a/content/static/datenspuren/2012/images/battery.svg +++ b/content/static/datenspuren/2012/images/battery.svg @@ -14,7 +14,7 @@ height="128" id="RSSicon" viewBox="0 0 444.31479 256" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48.3.1 r9886" sodipodi:docname="battery.svg"> @@ -24,7 +24,7 @@ image/svg+xml - + @@ -41,9 +41,9 @@ inkscape:window-height="553" id="namedview4372" showgrid="false" - inkscape:zoom="2.3515625" - inkscape:cx="157.10021" - inkscape:cy="66.007561" + inkscape:zoom="1.1757813" + inkscape:cx="152.42127" + inkscape:cy="-1.7397098" inkscape:window-x="-3" inkscape:window-y="-3" inkscape:window-maximized="1" @@ -141,8 +141,8 @@ + style="fill:#ffffff;fill-opacity:1" + rx="18.5" + ry="18.5" /> + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="wlan.svg"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -123,8 +123,8 @@ Date: Wed, 27 Jun 2012 20:15:09 +0200 Subject: [PATCH 16/22] svg structure fix, changed sender --- .../datenspuren/2012/images/battery.svg | 39 ++++------ .../static/datenspuren/2012/images/wlan.svg | 77 +++++++++++-------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/content/static/datenspuren/2012/images/battery.svg b/content/static/datenspuren/2012/images/battery.svg index b69968c09..1e9ad4a8f 100644 --- a/content/static/datenspuren/2012/images/battery.svg +++ b/content/static/datenspuren/2012/images/battery.svg @@ -41,9 +41,9 @@ inkscape:window-height="553" id="namedview4372" showgrid="false" - inkscape:zoom="1.1757813" - inkscape:cx="152.42127" - inkscape:cy="-1.7397098" + inkscape:zoom="1.6628059" + inkscape:cx="47.659543" + inkscape:cy="-0.79726268" inkscape:window-x="-3" inkscape:window-y="-3" inkscape:window-maximized="1" @@ -51,7 +51,11 @@ fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-grids="false" + inkscape:snap-to-guides="false" /> - - + diff --git a/content/static/datenspuren/2012/images/wlan.svg b/content/static/datenspuren/2012/images/wlan.svg index 6f144eb38..1db5474ca 100644 --- a/content/static/datenspuren/2012/images/wlan.svg +++ b/content/static/datenspuren/2012/images/wlan.svg @@ -40,9 +40,9 @@ inkscape:window-height="553" id="namedview4372" showgrid="false" - inkscape:zoom="2.3515625" - inkscape:cx="104.15669" - inkscape:cy="66.007561" + inkscape:zoom="1.6628058" + inkscape:cx="159.37103" + inkscape:cy="69.128557" inkscape:window-x="-3" inkscape:window-y="-3" inkscape:window-maximized="1" @@ -50,7 +50,20 @@ fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-grids="false" + inkscape:snap-to-guides="false"> + + + - - @@ -187,15 +182,29 @@ style="fill:#000000;fill-opacity:1" d="m 311.33737,127.86014 -29.09074,-50.299903 20.00375,0 29.09075,50.299903 -29.09075,49.24097 -19.72508,0 z" id="path4441" /> - + + + + + From a0afc589fe60ab42f21a19a29ad1c92b140cf36e Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 20:42:36 +0200 Subject: [PATCH 17/22] [ds12] added licenses.xml and a little bit of CC SA 3 license fun --- content/datenspuren/licenses.xml | 43 ++++++++++++++++++++++++++++++++ xsl/datenspuren/xhtml5.xsl | 4 +-- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 content/datenspuren/licenses.xml diff --git a/content/datenspuren/licenses.xml b/content/datenspuren/licenses.xml new file mode 100644 index 000000000..8914baadf --- /dev/null +++ b/content/datenspuren/licenses.xml @@ -0,0 +1,43 @@ + + + +

+ Diese Seite enthält einige Werke und ziehmlich alle treten einen Teil ihrer Rechte an die Menschheit ab um uns alle ein Stück vorwärts zu bringen. + Generell gilt "Copyleft" von 2004 bis zu deinem heute :) außer hier steht etwas anderes. +

+
    +
  • + Das Feed-icon.svg ist + von Matt Brett. +
  • +
  • + Folgende Werke hat payload bearbeitet. + Diese Dateien stehen unter einer Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Unported Lizenz. +
      +
    • + map.svg basiert auf + marker_default.svg + von osmdroid, + Public-images-osm_logo.svg + von Ken Vermette + und auf dem Feed-icon.svg. +
    • +
    • + video.svg basiert auf + Film_strip.svg + von Nevit Dilmen + und auf Feed-icon.svg. +
    • +
    • + calendar.svg basiert + auf dem Feed-icon.svg. +
    • +
    • + info.svg basiert + auf dem Feed-icon.svg. +
    • +
    +
  • +
+
+ \ No newline at end of file diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index 24c6c9f0a..6c1c54049 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -134,9 +134,9 @@
- Copyleft 2004 - 2012 | + Lizenzen | Chaos Computer Club Dresden | - mail@c3d2.de
+ mail@c3d2.de
From be4b71501e9fc340f2af86ea87a85742ab95ef1f Mon Sep 17 00:00:00 2001 From: payload Date: Wed, 27 Jun 2012 21:11:39 +0200 Subject: [PATCH 18/22] [ds12] added battery and wlan to licenses --- content/datenspuren/licenses.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/content/datenspuren/licenses.xml b/content/datenspuren/licenses.xml index 8914baadf..7039997d1 100644 --- a/content/datenspuren/licenses.xml +++ b/content/datenspuren/licenses.xml @@ -10,6 +10,12 @@ Das Feed-icon.svg ist von Matt Brett. +
  • + battery.svg entstand durch payload und _john und steht unter CC0. +
  • +
  • + wlan.svg entstand durch payload und _john und steht unter einer Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Unported Lizenz. +
  • Folgende Werke hat payload bearbeitet. Diese Dateien stehen unter einer Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Unported Lizenz. From 09fced1c6857672ab5d37d5d2bf135ccd4874bf7 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 27 Jun 2012 23:36:27 +0200 Subject: [PATCH 19/22] datenspuren style: #footer --- .../static/datenspuren/2012/style/style.css | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 9dc2cd482..51dffeb3a 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -98,7 +98,11 @@ body { list-style: none; padding-left: 0px; } -.date { float: right; } +.date { + float: right; + color: #999; + font-size: 80%; +} #content p { text-align: justify; } a { text-decoration: none; @@ -112,11 +116,21 @@ a { /**/ /* footer */ -#footer { text-align: center; } -#oldds { padding-left: 0px; } +#footer { + border-top: 1px solid black; + text-align: center; + margin: 0 auto; + padding: 0.8em 0; + font-size: 85%; +} +#oldds { + padding-left: 0px; + margin: 0; +} #oldds li { list-style: none; display: inline; + margin: 0 0.5em; } /* debug */ @@ -140,4 +154,4 @@ section.resource > h4 { } section.resource > p.play { text-align: center !important; -} \ No newline at end of file +} From ef777681cddc7ebabafab759103955ba33332248 Mon Sep 17 00:00:00 2001 From: payload Date: Thu, 28 Jun 2012 23:14:59 +0200 Subject: [PATCH 20/22] [ds12] removed nav blob on the, moved under buttons and in the head --- .../static/datenspuren/2012/style/style.css | 38 ++++++++----------- xsl/datenspuren/xhtml5.xsl | 30 ++++++--------- 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 51dffeb3a..7c428557c 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -10,10 +10,6 @@ body { margin-left: auto; margin-right: auto; } -#nav { - float: left; - margin-right: 0.5em; -} #screen { margin-top: 1em; margin-bottom: 45pt; @@ -35,12 +31,6 @@ body { #screen { border: 2pt solid black; } -#nav { - margin: 0.5em; - padding: 0em 0.5em 0em 0em; - border-right: 1pt solid black; - border-bottom: 1pt solid black; -} /**/ /* font */ @@ -64,15 +54,14 @@ body { display: table-cell; padding: 5pt; vertical-align: top; + width: 15%; +} +#menu * { + text-align: center; + font-size: 75%; } #battery, #c3d2 { width: auto; } #c3d2 { text-align: right; } -#buttons { text-align: center; } -#buttons > * { - display: inline; - margin-left: 10pt; - margin-right: 10pt; -} /**/ /* polish */ @@ -92,12 +81,6 @@ body { } #screen { background: white; } #screen-top { min-height: 1000px; } -#nav * { - font-family: monospace; - text-align: right; - list-style: none; - padding-left: 0px; -} .date { float: right; color: #999; @@ -155,3 +138,14 @@ section.resource > h4 { section.resource > p.play { text-align: center !important; } + +/* info */ +#info { + position: absolute; + color: #CCC; + font-weight: 300; + padding-left: 0; + list-style-type: none; + margin-left: 7pt; + margin-top: 5pt; +} \ No newline at end of file diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index 6c1c54049..a4e0ed435 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -38,6 +38,12 @@
    +
      +
    • Samstag & Sonntag,
    • +
    • 13. & 14. Oktober 2012
    • +
    • Eintritt frei
    • +
    + - -
    From 04ffb35e78e75d2f1deff23b7df86d45c2a39357 Mon Sep 17 00:00:00 2001 From: payload Date: Thu, 28 Jun 2012 23:35:05 +0200 Subject: [PATCH 21/22] [ds12] minor stuff --- content/static/datenspuren/2012/style/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 7c428557c..3b66608ca 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -58,7 +58,7 @@ body { } #menu * { text-align: center; - font-size: 75%; + font-size: 87%; } #battery, #c3d2 { width: auto; } #c3d2 { text-align: right; } @@ -134,6 +134,7 @@ section.resource > h4 { margin-left: auto; margin-right: auto; max-width: 300px; + min-height: 3em; } section.resource > p.play { text-align: center !important; From 1b202977bbbb9eed6ec1d5f56c39f3caf3412e12 Mon Sep 17 00:00:00 2001 From: payload Date: Thu, 28 Jun 2012 23:45:33 +0200 Subject: [PATCH 22/22] [ds12] cross browser gradient --- .../static/datenspuren/2012/style/style.css | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/content/static/datenspuren/2012/style/style.css b/content/static/datenspuren/2012/style/style.css index 3b66608ca..490a468e9 100644 --- a/content/static/datenspuren/2012/style/style.css +++ b/content/static/datenspuren/2012/style/style.css @@ -70,14 +70,46 @@ body { box-shadow: 0em -0.1em 0.4em #CCC; } #device-2 { + /* bark!! */ background: #222; background: -moz-linear-gradient( 200deg, rgb(174, 188, 191) 0, rgb(110, 119, 116) 230pt, rgb(26, 30, 26) 231pt, - rgb(10, 8, 9) 100%) - repeat scroll 0% 0% transparent; + rgb(10, 8, 9) 100%); /* FF3.6+ */ + background: -webkit-gradient( + linear, + right top, + left bottom, + color-stop(0, rgb(174, 188, 191)), + color-stop(230pt, rgb(110, 119, 116)), + color-stop(231pt, rgb(26, 30, 26)), + color-stop(100%, rgb(10, 8, 9))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient( + 200deg, + rgb(174, 188, 191) 0, + rgb(110, 119, 116) 230pt, + rgb(26, 30, 26) 231pt, + rgb(10, 8, 9) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient( + 200deg, + rgb(174, 188, 191) 0, + rgb(110, 119, 116) 230pt, + rgb(26, 30, 26) 231pt, + rgb(10, 8, 9) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient( + 200deg, + rgb(174, 188, 191) 0, + rgb(110, 119, 116) 230pt, + rgb(26, 30, 26) 231pt, + rgb(10, 8, 9) 100%); /* IE10+ */ + background: linear-gradient( + 200deg, + rgb(174, 188, 191) 0, + rgb(110, 119, 116) 230pt, + rgb(26, 30, 26) 231pt, + rgb(10, 8, 9) 100%); /* W3C */ } #screen { background: white; } #screen-top { min-height: 1000px; }