From a7df403542bde8de30048ae37dba14fc53ed2976 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 21 Nov 2014 21:38:20 +0100 Subject: [PATCH] mediawiki.ui: Reorder styleguide sections Mostly to have checkboxes and radio buttons in neighboring sections. Before: 1. Inputs 2. Buttons 3. Forms 4. Icons 5. Checkbox 6. Text & anchors 7. Radio After: 1. Text inputs 2. Buttons 3. Checkbox 4. Radio 5. Forms 6. Icons 7. Text & anchors Change-Id: I6b067eb90f5f05d7773c4879b87317436554701e --- .../src/mediawiki.ui/components/checkbox.less | 18 +++++++++--------- .../src/mediawiki.ui/components/forms.less | 6 +++--- .../src/mediawiki.ui/components/icons.less | 8 ++++---- .../src/mediawiki.ui/components/inputs.less | 2 +- .../src/mediawiki.ui/components/radio.less | 18 +++++++++--------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/resources/src/mediawiki.ui/components/checkbox.less b/resources/src/mediawiki.ui/components/checkbox.less index 67f8a21377..ff454e1584 100644 --- a/resources/src/mediawiki.ui/components/checkbox.less +++ b/resources/src/mediawiki.ui/components/checkbox.less @@ -11,23 +11,23 @@ // // Markup: //
-// -// +// +// //
//
-// -// +// +// //
//
-// -// +// +// //
//
-// -// +// +// //
// -// Styleguide 5. +// Styleguide 3. .mw-ui-checkbox { display: inline-block; vertical-align: middle; diff --git a/resources/src/mediawiki.ui/components/forms.less b/resources/src/mediawiki.ui/components/forms.less index 499b91a2a1..dc49e2023c 100644 --- a/resources/src/mediawiki.ui/components/forms.less +++ b/resources/src/mediawiki.ui/components/forms.less @@ -15,7 +15,7 @@ // Forms // -// Styleguide 3. +// Styleguide 5. // VForm // @@ -34,7 +34,7 @@ // // // -// Styleguide 3.1. +// Styleguide 5.1. .mw-ui-vform { .box-sizing(border-box); @@ -102,7 +102,7 @@ // // // - // Styleguide 3.2. + // Styleguide 5.2. .error, .errorbox, .warningbox, diff --git a/resources/src/mediawiki.ui/components/icons.less b/resources/src/mediawiki.ui/components/icons.less index dc2ca52f76..0912554c9e 100644 --- a/resources/src/mediawiki.ui/components/icons.less +++ b/resources/src/mediawiki.ui/components/icons.less @@ -26,7 +26,7 @@ // However, icon-only elements do not yet degrade to text-only elements in these // browsers. // -// Styleguide 4. +// Styleguide 6. .mw-ui-icon { position: relative; @@ -39,7 +39,7 @@ //
OK
//
OK
// - // Styleguide 4.1.1. + // Styleguide 6.1.1. &.mw-ui-icon-element { @width: @iconSize + ( 2 * @gutterWidth ); @@ -75,7 +75,7 @@ //
OK
//
OK
// - // Styleguide 4.1.2 + // Styleguide 6.1.2 &.mw-ui-icon-before { &:before { position: relative; @@ -89,7 +89,7 @@ // Markup: //
OK
// - // Styleguide 4.1.3 + // Styleguide 6.1.3 &.mw-ui-icon-after { &:after { position: relative; diff --git a/resources/src/mediawiki.ui/components/inputs.less b/resources/src/mediawiki.ui/components/inputs.less index 9f3a77d9e4..28d597ea33 100644 --- a/resources/src/mediawiki.ui/components/inputs.less +++ b/resources/src/mediawiki.ui/components/inputs.less @@ -9,7 +9,7 @@ font-style: italic; font-weight: normal; } -// Inputs +// Text inputs // // Apply the mw-ui-input class to input and textarea fields. // diff --git a/resources/src/mediawiki.ui/components/radio.less b/resources/src/mediawiki.ui/components/radio.less index 3bbbb28c1e..425ec1b865 100644 --- a/resources/src/mediawiki.ui/components/radio.less +++ b/resources/src/mediawiki.ui/components/radio.less @@ -11,23 +11,23 @@ // // Markup: //
-// -// +// +// //
//
-// -// +// +// //
//
-// -// +// +// //
//
-// -// +// +// //
// -// Styleguide 7. +// Styleguide 4. .mw-ui-radio { display: inline-block; vertical-align: middle; -- 2.20.1