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

Jump to bottom

Rename filters #4038

Closed
wants to merge 2 commits into from
Closed

Rename filters #4038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25ecc6e
New names for all filters
snan Dec 29, 2022
b53e1e5
Remove the i prefix when we have new names
snan Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 41 additions & 41 deletions app/Util/Media/Filter.php
View file
Open in desktop
Expand Up @@ -5,47 +5,47 @@
class Filter {

public static $filters = [
'1977' => 'filter-1977',
'Aden' => 'filter-aden',
'Amaro' => 'filter-amaro',
'Ashby' => 'filter-ashby',
'Brannan' => 'filter-brannan',
'Brooklyn' => 'filter-brooklyn',
'Charmes' => 'filter-charmes',
'Clarendon' => 'filter-clarendon',
'Crema' => 'filter-crema',
'Dogpatch' => 'filter-dogpatch',
'Earlybird' => 'filter-earlybird',
'Gingham' => 'filter-gingham',
'Ginza' => 'filter-ginza',
'Hefe' => 'filter-hefe',
'Helena' => 'filter-helena',
'Hudson' => 'filter-hudson',
'Inkwell' => 'filter-inkwell',
'Kelvin' => 'filter-kelvin',
'Kuno' => 'filter-juno',
'Lark' => 'filter-lark',
'Lo-Fi' => 'filter-lofi',
'Ludwig' => 'filter-ludwig',
'Maven' => 'filter-maven',
'Mayfair' => 'filter-mayfair',
'Moon' => 'filter-moon',
'Nashville' => 'filter-nashville',
'Perpetua' => 'filter-perpetua',
'Poprocket' => 'filter-poprocket',
'Reyes' => 'filter-reyes',
'Rise' => 'filter-rise',
'Sierra' => 'filter-sierra',
'Skyline' => 'filter-skyline',
'Slumber' => 'filter-slumber',
'Stinson' => 'filter-stinson',
'Sutro' => 'filter-sutro',
'Toaster' => 'filter-toaster',
'Valencia' => 'filter-valencia',
'Vesper' => 'filter-vesper',
'Walden' => 'filter-walden',
'Willow' => 'filter-willow',
'X-Pro II' => 'filter-xpro-ii'
'Luke' => 'filter-luke',
'Minotaur' => 'filter-minotaur',
'Magma' => 'filter-magma',
'Spell' => 'filter-spell',
'Dimension' => 'filter-dimension',
'Fixie' => 'filter-fixie',
'Berlock' => 'filter-berlock',
'Bells' => 'filter-bells',
'Welcome' => 'filter-welcome',
'Abner' => 'filter-abner',
'Woodstock' => 'filter-woodstock',
'Fields' => 'filter-fields',
'Dinner' => 'filter-dinner',
'Boss' => 'filter-boss',
'Handbasket' => 'filter-handbasket',
'River' => 'filter-river',
'Quill' => 'filter-quill',
'Frosty' => 'filter-frosty',
'Hera' => 'filter-hera',
'Birdsong' => 'filter-birdsong',
'Canada' => 'filter-canada',
'Wendy' => 'filter-wendy',
'Shamus' => 'filter-shamus',
'Marylebone' => 'filter-marylebone',
'Luna' => 'filter-luna',
'Chattanooga' => 'filter-chattanooga',
'Felicity' => 'filter-felicity',
'Jazz' => 'filter-jazz',
'Doggett' => 'filter-doggett',
'Ascend' => 'filter-ascend',
'Tango' => 'filter-tango',
'Cherry' => 'filter-cherry',
'Nemo' => 'filter-nemo',
'Suitable' => 'filter-suitable',
'Mayor' => 'filter-mayor',
'Bread' => 'filter-bread',
'Iberia' => 'filter-iberia',
'Folded' => 'filter-folded',
'Cabin' => 'filter-cabin',
'Crayon' => 'filter-crayon',
'Expert' => 'filter-expert'
];

public static function classes()
Expand Down
2 changes: 1 addition & 1 deletion public/css/app.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/appdark.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/compose-classic.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/spa.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js
View file
Open in desktop

Large diffs are not rendered by default.

164 changes: 82 additions & 82 deletions resources/assets/js/app.js
View file
Open in desktop
Expand Up @@ -149,90 +149,90 @@ window.App.util = {
})
},
filters: [
['1977','filter-1977'],
['Aden','filter-aden'],
['Amaro','filter-amaro'],
['Ashby','filter-ashby'],
['Brannan','filter-brannan'],
['Brooklyn','filter-brooklyn'],
['Charmes','filter-charmes'],
['Clarendon','filter-clarendon'],
['Crema','filter-crema'],
['Dogpatch','filter-dogpatch'],
['Earlybird','filter-earlybird'],
['Gingham','filter-gingham'],
['Ginza','filter-ginza'],
['Hefe','filter-hefe'],
['Helena','filter-helena'],
['Hudson','filter-hudson'],
['Inkwell','filter-inkwell'],
['Kelvin','filter-kelvin'],
['Kuno','filter-juno'],
['Lark','filter-lark'],
['Lo-Fi','filter-lofi'],
['Ludwig','filter-ludwig'],
['Maven','filter-maven'],
['Mayfair','filter-mayfair'],
['Moon','filter-moon'],
['Nashville','filter-nashville'],
['Perpetua','filter-perpetua'],
['Poprocket','filter-poprocket'],
['Reyes','filter-reyes'],
['Rise','filter-rise'],
['Sierra','filter-sierra'],
['Skyline','filter-skyline'],
['Slumber','filter-slumber'],
['Stinson','filter-stinson'],
['Sutro','filter-sutro'],
['Toaster','filter-toaster'],
['Valencia','filter-valencia'],
['Vesper','filter-vesper'],
['Walden','filter-walden'],
['Willow','filter-willow'],
['X-Pro II','filter-xpro-ii']
['Luke','filter-luke'],
['Minotaur','filter-minotaur'],
['Magma','filter-magma'],
['Spell','filter-spell'],
['Dimension','filter-dimension'],
['Fixie','filter-fixie'],
['Berlock','filter-berlock'],
['Bells','filter-bells'],
['Welcome','filter-welcome'],
['Abner','filter-abner'],
['Woodstock','filter-woodstock'],
['Fields','filter-fields'],
['Dinner','filter-dinner'],
['Boss','filter-boss'],
['Handbasket','filter-handbasket'],
['River','filter-river'],
['Quill','filter-quill'],
['Frosty','filter-frosty'],
['Hera','filter-hera'],
['Birdsong','filter-birdsong'],
['Canada','filter-canada'],
['Wendy','filter-wendy'],
['Shamus','filter-shamus'],
['Marylebone','filter-marylebone'],
['Luna','filter-luna'],
['Chattanooga','filter-chattanooga'],
['Felicity','filter-felicity'],
['Jazz','filter-jazz'],
['Doggett','filter-doggett'],
['Ascend','filter-ascend'],
['Tango','filter-tango'],
['Cherry','filter-cherry'],
['Nemo','filter-nemo'],
['Suitable','filter-suitable'],
['Mayor','filter-mayor'],
['Bread','filter-bread'],
['Iberia','filter-iberia'],
['Folded','filter-folded'],
['Cabin','filter-cabin'],
['Crayon','filter-crayon'],
['Expert','filter-expert']
],
filterCss: {
'filter-1977': 'sepia(.5) hue-rotate(-30deg) saturate(1.4)',
'filter-aden': 'sepia(.2) brightness(1.15) saturate(1.4)',
'filter-amaro': 'sepia(.35) contrast(1.1) brightness(1.2) saturate(1.3)',
'filter-ashby': 'sepia(.5) contrast(1.2) saturate(1.8)',
'filter-brannan': 'sepia(.4) contrast(1.25) brightness(1.1) saturate(.9) hue-rotate(-2deg)',
'filter-brooklyn': 'sepia(.25) contrast(1.25) brightness(1.25) hue-rotate(5deg)',
'filter-charmes': 'sepia(.25) contrast(1.25) brightness(1.25) saturate(1.35) hue-rotate(-5deg)',
'filter-clarendon': 'sepia(.15) contrast(1.25) brightness(1.25) hue-rotate(5deg)',
'filter-crema': 'sepia(.5) contrast(1.25) brightness(1.15) saturate(.9) hue-rotate(-2deg)',
'filter-dogpatch': 'sepia(.35) saturate(1.1) contrast(1.5)',
'filter-earlybird': 'sepia(.25) contrast(1.25) brightness(1.15) saturate(.9) hue-rotate(-5deg)',
'filter-gingham': 'contrast(1.1) brightness(1.1)',
'filter-ginza': 'sepia(.25) contrast(1.15) brightness(1.2) saturate(1.35) hue-rotate(-5deg)',
'filter-hefe': 'sepia(.4) contrast(1.5) brightness(1.2) saturate(1.4) hue-rotate(-10deg)',
'filter-helena': 'sepia(.5) contrast(1.05) brightness(1.05) saturate(1.35)',
'filter-hudson': 'sepia(.25) contrast(1.2) brightness(1.2) saturate(1.05) hue-rotate(-15deg)',
'filter-inkwell': 'brightness(1.25) contrast(.85) grayscale(1)',
'filter-kelvin': 'sepia(.15) contrast(1.5) brightness(1.1) hue-rotate(-10deg)',
'filter-juno': 'sepia(.35) contrast(1.15) brightness(1.15) saturate(1.8)',
'filter-lark': 'sepia(.25) contrast(1.2) brightness(1.3) saturate(1.25)',
'filter-lofi': 'saturate(1.1) contrast(1.5)',
'filter-ludwig': 'sepia(.25) contrast(1.05) brightness(1.05) saturate(2)',
'filter-maven': 'sepia(.35) contrast(1.05) brightness(1.05) saturate(1.75)',
'filter-mayfair': 'contrast(1.1) brightness(1.15) saturate(1.1)',
'filter-moon': 'brightness(1.4) contrast(.95) saturate(0) sepia(.35)',
'filter-nashville': 'sepia(.25) contrast(1.5) brightness(.9) hue-rotate(-15deg)',
'filter-perpetua': 'contrast(1.1) brightness(1.25) saturate(1.1)',
'filter-poprocket': 'sepia(.15) brightness(1.2)',
'filter-reyes': 'sepia(.75) contrast(.75) brightness(1.25) saturate(1.4)',
'filter-rise': 'sepia(.25) contrast(1.25) brightness(1.2) saturate(.9)',
'filter-sierra': 'sepia(.25) contrast(1.5) brightness(.9) hue-rotate(-15deg)',
'filter-skyline': 'sepia(.15) contrast(1.25) brightness(1.25) saturate(1.2)',
'filter-slumber': 'sepia(.35) contrast(1.25) saturate(1.25)',
'filter-stinson': 'sepia(.35) contrast(1.25) brightness(1.1) saturate(1.25)',
'filter-sutro': 'sepia(.4) contrast(1.2) brightness(.9) saturate(1.4) hue-rotate(-10deg)',
'filter-toaster': 'sepia(.25) contrast(1.5) brightness(.95) hue-rotate(-15deg)',
'filter-valencia': 'sepia(.25) contrast(1.1) brightness(1.1)',
'filter-vesper': 'sepia(.35) contrast(1.15) brightness(1.2) saturate(1.3)',
'filter-walden': 'sepia(.35) contrast(.8) brightness(1.25) saturate(1.4)',
'filter-willow': 'brightness(1.2) contrast(.85) saturate(.05) sepia(.2)',
'filter-xpro-ii': 'sepia(.45) contrast(1.25) brightness(1.75) saturate(1.3) hue-rotate(-5deg)'
'filter-luke': 'sepia(.5) hue-rotate(-30deg) saturate(1.4)',
'filter-minotaur': 'sepia(.2) brightness(1.15) saturate(1.4)',
'filter-magma': 'sepia(.35) contrast(1.1) brightness(1.2) saturate(1.3)',
'filter-spell': 'sepia(.5) contrast(1.2) saturate(1.8)',
'filter-dimension': 'sepia(.4) contrast(1.25) brightness(1.1) saturate(.9) hue-rotate(-2deg)',
'filter-fixie': 'sepia(.25) contrast(1.25) brightness(1.25) hue-rotate(5deg)',
'filter-berlock': 'sepia(.25) contrast(1.25) brightness(1.25) saturate(1.35) hue-rotate(-5deg)',
'filter-bells': 'sepia(.15) contrast(1.25) brightness(1.25) hue-rotate(5deg)',
'filter-welcome': 'sepia(.5) contrast(1.25) brightness(1.15) saturate(.9) hue-rotate(-2deg)',
'filter-abner': 'sepia(.35) saturate(1.1) contrast(1.5)',
'filter-woodstock': 'sepia(.25) contrast(1.25) brightness(1.15) saturate(.9) hue-rotate(-5deg)',
'filter-fields': 'contrast(1.1) brightness(1.1)',
'filter-dinner': 'sepia(.25) contrast(1.15) brightness(1.2) saturate(1.35) hue-rotate(-5deg)',
'filter-boss': 'sepia(.4) contrast(1.5) brightness(1.2) saturate(1.4) hue-rotate(-10deg)',
'filter-handbasket': 'sepia(.5) contrast(1.05) brightness(1.05) saturate(1.35)',
'filter-river': 'sepia(.25) contrast(1.2) brightness(1.2) saturate(1.05) hue-rotate(-15deg)',
'filter-quill': 'brightness(1.25) contrast(.85) grayscale(1)',
'filter-frosty': 'sepia(.15) contrast(1.5) brightness(1.1) hue-rotate(-10deg)',
'filter-hera': 'sepia(.35) contrast(1.15) brightness(1.15) saturate(1.8)',
'filter-birdsong': 'sepia(.25) contrast(1.2) brightness(1.3) saturate(1.25)',
'filter-canada': 'saturate(1.1) contrast(1.5)',
'filter-wendy': 'sepia(.25) contrast(1.05) brightness(1.05) saturate(2)',
'filter-shamus': 'sepia(.35) contrast(1.05) brightness(1.05) saturate(1.75)',
'filter-marylebone': 'contrast(1.1) brightness(1.15) saturate(1.1)',
'filter-luna': 'brightness(1.4) contrast(.95) saturate(0) sepia(.35)',
'filter-chattanooga': 'sepia(.25) contrast(1.5) brightness(.9) hue-rotate(-15deg)',
'filter-felicity': 'contrast(1.1) brightness(1.25) saturate(1.1)',
'filter-jazz': 'sepia(.15) brightness(1.2)',
'filter-doggett': 'sepia(.75) contrast(.75) brightness(1.25) saturate(1.4)',
'filter-ascend': 'sepia(.25) contrast(1.25) brightness(1.2) saturate(.9)',
'filter-tango': 'sepia(.25) contrast(1.5) brightness(.9) hue-rotate(-15deg)',
'filter-cherry': 'sepia(.15) contrast(1.25) brightness(1.25) saturate(1.2)',
'filter-nemo': 'sepia(.35) contrast(1.25) saturate(1.25)',
'filter-suitable': 'sepia(.35) contrast(1.25) brightness(1.1) saturate(1.25)',
'filter-mayor': 'sepia(.4) contrast(1.2) brightness(.9) saturate(1.4) hue-rotate(-10deg)',
'filter-bread': 'sepia(.25) contrast(1.5) brightness(.95) hue-rotate(-15deg)',
'filter-iberia': 'sepia(.25) contrast(1.1) brightness(1.1)',
'filter-folded': 'sepia(.35) contrast(1.15) brightness(1.2) saturate(1.3)',
'filter-cabin': 'sepia(.35) contrast(.8) brightness(1.25) saturate(1.4)',
'filter-crayon': 'brightness(1.2) contrast(.85) saturate(.05) sepia(.2)',
'filter-expert': 'sepia(.45) contrast(1.25) brightness(1.75) saturate(1.3) hue-rotate(-5deg)'
},
emoji: [
'😂','💯','❤️','🙌','👏','👌','😍','😯','😢','😅','😁','🙂','😎','😀','🤣','😃','😄','😆','😉','😊','😋','😘','😗','😙','😚','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','🙁','😖','😞','😟','😤','😭','😦','😧','😨','😩','🤯','😬','😰','😱','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾','🤲','👐','🤝','👍','👎','👊','✊','🤛','🤜','🤞','✌️','🤟','🤘','👈','👉','👆','👇','☝️','✋','🤚','🖐','🖖','👋','🤙','💪','🖕','✍️','🙏','💍','💄','💋','👄','👅','👂','👃','👣','👁','👀','🧠','🗣','👤','👥'
Expand Down
82 changes: 41 additions & 41 deletions resources/assets/js/components/ComposeClassic.vue
View file
Open in desktop
Expand Up @@ -249,47 +249,47 @@ export default {
mounted() {
this.mediaWatcher();
this.filters = [
['1977','filter-1977'],
['Aden','filter-aden'],
['Amaro','filter-amaro'],
['Ashby','filter-ashby'],
['Brannan','filter-brannan'],
['Brooklyn','filter-brooklyn'],
['Charmes','filter-charmes'],
['Clarendon','filter-clarendon'],
['Crema','filter-crema'],
['Dogpatch','filter-dogpatch'],
['Earlybird','filter-earlybird'],
['Gingham','filter-gingham'],
['Ginza','filter-ginza'],
['Hefe','filter-hefe'],
['Helena','filter-helena'],
['Hudson','filter-hudson'],
['Inkwell','filter-inkwell'],
['Kelvin','filter-kelvin'],
['Kuno','filter-juno'],
['Lark','filter-lark'],
['Lo-Fi','filter-lofi'],
['Ludwig','filter-ludwig'],
['Maven','filter-maven'],
['Mayfair','filter-mayfair'],
['Moon','filter-moon'],
['Nashville','filter-nashville'],
['Perpetua','filter-perpetua'],
['Poprocket','filter-poprocket'],
['Reyes','filter-reyes'],
['Rise','filter-rise'],
['Sierra','filter-sierra'],
['Skyline','filter-skyline'],
['Slumber','filter-slumber'],
['Stinson','filter-stinson'],
['Sutro','filter-sutro'],
['Toaster','filter-toaster'],
['Valencia','filter-valencia'],
['Vesper','filter-vesper'],
['Walden','filter-walden'],
['Willow','filter-willow'],
['X-Pro II','filter-xpro-ii']
['Luke','filter-luke'],
['Minotaur','filter-minotaur'],
['Magma','filter-magma'],
['Spell','filter-spell'],
['Dimension','filter-dimension'],
['Fixie','filter-fixie'],
['Berlock','filter-berlock'],
['Bells','filter-bells'],
['Welcome','filter-welcome'],
['Abner','filter-abner'],
['Woodstock','filter-woodstock'],
['Fields','filter-fields'],
['Dinner','filter-dinner'],
['Boss','filter-boss'],
['Handbasket','filter-handbasket'],
['River','filter-river'],
['Quill','filter-quill'],
['Frosty','filter-frosty'],
['Hera','filter-hera'],
['Birdsong','filter-birdsong'],
['Canada','filter-canada'],
['Wendy','filter-wendy'],
['Shamus','filter-shamus'],
['Marylebone','filter-marylebone'],
['Luna','filter-luna'],
['Chattanooga','filter-chattanooga'],
['Felicity','filter-felicity'],
['Jazz','filter-jazz'],
['Doggett','filter-doggett'],
['Ascend','filter-ascend'],
['Tango','filter-tango'],
['Cherry','filter-cherry'],
['Nemo','filter-nemo'],
['Suitable','filter-suitable'],
['Mayor','filter-mayor'],
['Bread','filter-bread'],
['Iberia','filter-iberia'],
['Folded','filter-folded'],
['Cabin','filter-cabin'],
['Crayon','filter-crayon'],
['Expert','filter-expert']
];
},

Expand Down
4 changes: 2 additions & 2 deletions resources/assets/js/components/ComposeModal.vue
View file
Open in desktop
Expand Up @@ -370,7 +370,7 @@
<div class="p-1 pt-3">
<img :src="media[carouselCursor].url" width="100px" height="60px" :class="filter[1]" v-on:click.prevent="toggleFilter($event, filter[1])">
</div>
<a :class="[media[carouselCursor].filter_class == filter[1] ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, filter[1])">i{{filter[0]}}</a>
<a :class="[media[carouselCursor].filter_class == filter[1] ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, filter[1])">{{filter[0]}}</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -407,7 +407,7 @@
<div class="p-1 pt-3">
<img :src="media[carouselCursor].url" width="100px" height="60px" :class="filter[1]" v-on:click.prevent="toggleFilter($event, filter[1])">
</div>
<a :class="[media[carouselCursor].filter_class == filter[1] ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, filter[1])">i{{filter[0]}}</a>
<a :class="[media[carouselCursor].filter_class == filter[1] ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, filter[1])">{{filter[0]}}</a>
</li>
</ul>
</div>
Expand Down