Y-Foundry-Dao / yfd-dapp-core

Governance dApp
GNU Affero General Public License v3.0
2 stars 1 forks source link

dashboard, vault and side-wrapper height fixed #93 #106

Closed tarnveerSingh closed 1 year ago

tarnveerSingh commented 1 year ago

dashboard, vault and side-wrapper height fixed #93 and here, the side wrapper refer to changes to side bar height extended as well just a bit. #93 resolved

rayraspberry commented 1 year ago

@tarnveerSingh please update your fork and resubmit after conflicts are resolved.

rayraspberry commented 1 year ago

also checkout https://app.dework.xyz/y-foundry-dao for additional development bounties

tarnveerSingh commented 1 year ago

@rayraspberry, I've fixed the issues. I think you'll be able to merge it now, please let me know how it goes.

rayraspberry commented 1 year ago

there are still conflicts in the css. please resolve conflicts

tarnveerSingh commented 1 year ago

@rayraspberry Sure thing, I'll get it done but can you please tell me where and how many conflicts are there that needs to resolved. Is it just these files -

src/assets/styles/scss/app.module.scss src/assets/styles/scss/appcard.module.scss src/assets/styles/scss/content.module.scss src/assets/styles/scss/footer.module.scss

..??

Or any other file that needs to be fixed.? Can you please mention the all file name that needs to resolved.? As cause I don't have write access to the repository.

rayraspberry commented 1 year ago

yes it looks like those files


 to resolve conflicts before continuing.
Conflicting files
src/assets/styles/scss/app.module.scss
src/assets/styles/scss/appcard.module.scss
src/assets/styles/scss/content.module.scss
src/assets/styles/scss/footer.module.scss```