diff options
Diffstat (limited to 'files/ja/conflicting/web/css')
23 files changed, 49 insertions, 25 deletions
diff --git a/files/ja/conflicting/web/css/@media/index.html b/files/ja/conflicting/web/css/@media/index.html index 5bf2140f1d..54635c83da 100644 --- a/files/ja/conflicting/web/css/@media/index.html +++ b/files/ja/conflicting/web/css/@media/index.html @@ -1,5 +1,6 @@ --- title: Media -slug: Web/CSS/Media +slug: conflicting/Web/CSS/@media +original_slug: Web/CSS/Media --- {{wiki.localize('System.API.page-generated-for-subpage')}} diff --git a/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html b/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html index 87ca6f864c..25382e211f 100644 --- a/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html +++ b/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html @@ -1,6 +1,6 @@ --- title: Visual -slug: Web/CSS/Media/Visual +slug: conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7 tags: - CSS - CSS Reference @@ -8,6 +8,7 @@ tags: - NeedsContent translation_of: Web/CSS/@media translation_of_original: Web/CSS/media/visual +original_slug: Web/CSS/Media/Visual --- <div>{{ CSSRef() }}</div> <p><a href="/ja/CSS" title="ja/CSS">CSS</a> 標準で定義された<a href="/ja/CSS/@media#Media_groups" title="ja/CSS/@media#Media_groups">メディアグループ</a>。</p> diff --git a/files/ja/conflicting/web/css/@viewport/index.html b/files/ja/conflicting/web/css/@viewport/index.html index 38f093896b..d92f4f14dd 100644 --- a/files/ja/conflicting/web/css/@viewport/index.html +++ b/files/ja/conflicting/web/css/@viewport/index.html @@ -1,6 +1,6 @@ --- title: height -slug: Web/CSS/@viewport/height +slug: conflicting/Web/CSS/@viewport tags: - '@viewport' - At-rule descriptor @@ -9,6 +9,7 @@ tags: - Reference translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/height +original_slug: Web/CSS/@viewport/height --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html b/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html index 0e9f9079f0..babd38fcfd 100644 --- a/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html +++ b/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html @@ -1,6 +1,6 @@ --- title: max-height -slug: Web/CSS/@viewport/max-height +slug: conflicting/Web/CSS/@viewport_516ab4b0283b5b2231fb657505e22440 tags: - '@viewport' - CSS @@ -8,6 +8,7 @@ tags: - Reference translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/max-height +original_slug: Web/CSS/@viewport/max-height --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html b/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html index 01b0ae54b2..014def1f1b 100644 --- a/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html +++ b/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html @@ -1,6 +1,6 @@ --- title: min-zoom -slug: Web/CSS/@viewport/min-zoom +slug: conflicting/Web/CSS/@viewport_6e9c91ec34cdb0393d301240d0d50d84 tags: - '@viewport' - CSS @@ -8,6 +8,7 @@ tags: - リファレンス translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/min-zoom +original_slug: Web/CSS/@viewport/min-zoom --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html b/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html index 97814ca702..8b1161da9c 100644 --- a/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html +++ b/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html @@ -1,6 +1,6 @@ --- title: viewport-fit -slug: Web/CSS/@viewport/viewport-fit +slug: conflicting/Web/CSS/@viewport_a33ee59ffd8336ffb3336900dea02e9f tags: - '@viewport' - CSS @@ -11,6 +11,7 @@ tags: - 画面レイアウト translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/viewport-fit +original_slug: Web/CSS/@viewport/viewport-fit --- <div>{{CSSRef}}{{Draft}}{{SeeCompatTable}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html b/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html index 483e5c214f..fc790794ae 100644 --- a/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html +++ b/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html @@ -1,6 +1,6 @@ --- title: max-zoom -slug: Web/CSS/@viewport/max-zoom +slug: conflicting/Web/CSS/@viewport_d03ebc763769680c55d1a4258592d3ed tags: - '@viewport' - At-rule descriptor @@ -9,6 +9,7 @@ tags: - Reference translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/max-zoom +original_slug: Web/CSS/@viewport/max-zoom --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html b/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html index f05447a501..19ee67e0fd 100644 --- a/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html +++ b/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html @@ -1,6 +1,6 @@ --- title: zoom -slug: Web/CSS/@viewport/zoom +slug: conflicting/Web/CSS/@viewport_e065ce90bde08c9679692adbe64f6518 tags: - '@viewport' - At-rule descriptor @@ -12,6 +12,7 @@ tags: - Web translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/zoom +original_slug: Web/CSS/@viewport/zoom --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html b/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html index f9e7367a09..f67b584d66 100644 --- a/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html +++ b/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html @@ -1,12 +1,13 @@ --- title: ':-moz-placeholder' -slug: 'Web/CSS/:-moz-placeholder' +slug: conflicting/Web/CSS/:placeholder-shown tags: - CSS - CSS Reference - Non-standard -translation_of: 'Web/CSS/:placeholder-shown' -translation_of_original: 'Web/CSS/:-moz-placeholder' +translation_of: Web/CSS/:placeholder-shown +translation_of_original: Web/CSS/:-moz-placeholder +original_slug: Web/CSS/:-moz-placeholder --- <p>{{Non-standard_header}}{{ CSSRef() }}{{ gecko_minversion_header("2.0") }}</p> diff --git a/files/ja/conflicting/web/css/box-ordinal-group/index.html b/files/ja/conflicting/web/css/box-ordinal-group/index.html index 147bdbd9b4..121d6ea03f 100644 --- a/files/ja/conflicting/web/css/box-ordinal-group/index.html +++ b/files/ja/conflicting/web/css/box-ordinal-group/index.html @@ -1,6 +1,6 @@ --- title: '-moz-box-ordinal-group' -slug: Web/CSS/-moz-box-ordinal-group +slug: conflicting/Web/CSS/box-ordinal-group tags: - CSS - Mozilla 拡張 @@ -9,6 +9,7 @@ tags: - フレックスボックス translation_of: Web/CSS/box-ordinal-group translation_of_original: Web/CSS/-moz-box-ordinal-group +original_slug: Web/CSS/-moz-box-ordinal-group --- <p>{{CSSRef}}{{warning("これは CSS フレックスボックスレイアウトモジュールの初期の草稿にあったプロパティであり、その後の草稿で置き換えられました。")}}</p> diff --git a/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html b/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html index fa7ce58677..f977767419 100644 --- a/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html +++ b/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html @@ -1,8 +1,9 @@ --- title: 背景画像の拡大縮小 -slug: Web/CSS/Scaling_background_images +slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images translation_of: Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images translation_of_original: Web/CSS/CSS_Background_and_Borders/Scaling_background_images +original_slug: Web/CSS/Scaling_background_images --- <p>CSS の {{cssxref("background-size")}} プロパティによって、フルサイズの画像がタイル状に配置されるという既定の動作の代わりに、背景画像のサイズを調節することができるようになります。画像を望むように拡大または縮小することができます。</p> diff --git a/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html b/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html index 4c7327f6c1..863b8661e9 100644 --- a/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html +++ b/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html @@ -1,6 +1,6 @@ --- title: CSS での複数の背景の利用方法 -slug: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds +slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds tags: - CSS - CSS Background @@ -9,6 +9,7 @@ tags: - Intermediate translation_of: Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds translation_of_original: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds +original_slug: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds --- <p id="Summary">{{CSSRef}}</p> diff --git a/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html b/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html index fc56bb1de6..6e0d6f11fe 100644 --- a/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html +++ b/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html @@ -1,11 +1,13 @@ --- title: cursor のプロパティーに URL 値を使用する -slug: Using_URL_values_for_the_cursor_property +slug: >- + conflicting/Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property tags: - CSS - CSS_2.1 - Cross-browser_Development - Web Development +original_slug: Using_URL_values_for_the_cursor_property --- <p> </p> <p><a href="ja/Gecko">Gecko</a> 1.8 (<a href="ja/Firefox_1.5">Firefox 1.5</a>, SeaMonkey 1.0) では、<a class="external" href="http://www.w3.org/TR/CSS21/ui.html#cursor-props">CSS2 cursor プロパティー</a> で URL 値が使用できます。これにより、自由な画像 — Gecko がサポートする画像形式なら — がマウスカーソルとして利用できます。</p> diff --git a/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html b/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html index 42426babe4..7fa1a3b2d7 100644 --- a/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html +++ b/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html @@ -1,12 +1,13 @@ --- title: クロスブラウザのフレックスボックスのミックスイン -slug: Web/CSS/CSS_Flexible_Box_Layout/Mixins +slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox tags: - CSS - CSS フレックスボックス - ミックスイン - リファレンス translation_of: Web/CSS/CSS_Flexible_Box_Layout/Mixins +original_slug: Web/CSS/CSS_Flexible_Box_Layout/Mixins --- <div>{{cssref}}</div> diff --git a/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html b/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html index 4458dddff2..8f7ad0278f 100644 --- a/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html +++ b/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html @@ -1,6 +1,6 @@ --- title: Web アプリケーションのレイアウトに flexbox を使用する -slug: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications +slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox tags: - Advanced - CSS @@ -10,6 +10,7 @@ tags: - Web translation_of: Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox translation_of_original: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications +original_slug: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/float/index.html b/files/ja/conflicting/web/css/float/index.html index 562347725e..bf8bb57433 100644 --- a/files/ja/conflicting/web/css/float/index.html +++ b/files/ja/conflicting/web/css/float/index.html @@ -1,11 +1,12 @@ --- title: none -slug: Web/CSS/none +slug: conflicting/Web/CSS/float tags: - CSS - CSS Reference translation_of: Web/CSS/float translation_of_original: Web/CSS/none +original_slug: Web/CSS/none --- <div> {{CSSRef()}}</div> diff --git a/files/ja/conflicting/web/css/font-variant/index.html b/files/ja/conflicting/web/css/font-variant/index.html index 4f1a3acf6b..d0b2e6859e 100644 --- a/files/ja/conflicting/web/css/font-variant/index.html +++ b/files/ja/conflicting/web/css/font-variant/index.html @@ -1,10 +1,11 @@ --- title: normal -slug: Web/CSS/normal +slug: conflicting/Web/CSS/font-variant tags: - CSS Reference translation_of: Web/CSS/font-variant translation_of_original: Web/CSS/normal +original_slug: Web/CSS/normal --- <div> {{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/index.html b/files/ja/conflicting/web/css/index.html index 7eed5bdf59..3b505b86f1 100644 --- a/files/ja/conflicting/web/css/index.html +++ b/files/ja/conflicting/web/css/index.html @@ -1,12 +1,13 @@ --- title: CSS-2 Quick Reference -slug: 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> diff --git a/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html b/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html index 961536b070..6061a96fe2 100644 --- a/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html +++ b/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html @@ -1,9 +1,10 @@ --- title: メディアクエリ -slug: Web/Guide/CSS/Media_queries +slug: conflicting/Web/CSS/Media_Queries/Using_media_queries tags: - CSS - CSS Reference +original_slug: Web/Guide/CSS/Media_queries --- <p>{{ gecko_minversion_header("1.9.1") }}</p> diff --git a/files/ja/conflicting/web/css/reference/index.html b/files/ja/conflicting/web/css/reference/index.html index 9d20688007..895d608fb9 100644 --- a/files/ja/conflicting/web/css/reference/index.html +++ b/files/ja/conflicting/web/css/reference/index.html @@ -1,12 +1,13 @@ --- title: All in a page -slug: CSS-2_Quick_Reference/All_in_a_page +slug: conflicting/Web/CSS/Reference tags: - CSS - CSS2_Quick_Reference - CSS_2.1 translation_of: Web/CSS/Reference translation_of_original: CSS-2_Quick_Reference/All_in_a_page +original_slug: CSS-2_Quick_Reference/All_in_a_page --- <p> </p><p>この文書は、初心者からエキスパートまでのための CSS-2 仕様のクイックリファレンスです。スタイルプロパティは簡単な文法で書かれています。 diff --git a/files/ja/conflicting/web/css/url()/index.html b/files/ja/conflicting/web/css/url()/index.html index 2ca334be5a..482b13773d 100644 --- a/files/ja/conflicting/web/css/url()/index.html +++ b/files/ja/conflicting/web/css/url()/index.html @@ -1,6 +1,6 @@ --- title: <url> -slug: Web/CSS/url +slug: conflicting/Web/CSS/url() tags: - CSS - CSS データ型 @@ -11,6 +11,7 @@ tags: - レイアウト translation_of: Web/CSS/url() translation_of_original: Web/CSS/url +original_slug: Web/CSS/url --- <div>{{CssRef}}</div> diff --git a/files/ja/conflicting/web/css/width/index.html b/files/ja/conflicting/web/css/width/index.html index cae634e45a..4acaea3400 100644 --- a/files/ja/conflicting/web/css/width/index.html +++ b/files/ja/conflicting/web/css/width/index.html @@ -1,11 +1,12 @@ --- title: auto -slug: Web/CSS/auto +slug: conflicting/Web/CSS/width tags: - CSS - CSS Reference translation_of: Web/CSS/width translation_of_original: Web/CSS/auto +original_slug: Web/CSS/auto --- <div> {{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html b/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html index aad9d6d606..7f5df2ea39 100644 --- a/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html +++ b/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html @@ -1,10 +1,11 @@ --- title: width -slug: width +slug: conflicting/Web/CSS/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc tags: - Disambiguation translation_of: Web/CSS/width translation_of_original: width +original_slug: width --- <p><code>width</code> は多くの文脈で用いられます。</p> |