[更新]:AlterLinuxのロゴをロゴ一つ分下に下げる

・ようこその文字をもっと小さく
・ロック時の時計の位置を、左寄せ（とはいっても左側に時計の数字の大きさの半分くらいの隙間を開ける）
・時計のフォントをこれにする（他の部分のフォントはそのまま）の更新

diff --git a/css/Lato-Black.ttf b/css/Lato-Black.ttf
new file mode 100644 (file)
index 0000000..a4a924f
Binary files /dev/null and b/css/Lato-Black.ttf differ

diff --git a/css/Lato-BlackItalic.ttf b/css/Lato-BlackItalic.ttf
new file mode 100644 (file)
index 0000000..d6f8945
Binary files /dev/null and b/css/Lato-BlackItalic.ttf differ

diff --git a/css/Lato-Bold.ttf b/css/Lato-Bold.ttf
new file mode 100644 (file)
index 0000000..b63a14d
Binary files /dev/null and b/css/Lato-Bold.ttf differ

diff --git a/css/Lato-BoldItalic.ttf b/css/Lato-BoldItalic.ttf
new file mode 100644 (file)
index 0000000..8f9a50d
Binary files /dev/null and b/css/Lato-BoldItalic.ttf differ

diff --git a/css/Lato-Italic.ttf b/css/Lato-Italic.ttf
new file mode 100644 (file)
index 0000000..49e9f2c
Binary files /dev/null and b/css/Lato-Italic.ttf differ

diff --git a/css/Lato-Light.ttf b/css/Lato-Light.ttf
new file mode 100644 (file)
index 0000000..9c0a705
Binary files /dev/null and b/css/Lato-Light.ttf differ

diff --git a/css/Lato-LightItalic.ttf b/css/Lato-LightItalic.ttf
new file mode 100644 (file)
index 0000000..53b140b
Binary files /dev/null and b/css/Lato-LightItalic.ttf differ

diff --git a/css/Lato-Regular.ttf b/css/Lato-Regular.ttf
new file mode 100644 (file)
index 0000000..33eba8b
Binary files /dev/null and b/css/Lato-Regular.ttf differ

diff --git a/css/Lato-Thin.ttf b/css/Lato-Thin.ttf
new file mode 100644 (file)
index 0000000..0c599a0
Binary files /dev/null and b/css/Lato-Thin.ttf differ

diff --git a/css/Lato-ThinItalic.ttf b/css/Lato-ThinItalic.ttf
new file mode 100644 (file)
index 0000000..7db3a8c
Binary files /dev/null and b/css/Lato-ThinItalic.ttf differ

diff --git a/css/OFL.txt b/css/OFL.txt
new file mode 100644 (file)
index 0000000..dfca0da
--- /dev/null
+++ b/css/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"\r
+\r
+This Font Software is licensed under the SIL Open Font License, Version 1.1.\r
+This license is copied below, and is also available with a FAQ at:\r
+http://scripts.sil.org/OFL\r
+\r
+\r
+-----------------------------------------------------------\r
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007\r
+-----------------------------------------------------------\r
+\r
+PREAMBLE\r
+The goals of the Open Font License (OFL) are to stimulate worldwide\r
+development of collaborative font projects, to support the font creation\r
+efforts of academic and linguistic communities, and to provide a free and\r
+open framework in which fonts may be shared and improved in partnership\r
+with others.\r
+\r
+The OFL allows the licensed fonts to be used, studied, modified and\r
+redistributed freely as long as they are not sold by themselves. The\r
+fonts, including any derivative works, can be bundled, embedded, \r
+redistributed and/or sold with any software provided that any reserved\r
+names are not used by derivative works. The fonts and derivatives,\r
+however, cannot be released under any other type of license. The\r
+requirement for fonts to remain under this license does not apply\r
+to any document created using the fonts or their derivatives.\r
+\r
+DEFINITIONS\r
+"Font Software" refers to the set of files released by the Copyright\r
+Holder(s) under this license and clearly marked as such. This may\r
+include source files, build scripts and documentation.\r
+\r
+"Reserved Font Name" refers to any names specified as such after the\r
+copyright statement(s).\r
+\r
+"Original Version" refers to the collection of Font Software components as\r
+distributed by the Copyright Holder(s).\r
+\r
+"Modified Version" refers to any derivative made by adding to, deleting,\r
+or substituting -- in part or in whole -- any of the components of the\r
+Original Version, by changing formats or by porting the Font Software to a\r
+new environment.\r
+\r
+"Author" refers to any designer, engineer, programmer, technical\r
+writer or other person who contributed to the Font Software.\r
+\r
+PERMISSION & CONDITIONS\r
+Permission is hereby granted, free of charge, to any person obtaining\r
+a copy of the Font Software, to use, study, copy, merge, embed, modify,\r
+redistribute, and sell modified and unmodified copies of the Font\r
+Software, subject to the following conditions:\r
+\r
+1) Neither the Font Software nor any of its individual components,\r
+in Original or Modified Versions, may be sold by itself.\r
+\r
+2) Original or Modified Versions of the Font Software may be bundled,\r
+redistributed and/or sold with any software, provided that each copy\r
+contains the above copyright notice and this license. These can be\r
+included either as stand-alone text files, human-readable headers or\r
+in the appropriate machine-readable metadata fields within text or\r
+binary files as long as those fields can be easily viewed by the user.\r
+\r
+3) No Modified Version of the Font Software may use the Reserved Font\r
+Name(s) unless explicit written permission is granted by the corresponding\r
+Copyright Holder. This restriction only applies to the primary font name as\r
+presented to the users.\r
+\r
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\r
+Software shall not be used to promote, endorse or advertise any\r
+Modified Version, except to acknowledge the contribution(s) of the\r
+Copyright Holder(s) and the Author(s) or with their explicit written\r
+permission.\r
+\r
+5) The Font Software, modified or unmodified, in part or in whole,\r
+must be distributed entirely under this license, and must not be\r
+distributed under any other license. The requirement for fonts to\r
+remain under this license does not apply to any document created\r
+using the Font Software.\r
+\r
+TERMINATION\r
+This license becomes null and void if any of the above conditions are\r
+not met.\r
+\r
+DISCLAIMER\r
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\r
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\r
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\r
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\r
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\r
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\r
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\r
+OTHER DEALINGS IN THE FONT SOFTWARE.\r

diff --git a/css/theme.css b/css/theme.css
index 24f0370..917bfd3 100644 (file)
--- a/css/theme.css
+++ b/css/theme.css
@@ -14,6 +14,11 @@
        src: url('Renner_ 400 Book.ttf') format('truetype');
 
 }
+@font-face {
+       font-family: 'MyFont3';
+       src: url('Lato-Regular.ttf') format('truetype');
+
+}
 /* .gaussfade-out{
   animation: rotation 2s ease 0s 1 alternate none running;
 } */
@@ -67,7 +72,7 @@ input {
   fill: grey !important;
 }
 .row{
-  margin: 0 auto 30px;
+  /* margin: 0 auto 30px; */
 }
 .col.right{
   position: fixed;
@@ -118,7 +123,7 @@ div#console .terminal text {
   margin: 0;
 }
 .welcome-text {
-  font-size: 30px;
+  font-size: 20px;
   font-weight: lighter;
 }
 .logo-ubuntu {

diff --git a/index.html b/index.html
index 3aa024c..1da46b3 100644 (file)
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@
   <header></header>
   <main>
     <div class="container">
-      <div class="row" style="margin-top: 10vh;"></div>
+      <div class="row" style="margin-top: 15vh;"></div>
 
       <div class="row">
         <div style="text-align: center"  class="col s12">

diff --git a/js/splashscreen.js b/js/splashscreen.js
index 25081da..46ab69d 100644 (file)
--- a/js/splashscreen.js
+++ b/js/splashscreen.js
@@ -81,14 +81,15 @@ class SplashScreen {
         // },{
           "format": ["h:mm", "A"],
           "css": [
-            {"font-size": "40pt", "font-weight": 200 },
-            {"font-size": "20pt", "font-weight": "lighter", "margin-left": "10pt"}
+            {'font-family': 'MyFont3',"font-size": "40pt", "font-weight": 200 },
+            {'font-family': 'MyFont3',"font-size": "20pt", "font-weight": "lighter", "margin-left": "10pt"}
           ],
           "parent-css": {
-            "margin-top": "45vh",
+            "margin-top": "47vh",
+            "margin-left": "20vw",
             "color": "white",
-            "font-family": "MyFont",
-            "text-align": "center",
+            "font-family": 'MyFont3',
+            "text-align": "left",
             "text-shadow": "rgba(0, 0, 0, 0.25) 0px 3px 3px",
           }
         }],