Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ja] sync translated content #13205

Merged
merged 4 commits into from
May 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions files/ja/_redirects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@
/ja/docs/Glossary/ルーター /ja/docs/Glossary/Routers
/ja/docs/HTML /ja/docs/Web/HTML
/ja/docs/HTML/Attributes /ja/docs/Web/HTML/Attributes
/ja/docs/HTML/Block-level_elements /ja/docs/Web/HTML/Block-level_elements
/ja/docs/HTML/Block-level_elements /ja/docs/Glossary/Block-level_content
/ja/docs/HTML/CORS_settings_attributes /ja/docs/Web/HTML/Attributes/crossorigin
/ja/docs/HTML/Canvas /ja/docs/Web/API/Canvas_API
/ja/docs/HTML/Canvas/Drawing_Graphics_with_Canvas /ja/docs/Web/API/Canvas_API/Tutorial
Expand Down Expand Up @@ -2067,17 +2067,15 @@
/ja/docs/HTML/HTML_Elements/strong /ja/docs/Web/HTML/Element/strong
/ja/docs/HTML/HTML_Elements/title /ja/docs/Web/HTML/Element/title
/ja/docs/HTML/HTML_Elements/var /ja/docs/Web/HTML/Element/var
/ja/docs/HTML/Inline_elements /ja/docs/Web/HTML/Inline_elements
/ja/docs/HTML/Introduction /ja/docs/Learn/HTML/Introduction_to_HTML
/ja/docs/HTML/Sections_and_Outlines_of_an_HTML5_document /ja/docs/orphaned/Web/Guide/HTML/Using_HTML_sections_and_outlines
/ja/docs/HTML/Supported_media_formats /ja/docs/Web/Media/Formats
/ja/docs/HTML/Using_HTML5_audio_and_video /ja/docs/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
/ja/docs/HTML/属性 /ja/docs/Web/HTML/Attributes
/ja/docs/HTML:Block-level_elements /ja/docs/Web/HTML/Block-level_elements
/ja/docs/HTML:Block-level_elements /ja/docs/Glossary/Block-level_content
/ja/docs/HTML:Canvas /ja/docs/Web/API/Canvas_API
/ja/docs/HTML:Element /ja/docs/Web/HTML/Element
/ja/docs/HTML:Element:a /ja/docs/Web/HTML/Element/a
/ja/docs/HTML:Inline_elements /ja/docs/Web/HTML/Inline_elements
/ja/docs/HTMLSpanElement /ja/docs/Web/API/HTMLSpanElement
/ja/docs/HTMLSpanElement_interface /ja/docs/Web/API/HTMLSpanElement
/ja/docs/HTML_in_XMLHttpRequest /ja/docs/Web/API/XMLHttpRequest/HTML_in_XMLHttpRequest
Expand Down Expand Up @@ -4443,6 +4441,7 @@
/ja/docs/Web/Guide/User_experience/Using_the_Page_Visibility_API /ja/docs/Web/API/Page_Visibility_API
/ja/docs/Web/Guide/Using_FormData_Objects /ja/docs/Web/API/FormData/Using_FormData_Objects
/ja/docs/Web/HTML/Applying_color /ja/docs/Web/CSS/CSS_Colors/Applying_color
/ja/docs/Web/HTML/Block-level_elements /ja/docs/Glossary/Block-level_content
/ja/docs/Web/HTML/CORS_settings_attributes /ja/docs/Web/HTML/Attributes/crossorigin
/ja/docs/Web/HTML/Canvas /ja/docs/Web/API/Canvas_API
/ja/docs/Web/HTML/Canvas/Drawing_Graphics_with_Canvas /ja/docs/Web/API/Canvas_API/Tutorial
Expand Down
28 changes: 12 additions & 16 deletions files/ja/_wikihistory.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,18 @@
"modified": "2020-02-22T11:07:37.995Z",
"contributors": ["Uemmra3", "Wind1808", "Sheppy"]
},
"Glossary/Block-level_content": {
"modified": "2020-11-09T07:01:45.000Z",
"contributors": [
"mfuji09",
"FumiyaShibusawa",
"himrock922",
"iwamot",
"yyss",
"ethertank",
"Marsf"
]
},
"Glossary/Block/CSS": {
"modified": "2019-03-18T21:28:49.620Z",
"contributors": ["mfuji09", "Wind1808"]
Expand Down Expand Up @@ -20715,18 +20727,6 @@
"modified": "2020-09-28T04:18:49.266Z",
"contributors": ["mfuji09"]
},
"Web/HTML/Block-level_elements": {
"modified": "2020-11-09T07:01:45.000Z",
"contributors": [
"mfuji09",
"FumiyaShibusawa",
"himrock922",
"iwamot",
"yyss",
"ethertank",
"Marsf"
]
},
"Web/HTML/CORS_enabled_image": {
"modified": "2020-12-04T05:50:44.102Z",
"contributors": [
Expand Down Expand Up @@ -21672,10 +21672,6 @@
"modified": "2020-11-09T08:36:24.343Z",
"contributors": ["mfuji09", "yyss", "hamasaki"]
},
"Web/HTML/Inline_elements": {
"modified": "2019-04-15T20:58:44.936Z",
"contributors": ["hSakura", "mfuji09", "yyss", "ethertank", "Marsf"]
},
"Web/HTML/Microdata": {
"modified": "2020-09-06T05:56:41.358Z",
"contributors": ["mfuji09", "momdo"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: ブロックレベル要素
slug: Web/HTML/Block-level_elements
slug: Glossary/Block-level_content
original_slug: Web/HTML/Block-level_elements
---

HTML (**Hypertext Markup Language**) の要素は従来、 「ブロックレベル」要素または「インライン要素」の何れかに分類されてきました。これは表示特性であることから、現在は CSS において[フローレイアウト](/ja/docs/Web/CSS/CSS_Flow_Layout)の中で定義されています。ブロックレベル要素は親要素 (コンテナー) の水平空間全体と、内容物の高さに等しい垂直空間を占有し、「ブロック」を生成します。この記事では、 HTML のブロックレベル要素とは何か、[インラインレベル要素](/ja/docs/Web/HTML/Inline-level_elements)とどのように異なるかを説明します。
Expand Down
155 changes: 0 additions & 155 deletions files/ja/web/html/inline_elements/index.md

This file was deleted.