diff options
Diffstat (limited to 'files/ja')
| -rw-r--r-- | files/ja/_redirects.txt | 8 | ||||
| -rw-r--r-- | files/ja/_wikihistory.json | 27 | ||||
| -rw-r--r-- | files/ja/conflicting/web/css/index.html | 32 | ||||
| -rw-r--r-- | files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html | 29 |
4 files changed, 4 insertions, 92 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index 30aa22a5b7..67106e3bfd 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -140,7 +140,7 @@ /ja/docs/Building_an_Extension /ja/docs/Mozilla/Add-ons /ja/docs/CORS_Enabled_Image /ja/docs/Web/HTML/CORS_enabled_image /ja/docs/CSS /ja/docs/Web/CSS -/ja/docs/CSS-2_Quick_Reference /ja/docs/conflicting/Web/CSS +/ja/docs/CSS-2_Quick_Reference /ja/docs/Web/CSS /ja/docs/CSS-2_Quick_Reference/All_in_a_page /ja/docs/Web/CSS/Reference /ja/docs/CSS-2_Quick_Reference:All_in_a_page /ja/docs/Web/CSS/Reference /ja/docs/CSS-redirect-1 /ja/docs/Web/CSS @@ -278,7 +278,7 @@ /ja/docs/CSS/Media/Visual /ja/docs/Web/CSS/@media /ja/docs/CSS/Media_queries /ja/docs/Web/CSS/Media_queries /ja/docs/CSS/Multiple_backgrounds /ja/docs/Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds -/ja/docs/CSS/Other_Resources /ja/docs/conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea +/ja/docs/CSS/Other_Resources /ja/docs/Web/CSS /ja/docs/CSS/Privacy_and_the_:visited_selector /ja/docs/Web/CSS/Privacy_and_the_:visited_selector /ja/docs/CSS/Pseudo-classes /ja/docs/Web/CSS/Pseudo-classes /ja/docs/CSS/Pseudo-elements /ja/docs/Web/CSS/Pseudo-elements @@ -547,7 +547,7 @@ /ja/docs/CSS:Getting_Started:What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works /ja/docs/CSS:Getting_Started:Why_use_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works /ja/docs/CSS:Media:Visual /ja/docs/Web/CSS/@media -/ja/docs/CSS:Other_Resources /ja/docs/conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea +/ja/docs/CSS:Other_Resources /ja/docs/Web/CSS /ja/docs/CSS:color /ja/docs/Web/CSS/color /ja/docs/CSS:computed_value /ja/docs/Web/CSS/computed_value /ja/docs/CSS:font /ja/docs/Web/CSS/font @@ -3672,7 +3672,7 @@ /ja/docs/Web/CSS/Media /ja/docs/Web/CSS/@media /ja/docs/Web/CSS/Media/Visual /ja/docs/Web/CSS/@media /ja/docs/Web/CSS/Motion_Path /ja/docs/Web/CSS/CSS_Motion_Path -/ja/docs/Web/CSS/Other_Resources /ja/docs/conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea +/ja/docs/Web/CSS/Other_Resources /ja/docs/Web/CSS /ja/docs/Web/CSS/Reference/@viewport /ja/docs/Web/CSS/@viewport /ja/docs/Web/CSS/Reference/@viewport/max-zoom /ja/docs/Web/CSS/@viewport /ja/docs/Web/CSS/Reference/@viewport/min-zoom /ja/docs/Web/CSS/@viewport diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index 8377aa3478..d84830442c 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -48627,33 +48627,6 @@ "Jeremie" ] }, - "conflicting/Web/CSS": { - "modified": "2019-03-23T23:49:43.648Z", - "contributors": [ - "Marsf" - ] - }, - "conflicting/Web/CSS/Reference": { - "modified": "2019-01-16T15:49:24.673Z", - "contributors": [ - "Marsf" - ] - }, - "conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea": { - "modified": "2019-03-23T23:44:01.923Z", - "contributors": [ - "ethertank", - "Mgjbot", - "Okome", - "Shimono" - ] - }, - "conflicting/Web/HTTP/Headers/X-DNS-Prefetch-Control": { - "modified": "2019-03-24T00:00:27.042Z", - "contributors": [ - "RobinEgg" - ] - }, "orphaned/Building_a_Mozilla_Distribution": { "modified": "2019-03-23T23:49:07.062Z", "contributors": [ diff --git a/files/ja/conflicting/web/css/index.html b/files/ja/conflicting/web/css/index.html deleted file mode 100644 index 3b505b86f1..0000000000 --- a/files/ja/conflicting/web/css/index.html +++ /dev/null @@ -1,32 +0,0 @@ ---- -title: CSS-2 Quick Reference -slug: conflicting/Web/CSS -tags: - - CSS - - CSS2_Quick_Reference - - CSS_2.1 -translation_of: Web/CSS -translation_of_original: CSS-2_Quick_Reference -original_slug: CSS-2_Quick_Reference ---- -<p> </p><p>この文書は、初心者からエキスパートまでのための CSS-2 仕様のクイックリファレンスです。スタイルプロパティは簡単な文法で書かれています。 -</p><p><big><b><a href="ja/CSS-2_Quick_Reference/All_in_a_page">CSS-2 クイックリファレンス(一括)</a></b></big> -</p><p>さらに詳しい情報とブラウザのサポート: -</p><p><big> -<b><a href="ja/CSS-2_Quick_Reference/Selectors">セレクタ</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Box_model">ボックスモデル</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Visual_formatting_model">視覚的構成モデル</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Visual_formatting_details">視覚的構成の詳細</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Visual_effects">視覚効果</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Lists">リスト</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Color_and_Background">カラーと背景</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Font">フォント</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Text">テキスト</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Tables">表組み</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/User_interface">ユーザインタフェース</a></b><br> -<b><a href="ja/CSS-2_Quick_Reference/Units">単位</a></b><br> -</big> -</p> -<div class="noinclude"> -</div> -{{ languages( { "en": "en/CSS-2_Quick_Reference", "fr": "fr/Pr\u00e9cis_CSS_2", "pl": "pl/Szybka_dokumentacja_CSS-2" } ) }} diff --git a/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html b/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html deleted file mode 100644 index c3f2335ad4..0000000000 --- a/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html +++ /dev/null @@ -1,29 +0,0 @@ ---- -title: Other Resources -slug: conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea -tags: - - CSS -translation_of: Web/CSS -translation_of_original: Web/CSS/Other_Resources -original_slug: Web/CSS/Other_Resources ---- -<h2 id="W3C_Documents" name="W3C_Documents">W3C の文書</h2> -<ul> - <li><a class="external" href="http://www.w3.org/Style/CSS/">CSS メインページ</a></li> - <li><a class="external" href="http://www.w3.org/TR/REC-CSS2/">CSS2 仕様</a></li> - <li><a class="external" href="http://www.w3.org/TR/CSS21/">CSS 2.1 仕様</a></li> - <li><a class="external" href="http://www.w3.org/Stylesheets/Core/">W3C での基本スタイルシート</a></li> - <li><a class="external" href="http://www.w3.org/Style/CSS/Test/current/">CSS1 テストスイート</a></li> - <li><a class="external" href="http://www.w3.org/Style/CSS/Test/CSS2.1/current/">CSS2.1 テストスイート</a></li> -</ul> - - -<h2 id="Other_Resources" name="Other_Resources">その他の資料</h2> -<ul> - <li><a class="external" href="http://www.w3schools.com/css/">W3 Schools CSS tutorial pages</a></li> - <li><a class="external" href="http://gallery.theopalgroup.com/selectoracle/">SelectORacle</a></li> - <li><a class="external" href="http://www.westciv.com/style_master/house/">House of Style</a></li> - <li><a class="external" href="http://www.mako4css.com/">MaKo4CSS.com</a></li> - <li>css-discuss: <a class="external" href="http://archivist.incutio.com/css-discuss/">archives</a>, <a class="external" href="http://css-discuss.incutio.com/">wiki</a></li> - <li><a class="external" href="http://www.meyerweb.com/eric/css/edge/">css/edge</a></li> -</ul> |