Merge branch 'master' of localhost:pendulum/traxxx

This commit is contained in:
ThePendulum 2020-01-27 00:41:21 +00:00
commit 89c0776045
5 changed files with 20 additions and 16 deletions

View File

@ -289,6 +289,13 @@ export default {
}; };
</script> </script>
<style lang="scss">
.header-gender .icon {
width: 1.25rem;
height: 1.25rem;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import 'theme'; @import 'theme';
@ -313,11 +320,6 @@ export default {
display: inline-block; display: inline-block;
margin: 0 0 0 .5rem; margin: 0 0 0 .5rem;
transform: translate(0, .1rem); transform: translate(0, .1rem);
.icon {
width: 1.25rem;
height: 1.25rem;
}
} }
.header-social { .header-social {
@ -326,13 +328,6 @@ export default {
margin: 0 1rem 0 0; margin: 0 1rem 0 0;
} }
.header-gender {
.icon {
width: 1.25rem;
height: 1.25rem;
}
}
.actor-inner { .actor-inner {
height: 100%; height: 100%;
display: flex; display: flex;
@ -558,9 +553,15 @@ export default {
@media(max-width: $breakpoint) { @media(max-width: $breakpoint) {
.profile { .profile {
height: auto; height: auto;
max-height: none;
flex-direction: column; flex-direction: column;
padding: 0 0 .5rem 0; padding: 0 0 .5rem 0;
&.with-avatar {
height: auto;
max-height: none;
}
&:not(.expanded) .hideable { &:not(.expanded) .hideable {
display: none; display: none;
} }

View File

@ -23,16 +23,19 @@ export default {
.gender { .gender {
&.female .icon { &.female .icon {
fill: $female; fill: $female;
filter: drop-shadow(0 0 1px $shadow);
} }
&.male .icon { &.male .icon {
fill: $male; fill: $male;
filter: drop-shadow(0 0 1px $shadow);
} }
&.transsexual .icon { &.transsexual .icon {
fill: $text-contrast; fill: $text-contrast;
filter: drop-shadow(1px 0 0 $female) drop-shadow(-1px 0 0 $female) drop-shadow(0 1px 0 $female) drop-shadow(0 -1px 0 $female) filter: drop-shadow(1px 0 0 $female) drop-shadow(-1px 0 0 $female) drop-shadow(0 1px 0 $female) drop-shadow(0 -1px 0 $female)
drop-shadow(1px 0 0 $male) drop-shadow(-1px 0 0 $male) drop-shadow(0 1px 0 $male) drop-shadow(0 -1px 0 $male); drop-shadow(1px 0 0 $male) drop-shadow(-1px 0 0 $male) drop-shadow(0 1px 0 $male) drop-shadow(0 -1px 0 $male)
drop-shadow(0 0 1px $shadow)
} }
} }
</style> </style>

View File

@ -43,7 +43,7 @@ module.exports = {
media: { media: {
path: './media', path: './media',
thumbnailSize: 320, // width for 16:9 will be exactly 576px thumbnailSize: 320, // width for 16:9 will be exactly 576px
thumbnailQuality: 90, thumbnailQuality: 100,
limit: 25, // max number of photos per release limit: 25, // max number of photos per release
}, },
}; };

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.62.6", "version": "1.62.8",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.62.6", "version": "1.62.8",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {