diff --git a/vue-app/src/App.vue b/vue-app/src/App.vue index 2ae1004df..749798fdb 100644 --- a/vue-app/src/App.vue +++ b/vue-app/src/App.vue @@ -274,7 +274,7 @@ a { .modal-body { background-color: $bg-light-color; - padding: 20px; + padding: $modal-space; text-align: center; } @@ -282,7 +282,7 @@ a { display: block; width: 40px; height: 40px; - margin: 20px auto; + margin: $modal-space auto; } .loader:after { diff --git a/vue-app/src/assets/add.svg b/vue-app/src/assets/add.svg new file mode 100644 index 000000000..10df234ba --- /dev/null +++ b/vue-app/src/assets/add.svg @@ -0,0 +1,62 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/vue-app/src/components/BrightIdModal.vue b/vue-app/src/components/BrightIdModal.vue index c78057f2a..ec7f66754 100644 --- a/vue-app/src/components/BrightIdModal.vue +++ b/vue-app/src/components/BrightIdModal.vue @@ -174,6 +174,6 @@ export default class BrightIdModal extends Vue { } .close-btn { - margin-top: 20px; + margin-top: $modal-space; } diff --git a/vue-app/src/components/ClaimModal.vue b/vue-app/src/components/ClaimModal.vue index a2839755a..6ffa41198 100644 --- a/vue-app/src/components/ClaimModal.vue +++ b/vue-app/src/components/ClaimModal.vue @@ -86,6 +86,6 @@ export default class ClaimModal extends Vue { @import '../styles/vars'; .close-btn { - margin-top: 20px; + margin-top: $modal-space; } diff --git a/vue-app/src/components/ContributionModal.vue b/vue-app/src/components/ContributionModal.vue index 476a28f0b..381026f60 100644 --- a/vue-app/src/components/ContributionModal.vue +++ b/vue-app/src/components/ContributionModal.vue @@ -222,17 +222,15 @@ export default class ContributionModal extends Vue { diff --git a/vue-app/src/components/KlerosGTCRAdapterModal.vue b/vue-app/src/components/KlerosGTCRAdapterModal.vue index e68bd49f3..49e13a04e 100644 --- a/vue-app/src/components/KlerosGTCRAdapterModal.vue +++ b/vue-app/src/components/KlerosGTCRAdapterModal.vue @@ -66,6 +66,6 @@ export default class KlerosGTCRAdapterModal extends Vue { @import '../styles/vars'; .close-btn { - margin-top: 20px; + margin-top: $modal-space; } diff --git a/vue-app/src/components/MatchingFundsModal.vue b/vue-app/src/components/MatchingFundsModal.vue new file mode 100644 index 000000000..0c43cfcf3 --- /dev/null +++ b/vue-app/src/components/MatchingFundsModal.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/vue-app/src/components/ReallocationModal.vue b/vue-app/src/components/ReallocationModal.vue index a3445019c..ea7255612 100644 --- a/vue-app/src/components/ReallocationModal.vue +++ b/vue-app/src/components/ReallocationModal.vue @@ -88,6 +88,6 @@ export default class ReallocationModal extends Vue { @import '../styles/vars'; .close-btn { - margin-top: 20px; + margin-top: $modal-space; } diff --git a/vue-app/src/styles/_vars.scss b/vue-app/src/styles/_vars.scss index 9a2e9d35f..0e34bef23 100644 --- a/vue-app/src/styles/_vars.scss +++ b/vue-app/src/styles/_vars.scss @@ -11,6 +11,7 @@ $error-color: #BD6B5E; $border: 2px solid $border-color; $content-space: 30px; +$modal-space: 20px; $nav-header-height-sm: 40px; $profile-image-size: 50px; diff --git a/vue-app/src/views/ProjectList.vue b/vue-app/src/views/ProjectList.vue index 35807185a..718504d00 100644 --- a/vue-app/src/views/ProjectList.vue +++ b/vue-app/src/views/ProjectList.vue @@ -26,7 +26,16 @@
Matching Pool:
-
{{ currentRound.matchingPool | formatAmount }} {{ currentRound.nativeTokenSymbol }}
+
+ {{ currentRound.matchingPool | formatAmount }} {{ currentRound.nativeTokenSymbol }} + + + +
Contributions:
@@ -57,6 +66,7 @@ import { RoundInfo } from '@/api/round' import { Project, getProjects } from '@/api/projects' import ProjectListItem from '@/components/ProjectListItem.vue' +import MatchingFundsModal from '@/components/MatchingFundsModal.vue' import { LOAD_ROUND_INFO } from '@/store/action-types' import { SET_CURRENT_ROUND_ADDRESS } from '@/store/mutation-types' @@ -136,6 +146,22 @@ export default class ProjectList extends Vue { } return FixedNumber.fromValue(contribution, decimals) } + + addMatchingFunds(): void { + if (!this.$store.state.currentUser) { + return + } + this.$modal.show( + MatchingFundsModal, + { }, + { }, + { + closed: () => { + this.$store.dispatch(LOAD_ROUND_INFO) + }, + }, + ) + } } @@ -181,6 +207,17 @@ export default class ProjectList extends Vue { gap: $content-space; } +.add-matching-funds-btn { + display: inline-block; + line-height: 1; + margin-left: 5px; + + img { + height: 1em; + vertical-align: bottom; + } +} + @media (max-width: 1150px) { .round-info-item { flex: 0 0 50%;