WebSVN - LCARS - Path Comparison - / Rev 57 and / Rev 58

Ignore whitespace Rev 57 → Rev 58

 /trunk/styles/lcars22.css
 ,168 → 1,32
 <?php
-// \header('Last-Modified: ' . gmdate('D, d M Y H:i:s', @filemtime(__FILE__)) . ' GMT');
-//
-// /* Cached resource expires in HTTP/1.1 caches 24h after last retrieval */
-// \header('Cache-Control: max-age=86400, s-maxage=86400, must-revalidate, proxy-revalidate');
-//
-// /* Cached resource expires in HTTP/1.0 caches 24h after last retrieval */
-// \header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 86400) . ' GMT');
+\header('Last-Modified: ' . gmdate('D, d M Y H:i:s', @filemtime(__FILE__)) . ' GMT');
+/* Do not let resource be cached in HTTP/1.1 caches */
+\header('Cache-Control: max-age=0, s-maxage=0, must-revalidate, proxy-revalidate');
+/* Do not let resource be cached in HTTP/1.0 caches */
+\header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 \header('Content-Type: text/css; charset=UTF-8');
 ?>
 @CHARSET "UTF-8";
-@import url("/styles/lcars-ani.css");
+<?php
+  if (!isset($_GET['ani']) || $_GET['ani'] !== '0')
+  {
+?>
+    @import url("/styles/lcars-ani.css");
+<?php
+  }
+?>
-/* Basic fonts */
-@font-face {
-  font-family: "LCARS";
-  font-style: normal;
-  font-weight: normal;
-  src: local("LCARS"), url(fonts/LCARS.ttf);
-}
-/* EOT font created with WEFT on 2002-03-23 */
-@font-face {
-  font-family: "Downloadable Haettenschweiler";
-  font-style: normal;
-  font-weight: normal;
-  src: url(fonts/HAETTEN0.eot), url(fonts/HAETTENS.ttf);
-}
-/*
-@font-face {
-  font-family:Webdings;
-  font-style:normal;
-  font-weight:normal;
-  src:url(fonts/WEBDING0.eot);
-}
-*/
-@font-face {
-  font-family: "Downloadable Zurich XCn BT";
-  font-style: normal;
-  font-weight: normal;
-  src: url(fonts/ZurichXCn.pfr);
-}
-/* Basic display */
-* {
-  font-family: "LCARS",
-    Haettenschweiler, "Downloadable Haettenschweiler",
-    "Zurich XCn BT", "Downloadable Zurich XCn BT",
-    impact, Verdana, Geneva, Arial, Helvetica, sans-serif;
-  font-weight: normal;
-}
 body {
   margin-top: 12em;
   margin-left: 22em;
   margin-right: 0.2em;
   margin-bottom: 0.2em;
-  background-color: #000;
-  color: #99f;
-  font-size: 131%;
-  overflow: auto;
 }
-body.empty {
-  margin-top: 3em;
-  margin-left: 0.2em;
-  margin-bottom: 3em;
-}
-body.multi {
-  /* TODO from lcars21.css, use `em' instead */
-}
-#content {
-  /* position: relative; */
-  margin-right: 1em;
-}
-a {
-  text-decoration: none;
-}
-a:link:hover,
-a:link:focus
-{
-  background-color:#000;
-  color: #f90;
-}
-a:link:active {
-  background-color:#000;
-  color: #fff;
-}
-a:link {
-  background-color:#000;
-  color:#fc9;
-}
-a:visited:hover,
-a:visited:focus
-{
-  background-color:#000;
-  color:#f90;
-}
-a:visited:active {
-  background-color:black;
-  color:#fff;
-}
-a:hover,
-a:focus,
-a:active
-{
-  text-decoration: underline;
-}
-a:visited {
-  background-color:black;
-  color:#c9c;
-}
-h2 {
-  background-color: #000;
-  color: #fff;
-  font-size: 136%;
-}
-p {
-  margin-top: 1em;
-  margin-bottom: 0;
-  line-height: 1.5;
-  text-align: justify;
-}
-li p {
-  line-height: normal;
-}
-p:first-child {
-  margin-top: 0;
-}
-.instruction {
-  background-color: #000;
-  color: #f90;
-  font-size: 136%;
-}
-/* Language support */
-[lang^="x-vulcan-latin"] {
-  font-family: "URW Chancery L", "Matura MT Script Capitals",
-    Haettenschweiler, Haettens, "Zurich XCn BT", impact, Verdana,
-    Geneva, Arial, Helvetica, sans-serif;
-}
 /* Bow (main) and elbo (multi-view) */
 #LCARS {
 ,6 → 164,10
   background-color: #000;
 }
+.bow {
+  background-color: #999;
+}
 #bow-top-left {
   position: absolute;
   top: 2em;
 ,7 → 208,7
 .menu
 {
-  height: 17.6em;
+  height: 20.1em;
   background-color: #000;
 }
 ,6 → 343,12
   white-space: nowrap;
 }
+#connectors {
+  position: fixed;
+  left: 8.4em;
+  top: 5.6em;
+}
 .multi-display
 {
   position: fixed;

 /trunk/styles/lcars-ani.css
 ,13 → 1,13
 <?php
 namespace de\pointedears\css\least;
-// \header('Last-Modified: ' . gmdate('D, d M Y H:i:s', @filemtime(__FILE__)) . ' GMT');
-//
-// /* Cached resource expires in HTTP/1.1 caches 24h after last retrieval */
-// \header('Cache-Control: max-age=86400, s-maxage=86400, must-revalidate, proxy-revalidate');
-//
-// /* Cached resource expires in HTTP/1.0 caches 24h after last retrieval */
-// \header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 86400) . ' GMT');
+\header('Last-Modified: ' . gmdate('D, d M Y H:i:s', @filemtime(__FILE__)) . ' GMT');
+/* Cached resource expires in HTTP/1.1 caches 0h after last retrieval */
+\header('Cache-Control: max-age=86400, s-maxage=0'/*'86400*/.', must-revalidate, proxy-revalidate');
+/* Cached resource expires in HTTP/1.0 caches 0h after last retrieval */
+\header('Expires: ' . gmdate('D, d M Y H:i:s', time()/* + 86400*/) . ' GMT');
 \header('Content-Type: text/css; charset=UTF-8');
 ,7 → 40,7
 /* 0.0 to 0.6 s */
 <?php
-  Mixins::keyframes('content',
+  Mixins::keyframes('empty-content',
     'from {
        opacity: 0;
      }
 ,12 → 53,33
 .empty.fade-in #content {
   <?php
-    Mixins::animation('-name', 'content');
+    Mixins::animation('-name', 'empty-content');
     Mixins::animation('-duration', '0.6s');
     Mixins::animation('-timing-function', 'linear');
   ?>
 }
+/*
+time in s      |0.0                |0.5      |0.75     |1.0                |1.5
+                                   :   |0.625   :      :       |1.25
+                                   :   :  |0.63 |0.875
+bow-top        |------------------>|   :  :  :  :  :  :  :
+bow-top-left   |                   :-->|  :  :  :  :  :  :
+bow-top-text   |------------------>|   :  :  :  :  :  :  :
+menu-container |                   :   :->|  :  :  :  :  :
+footer         |------------------>|   :  :  :  :  :  :  :
+menu           |                   :   :->|  :  :  :  :  :
+footer-text    |------------------>|      :  :  :  :  :  :
+bow-bottom     |                          :> |  :  :  :  :
+elbo-bg        |                           :>|  :  :  :
+elbo           |                                :->|  :
+elbo-border    |                                         :->|
+content        |                                      :->|
+: bow-top-left
+*/
 /* 0.0 to 0.5 s */
 <?php
   Mixins::keyframes('bow-top',
 ,7 → 160,7
   ?>
 }
-/* 0.0 to 0.625 s */
+/* 0.0 to 0.625s */
 <?php
   Mixins::keyframes('bow-top-left',
     'from {
 ,7 → 167,7
        height: 0;
      }
-     /* at 0.5 s */
+     /* at 0.5s */
 % {
        height: 0;
      }');
 ,7 → 181,7
   ?>
 }
-/* 0.0 to 1.125 s */
+/* 0.0 to 0.63s */
 <?php
   Mixins::keyframes('menu-container',
     'from {
 ,39 → 188,43
        opacity: 0;
      }
-     /* at ca. 0.61875 s */
-% {
+     /* at ca. 0.61875s */
+% {
        opacity: 0;
      }
-% {
+     to {
        opacity: 1;
-     }');
+     }'
+   );
 ?>
 .fade-in .menu-container {
   <?php
     Mixins::animation('-name', 'menu-container');
-    Mixins::animation('-duration', '1.125s');
+    Mixins::animation('-duration', '0.63s');
     Mixins::animation('-timing-function', 'linear');
   ?>
 }
-/* 0.0 to 1.125 s */
+/* 0.0 to 0.63s */
 <?php
-  Mixins::keyframes('menu',
-    'from {
-       opacity: 0;
-     }
+  Mixins::keyframes('menu', <<<CSS
+    from {
+      opacity: 0;
+    }
-     /* at ca. 0.61875 s */
-% {
-       opacity: 0;
-     }
+    /* at ca. 0.61875 s */
+% {
+      opacity: 0;
+    }
-% {
-       opacity: 1;
-     }');
+    /* at ca. 0.63 s */
+    to {
+      opacity: 1;
+    }
+CSS
+   );
 ?>
 .fade-in .menu
 ,6 → 231,157
 {
   <?php
     Mixins::animation('-name', 'menu');
+    Mixins::animation('-duration', '0.63s');
+    Mixins::animation('-timing-function', 'linear');
+  ?>
+}
+/* 0.0 to 0.75s */
+<?php
+  Mixins::keyframes('bow-bottom', <<<CSS
+    from {
+      bottom: 2.6em;
+      width: 20.6em;
+      height: 0em;
+      border-bottom-right-radius: 0em;
+      opacity: 0;
+    }
+    /* 0.64125 s */
+% {
+      bottom: 2.6em;
+      width: 0em;
+      height: 0em;
+      border-bottom-right-radius: 0em;
+      opacity: 1;
+    }
+% {
+      bottom: 0.2em;
+      width: 20.6em;
+      height: 2.4em;
+      border-bottom-right-radius: 2em;
+    }
+CSS
+   );
+?>
+.fade-in #bow-bottom {
+  <?php
+    Mixins::animation('-name', 'bow-bottom');
+    Mixins::animation('-duration', '0.75s');
+    Mixins::animation('-timing-function', 'linear');
+  ?>
+}
+/* 0.0 to 0.875s */
+<?php
+  Mixins::keyframes('elbo-bg', <<<CSS
+    from {
+      opacity: 0;
+    }
+% {
+      opacity: 0;
+    }
+    /* 0.75 s */
+    to {
+      opacity: 1;
+    }
+CSS
+   );
+?>
+.fade-in .multi-display .upper .button,
+.fade-in .multi-display .lower .bg
+{
+  <?php
+    Mixins::animation('-name', 'elbo-bg');
+    Mixins::animation('-duration', '0.75s');
+    Mixins::animation('-timing-function', 'linear');
+  ?>
+}
+/* 0.0 to 0.875 */
+<?php
+  Mixins::keyframes('elbo', <<<CSS
+    from {
+      opacity: 0;
+    }
+% {
+      opacity: 0;
+    }
+    /* 0.875 s */
+    to {
+      opacity: 1;
+    }
+CSS
+   );
+?>
+.fade-in .multi-display .elbo {
+  <?php
+    Mixins::animation('-name', 'elbo');
+    Mixins::animation('-duration', '0.875s');
+    Mixins::animation('-timing-function', 'linear');
+  ?>
+}
+/* 0.0 to 1s */
+<?php
+  Mixins::keyframes('elbo-border', <<<CSS
+    from {
+      opacity: 0;
+    }
+    /* 0.99 s */
+% {
+      opacity: 0;
+    }
+    /* 1 s */
+    to {
+      opacity: 1;
+    }
+CSS
+   );
+?>
+.fade-in .multi-display .border {
+  <?php
+    Mixins::animation('-name', 'elbo-border');
+    Mixins::animation('-duration', '1s');
+    Mixins::animation('-timing-function', 'linear');
+  ?>
+}
+/* 0.0 to 1.125s */
+<?php
+  Mixins::keyframes('content', <<<CSS
+    from {
+      opacity: 0;
+    }
+% {
+      opacity: 0;
+    }
+    /* 1.125s */
+    to {
+      opacity: 1;
+    }
+CSS
+   );
+?>
+.fade-in #connectors,
+.fade-in #content
+{
+  <?php
+    Mixins::animation('-name', 'content');
     Mixins::animation('-duration', '1.125s');
     Mixins::animation('-timing-function', 'linear');
   ?>

 /trunk/styles/lcars-basic.css
 ,0 → 1,170
+<?php
+\header('Last-Modified: ' . gmdate('D, d M Y H:i:s', @filemtime(__FILE__)) . ' GMT');
+/* Do not let resource be cached in HTTP/1.1 caches */
+\header('Cache-Control: max-age=0, s-maxage=0, must-revalidate, proxy-revalidate');
+/* Do not let resource be cached in HTTP/1.0 caches */
+\header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+\header('Content-Type: text/css; charset=UTF-8');
+?>
+@CHARSET "UTF-8";
+<?php
+  if (!isset($_GET['ani']) || $_GET['ani'] !== '0')
+  {
+?>
+    @import url("/styles/lcars-ani.css");
+<?php
+  }
+?>
+/* Basic fonts */
+@font-face {
+  font-family: "LCARS";
+  font-style: normal;
+  font-weight: normal;
+  src: local("LCARS"), url(fonts/LCARS.ttf);
+}
+/* EOT font created with WEFT on 2002-03-23 */
+@font-face {
+  font-family: "Downloadable Haettenschweiler";
+  font-style: normal;
+  font-weight: normal;
+  src: url(fonts/HAETTEN0.eot), url(fonts/HAETTENS.ttf);
+}
+/*
+@font-face {
+  font-family:Webdings;
+  font-style:normal;
+  font-weight:normal;
+  src:url(fonts/WEBDING0.eot);
+}
+*/
+@font-face {
+  font-family: "Downloadable Zurich XCn BT";
+  font-style: normal;
+  font-weight: normal;
+  src: url(fonts/ZurichXCn.pfr);
+}
+/* Basic display */
+* {
+  font-family: "LCARS",
+    Haettenschweiler, "Downloadable Haettenschweiler",
+    "Zurich XCn BT", "Downloadable Zurich XCn BT",
+    impact, Verdana, Geneva, Arial, Helvetica, sans-serif;
+  font-weight: normal;
+}
+html {
+  background-color: #000;
+  color: #99f;
+}
+body {
+  background-color: #000;
+  color: #99f;
+  font-size: 131%;
+  overflow: auto;
+}
+body.empty {
+  margin-top: 3em;
+  margin-left: 0.2em;
+  margin-bottom: 3em;
+}
+body.multi {
+  /* TODO from lcars21.css, use `em' instead */
+}
+#content {
+  /* position: relative; */
+  margin-right: 1em;
+}
+a {
+  text-decoration: none;
+}
+a:link:hover,
+a:link:focus
+{
+  background-color:#000;
+  color: #f90;
+}
+a:link:active {
+  background-color:#000;
+  color: #fff;
+}
+a:link {
+  background-color:#000;
+  color:#fc9;
+}
+a:visited:hover,
+a:visited:focus
+{
+  background-color:#000;
+  color:#f90;
+}
+a:visited:active {
+  background-color:black;
+  color:#fff;
+}
+a:hover,
+a:focus,
+a:active
+{
+  text-decoration: underline;
+}
+a:visited {
+  background-color:black;
+  color:#c9c;
+}
+h2 {
+  background-color: #000;
+  color: #fff;
+  font-size: 136%;
+}
+p {
+  margin-top: 1em;
+  margin-bottom: 0;
+  line-height: 1.5;
+  text-align: justify;
+}
+li p {
+  line-height: normal;
+}
+p:first-child {
+  margin-top: 0;
+}
+.instruction {
+  background-color: #000;
+  color: #f90;
+  font-size: 136%;
+}
+/* Language support */
+[lang^="x-vulcan-latin"] {
+  font-family: "URW Chancery L", "Matura MT Script Capitals",
+    Haettenschweiler, Haettens, "Zurich XCn BT", impact, Verdana,
+    Geneva, Arial, Helvetica, sans-serif;
+}
 Property changes:
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property

Subversion Repositories LCARS

Compare Revisions

Last modification

Ignore whitespace Rev 57 → Rev 58