From a047d4112fbbfcb1fe78bbd08736a0d3337e6fe8 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Thu, 11 Feb 2016 22:43:37 +0300 Subject: [PATCH] Build: use tabs in CSS, also simplify and correct .editorconfig See https://contribute.jquery.org/style-guide/css/#spacing > Indentation with tabs. --- .editorconfig | 20 ++------- test/data/testsuite.css | 98 ++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 65 deletions(-) diff --git a/.editorconfig b/.editorconfig index a7ed4a83a..b5bd7f60e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,26 +3,14 @@ root = true - [*] +indent_style = tab end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -# Tabs in JS unless otherwise specified -[**.js] -indent_style = tab - -[test/**.xml] -indent_style = tab - -[test/**.php] -indent_style = tab - -[test/**.html] -indent_style = tab - -[test/**.css] +[package.json] indent_style = space -indent_size = 8 +indent_size = 2 + diff --git a/test/data/testsuite.css b/test/data/testsuite.css index f2f13a427..40ce07188 100644 --- a/test/data/testsuite.css +++ b/test/data/testsuite.css @@ -1,127 +1,127 @@ /* for testing opacity set in styles in IE */ ol#empty { - opacity: 0; - filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff'); + opacity: 0; + filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff'); } div#fx-tests h4 { - background: red; + background: red; } div#fx-tests h4.pass { - background: green; + background: green; } div#fx-tests div.box { - background: red; - overflow: hidden; - border: 2px solid #000; + background: red; + overflow: hidden; + border: 2px solid #000; } div#fx-tests div.overflow { - overflow: visible; + overflow: visible; } div.inline { - display: inline; + display: inline; } div.autoheight { - height: auto; + height: auto; } div.autowidth { - width: auto; + width: auto; } div.autoopacity { - opacity: auto; + opacity: auto; } div.largewidth { - width: 100px; + width: 100px; } div.largeheight { - height: 100px; + height: 100px; } div.largeopacity { - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100); + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100); } div.medwidth { - width: 50px; + width: 50px; } div.medheight { - height: 50px; + height: 50px; } div.medopacity { - opacity: 0.5; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50); + opacity: 0.5; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50); } div.nowidth { - width: 0px; + width: 0px; } div.noheight { - height: 0px; + height: 0px; } div.noopacity { - opacity: 0; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); + opacity: 0; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); } div.hidden { - display: none; + display: none; } div#fx-tests div.widewidth { - background-repeat: repeat-x; + background-repeat: repeat-x; } div#fx-tests div.wideheight { - background-repeat: repeat-y; + background-repeat: repeat-y; } div#fx-tests div.widewidth.wideheight { - background-repeat: repeat; + background-repeat: repeat; } div#fx-tests div.noback { - background-image: none; + background-image: none; } .chain-test, .chain-test div { - width: 100px; - height: 20px; - position: relative; - float: left; + width: 100px; + height: 20px; + position: relative; + float: left; } .chain-test div { - position: absolute; - top: 0; - left: 0; + position: absolute; + top: 0; + left: 0; } .chain-test { - background: red; + background: red; } .chain-test div { - background: green; + background: green; } .chain-test-out { - background: green; + background: green; } .chain-test-out div { - background: red; - display: none; + background: red; + display: none; } /* tests to ensure jQuery can determine the native display mode of elements @@ -159,19 +159,19 @@ section { background:#f0f; display:block; } /* fix get alpha opacity in IE8 */ .fix-get-alpha-opacity-in-ie8 { - opacity: 0.5; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + opacity: 0.5; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; } #div-gh-2836 { - position: relative; - overflow: auto; - height: 100px; + position: relative; + overflow: auto; + height: 100px; } #div-gh-2836 div { - position: relative; - height: 100%; - padding: 0; - margin: 0; + position: relative; + height: 100%; + padding: 0; + margin: 0; }