OSDN Git Service

(root) / serene / BuildMyDistro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 57abe62)
Merge branch 'master' into feature/yuki 1/head
authorYukidaruma-dev <yukir0dev@gmail.com>
Mon, 13 May 2019 09:08:41 +0000 (18:08 +0900)
committerYukidaruma-dev <yukir0dev@gmail.com>
Mon, 13 May 2019 09:08:41 +0000 (18:08 +0900)
12 files changed:
index.html patch | blob | history
page/about.html patch | blob | history
page/customize.html patch | blob | history
page/distribution.html patch | blob | history
page/history.html patch | blob | history
page/makeiso.html patch | blob | history
page/preparation.html patch | blob | history
page/template.html patch | blob | history
page/website.html patch | blob | history
style/history.css patch | blob | history
style/main-resp.css patch | blob | history
style/main.css patch | blob | history

diff --git a/index.html b/index.html
index bf15083..3742c48 100644 (file)
--- a/index.html
+++ b/index.html
@@ -15,7 +15,8 @@
     <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js">\r
     </script>\r
     <link rel="shortcut icon" href="favicon.ico">\r
-    <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">\r
+    <link rel="stylesheet" type="text/css" media="print" href="/style/main.css">\r
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">\r
 \r
     <!-- class="prettyprint linenums" でコードに色付け -->\r
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->\r
diff --git a/page/about.html b/page/about.html
index dc168e4..b5bd67a 100644 (file)
--- a/page/about.html
+++ b/page/about.html
@@ -15,6 +15,7 @@
     <script src="../code/highlight.pack.js"></script>
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
diff --git a/page/customize.html b/page/customize.html
index 2b17ce3..ff224b1 100644 (file)
--- a/page/customize.html
+++ b/page/customize.html
@@ -18,6 +18,7 @@
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
   </head>
   <body>
     <header>
@@ -198,7 +199,7 @@
                 </p>
               </td>
               <td label="重さ">
-                最も重い
+                Gnomeよりは軽い(かも)
               </td>
             </tr>
 
@@ -229,7 +230,7 @@
 
             <tr>
               <th>
-                Lxqt
+                LxQt
               </th>
               <td label="標準ディストリビューション">
                 ---
@@ -400,10 +401,10 @@
 
             <tr>
               <th>
-                KDM
+                KDM(開発停止)
               </th>
               <td label="標準ディストリビューション">
-                  Kubuntu
+                  Kubuntu(KDE4以下)
               </td>
               <td label="特徴">
                 <p>
@@ -422,7 +423,7 @@
                 SDDM
               </th>
               <td label="標準ディストリビューション">
-                Lxqt
+                LxQt, KDE Plasma 5
               </td>
               <td label="特徴">
                 <p>
@@ -443,7 +444,7 @@
         今回は最も一般的なLightDMを使用していきます
       </p>
       <p>
-        ï¼\88ç­\86è\80\85ã\81¯LightDMã\81¨GDMã\81\97ã\81\8b使ç\94¨ã\81\97ã\81\9fã\81\93ã\81¨ç\84¡ã\81\84ã\81®ã\81§SDDMã\82\84KDMã\81¯ã\82\8fã\81\8bã\82\89ã\81ªã\81\84ã\81§ã\81\99ï¼\89
+        （筆者はLightDMとGDMしか使用したこと無いのでSDDMはわからないです）
       </p>
       <h3>
         Greeterについて
diff --git a/page/distribution.html b/page/distribution.html
index e5ea724..edc6781 100644 (file)
--- a/page/distribution.html
+++ b/page/distribution.html
@@ -16,6 +16,7 @@
     <script src="../code/highlight.pack.js"></script>
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
diff --git a/page/history.html b/page/history.html
index 7fb0f6e..1c1b70d 100644 (file)
--- a/page/history.html
+++ b/page/history.html
@@ -15,12 +15,25 @@
     <script src="../code/highlight.pack.js"></script>
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
   </head>
   <body>
     <h3>
+      2019/05/13
+    </h3>
+    <p>
+      <ul>
+        <li>
+          <h4>Pull Request by 液T(a)i</h4>
+          KDEの情報を最新に変更
+          Noto Sansフォントの適用
+        </li>
+      </ul>
+    </p>
+    <h3>
       2019/05/05
     </h3>
     <p>
diff --git a/page/makeiso.html b/page/makeiso.html
index 7fb661a..161488e 100644 (file)
--- a/page/makeiso.html
+++ b/page/makeiso.html
@@ -16,6 +16,7 @@
     <link rel="stylesheet" href="../code/vs2015.css">
     <script src="../code/highlight.pack.js"></script>
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- '<pre><code class="prettyprint linenums"></code></pre>' -->
diff --git a/page/preparation.html b/page/preparation.html
index 22954ae..6f8cca3 100644 (file)
--- a/page/preparation.html
+++ b/page/preparation.html
@@ -15,6 +15,7 @@
     <script src="../code/highlight.pack.js"></script>
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
diff --git a/page/template.html b/page/template.html
index 5f386df..94364c0 100644 (file)
--- a/page/template.html
+++ b/page/template.html
@@ -16,6 +16,7 @@
     <script src="../code/highlight.pack.js"></script>
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
diff --git a/page/website.html b/page/website.html
index f1a2bd9..81632a9 100644 (file)
--- a/page/website.html
+++ b/page/website.html
@@ -16,6 +16,7 @@
     <script src="../code/highlight.pack.js"></script>
     <link rel="shortcut icon" href="../favicon.ico">
     <link rel="stylesheet" type="text/css" media="print" href="../style/main.css">
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+JP:100,300,400,500,700,900&amp;subset=japanese" rel="stylesheet">
 
     <!-- class="prettyprint linenums" でコードに色付け -->
     <!-- <pre><code class="prettyprint linenums"></code></pre> -->
diff --git a/style/history.css b/style/history.css
index b25d5e6..e9e5a5e 100644 (file)
--- a/style/history.css
+++ b/style/history.css
@@ -11,6 +11,7 @@ h2 {
   font-weight: bold;
   margin: 0 0 20px;
   padding: 10px 15px 10px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 h1 {
   color: #1B73BA;
@@ -30,11 +31,13 @@ h3 {
   font-weight: bold;
   margin: 0 0 20px;
   padding-bottom: 5px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 h4 {
   border-left: 2px solid #1B73BA;
   font-size: 16px;
   font-weight: bold;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 
 /* 背景 */
diff --git a/style/main-resp.css b/style/main-resp.css
index 23c6157..bd26621 100644 (file)
--- a/style/main-resp.css
+++ b/style/main-resp.css
@@ -49,6 +49,7 @@ h2 {
   font-weight: bold;
   margin: 0 0 20px;
   padding: 10px 15px 10px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 h1 {
   color: #1B73BA;
@@ -68,6 +69,7 @@ h3 {
   font-weight: bold;
   margin: 0 0 20px;
   padding-bottom: 5px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 h4 {
   border-left: 2px solid #1B73BA;
@@ -75,6 +77,7 @@ h4 {
   font-weight: bold;
   margin: 0 0 20px;
   padding-left: 5px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 
 /*プログラムコード*/
@@ -131,6 +134,7 @@ pre {
 /*本文フォントサイズ*/
 p {
   font-size: 110%;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 
 /*テーブル*/
@@ -155,6 +159,7 @@ tfoot {
 }
 tbody tr th {
   font-weight: bold;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 tbody tr:nth-of-type(2n) {
   background: #191919;
diff --git a/style/main.css b/style/main.css
index 1f2bec7..5e8df16 100644 (file)
--- a/style/main.css
+++ b/style/main.css
@@ -47,6 +47,7 @@ h2 {
   font-weight: bold;
   margin: 0 0 20px;
   padding: 10px 15px 10px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 h1 {
   color: #1B73BA;
@@ -67,6 +68,7 @@ h3 {
   font-weight: bold;
   margin: 0 0 20px;
   padding-bottom: 5px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 h4 {
   border-left: 2px solid #1B73BA;
@@ -74,6 +76,7 @@ h4 {
   font-weight: bold;
   margin: 0 0 20px;
   padding-left: 5px;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 
 /*プログラムコード*/
@@ -153,6 +156,7 @@ tfoot {
 }
 tbody tr th {
   font-weight: bold;
+  font-family: 'Noto Sans JP', sans-serif;
 }
 tbody tr:nth-of-type(2n) {
   background: #191919;
@@ -175,4 +179,6 @@ a:hover {
 a:visited {
   text-decoration:none;
   color: #6EDEFF;
-}
\ No newline at end of file
+}
+
+/*pullreq by ek*/
\ No newline at end of file
About OSDN
Find Software
Develop Software
Help