From: jenkins-bot Date: Tue, 26 Jan 2016 13:09:29 +0000 (+0000) Subject: Merge "TableSorter: Use SVGs with PNG fallbacks instead of GIFs" X-Git-Tag: 1.31.0-rc.0~8204 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=01f81c322cc47ce21ccabf3b18d2e6fa97a1a1e8;hp=ed7977d6b6091795094803b3fd0c4afe6b9bea4c;p=lhc%2Fweb%2Fwiklou.git Merge "TableSorter: Use SVGs with PNG fallbacks instead of GIFs" --- diff --git a/resources/Resources.php b/resources/Resources.php index 8dac08e4c6..458d5f1a0c 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -338,7 +338,7 @@ return array( ), 'jquery.tablesorter' => array( 'scripts' => 'resources/src/jquery/jquery.tablesorter.js', - 'styles' => 'resources/src/jquery/jquery.tablesorter.css', + 'styles' => 'resources/src/jquery/jquery.tablesorter.less', 'messages' => array( 'sort-descending', 'sort-ascending' ), 'dependencies' => array( 'dom-level2-shim', diff --git a/resources/src/jquery/images/sort_both.gif b/resources/src/jquery/images/sort_both.gif deleted file mode 100644 index 50ad15a0a9..0000000000 Binary files a/resources/src/jquery/images/sort_both.gif and /dev/null differ diff --git a/resources/src/jquery/images/sort_both.png b/resources/src/jquery/images/sort_both.png new file mode 100644 index 0000000000..e340425f38 Binary files /dev/null and b/resources/src/jquery/images/sort_both.png differ diff --git a/resources/src/jquery/images/sort_both.svg b/resources/src/jquery/images/sort_both.svg new file mode 100644 index 0000000000..f906b93214 --- /dev/null +++ b/resources/src/jquery/images/sort_both.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/src/jquery/images/sort_down.gif b/resources/src/jquery/images/sort_down.gif deleted file mode 100644 index ec4f41b001..0000000000 Binary files a/resources/src/jquery/images/sort_down.gif and /dev/null differ diff --git a/resources/src/jquery/images/sort_down.png b/resources/src/jquery/images/sort_down.png new file mode 100644 index 0000000000..d58d54dc36 Binary files /dev/null and b/resources/src/jquery/images/sort_down.png differ diff --git a/resources/src/jquery/images/sort_down.svg b/resources/src/jquery/images/sort_down.svg new file mode 100644 index 0000000000..105574bc3a --- /dev/null +++ b/resources/src/jquery/images/sort_down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/src/jquery/images/sort_none.gif b/resources/src/jquery/images/sort_none.gif deleted file mode 100644 index edd07e5862..0000000000 Binary files a/resources/src/jquery/images/sort_none.gif and /dev/null differ diff --git a/resources/src/jquery/images/sort_up.gif b/resources/src/jquery/images/sort_up.gif deleted file mode 100644 index 8018918541..0000000000 Binary files a/resources/src/jquery/images/sort_up.gif and /dev/null differ diff --git a/resources/src/jquery/images/sort_up.png b/resources/src/jquery/images/sort_up.png new file mode 100644 index 0000000000..1a5f27e5f5 Binary files /dev/null and b/resources/src/jquery/images/sort_up.png differ diff --git a/resources/src/jquery/images/sort_up.svg b/resources/src/jquery/images/sort_up.svg new file mode 100644 index 0000000000..2fa4c731ba --- /dev/null +++ b/resources/src/jquery/images/sort_up.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/src/jquery/jquery.tablesorter.css b/resources/src/jquery/jquery.tablesorter.css deleted file mode 100644 index a88acc0909..0000000000 --- a/resources/src/jquery/jquery.tablesorter.css +++ /dev/null @@ -1,17 +0,0 @@ -/* Table Sorting */ -table.jquery-tablesorter th.headerSort { - /* @embed */ - background-image: url(images/sort_both.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 21px; -} -table.jquery-tablesorter th.headerSortUp { - /* @embed */ - background-image: url(images/sort_up.gif); -} -table.jquery-tablesorter th.headerSortDown { - /* @embed */ - background-image: url(images/sort_down.gif); -} diff --git a/resources/src/jquery/jquery.tablesorter.less b/resources/src/jquery/jquery.tablesorter.less new file mode 100644 index 0000000000..f4ef540954 --- /dev/null +++ b/resources/src/jquery/jquery.tablesorter.less @@ -0,0 +1,19 @@ +@import "mediawiki.mixins"; + +/* Table Sorting */ + +table.jquery-tablesorter th.headerSort { + .background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' ); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 21px; +} + +table.jquery-tablesorter th.headerSortUp { + .background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' ); +} + +table.jquery-tablesorter th.headerSortDown { + .background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' ); +}