From 24c89f3f8ed7e6bb228d85621d1ef73e9d43732c Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Fri, 24 Jan 2025 17:31:09 +0100 Subject: [PATCH 1/2] chore(ia): reorg /web/guide dir --- files/en-us/_redirects.txt | 4 ++- files/en-us/_wikihistory.json | 24 +++++++++--------- .../core/challenges}/index.md | 2 +- .../core/challenges}/pin_placement.png | Bin .../css/css_layout => css/guides}/index.md | 7 +++-- files/en-us/web/guide/index.md | 2 +- .../web/svg/tutorial/svg_and_css/index.md | 2 +- files/sidebars/cssref.yaml | 21 +++++++-------- files/sidebars/jssidebar.yaml | 14 +++++----- 9 files changed, 41 insertions(+), 35 deletions(-) rename files/en-us/{web/guide/css/getting_started/challenge_solutions => learn_web_development/core/challenges}/index.md (99%) rename files/en-us/{web/guide/css/getting_started/challenge_solutions => learn_web_development/core/challenges}/pin_placement.png (100%) rename files/en-us/web/{guide/css/css_layout => css/guides}/index.md (99%) diff --git a/files/en-us/_redirects.txt b/files/en-us/_redirects.txt index 61c25aad4b1ccdb..b4269a613c0eade 100644 --- a/files/en-us/_redirects.txt +++ b/files/en-us/_redirects.txt @@ -491,7 +491,7 @@ /en-US/docs/CSS/Getting_Started /en-US/docs/Learn_web_development/Core/Styling_basics /en-US/docs/CSS/Getting_Started/Boxes /en-US/docs/Learn_web_development/Core/Styling_basics /en-US/docs/CSS/Getting_Started/Cascading_and_inheritance /en-US/docs/Learn_web_development/Core/Styling_basics/Handling_conflicts -/en-US/docs/CSS/Getting_Started/Challenge_solutions /en-US/docs/Web/Guide/CSS/Getting_started/Challenge_solutions +/en-US/docs/CSS/Getting_Started/Challenge_solutions /en-US/docs/Learn_web_development/Core/Challenges /en-US/docs/CSS/Getting_Started/Content /en-US/docs/Learn_web_development/Howto/Solve_CSS_problems/Generated_content /en-US/docs/CSS/Getting_Started/How_CSS_works /en-US/docs/Learn_web_development/Core/Styling_basics/What_is_CSS /en-US/docs/CSS/Getting_Started/JavaScript /en-US/docs/Learn_web_development/Core/Scripting/DOM_scripting @@ -12444,12 +12444,14 @@ /en-US/docs/Web/Guide/Audio_and_video_manipulation /en-US/docs/Web/Media/Audio_and_video_manipulation /en-US/docs/Web/Guide/CSS/Block_formatting_context /en-US/docs/Web/CSS/CSS_display/Block_formatting_context /en-US/docs/Web/Guide/CSS/CSS_Image_Sprites /en-US/docs/Web/CSS/CSS_images/Implementing_image_sprites_in_CSS +/en-US/docs/Web/Guide/CSS/CSS_Layout /en-US/docs/Web/CSS/Guides /en-US/docs/Web/Guide/CSS/Consistent_list_indentation /en-US/docs/Web/CSS/CSS_lists/Consistent_list_indentation /en-US/docs/Web/Guide/CSS/Counters /en-US/docs/Web/CSS/CSS_counter_styles/Using_CSS_counters /en-US/docs/Web/Guide/CSS/Flexible_boxes /en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox /en-US/docs/Web/Guide/CSS/Getting_started /en-US/docs/Learn_web_development/Core/Styling_basics /en-US/docs/Web/Guide/CSS/Getting_started/Boxes /en-US/docs/Learn_web_development/Core/Styling_basics /en-US/docs/Web/Guide/CSS/Getting_started/Cascading_and_inheritance /en-US/docs/Learn_web_development/Core/Styling_basics/Handling_conflicts +/en-US/docs/Web/Guide/CSS/Getting_started/Challenge_solutions /en-US/docs/Learn_web_development/Core/Challenges /en-US/docs/Web/Guide/CSS/Getting_started/Content /en-US/docs/Learn_web_development/Howto/Solve_CSS_problems/Generated_content /en-US/docs/Web/Guide/CSS/Getting_started/How_CSS_works /en-US/docs/Learn_web_development/Core/Styling_basics/What_is_CSS /en-US/docs/Web/Guide/CSS/Getting_started/JavaScript /en-US/docs/Learn_web_development/Core/Scripting/DOM_scripting diff --git a/files/en-us/_wikihistory.json b/files/en-us/_wikihistory.json index 906cb4966f99e1d..693f948426dc418 100644 --- a/files/en-us/_wikihistory.json +++ b/files/en-us/_wikihistory.json @@ -6214,6 +6214,18 @@ "modified": "2020-07-16T22:27:36.041Z", "contributors": ["MelchiorIm3Tal", "chrisdavidmills", "rachelandrew"] }, + "Learn_web_development/Core/Challenges": { + "modified": "2019-08-29T20:48:33.765Z", + "contributors": [ + "Sebastianz", + "strael1", + "teoli", + "Jeremie", + "Sheppy", + "illourr", + "jswisher" + ] + }, "Learn_web_development/Core/Frameworks_libraries": { "modified": "2020-09-25T22:34:22.129Z", "contributors": ["chrisdavidmills", "CodeDotJS"] @@ -91086,18 +91098,6 @@ "ethertank" ] }, - "Web/Guide/CSS/Getting_started/Challenge_solutions": { - "modified": "2019-08-29T20:48:33.765Z", - "contributors": [ - "Sebastianz", - "strael1", - "teoli", - "Jeremie", - "Sheppy", - "illourr", - "jswisher" - ] - }, "Web/Guide/Parsing_and_serializing_XML": { "modified": "2020-09-09T05:19:22.895Z", "contributors": [ diff --git a/files/en-us/web/guide/css/getting_started/challenge_solutions/index.md b/files/en-us/learn_web_development/core/challenges/index.md similarity index 99% rename from files/en-us/web/guide/css/getting_started/challenge_solutions/index.md rename to files/en-us/learn_web_development/core/challenges/index.md index 40ad78a2741706e..5eeed80daf5a2a8 100644 --- a/files/en-us/web/guide/css/getting_started/challenge_solutions/index.md +++ b/files/en-us/learn_web_development/core/challenges/index.md @@ -1,6 +1,6 @@ --- title: Challenge solutions -slug: Web/Guide/CSS/Getting_started/Challenge_solutions +slug: Learn_web_development/Core/Challenges page-type: guide --- diff --git a/files/en-us/web/guide/css/getting_started/challenge_solutions/pin_placement.png b/files/en-us/learn_web_development/core/challenges/pin_placement.png similarity index 100% rename from files/en-us/web/guide/css/getting_started/challenge_solutions/pin_placement.png rename to files/en-us/learn_web_development/core/challenges/pin_placement.png diff --git a/files/en-us/web/guide/css/css_layout/index.md b/files/en-us/web/css/guides/index.md similarity index 99% rename from files/en-us/web/guide/css/css_layout/index.md rename to files/en-us/web/css/guides/index.md index 96236ff2447640f..2d3ab904fe52fbf 100644 --- a/files/en-us/web/guide/css/css_layout/index.md +++ b/files/en-us/web/css/guides/index.md @@ -1,9 +1,12 @@ --- -title: CSS Layout -slug: Web/Guide/CSS/CSS_Layout +title: CSS guides +short-title: Guides +slug: Web/CSS/Guides page-type: guide --- +{{CSSRef}} + There are a number of methods that you can use to lay out your web pages and applications. MDN contains a number of in-depth guides to the different methods, and this page provides an overview of them all. ## Normal flow, block, and inline layout diff --git a/files/en-us/web/guide/index.md b/files/en-us/web/guide/index.md index 6c2e708d1251e70..660011afe6abbd1 100644 --- a/files/en-us/web/guide/index.md +++ b/files/en-us/web/guide/index.md @@ -21,7 +21,7 @@ There are a number of guides within MDN docs. These articles aim to add addition - [Learn to style HTML using CSS](/en-US/docs/Learn_web_development/Core/Styling_basics) - : Our complete CSS tutorial, taking you from first steps through styling text, creating layouts, and more. -- [CSS Layout Guides](/en-US/docs/Web/Guide/CSS/CSS_Layout) +- [CSS Layout Guides](/en-US/docs/Web/CSS/Guides) - : There are a large number of guides to CSS Layout across MDN, this page collects them all together. - [Using CSS animations](/en-US/docs/Web/CSS/CSS_animations/Using_CSS_animations) - : CSS animations make it possible to animate transitions from one CSS style configuration to another. This guide will help you get started with the animation properties. diff --git a/files/en-us/web/svg/tutorial/svg_and_css/index.md b/files/en-us/web/svg/tutorial/svg_and_css/index.md index 37f2c15e8f0dbe1..a9e7f4c341d3f0d 100644 --- a/files/en-us/web/svg/tutorial/svg_and_css/index.md +++ b/files/en-us/web/svg/tutorial/svg_and_css/index.md @@ -413,7 +413,7 @@ Notes about this demonstration: Change the stylesheet so that the inner petals all turn pink when the mouse pointer is over any one of them, without changing the way the outer petals work. -[See a solution to this challenge.](/en-US/docs/Web/Guide/CSS/Getting_started/Challenge_solutions#svg_and_css) +[See a solution to this challenge.](/en-US/docs/Learn_web_development/Core/Challenges#svg_and_css) ## Simplified structure diff --git a/files/sidebars/cssref.yaml b/files/sidebars/cssref.yaml index 44c3884c2cbadbe..8ae0e7592426a6a 100644 --- a/files/sidebars/cssref.yaml +++ b/files/sidebars/cssref.yaml @@ -57,53 +57,54 @@ sidebar: link: /Web/CSS/Reference - type: listSubPages path: /Web/CSS - title: Modules tags: css-module + title: Modules details: closed - type: listSubPagesGrouped path: /Web/CSS - title: Properties tags: - css-property - css-shorthand-property + title: Properties details: closed - type: listSubPages path: /Web/CSS - title: Selectors tags: css-selector + title: Selectors details: closed - type: listSubPages path: /Web/CSS - title: Combinators tags: css-combinator + title: Combinators details: closed - type: listSubPages path: /Web/CSS - title: Pseudo-classes tags: css-pseudo-class + title: Pseudo-classes details: closed - type: listSubPages path: /Web/CSS - title: Pseudo-elements tags: css-pseudo-element + title: Pseudo-elements details: closed - type: listSubPages path: /Web/CSS - title: At-rules tags: css-at-rule + title: At-rules details: closed - type: listSubPages path: /Web/CSS - title: Functions tags: css-function - details: closed depth: 2 + title: Functions + details: closed - type: listSubPages path: /Web/CSS - title: Types tags: css-type + title: Types details: closed - type: section + link: /Web/CSS/Guides title: Guides - title: Animations details: closed diff --git a/files/sidebars/jssidebar.yaml b/files/sidebars/jssidebar.yaml index 9a03d52ce6187fb..63c2e5606ed7fa7 100644 --- a/files/sidebars/jssidebar.yaml +++ b/files/sidebars/jssidebar.yaml @@ -89,39 +89,39 @@ sidebar: title: Reference - type: listSubPages path: /Web/JavaScript/Reference/Global_Objects + includeParent: true title: Global_Objects details: closed - includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Operators + includeParent: true title: Operators details: closed - includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Statements + includeParent: true title: Statements details: closed - includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Functions + includeParent: true title: Functions details: closed - includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Classes + includeParent: true title: Classes details: closed - includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Regular_expressions + includeParent: true title: Guide_RegExp details: closed - includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Errors + includeParent: true title: Errors details: closed - includeParent: true - title: More details: closed children: From a4589ddf6f0e125f0ec4895c7e2dd245ad4bd88a Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 27 Jan 2025 16:58:12 +0100 Subject: [PATCH 2/2] chore: Revert key ordering from fmt-sidebars --- files/sidebars/cssref.yaml | 73 ++++++++++++++++++++++++++++------- files/sidebars/jssidebar.yaml | 42 +++++++++++--------- 2 files changed, 84 insertions(+), 31 deletions(-) diff --git a/files/sidebars/cssref.yaml b/files/sidebars/cssref.yaml index 8ae0e7592426a6a..b0c2fe42b237ab2 100644 --- a/files/sidebars/cssref.yaml +++ b/files/sidebars/cssref.yaml @@ -57,55 +57,55 @@ sidebar: link: /Web/CSS/Reference - type: listSubPages path: /Web/CSS - tags: css-module title: Modules + tags: css-module details: closed - type: listSubPagesGrouped path: /Web/CSS + title: Properties tags: - css-property - css-shorthand-property - title: Properties details: closed - type: listSubPages path: /Web/CSS - tags: css-selector title: Selectors + tags: css-selector details: closed - type: listSubPages path: /Web/CSS - tags: css-combinator title: Combinators + tags: css-combinator details: closed - type: listSubPages path: /Web/CSS - tags: css-pseudo-class title: Pseudo-classes + tags: css-pseudo-class details: closed - type: listSubPages path: /Web/CSS - tags: css-pseudo-element title: Pseudo-elements + tags: css-pseudo-element details: closed - type: listSubPages path: /Web/CSS - tags: css-at-rule title: At-rules + tags: css-at-rule details: closed - type: listSubPages path: /Web/CSS - tags: css-function - depth: 2 title: Functions + tags: css-function details: closed + depth: 2 - type: listSubPages path: /Web/CSS - tags: css-type title: Types + tags: css-type details: closed - type: section - link: /Web/CSS/Guides title: Guides + link: /Web/CSS/Guides - title: Animations details: closed children: @@ -138,7 +138,7 @@ sidebar: - /Web/CSS/CSS_colors/Relative_colors - /Web/CSS/CSS_colors/Using_color_wisely - link: /Web/Accessibility/Understanding_Colors_and_Luminance - title: Accessibility_Understanding_colors_and_luminance" + title: Accessibility_Understanding_colors_and_luminance - link: /Web/Accessibility/Understanding_WCAG/Perceivable/Color_contrast title: Color_contrast - title: Columns @@ -284,37 +284,53 @@ sidebar: - /Web/CSS/CSS_Backgrounds_and_Borders/Border-radius_generator l10n: de: + Beginners: Einsteiger-Tutorials + Styling_the_content: "Ihre erste Website: Das Styling des Inhalts" + CSS_styling_basics: Grundlagen des CSS-Stylings + CSS_text_styling: CSS-Textgestaltung CSS_layout: CSS-Layout - Combinators: Kombinatoren Guides: Leitfäden Animations: Animationen + "Accessibility_Understanding_colors_and_luminance": "Barrierefreiheit: Farbwerte verstehen" + Applying_color_to_HTML_elements: Farben auf HTML-Elemente anwenden + At-rules: At-Regeln Backgrounds_and_Borders: Hintergründe und Rahmen Resizing_background_images: Hintergrundbilder skalieren + "Box alignment": "Box-Ausrichtung" Box_alignment_in_block_layout: Box-Ausrichtung im Block-Layout Box_model: Box-Modell Colors: Farben Color_contrast: "Barrierefreiheit: Farbkontrast" + Color_values: "CSS-Farbwerte" Columns: Spalten + Combinators: Kombinatoren Conditional_rules: Bedingte Regeln Containment: Containment CSSOM_view: CSSOM-Ansicht Flexbox: Flexbox Flow_layout: Fluss-Layout Fonts: Schriftarten + Functions: Funktionen Grid: Raster Images: Bilder Lists_and_counters: Listen und Zähler Logical_properties: Logische Eigenschaften Math_functions: Mathematische Funktionen Media_queries: Media-Abfragen + Modules: Module Nesting: Verschachteln von Stilregeln Positioning: Positionierung + Pseudo-classes: Pseudo-Klassen + Pseudo-elements: Pseudo-Elemente + Properties: Eigenschaften Scroll_snap: Scroll-Snap + Selectors: Selektoren Shapes: Formen Text: Text Transforms: Transformationen Transitions: Übergänge Tools: Werkzeuge + Types: Typen en-US: Beginners: Beginner's tutorials Styling_the_content: "Your first website: Styling the content" @@ -377,9 +393,40 @@ l10n: Transitions: Transitions Tools: Outils ja: + Beginners: 初心者向けチュートリアル + Styling_the_content: "初めてのウェブサイト: コンテンツのスタイル設定" + CSS_styling_basics: CSS スタイル設定の基本 + CSS_text_styling: CSS テキストの装飾 CSS_layout: CSS レイアウト + Guides: ガイド + Animations: アニメーション + Backgrounds_and_Borders: 背景と境界 + Resizing_background_images: 背景画像の拡大縮小 + Box_alignment_in_block_layout: ブロックレイアウトでのボックス配置 + Box_model: ボックスモデル + Colors: 色 + Color_contrast: "アクセシビリティ: 色のコントラスト" + Columns: 段組み + Conditional_rules: 条件付きルール + Containment: 拘束 + CSSOM_view: CSSOM view Flexbox: フレックスボックス + Flow_layout: フローレイアウト + Fonts: フォント + Grid: グリッド + Images: 画像 + Lists_and_counters: リストとカウンター + Logical_properties: 論理的プロパティ + Math_functions: 数学関数 + Media_queries: メディアクエリー + Nesting: 入れ子のスタイルルール Positioning: 位置指定 + Scroll_snap: スクロールスナップ + Shapes: シェイプ + Text: テキスト + Transforms: 座標変換 + Transitions: トランジション + Tools: ツール ko: CSS_layout: CSS 레이아웃 Guides: 안내서 diff --git a/files/sidebars/jssidebar.yaml b/files/sidebars/jssidebar.yaml index 63c2e5606ed7fa7..78ce9026453f224 100644 --- a/files/sidebars/jssidebar.yaml +++ b/files/sidebars/jssidebar.yaml @@ -89,39 +89,39 @@ sidebar: title: Reference - type: listSubPages path: /Web/JavaScript/Reference/Global_Objects - includeParent: true title: Global_Objects details: closed + includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Operators - includeParent: true title: Operators details: closed + includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Statements - includeParent: true title: Statements details: closed + includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Functions - includeParent: true title: Functions details: closed + includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Classes - includeParent: true title: Classes details: closed + includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Regular_expressions - includeParent: true title: Guide_RegExp details: closed + includeParent: true - type: listSubPages path: /Web/JavaScript/Reference/Errors - includeParent: true title: Errors details: closed + includeParent: true - title: More details: closed children: @@ -141,8 +141,8 @@ sidebar: title: Deprecated_features l10n: de: - Overview: JavaScript-Technologie (Übersicht) - Tutorials: Tutorials + Overview: Übersicht über JavaScript-Technologien + Tutorials: Tutorials und Anleitungen Guide: JavaScript-Handbuch Guide_Introduction: Einführung Guide_Grammar: Grammatik und Typen @@ -150,20 +150,26 @@ l10n: Guide_Loops: Schleifen und Iteration Guide_Functions: Funktionen Guide_Expressions: Ausdrücke und Operatoren - Guide_Numbers: Numbers and strings - Guide_Dates: Representing dates & times + Guide_Numbers: Zahlen und Zeichenketten + Guide_Dates: Darstellung von Daten und Uhrzeiten Guide_RegExp: Reguläre Ausdrücke Guide_Indexed_collections: Indexierte Sammlungen - Guide_keyed_collections: Gekennzeichnete Sammlungen + Guide_keyed_collections: Schlüsselbasierte Sammlungen Guide_Objects: Arbeiten mit Objekten Guide_Classes: Verwendung von Klassen Guide_Promises: Verwendung von Promises Guide_Typed_arrays: Typisierte Arrays in JavaScript Guide_Iterators_generators: Iteratoren und Generatoren - Guide_Internationalization: Internationalization + Guide_Internationalization: Internationalisierung Guide_Meta: Metaprogrammierung Guide_Modules: JavaScript-Module + Beginners: Tutorials für Anfänger + Adding_interactivity: "Ihre erste Webseite: Interaktivität hinzufügen" + Dynamic_scripting_with_JavaScript: Dynamisches Scripting mit JavaScript + JavaScript_frameworks_and_libraries: JavaScript-Frameworks und -Bibliotheken Intermediate: Mittelstufe + Asynchronous_JavaScript: Asynchrones JavaScript + Client-side_web_APIs: Clientseitige Web-APIs Language_overview: Sprachübersicht Data_structures: JavaScript-Datenstrukturen Equality: Gleichheitsvergleiche und Gleichheit @@ -184,7 +190,7 @@ l10n: Lexical_grammar: Lexikalische Grammatik Enumerability: Aufzählbarkeit und Eigentum von Eigenschaften Iteration_protocols: Iterationsprotokolle - Template_strings: Vorlagenliterale + Template_strings: Template-Literale Trailing_commas: Abschließende Kommas Deprecated_features: Veraltete Funktionen en-US: @@ -397,7 +403,7 @@ l10n: Guide_Indexed_collections: インデックス付きコレクション Guide_keyed_collections: キー付きコレクション Guide_Objects: オブジェクトを利用する - Guide_Classes: Using classes + Guide_Classes: クラスの使用 Guide_Promises: プロミスの使用 Guide_Typed_arrays: JavaScript 型付き配列 Guide_Iterators_generators: イテレーターとジェネレーター @@ -405,13 +411,13 @@ l10n: Guide_Meta: メタプログラミング Guide_Modules: JavaScript モジュール Intermediate: 中級編 - Language_overview: Language overview + Language_overview: 言語概要 Data_structures: JavaScript のデータ構造 Equality: 等値比較と同一性 Closures: クロージャ Advanced: 上級編 Inheritance: 継承とプロトタイプチェーン - Strict_mode: Strict モード + Strict_mode: 厳格モード Memory_management: メモリー管理 Event_loop: 並列モデルとイベントループ Reference: リファレンス @@ -420,7 +426,7 @@ l10n: Statements: 文と宣言 Functions: 関数 Classes: クラス - Errors: Errors + Errors: エラー More: その他 Lexical_grammar: 字句文法 Enumerability: プロパティの列挙可能性と所有権