hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'threecolumn' into shigusegubu-vue3

Browse source 
* threecolumn:
  remove margins from underlay since it causes horizontal scroll on smaller screens
  underlay improvements
  Fix image cropper not closing correctly
This commit is contained in:
Henry Jameson 2022-04-10 20:43:10 +03:00
commit 5b71b33579
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/App.scss
View file

@ -151,7 +151,6 @@ nav {
grid-column-end: span 3; grid-column-end: span 3;
grid-row-start: 1; grid-row-start: 1;
grid-row-end: 1; grid-row-end: 1;
margin: 0 calc(var(--columnGap) / -2);
pointer-events: none; pointer-events: none;
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.15);
background-color: var(--underlay, rgba(0, 0, 0, 0.15)); background-color: var(--underlay, rgba(0, 0, 0, 0.15));

2
src/components/image_cropper/image_cropper.js
View file

@ -66,7 +66,7 @@ const ImageCropper = {
} }
}, },
methods: { methods: {
unmounted () { destroy () {
if (this.cropper) { if (this.cropper) {
this.cropper.destroy() this.cropper.destroy()
} }