Replace country flags with single language icon (jdm-contrib#943)

CodingVoid · Nov 1, 2021 · a1b6b8c · a1b6b8c
1 parent cce96d8
commit a1b6b8c
Show file tree

Hide file tree

Showing 55 changed files with 15 additions and 63 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,6 +12,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.svg]
+indent_size = 1
+
 [*.yml]
 indent_size = 2
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -41,6 +41,3 @@ Look for the `CODE.json` file in the `_data/trans/` directory where `CODE` is yo
 2. Copy the contents of `en.json` to your new file
 3. Translate each line
 4. Within the `_pages/` directory, copy `_pages/index.html` to a new `CODE.html` file, and update the `lang: CODE` line to match the new page's code
-5. Visit [gosquared/flags](https://github.com/gosquared/flags/tree/master/flags/flags-iso/shiny) and get the shiny 16px and 24px flags for your language.
-6. Save the flag icons onto `assets/icons` as `CODE16.png` and `CODE24.png`, where `CODE` is your short country code.
-7. On `assets/css/style.css` insert a `dropdown` and a `background-image` that reference these flags.
diff --git a/README.md b/README.md
@@ -50,8 +50,9 @@ Project licensed under the [MIT License](LICENSE) (MIT). This is a detached
 fork of the [original repo](https://github.com/justdeleteme/justdelete.me)
 that intends to keep the project alive, as the original one was abandoned.
 
-Flags modified from [gosquared/flags](https://github.com/gosquared/flags),
-MIT licensed, Copyright (c) 2017 Go Squared Ltd.
+Language icon from [Font Awesome](https://github.com/FortAwesome/Font-Awesome)
+released under the [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)
+license. Minor alignment changes made to optimize for the display size.
 
 Search functionality modified from [DevCenter.me](https://github.com/stevestreza/DevCenter.me),
 MIT licensed, Copyright (c) 2013 Steve Streza.
diff --git a/_includes/body.html b/_includes/body.html
@@ -109,7 +109,7 @@ <h2>{{ site.data.trans[page.lang].extensionguide|safe }}</h2>
 </div>
 
 <!-- Language dropdown -->
-<div id="language-dropdown" class="dropdown dropdown-tip has-icons">
+<div id="language-dropdown" class="dropdown dropdown-tip">
     <ul class="dropdown-menu">
         {% assign sorted_files = (site.data.trans | sort:0) %}
         {% for lang in sorted_files %}

diff --git a/_includes/header.html b/_includes/header.html
@@ -29,9 +29,9 @@
 <body lang="{{ page.lang }}"{% if rtl %} dir="rtl"{% endif %}>
 
 <nav>
-    <!-- begin language switcher -->
-    <span class="language-switch" href="#" data-dropdown="#language-dropdown" id="{{ page.lang }}">{{ site.data.trans[page.lang].name }}</span>
-    <!-- end language switcher -->
+    <a class="language-switch" href="#" data-dropdown="#language-dropdown">
+        <img class="icon" src="{{ site.baseurl }}/assets/icons/language.svg" alt="A|文"/>
+    </a>
     <a href="#about" class="info">{{ site.data.trans.[page.lang].about }}</a>
 </nav>
 

diff --git a/assets/css/style.css b/assets/css/style.css
@@ -34,61 +34,9 @@ nav {
 }
 
 .language-switch {
-    background-position: left center;
-    background-repeat: no-repeat;
     cursor: pointer;
-    padding: 8px 10px 8px 29px;
-}
-
-.dropdown .ar a,    .ar a    { background-image: url(../icons/flags/ar16.png); }
-.dropdown .cat a,   .cat a   { background-image: url(../icons/flags/cat16.png); }
-.dropdown .cz a,    .cz a    { background-image: url(../icons/flags/cz16.png); }
-.dropdown .de a,    .de a    { background-image: url(../icons/flags/de16.png); }
-.dropdown .en a,    .en a    { background-image: url(../icons/flags/en16.png); }
-.dropdown .es a,    .es a    { background-image: url(../icons/flags/es16.png); }
-.dropdown .fa a,    .fa a    { background-image: url(../icons/flags/fa16.png); }
-.dropdown .fr a,    .fr a    { background-image: url(../icons/flags/fr16.png); }
-.dropdown .gr a,    .gr a    { background-image: url(../icons/flags/gr16.png); }
-.dropdown .id a,    .id a    { background-image: url(../icons/flags/id16.png); }
-.dropdown .it a,    .it a    { background-image: url(../icons/flags/it16.png); }
-.dropdown .kr a,    .kr a    { background-image: url(../icons/flags/kr16.png); }
-.dropdown .nl a,    .nl a    { background-image: url(../icons/flags/nl16.png); }
-.dropdown .pl a,    .pl a    { background-image: url(../icons/flags/pl16.png); }
-.dropdown .pt_br a, .pt_br a { background-image: url(../icons/flags/pt_br16.png); }
-.dropdown .ro a,    .ro a    { background-image: url(../icons/flags/ro16.png); }
-.dropdown .ru a,    .ru a    { background-image: url(../icons/flags/ru16.png); }
-.dropdown .sk a,    .sk a    { background-image: url(../icons/flags/sk16.png); }
-.dropdown .sr a,    .sr a    { background-image: url(../icons/flags/sr16.png); }
-.dropdown .th a,    .th a    { background-image: url(../icons/flags/th16.png); }
-.dropdown .tr a,    .tr a    { background-image: url(../icons/flags/tr16.png); }
-.dropdown .vi a,    .vi a    { background-image: url(../icons/flags/vi16.png); }
-.dropdown .zh-cn a, .zh-cn a { background-image: url(../icons/flags/cn16.png); }
-.dropdown .zh-tw a, .zh-tw a { background-image: url(../icons/flags/tw16.png); }
-
-#ar    { background-image: url(../icons/flags/ar24.png); }
-#cat   { background-image: url(../icons/flags/cat24.png); }
-#cz    { background-image: url(../icons/flags/cz24.png); }
-#de    { background-image: url(../icons/flags/de24.png); }
-#en    { background-image: url(../icons/flags/en24.png); }
-#es    { background-image: url(../icons/flags/es24.png); }
-#fa    { background-image: url(../icons/flags/fa24.png); }
-#fr    { background-image: url(../icons/flags/fr24.png); }
-#gr    { background-image: url(../icons/flags/gr24.png); }
-#id    { background-image: url(../icons/flags/id24.png); }
-#it    { background-image: url(../icons/flags/it24.png); }
-#kr    { background-image: url(../icons/flags/kr24.png); }
-#nl    { background-image: url(../icons/flags/nl24.png); }
-#pl    { background-image: url(../icons/flags/pl24.png); }
-#pt_br { background-image: url(../icons/flags/pt_br24.png); }
-#ro    { background-image: url(../icons/flags/ro24.png); }
-#ru    { background-image: url(../icons/flags/ru24.png); }
-#sk    { background-image: url(../icons/flags/sk24.png); }
-#sr    { background-image: url(../icons/flags/sr24.png); }
-#th    { background-image: url(../icons/flags/th24.png); }
-#tr    { background-image: url(../icons/flags/tr24.png); }
-#vi    { background-image: url(../icons/flags/vi24.png); }
-#zh-cn { background-image: url(../icons/flags/cn24.png); }
-#zh-tw { background-image: url(../icons/flags/tw24.png); }
+    padding: 12px 10px 8px 12px;
+}
 
 nav a {
     color: black;

diff --git a/assets/icons/flags/ar16.png b/assets/icons/flags/ar16.png
diff --git a/assets/icons/flags/ar24.png b/assets/icons/flags/ar24.png
diff --git a/assets/icons/flags/cat16.png b/assets/icons/flags/cat16.png
diff --git a/assets/icons/flags/cat24.png b/assets/icons/flags/cat24.png
diff --git a/assets/icons/flags/cn16.png b/assets/icons/flags/cn16.png
diff --git a/assets/icons/flags/cn24.png b/assets/icons/flags/cn24.png
diff --git a/assets/icons/flags/cz16.png b/assets/icons/flags/cz16.png
diff --git a/assets/icons/flags/cz24.png b/assets/icons/flags/cz24.png
diff --git a/assets/icons/flags/de16.png b/assets/icons/flags/de16.png
diff --git a/assets/icons/flags/de24.png b/assets/icons/flags/de24.png
diff --git a/assets/icons/flags/en16.png b/assets/icons/flags/en16.png
diff --git a/assets/icons/flags/en24.png b/assets/icons/flags/en24.png
diff --git a/assets/icons/flags/es16.png b/assets/icons/flags/es16.png
diff --git a/assets/icons/flags/es24.png b/assets/icons/flags/es24.png
diff --git a/assets/icons/flags/fa16.png b/assets/icons/flags/fa16.png
diff --git a/assets/icons/flags/fa24.png b/assets/icons/flags/fa24.png
diff --git a/assets/icons/flags/fr16.png b/assets/icons/flags/fr16.png
diff --git a/assets/icons/flags/fr24.png b/assets/icons/flags/fr24.png
diff --git a/assets/icons/flags/gr16.png b/assets/icons/flags/gr16.png
diff --git a/assets/icons/flags/gr24.png b/assets/icons/flags/gr24.png
diff --git a/assets/icons/flags/id16.png b/assets/icons/flags/id16.png
diff --git a/assets/icons/flags/id24.png b/assets/icons/flags/id24.png
diff --git a/assets/icons/flags/it16.png b/assets/icons/flags/it16.png
diff --git a/assets/icons/flags/it24.png b/assets/icons/flags/it24.png
diff --git a/assets/icons/flags/kr16.png b/assets/icons/flags/kr16.png
diff --git a/assets/icons/flags/kr24.png b/assets/icons/flags/kr24.png
diff --git a/assets/icons/flags/nl16.png b/assets/icons/flags/nl16.png
diff --git a/assets/icons/flags/nl24.png b/assets/icons/flags/nl24.png
diff --git a/assets/icons/flags/pl16.png b/assets/icons/flags/pl16.png
diff --git a/assets/icons/flags/pl24.png b/assets/icons/flags/pl24.png
diff --git a/assets/icons/flags/pt_br16.png b/assets/icons/flags/pt_br16.png
diff --git a/assets/icons/flags/pt_br24.png b/assets/icons/flags/pt_br24.png
diff --git a/assets/icons/flags/ro16.png b/assets/icons/flags/ro16.png
diff --git a/assets/icons/flags/ro24.png b/assets/icons/flags/ro24.png
diff --git a/assets/icons/flags/ru16.png b/assets/icons/flags/ru16.png
diff --git a/assets/icons/flags/ru24.png b/assets/icons/flags/ru24.png
diff --git a/assets/icons/flags/sk16.png b/assets/icons/flags/sk16.png
diff --git a/assets/icons/flags/sk24.png b/assets/icons/flags/sk24.png
diff --git a/assets/icons/flags/sr16.png b/assets/icons/flags/sr16.png
diff --git a/assets/icons/flags/sr24.png b/assets/icons/flags/sr24.png
diff --git a/assets/icons/flags/th16.png b/assets/icons/flags/th16.png
diff --git a/assets/icons/flags/th24.png b/assets/icons/flags/th24.png
diff --git a/assets/icons/flags/tr16.png b/assets/icons/flags/tr16.png
diff --git a/assets/icons/flags/tr24.png b/assets/icons/flags/tr24.png
diff --git a/assets/icons/flags/tw16.png b/assets/icons/flags/tw16.png
diff --git a/assets/icons/flags/tw24.png b/assets/icons/flags/tw24.png
diff --git a/assets/icons/flags/vi16.png b/assets/icons/flags/vi16.png
diff --git a/assets/icons/flags/vi24.png b/assets/icons/flags/vi24.png
diff --git a/assets/icons/language.svg b/assets/icons/language.svg