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.

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

Draft: Brand new design from GeneralMagicio #610

Draft
wants to merge 32 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4c8c616
feat: added new font
pkretzschmar Aug 16, 2022
6804ad2
styles: change font style and text color
pkretzschmar Aug 16, 2022
3ab2fcd
Merge branch 'brightid-v6' into styles/new-themes
pkretzschmar Aug 16, 2022
ac059a2
feat: new images
pkretzschmar Aug 23, 2022
4432cd5
styles: added new font style
pkretzschmar Aug 23, 2022
fa8c27c
style: change button to new format
pkretzschmar Aug 23, 2022
c5617db
style: added new buttons and typography to theme
pkretzschmar Aug 23, 2022
0b5d83c
style: new colors and variables to manage light/dark theme
pkretzschmar Aug 23, 2022
5c967cb
hotfix: added new criterias
pkretzschmar Aug 23, 2022
0ae3921
styles: minor css changes
pkretzschmar Aug 23, 2022
9f086e6
style: change bright id widget to match new design
pkretzschmar Aug 23, 2022
4260221
styles: refactor cart to match new design
pkretzschmar Aug 23, 2022
4006edd
styles: refactor profile component
pkretzschmar Aug 23, 2022
dd0b5b5
styles: refactor success pages to match new design
pkretzschmar Aug 23, 2022
90b35f8
style: refactor project page
pkretzschmar Aug 23, 2022
485f1f4
hotfix: small css changes
pkretzschmar Aug 23, 2022
e6d39aa
style: refactor time-left component
pkretzschmar Aug 23, 2022
8d89b36
style: refactor about page
pkretzschmar Aug 23, 2022
4de3fb9
style: refactor join page
pkretzschmar Aug 23, 2022
b06fedc
style: refactor landing page
pkretzschmar Aug 23, 2022
82f20bc
Merge pull request #1 from GeneralMagicio/styles/new-themes
pkretzschmar Aug 24, 2022
c7d687d
mobile home
luizakp Aug 26, 2022
c6c7b6a
home page mobile
luizakp Aug 26, 2022
22a6151
fix padding to be equal
luizakp Sep 6, 2022
c3ab362
typos
luizakp Sep 6, 2022
46f357c
minor responsiveness issues
luizakp Sep 6, 2022
46bfdfc
project add scroll fix
luizakp Sep 8, 2022
62caec7
yuetloo feedback
luizakp Sep 9, 2022
b143836
verify page
luizakp Sep 9, 2022
9534584
minor fix
luizakp Sep 12, 2022
6bf3eee
project tag lightmode
luizakp Sep 12, 2022
c3dcc8e
Merge pull request #554 from GeneralMagicio/fix-reponsive
yuetloo Dec 15, 2022
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
1 change: 1 addition & 0 deletions vue-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"dependencies": {
"@kleros/gtcr-encoder": "^1.4.0",
"@openfonts/inter_all": "^1.0.2",
"@openfonts/work-sans_all": "^1.0.1",
"@walletconnect/web3-provider": "^1.5.1",
"axios": "^0.27.2",
"core-js": "^3.6.4",
Expand Down
14 changes: 7 additions & 7 deletions vue-app/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
'mr-cart-closed': !isCartToggledOpen && isSideCartShown,
}"
>
<breadcrumbs v-if="showBreadCrumb" />
<router-view :key="$route.path" />
</div>
<div
Expand Down Expand Up @@ -431,13 +430,14 @@ summary:focus {
}

.open-cart {
width: $cart-width-open;
width: 100%;
max-width: 35vw;
overflow-y: scroll;
overflow-x: hidden;
}

.closed-cart {
width: 4rem;
width: 0rem;
}

#nav-menu {
Expand Down Expand Up @@ -479,7 +479,6 @@ summary:focus {

#content {
flex: 1;
padding-bottom: 4rem;

.content-heading {
display: block;
Expand All @@ -499,18 +498,19 @@ summary:focus {
}

#content.padded {
padding: $content-space;
padding: $content-space 1rem $content-space 1rem;
@media (max-width: $breakpoint-m) {
padding: $content-space 0 $content-space 0;
}
}

#content.mr-cart-open {
margin-right: $cart-width-open;
@media (max-width: $breakpoint-m) {
margin-right: 0;
}
}

#content.mr-cart-closed {
margin-right: $cart-width-closed;
@media (max-width: $breakpoint-m) {
margin-right: 0;
}
Expand Down
3 changes: 3 additions & 0 deletions vue-app/src/assets/GitHub-purple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions vue-app/src/assets/Meridians-purple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions vue-app/src/assets/Twitter-purple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions vue-app/src/assets/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge_w1080.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge_w1440.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge_w2160.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge_w2880.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge_w360.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/bridge/bridge_w720.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions vue-app/src/assets/close-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions vue-app/src/assets/clr-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions vue-app/src/assets/copy-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion vue-app/src/assets/copy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vue-app/src/assets/green-tick.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion vue-app/src/assets/half-moon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions vue-app/src/assets/help-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/hero/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/hero/hero_w1080.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/hero/hero_w1440.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/hero/hero_w2160.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/hero/hero_w2880.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vue-app/src/assets/hero/hero_w360.png
Binary file added vue-app/src/assets/hero/hero_w720.png
3 changes: 3 additions & 0 deletions vue-app/src/assets/next-step.svg
Binary file added vue-app/src/assets/project-card-placeholder.png
Binary file added vue-app/src/assets/robot/robot.png
Binary file added vue-app/src/assets/robot/robot_w1080.png
Binary file added vue-app/src/assets/robot/robot_w1440.png
Binary file added vue-app/src/assets/robot/robot_w2160.png
Binary file added vue-app/src/assets/robot/robot_w2880.png
Binary file added vue-app/src/assets/robot/robot_w360.png
Binary file added vue-app/src/assets/robot/robot_w720.png
4 changes: 3 additions & 1 deletion vue-app/src/assets/sun.svg
3 changes: 3 additions & 0 deletions vue-app/src/assets/warning.svg
2 changes: 1 addition & 1 deletion vue-app/src/components/AddToCartButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
v-if="inCart && canContribute()"
:button="{
wide: true,
text: 'In cart 🎉',
text: 'In cart',
}"
@click="toggleCartPanel()"
/>
Expand Down
2 changes: 0 additions & 2 deletions vue-app/src/components/BalanceItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ export default class BalanceItem extends Vue {
.item {
display: flex;
align-items: center;
padding: 1rem;
border: 1px solid #000000;
margin-top: -1px;
&:first-of-type {
margin-top: 0px;
Expand Down
Loading