Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed "Blacklist" to "Blocklist" (inclusive language) #552

Closed
wants to merge 9 commits into from
Closed

Changed "Blacklist" to "Blocklist" (inclusive language) #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c8cec2
replace all occurences of "Blacklist" with "Blocklist"
denalena Nov 13, 2020
f11665d
replace all occurrences of "blacklist" with "blocklist"
denalena Nov 13, 2020
fc3ae2f
fix typo in de/messages.json
denalena Nov 13, 2020
ae03e63
adjust blacklist renaming
denalena Nov 28, 2020
42c7f57
Revert "adjust blacklist renaming"
denalena Nov 28, 2020
e9bfb33
Revert "replace all occurrences of "blacklist" with "blocklist""
denalena Nov 28, 2020
876520d
Revert "replace all occurences of "Blacklist" with "Blocklist""
denalena Nov 28, 2020
3a31bd5
rename blacklist to "exlcusions"
denalena Nov 28, 2020
9b5f2c6
rename blacklist.js to exclusions.js
denalena Nov 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/views/options/css/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ label.button > span {


/**
* Blacklist layout
* Exclusions layout
**/

.bl-form {
Expand Down Expand Up @@ -1104,11 +1104,11 @@ label.button > span {
line-height: 100%;
}

.blacklist {
.exclusions {
padding-top: 20px;
}

.blacklist::after {
.exclusions::after {
display: block;
visibility: hidden;
opacity: 0;
Expand All @@ -1118,7 +1118,7 @@ label.button > span {
font-size: 18px;
}

.blacklist:empty::after {
.exclusions:empty::after {
visibility: visible;
opacity: .5;
transition: opacity .3s;
Expand Down
14 changes: 7 additions & 7 deletions src/views/options/html/content/blacklist.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="content-header">
<h2 data-i18n="navigationBlacklist"></h2>
<h2 data-i18n="navigationExclusions"></h2>
</div>
<p class="justify-text">
<em data-i18n="blacklistLabelInformation"></em>
<span class="small-text" data-i18n="blacklistTextInformation"></span>
<a class="small-text" target="_blank" href="https://github.com/Robbendebiene/Gesturefy/wiki/Blacklist" data-i18n="linkAdditionalInformation"></a>
<em data-i18n="exclusionsLabelInformation"></em>
<span class="small-text" data-i18n="exclusionsTextInformation"></span>
<a class="small-text" target="_blank" href="https://github.com/Robbendebiene/Gesturefy/wiki/Exclusions" data-i18n="linkAdditionalInformation"></a>
</p>
<hr>
<form id="blacklistForm" class="bl-form">
<form id="exclusionsForm" class="bl-form">
<input name="urlPattern" autofocus class="bl-url-pattern-input">
<button class="bl-add-button" type="submit" data-i18n="blacklistAddButton"></button>
<button class="bl-add-button" type="submit" data-i18n="exclusionsAddButton"></button>
</form>
<ul class="blacklist" id="blacklistContainer"></ul>
<ul class="exclusions" id="exclusionsContainer"></ul>
8 changes: 4 additions & 4 deletions src/views/options/html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<script src="/views/options/js/index.js" type="module"></script>
<script src="/views/options/js/content/settings.js" type="module"></script>
<script src="/views/options/js/content/gestures.js" type="module"></script>
<script src="/views/options/js/content/blacklist.js" type="module"></script>
<script src="/views/options/js/content/exclusions.js" type="module"></script>
<script src="/views/options/js/content/about.js" type="module"></script>
</head>

Expand All @@ -41,9 +41,9 @@
</a>
</li>
<li class="nav-item">
<a href="#Blacklist">
<a href="#Exclusions">
<span class="nav-item-symbol icon-list"></span>
<span class="nav-item-label" data-i18n="navigationBlacklist"></span>
<span class="nav-item-label" data-i18n="navigationExclusions"></span>
</a>
</li>
<li class="nav-item">
Expand All @@ -65,7 +65,7 @@
<div class="content" data-include="/views/options/html/content/settings.inc" id="Settings"></div>
<div class="content" data-include="/views/options/html/content/gestures.inc" id="Gestures"></div>
<div class="content" data-include="/views/options/html/content/extras.inc" id="Extras"></div>
<div class="content" data-include="/views/options/html/content/blacklist.inc" id="Blacklist"></div>
<div class="content" data-include="/views/options/html/content/exclusions.inc" id="Exclusions"></div>
<div class="content" data-include="/views/options/html/content/about.inc" id="About"></div>
</div>
</body>
Expand Down
162 changes: 0 additions & 162 deletions src/views/options/js/content/blacklist.js
View file
Open in desktop

This file was deleted.

Loading