From 705adf7afc04910a23777489d0aeb7c0bfb146ca Mon Sep 17 00:00:00 2001 From: erlehmann Date: Wed, 19 Mar 2008 20:02:42 +0000 Subject: [PATCH] structural changes of css markup, see comments in the files git-svn-id: http://yolanda.mister-muffin.de/svn@255 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/images/flags/README | 2 + trunk/images/flags/de-de.png | Bin 0 -> 223 bytes trunk/images/flags/de-de.svg | 7 + trunk/images/flags/en-us.png | Bin 0 -> 1574 bytes trunk/images/flags/en-us.svg | 154 +++++++++++ trunk/locale/en-us.xml | 2 - trunk/style/colors/tango.css | 117 +++++++++ trunk/style/decoration/bridget.css | 162 ++++++++++++ trunk/style/default.css | 402 +---------------------------- trunk/style/structure/fake6.css | 240 +++++++++++++++++ trunk/xsl/xhtml/footer.xsl | 57 ++-- trunk/xsl/xhtml/header.xsl | 154 ++++++----- trunk/xsl/xhtml/results.xsl | 12 + trunk/xsl/xhtml/xhtml-head.xsl | 49 ++-- 14 files changed, 846 insertions(+), 512 deletions(-) create mode 100644 trunk/images/flags/README create mode 100644 trunk/images/flags/de-de.png create mode 100644 trunk/images/flags/de-de.svg create mode 100644 trunk/images/flags/en-us.png create mode 100644 trunk/images/flags/en-us.svg create mode 100644 trunk/style/colors/tango.css create mode 100644 trunk/style/decoration/bridget.css create mode 100644 trunk/style/structure/fake6.css diff --git a/trunk/images/flags/README b/trunk/images/flags/README new file mode 100644 index 0000000..d9f957b --- /dev/null +++ b/trunk/images/flags/README @@ -0,0 +1,2 @@ +images in this folder taken from KDE marble distribution +flags are probably free of any copyright diff --git a/trunk/images/flags/de-de.png b/trunk/images/flags/de-de.png new file mode 100644 index 0000000000000000000000000000000000000000..d26c4b2c9faa0c33ae8072e790ea6149aa62b0a5 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^ra-K~!3HEZ{WXXHQY^(zo*^7SP{WbZ0pxQQctjQh z={+FKcwSaT4#;dOBo})~sj0lOWO>DB>0<;d=4c zYgX|mUwo4cx(;b@E!OB+bi(vit;o**Re`GK&qG8Ex*jncTEel$GNptAXb*#@tDnm{ Hr-UW|w)sgR literal 0 HcmV?d00001 diff --git a/trunk/images/flags/de-de.svg b/trunk/images/flags/de-de.svg new file mode 100644 index 0000000..325f004 --- /dev/null +++ b/trunk/images/flags/de-de.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/trunk/images/flags/en-us.png b/trunk/images/flags/en-us.png new file mode 100644 index 0000000000000000000000000000000000000000..b1ecf9d582cf02fcc554a188a0cb0c5d96fe6011 GIT binary patch literal 1574 zcmV+>2HE+EP)h($8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11*1tsK~z|U?Urq9lvNsruk+4yzBn2l>Wrh(Z6AD26s!Hx{SRVU$>yk1a-gIY7FPc}x&Mo)EbZK!mdw#nSouUAcm*wKA z-S?58*8$*hIcR?3eoRKggqZlD2&d04z3x;LMd8A?eORp~63r$|CIf-4ZXC%r^m-jO ztA#JmUL?(7M@n#{*y#B3JZTO)k%&fy%Rzfb7mj2bqhn$6v)#0{2YBetg36w^L%-1 z-nf!qZaYAGM;8S-ZXVm(K;xEX+S&sExJnB1QhrvE7bkx=ML2zanVaP#(QKmQ>+=X9 za3tCAxE-{$2M|JFvsx(3&EV80od_XFG@B?b$)fdiC#t4lHW?|OlS6A;Cz=+;n2^BS z+1Y$_`U`e%Z5VC3rzRY4qt~McD9p_u(PHM)&%fcC_P89hp6&!7Z?=n)!c5*jbq0W< zTn}?ga(M59&j84Dr%^e7R!k>PpGIwUIW4Vc_`3Ok>AmNlG)=g(|AKJ({PLRk`N9&s z?o?iV<8J_z&&g$eX&!%i)-UQ+F`Q^I0B_!FcJone*0IXU*pE*TY z?0M#O0IDjAS-ET;zuEILFg^iIYioFT*9&OTCGR9f6gxsdaA<_-HY=*CqSGn#T^YokoAN|uMA?FX5m72A2U5^^z;QuO|kQj3q9<9WNqK3b<2n1ZS;C>*y+YK z%W$Qq#5!ERs*<@S+3ehV2!Pt^a#mEAv32)LNGVxdQOw4>m$G^L^QfA}?4p_Mc(9(P zN16$TC+|)Rr_V1d$_lVq&Aj`;r@(k%WoM>y{GE>h$j(fstR#mcZ=VFf>rSPrqL{-+ zThO9W($kWtsVe30u@+QSBQ@F1@>}L|1T%wl1AAx|BA6M(YWIoz?Lg2(s2hLn<`d=DGym-6VoS5Y;MnVuOu(72La`wqp% zd+*N1Nf%_XP8$pfbbNJzuJb(zA(&=0bM9g<{~QbfV7DdG-7~<^6Rk)oNwQn%>mTHe zw?9PHG?MIA27<#JJ<&=ytYWt%5*!RM931LaL!m2ib@?5H)906sYnCzHZl(FfV*u2x zTtsn!mnWV+3_wj)DJ!bW*!H`>08mj@K-1b9ezoHuS~SY6d@tJ{tmhY7|42mD$jnIN z$w!;m@X#MvC;BGcP79~cFB2`}uf)*EC;;E5EoLK%A{Y++N9z=Yq0m(TOhy9+gPy^m zk;$3fEiG+7z5oCK literal 0 HcmV?d00001 diff --git a/trunk/images/flags/en-us.svg b/trunk/images/flags/en-us.svg new file mode 100644 index 0000000..366cbc0 --- /dev/null +++ b/trunk/images/flags/en-us.svg @@ -0,0 +1,154 @@ + + + + + + + United States + + + + + united_nations_member + america + flag + unitedstates + north_america + sign + + + + + Daniel McRae + + + + + Daniel McRae + + + + + Daniel McRae + + + + image/svg+xml + + + en + + + + + + + + + + The United States of America flag, produced by Daniel McRae + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml index dbe118d..3e92dd7 100755 --- a/trunk/locale/en-us.xml +++ b/trunk/locale/en-us.xml @@ -27,8 +27,6 @@ view license get source code report bug - view this page as xml - Find diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css new file mode 100644 index 0000000..bd60696 --- /dev/null +++ b/trunk/style/colors/tango.css @@ -0,0 +1,117 @@ +/* +Yolanda default stylesheet colors (using tango color palette) +(c) 2007-2008 Nils Dagsson Moskopp + +This file is licensed under the WTF Public License +(License terms: Do what the fuck you want.) + +Purpose of this file is to provide colors according to the Tango! palette. +Protip: Use only CSS properties that contain "color" ! + +Please replace the colors in this file with suitable Tango! equivalents. +↑↑ Remove this notice as soon as this file holds only Tango! colors. ↑↑ +*/ + +a +{ + /* what color is this ? */ + color: #3465a4; +} + +a +{ +} + + a:focus + { + color: #cc0000; + } + + a:hover + { + } + + a.footer, + a.header, + div.footer, + div.header + { + background-color: #f0f0f0; + border-color: #f0f0f0; + } + + a.footer:hover, + a.header:hover + { + background-color: #ffffff; + border-color: #c0c0c0; + } + +div +{ +} + + div.footer, + div.header + { + border-color: #c0c0c0; + } + + div.messagebox + { + /* "Aluminium 5" */ + border-color: #555753; + } + + div.messagebox#error + { + /* "Scarlet Red 1" + 30 luminosity */ + background-color: #f46060; + } + + div.messagebox#warning + { + /* "Orange 1" */ + background-color: #fcaf3e; + } + + div.messagebox#information + { + /* "Chameleon 1" + 30 luminosity */ + background-color: #a9ec68; + } + + div.page-number + { + /* "Aluminium 5" */ + border-color: #555753; + } + + div.tagcloud + { + /* Aluminium 1 */ + background-color: #eeeeec; + /* "Aluminium 5" */ + border-color: #555753; + } + +span +{ +} + + span.instruction, + span.protip + { + /* "Aluminium 5" */ + color: #555753; + } + +ul +{ +} + +ul li:hover + { + /* Aluminium 1 */ + background-color: #eeeeec; + } diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css new file mode 100644 index 0000000..8c47364 --- /dev/null +++ b/trunk/style/decoration/bridget.css @@ -0,0 +1,162 @@ +/* +Yolanda default stylesheet colors (using tango color palette) +(c) 2007-2008 Nils Dagsson Moskopp + +This file is licensed under the WTF Public License +(License terms: Do what the fuck you want.) + +Purpose of this file is to provide decorations, such as: + - borders (size, width, style etc.) + - font properties (family, size, style, weight etc.) + - spacing between elements and / or content (margin, padding) + - content generated by css (:before, :after) +*/ + +body +{ + font-family: sans-serif; + font-size: 8pt; + font-weight: bold; + margin: 1.5em; +} + +a +{ + text-decoration: none; +} + + a:focus + { + } + + a:hover + { + text-decoration: underline; + } + + a.tag + { + margin-left: 0.25em; + margin-right: 0.25em; + } + +div +{ + border-width: 0px; +} + + div.footer, + div.header + { + } + + div.button-download, + div.button-edit, + div.button-junk + { + margin: 0.5em; + vertical-align: top; + } + + div.button-download img, + div.button-edit img, + div.button-junk img + { + margin: 0.5em; + } + + div.cc-license-chooser + { + } + + div.cc-license-chooser img + { + margin: 0.25em; + vertical-align: middle; + } + + div#container form + { + padding-left: auto; + padding-right: auto; + } + + div.messagebox + { + border-style: solid; + border-width: 1px; + margin: 1.5em; + } + + div.messagebox#error + { + } + + div.messagebox#warning + { + } + + div.messagebox#information + { + } + + div.messagebox img + { + margin: 0.75em; + overflow: visible; + vertical-align: middle; + } + + div.page-number + { + font-size: 40px; + overflow: visible; + } + + div.result + { + } + + div.result img + { + border-color: black; + border-width: 1px; + } + +input +{ + text-align: left; +} + +img +{ + border-width: 0; +} + +span.protip:after +{ + content: " )"; +} + +span.protip:before +{ + content: "( "; +} + +ul[role="navigation"] +{ + border-style: solid; + list-style-type: none; + border-width: 1px; +} + + ul[role="navigation"] li + { + } + + ul[role="navigation"] li a + { + font-size: 1em; + line-height: 3em; + padding: 1em; + } diff --git a/trunk/style/default.css b/trunk/style/default.css index a789a59..5143e3e 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -1,395 +1,13 @@ /* -Yolanda default stylesheet -(c) 2007-2008 Nils Dagsson Moskopp +Yolanda default stylesheet colors (using tango color palette) +(c) 2007-2008 Nils Dagsson Moskopp + +This file is licensed under the WTF Public License +(License terms: Do what the fuck you want.) + +Purpose of this file is to import color, decoration and structure stylesheets. */ -/* global default */ - -body -{ - font-family: sans-serif; - font-size: 8pt; - font-weight: bold; - margin: 1.5em; - min-height: 100%; - text-align: center; -} - -div -{ - border-width: 0px; -} - -input -{ - text-align: left; -} - -img -{ - border-width: 0; -} - -/* links */ - -a -{ - color: #3f3fff; - text-decoration: none; -} - - a:focus - { - font-style: italic; - } - - a:hover - { - text-decoration: underline; - } - - a.tag - { - display: inline-block; - margin-left: 0.25em; - margin-right: 0.25em; - } - -/* header, footer */ - - a.footer, - a.header, - div.footer, - div.header - { - background-color: #f0f0f0; - border-color: #f0f0f0; - border-style: solid; - clear: none; - font-size: 1em; - line-height: 3em; - height: 3em; - } - - div.footer, - div.header - { - clear: both; - } - - a.footer, - a.header - { - border-bottom-width: 0px; - border-top-width: 0px; - border-left-width: 1px; - border-right-width: 1px; - display: block; - padding-left: 1em; - padding-right: 1em; - } - - a.footer:hover, - a.header:hover - { - background-color: #ffffff; - border-color: #c0c0c0; - } - - a.latest-additions, - a.view-license - { - border-left-width: 0px; - } - - a.register, - a.upload-video, - a.view-xml - { - border-right-width: 0px; - } - - a.latest-additions, - a.most-downloads, - a.most-views, - a.report-bug, - a.view-license, - a.view-source-code - { - float: left; - } - - a.login, - a.login-openid, - a.logout, - a.preferences, - a.register, - a.upload-video, - a.view-xml - { - float: right; - } - - div.footer, - div.header - { - border-color: #c0c0c0; - border-width: 1px; - } - - img.logo-header - { - display: none; - border: 1px black solid; - clear: none; - float: left; - margin-left: 1.5em; - margin-right: 0.5em; - } - -/* content */ - - div.button-download, - div.button-edit, - div.button-junk - { - display: inline-block; - margin: 0.5em; - vertical-align: top; - } - - div.button-download img, - div.button-edit img, - div.button-junk img - { - margin: 0.5em; - } - - div.cc-license-chooser - { - } - - div.cc-license-chooser img - { - margin: 0.25em; - vertical-align: middle; - } - - div#container - { - position: relative; - } - - div#container form - { - position: absolute; - top: 50%; - padding-left: auto; - padding-right: auto; - width: 100% - } - - div.commentform, - div.loginform, - div.registerform, - div.settingsform, - div.uploadform - { - line-height: 2.5em; - margin: 1.5em; - } - - div.comments - { - } - - div.messagebox - { - border-color: #606060; - border-style: solid; - border-width: 1px; - margin: 1.5em; - } - - div.messagebox#error, - div.messagebox#warning - { - background-color: #f09090; - } - - div.messagebox#information - { - background-color: #90f090; - } - - div.messagebox img - { - margin: 0.75em; - overflow: visible; - vertical-align: middle; - } - - div.page-number - { - color: #606060; - display: inline-block; - font-size: 40px; - height: 32px; - width: 32px; - overflow: visible; - } - - div.result - { - display: inline-block; - margin: 0.75em; - overflow: visible; - vertical-align: top; - } - - div.result img - { - border-color: black; - border-width: 1px; - } - - div.search - { - padding: 0.75em; - } - - div.search-small - { - clear: both; - float: right; - height: 0em; - overflow: visible; - text-align: right; - } - - div.toplists - { - padding: 0.75em; - } - - div.tagcloud - { - background-color: #f0f0f0; - border-color: #c0c0c0; - border-style: solid; - border-width: 1px; - margin: 0.75em; - margin-left: 20%; - margin-right: 20%; - padding: 0.75em; - } - - div.video - { - display: inline-block; - margin-bottom: 0.5em; - } - - div.videoccdata - { - margin: 0.75em; - } - - div.videoccdata img - { - border-width: 0px; - margin-left: 0.5em; - margin-right: 0.5em; - margin-top: 0.5em; - } - - div.video-metadata - { - display: inline-block; - line-height: 1.5em; - margin-left: 1.5em; - text-align: left; - vertical-align: top; - width: 256px; - } - - div.videotitle - { - font-size: 1.5em; - margin-bottom: 0.5em; - } - -fieldset -{ - border-width: 0px; -} - - img.logo-big - { - padding-bottom: 0.5em; - } - - img.openid-icon - { - padding-left: 0.2em; - vertical-align: text-top; - } - -span.code -{ - font-family: monospace; - font-weight: normal; -} - -span.heading -{ - font-size: 1.5em; -} - -span.instruction, -span.protip -{ - color: #606060; -} - -span.protip:after -{ - content: " )"; -} - -span.protip:before -{ - content: "( "; -} - -table.metadata, -table.metadata-upload -{ - border-width: 0px; - border-collapse: collapse; - width: 100%; -} - - table.metadata td.metadata-content, - table.metadata td.metadata-title, - table.metadata-upload td.metadata-content - { - text-align: left; - width: 50%; - } - - table.metadata td.metadata-title - { - width: 40%; - } - - table.metadata-upload td.metadata-title - { - text-align: right; - width: 50%; - } - -td.metadata-title -{ - color: #606060; -} +@import "colors/tango.css"; +@import "decoration/bridget.css"; +@import "structure/fake6.css"; diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css new file mode 100644 index 0000000..026e82e --- /dev/null +++ b/trunk/style/structure/fake6.css @@ -0,0 +1,240 @@ +/* +Yolanda default stylesheet colors (using tango color palette) +(c) 2007-2008 Nils Dagsson Moskopp + +This file is licensed under the WTF Public License +(License terms: Do what the fuck you want.) + +Purpose of this file is to provide the structure of the layout, such as: + - display style (block, inline, inline-block etc.) + - size of (width, height) + +Please clear this file of any CSS properties that do not define structure. +↑↑ Remove this notice as soon as this file holds only structural CSS. ↑↑ +*/ + +body +{ + min-height: 100%; + text-align: center; +} + +a +{ +} + + a:focus + { + } + + a:hover + { + } + + a.tag + { + display: inline-block; + } + +div +{ +} + + div.button-download, + div.button-edit, + div.button-junk + { + display: inline-block; + } + + div#container + { + position: relative; + } + + div#container form + { + position: absolute; + top: 50%; + width: 100% + } + + div.commentform, + div.loginform, + div.registerform, + div.settingsform, + div.uploadform + { + line-height: 2.5em; + margin: 1.5em; + } + + div.comments + { + } + + div.page-number + { + display: inline-block; + font-size: 40px; + height: 32px; + width: 32px; + overflow: visible; + } + + div.result + { + display: inline-block; + position: relative; + vertical-align: top; + } + + div.result img + { + } + +/* + indefinitely postponed - does any major browser support absolute + positioning /inside inline-blocks/ ? + + div.result img.flag + { + position: absolute; + bottom: 32px; + right: 10px; + } +*/ + + div.search + { + padding: 0.75em; + } + + div.search-small + { + clear: both; + float: right; + height: 0em; + overflow: visible; + text-align: right; + } + + div.toplists + { + padding: 0.75em; + } + + div.tagcloud + { + border-style: solid; + border-width: 1px; + margin: 0.75em; + margin-left: 20%; + margin-right: 20%; + padding: 0.75em; + } + + div.video + { + display: inline-block; + margin-bottom: 0.5em; + } + + div.videoccdata + { + margin: 0.75em; + } + + div.videoccdata img + { + border-width: 0px; + margin-left: 0.5em; + margin-right: 0.5em; + margin-top: 0.5em; + } + + div.video-metadata + { + display: inline-block; + line-height: 1.5em; + margin-left: 1.5em; + text-align: left; + vertical-align: top; + width: 256px; + } + + div.videotitle + { + font-size: 1.5em; + margin-bottom: 0.5em; + } + +fieldset +{ + border-width: 0px; +} + + img.logo-big + { + padding-bottom: 0.5em; + } + + img.openid-icon + { + padding-left: 0.2em; + vertical-align: text-top; + } + +span.code +{ + font-family: monospace; + font-weight: normal; +} + +span.heading +{ + font-size: 1.5em; +} + +table.metadata, +table.metadata-upload +{ + border-width: 0px; + border-collapse: collapse; + width: 100%; +} + + table.metadata td.metadata-content, + table.metadata td.metadata-title, + table.metadata-upload td.metadata-content + { + text-align: left; + width: 50%; + } + + table.metadata td.metadata-title + { + width: 40%; + } + + table.metadata-upload td.metadata-title + { + text-align: right; + width: 50%; + } + +td.metadata-title +{ + color: #606060; +} + +ul[role="navigation"] +{ + display: block; + height: 3em; +} + + ul[role="navigation"] li + { + float: left; + } diff --git a/trunk/xsl/xhtml/footer.xsl b/trunk/xsl/xhtml/footer.xsl index 19b1e10..d678e59 100644 --- a/trunk/xsl/xhtml/footer.xsl +++ b/trunk/xsl/xhtml/footer.xsl @@ -9,41 +9,36 @@ -
+
+ - - - - - - - +
  • + + + + - + + +
    • - - - - - - +
  • + + + + + + +
    • - - - - - - +
  • + + + + + + +
    • - - - - - - +
  • + + + + + + +
    • - +     diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl index cb248b0..188bdb6 100644 --- a/trunk/xsl/xhtml/results.xsl +++ b/trunk/xsl/xhtml/results.xsl @@ -23,6 +23,18 @@ +
    diff --git a/trunk/xsl/xhtml/xhtml-head.xsl b/trunk/xsl/xhtml/xhtml-head.xsl index 90a7c4b..ec5a4d2 100644 --- a/trunk/xsl/xhtml/xhtml-head.xsl +++ b/trunk/xsl/xhtml/xhtml-head.xsl @@ -10,33 +10,43 @@ - + + - - - - - - + + + - - - - /style/embedded.css - - + + - + @@ -50,7 +60,10 @@ - +