diff --git a/sites.php b/sites.php index 1d45eb42..9602cea3 100644 --- a/sites.php +++ b/sites.php @@ -81,7 +81,7 @@ function jquery_sites() { 'jquery_body_class' => 'jquery-ui', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'blog.jqueryui.com' => array( @@ -95,7 +95,7 @@ function jquery_sites() { 'jquery_is_blog' => true, 'jquery_author' => 'jQuery Team', 'jquery_description' => 'jQuery: The Write Less, Do More, JavaScript Library', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jqueryui.com' => array( @@ -111,7 +111,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jqueryui.com/1.8' => array( @@ -127,7 +127,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jqueryui.com/1.9' => array( @@ -143,7 +143,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'jquery.org' => array( @@ -168,7 +168,7 @@ function jquery_sites() { 'jquery_body_class' => 'jquery-mobile', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jquerymobile_com', - 'jquery_twitter_link' => 'https://twitter.com/jquerymobile', + 'jquery_x_link' => 'https://x.com/jquerymobile', ), ), 'api.jquerymobile.com' => array( @@ -184,7 +184,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jquerymobile.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jquerymobile_com', - 'jquery_twitter_link' => 'https://twitter.com/jquerymobile', + 'jquery_x_link' => 'https://x.com/jquerymobile', ), ), 'blog.jquerymobile.com' => array( @@ -197,7 +197,7 @@ function jquery_sites() { 'jquery_is_blog' => true, 'jquery_author' => 'jQuery Team', 'jquery_description' => 'jQuery: The Write Less, Do More, JavaScript Library', - 'jquery_twitter_link' => 'https://twitter.com/jquerymobile', + 'jquery_x_link' => 'https://x.com/jquerymobile', ), ), 'brand.jquery.org' => array( @@ -246,7 +246,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jquerymobile.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jquerymobile_com', - 'jquery_twitter_link' => 'https://twitter.com/jquerymobile', + 'jquery_x_link' => 'https://x.com/jquerymobile', ), ), 'api.jqueryui.com/1.10' => array( @@ -262,7 +262,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jqueryui.com/1.12' => array( @@ -278,7 +278,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jqueryui.com/1.11' => array( @@ -294,7 +294,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jquerymobile.com/1.4' => array( @@ -310,7 +310,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jquerymobile.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jquerymobile_com', - 'jquery_twitter_link' => 'https://twitter.com/jquerymobile', + 'jquery_x_link' => 'https://x.com/jquerymobile', ), ), 'releases.jquery.com' => array( @@ -338,7 +338,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), 'api.jqueryui.com/1.14' => array( @@ -354,7 +354,7 @@ function jquery_sites() { 'jquery_logo_link'=> 'https://jqueryui.com/', 'jquery_typesense_key' => 'Zh8mMgohXECel9wjPwqT7lekLSG3OCgz', 'jquery_typesense_collection' => 'jqueryui_com', - 'jquery_twitter_link' => 'https://twitter.com/jqueryui', + 'jquery_x_link' => 'https://x.com/jqueryui', ), ), ); diff --git a/themes/jquery/css/base.css b/themes/jquery/css/base.css index 54e2f3a8..c5d5ad79 100644 --- a/themes/jquery/css/base.css +++ b/themes/jquery/css/base.css @@ -105,10 +105,11 @@ body { } [class^="icon-"]:before, [class*=" icon-"]:before { - font-size: 1.2em; - text-decoration: inherit; - display: inline-block; - speak: none; + display: inline-block; + width: 1.2em; + height: 1.2em; + vertical-align: sub; + filter: invert(0.4); } .icon-info-sign:before { content: "\f05a"; } @@ -727,27 +728,29 @@ ul.icons li [class*=" icon-"] { } /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen readers do not read off random characters that represent icons */ -.icon-bolt:before { content: "\f0e7"; } /* Used: learn */ -.icon-calendar:before { content: "\f073"; } /* Used: learn */ -.icon-certificate:before { content: "\f0a3"; } /* Used: learn */ -.icon-chevron-left:before { content: "\f053"; } /* Used: learn */ -.icon-chevron-right:before { content: "\f054"; } /* Used: learn */ -.icon-comments:before { content: "\f086"; } /* Used: footer */ -.icon-copy:before { content: "\f0c5"; } /* Used: releases */ -.icon-dashboard:before { content: "\f0e4"; } /* Used: learn */ -.icon-eye-open:before { content: "\f06e"; } /* Used: jqueryui.com */ -.icon-github:before { content: "\f09b"; } /* Used: footer */ -.icon-link:before { content: "\f0c1"; } /* Used: toc-link, grunt-jquery-content */ -.icon-magnet:before { content: "\f076"; } /* Used: learn */ -.icon-pencil:before { content: "\f040"; } /* Used: footer */ -.icon-picture:before { content: "\f03e"; } /* Used: learn */ -.icon-question-sign:before { content: "\f059"; } /* Used: learn */ -.icon-refresh:before { content: "\f021"; } /* Used: learn */ -.icon-sitemap:before { content: "\f0e8"; } /* Used: learn */ -.icon-star-empty:before { content: "\f006"; } /* Used: learn */ -.icon-tasks:before { content: "\f0ae"; } /* Used: learn */ -.icon-th-large:before { content: "\f009"; } /* Used: learn */ -.icon-twitter:before { content: "\f099"; } /* Used: footer */ +.icon-bolt:before { content: ""; background: url(../lib/FontAwesome/bolt.svg) no-repeat; } /* Used: learn */ +.icon-calendar:before { content: ""; background: url(../lib/FontAwesome/calendar-days.svg) no-repeat; } /* Used: learn */ +.icon-certificate:before { content: ""; background: url(../lib/FontAwesome/certificate.svg) no-repeat; } /* Used: learn */ +.icon-chevron-left:before { content: ""; background: url(../lib/FontAwesome/chevron-left.svg) no-repeat; } /* Used: learn */ +.icon-chevron-right:before { content: ""; background: url(../lib/FontAwesome/chevron-right.svg) no-repeat; } /* Used: learn */ +.icon-comments:before { content: ""; background: url(../lib/FontAwesome/comments.svg) no-repeat; } /* Used: footer */ +.icon-copy:before { content: ""; background: url(../lib/FontAwesome/copy.svg) no-repeat; } /* Used: releases */ +.icon-dashboard:before { content: ""; background: url(../lib/FontAwesome/gauge.svg) no-repeat; } /* Used: learn */ +.icon-eye-open:before { content: ""; background: url(../lib/FontAwesome/eye.svg) no-repeat; } /* Used: jqueryui.com */ +.icon-github:before { content: ""; background: url(../lib/FontAwesome/github.svg) no-repeat; } /* Used: footer */ +.icon-link:before { content: ""; background: url(../lib/FontAwesome/link.svg) no-repeat; } /* Used: toc-link, grunt-jquery-content */ +.icon-magnet:before { content: ""; background: url(../lib/FontAwesome/magnet.svg) no-repeat; } /* Used: learn */ +.icon-mastodon:before { content: ""; background: url(../lib/FontAwesome/mastodon.svg) no-repeat; } /* Used: footer */ +.icon-pencil:before { content: ""; background: url(../lib/FontAwesome/pencil.svg) no-repeat; } /* Used: footer */ +.icon-picture:before { content: ""; background: url(../lib/FontAwesome/image.svg) no-repeat; } /* Used: learn */ +.icon-question-sign:before { content: ""; background: url(../lib/FontAwesome/circle-question.svg) no-repeat; } /* Used: learn */ +.icon-refresh:before { content: ""; background: url(../lib/FontAwesome/arrows-rotate.svg) no-repeat; } /* Used: learn */ +.icon-sitemap:before { content: ""; background: url(../lib/FontAwesome/sitemap.svg) no-repeat; } /* Used: learn */ +.icon-star-empty:before { content: ""; background: url(../lib/FontAwesome/star.svg) no-repeat; } /* Used: learn */ +.icon-tasks:before { content: ""; background: url(../lib/FontAwesome/bars-progress.svg) no-repeat; } /* Used: learn */ +.icon-th-large:before { content: ""; background: url(../lib/FontAwesome/table-cells-large.svg) no-repeat; } /* Used: learn */ +.icon-twitter:before { content: ""; background: url(../lib/FontAwesome/twitter.svg) no-repeat; } /* Deprecated */ +.icon-x:before { content: ""; background: url(../lib/FontAwesome/x-twitter.svg) no-repeat; } /* Used: footer */ /* Manual Font Awesome Styles */ [class^="icon-"]::before, [class^="icon-"]::after, @@ -1898,16 +1901,19 @@ footer a.do-link:before { .footer-site-links li a:before { position: absolute; - font-size: 1.5em; - color: #4d4d4d; - text-shadow: 0 -1px 0 #000000; + width: 1.5em; + height: 1.5em; left: 2px; + text-shadow: 0 -1px 0 #000000; + filter: invert(0.4); } -.footer-site-links li:hover a, -.footer-site-links li:hover a:before { +.footer-site-links li:hover a { color: #e6e6e6; } +.footer-site-links li:hover a:before { + filter: invert(0.9); +} .footer-site-links li { display: inline-block; @@ -1970,14 +1976,21 @@ footer .books li a cite { .toc-linked { position: relative; + display: flex; + align-items: center; } .toc-linked .toc-link { position: absolute; - left: -1em; + left: -1.2em; text-decoration: none; opacity: 0; } + +.toc-linked .icon-link:before { + filter: invert(0.1); +} + /* TODO: Remove (https://github.com/jquery/jquery-wp-content/issues/143) */ #content .toc-linked .toc-link { text-decoration: none; diff --git a/themes/jquery/footer-bottom.php b/themes/jquery/footer-bottom.php index 420dfab2..873d07ce 100644 --- a/themes/jquery/footer-bottom.php +++ b/themes/jquery/footer-bottom.php @@ -8,9 +8,13 @@ 'class' => 'icon-comments', 'url' => 'https://jquery.com/support/' ), - 'Twitter' => array( - 'class' => 'icon-twitter', - 'url' => get_option( 'jquery_twitter_link' ) ?: 'https://twitter.com/jquery' + 'X' => array( + 'class' => 'icon-x', + 'url' => get_option( 'jquery_x_link' ) ?: 'https://x.com/jquery' + ), + 'Mastodon' => array( + 'class' => 'icon-mastodon', + 'url' => 'https://social.lfx.dev/@jquery' ), 'GitHub' => array( 'class' => 'icon-github', diff --git a/themes/jquery/lib/FontAwesome/arrows-rotate.svg b/themes/jquery/lib/FontAwesome/arrows-rotate.svg new file mode 100644 index 00000000..cd2d9220 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/arrows-rotate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/bars-progress.svg b/themes/jquery/lib/FontAwesome/bars-progress.svg new file mode 100644 index 00000000..56feffed --- /dev/null +++ b/themes/jquery/lib/FontAwesome/bars-progress.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/bolt.svg b/themes/jquery/lib/FontAwesome/bolt.svg new file mode 100644 index 00000000..9dc2ad8a --- /dev/null +++ b/themes/jquery/lib/FontAwesome/bolt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/calendar-days.svg b/themes/jquery/lib/FontAwesome/calendar-days.svg new file mode 100644 index 00000000..ba4b8ffe --- /dev/null +++ b/themes/jquery/lib/FontAwesome/calendar-days.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/certificate.svg b/themes/jquery/lib/FontAwesome/certificate.svg new file mode 100644 index 00000000..3cdac7e5 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/certificate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/chevron-left.svg b/themes/jquery/lib/FontAwesome/chevron-left.svg new file mode 100644 index 00000000..ece0be99 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/chevron-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/chevron-right.svg b/themes/jquery/lib/FontAwesome/chevron-right.svg new file mode 100644 index 00000000..02dc25ea --- /dev/null +++ b/themes/jquery/lib/FontAwesome/chevron-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/circle-question.svg b/themes/jquery/lib/FontAwesome/circle-question.svg new file mode 100644 index 00000000..369096c2 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/circle-question.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/comments.svg b/themes/jquery/lib/FontAwesome/comments.svg new file mode 100644 index 00000000..719bb98b --- /dev/null +++ b/themes/jquery/lib/FontAwesome/comments.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/copy.svg b/themes/jquery/lib/FontAwesome/copy.svg new file mode 100644 index 00000000..705afeb5 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/eye.svg b/themes/jquery/lib/FontAwesome/eye.svg new file mode 100644 index 00000000..7fbf56ed --- /dev/null +++ b/themes/jquery/lib/FontAwesome/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/gauge.svg b/themes/jquery/lib/FontAwesome/gauge.svg new file mode 100644 index 00000000..6c876322 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/gauge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/github.svg b/themes/jquery/lib/FontAwesome/github.svg new file mode 100644 index 00000000..71abd3e8 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/image.svg b/themes/jquery/lib/FontAwesome/image.svg new file mode 100644 index 00000000..e35f57e2 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/image.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/link.svg b/themes/jquery/lib/FontAwesome/link.svg new file mode 100644 index 00000000..78b7f87b --- /dev/null +++ b/themes/jquery/lib/FontAwesome/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/magnet.svg b/themes/jquery/lib/FontAwesome/magnet.svg new file mode 100644 index 00000000..a8b37002 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/magnet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/mastodon.svg b/themes/jquery/lib/FontAwesome/mastodon.svg new file mode 100644 index 00000000..502b251f --- /dev/null +++ b/themes/jquery/lib/FontAwesome/mastodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/pencil.svg b/themes/jquery/lib/FontAwesome/pencil.svg new file mode 100644 index 00000000..6feb7db5 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/pencil.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/sitemap.svg b/themes/jquery/lib/FontAwesome/sitemap.svg new file mode 100644 index 00000000..f836a486 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/sitemap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/star.svg b/themes/jquery/lib/FontAwesome/star.svg new file mode 100644 index 00000000..029965fd --- /dev/null +++ b/themes/jquery/lib/FontAwesome/star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/table-cells-large.svg b/themes/jquery/lib/FontAwesome/table-cells-large.svg new file mode 100644 index 00000000..50d77d92 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/table-cells-large.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/twitter.svg b/themes/jquery/lib/FontAwesome/twitter.svg new file mode 100644 index 00000000..c0059c9c --- /dev/null +++ b/themes/jquery/lib/FontAwesome/twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/jquery/lib/FontAwesome/x-twitter.svg b/themes/jquery/lib/FontAwesome/x-twitter.svg new file mode 100644 index 00000000..c6b3d545 --- /dev/null +++ b/themes/jquery/lib/FontAwesome/x-twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/learn.jquery.com/content-page.php b/themes/learn.jquery.com/content-page.php index 1b6bfa98..f07f0f77 100644 --- a/themes/learn.jquery.com/content-page.php +++ b/themes/learn.jquery.com/content-page.php @@ -42,7 +42,7 @@