Skip to content

Commit

Permalink
Merge pull request #824 from OlegMakarenko/terms
Browse files Browse the repository at this point in the history
Terms and Privacy update
  • Loading branch information
OlegMakarenko authored Mar 15, 2021
2 parents 4ded9f3 + a3f224c commit b5b3c88
Show file tree
Hide file tree
Showing 13 changed files with 343 additions and 143 deletions.
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ All notable changes to this project will be documented in this file.

The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [v1.0.0][v1.0.0] - 14-Mar-2021
## [v1.0.0][v1.0.0] - 15-Mar-2021

### Milestone: [[email protected]][[email protected]]

Package | Version | Link
---|---|---
REST Core| v2.3.3 | [catapult-rest][[email protected].3]
REST Core| v2.3.4 | [catapult-rest][[email protected].4]
SDK Core| v1.0.0 | [symbol-sdk][[email protected]]

- Mainnet launch.
- Symbol mainnet launch release
- Updated T&C and Privacy Policy

## [v0.10.0][v0.10.0] - 12-Mar-2021

Expand Down Expand Up @@ -330,3 +331,4 @@ SDK Core| v0.20.7 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)

[[email protected]]: https://github.com/nemtech/catapult-rest/releases/tag/v2.3.0
[[email protected]]: https://github.com/nemtech/catapult-rest/releases/tag/v2.3.3
[[email protected]]: https://github.com/nemtech/catapult-rest/releases/tag/v2.3.4
171 changes: 152 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"vue-apexcharts": "^1.6.0",
"vue-infinite-loading": "^2.4.5",
"vue-material-design-icons": "^4.4.0",
"vue-pdf": "^4.2.0",
"vue-router": "^3.1.6",
"vue-slim-tabs": "^0.3.0",
"vuex": "^3.1.3"
Expand Down
21 changes: 20 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<Header />
<NavigationMenu class="d-none d-md-block"/>
<div class="width-limiter">
<router-view :key="$route.fullPath"/>
<transition name="view">
<router-view :key="$route.fullPath"/>
</transition>
</div>
</div>
<Footer />
Expand Down Expand Up @@ -108,4 +110,21 @@ html, body, #fullheight {
.pointer {
cursor: pointer;
}
.view-leave-active {
transition: opacity 0.15s ease-in-out, transform 0.15s ease;
}
.view-enter-active {
transition: opacity 0.15s ease-in-out, transform 0.15s ease;
transition-delay: 0.15s;
}
.view-enter, .view-leave-to {
opacity: 0;
}
.view-enter-to, .view-leave {
opacity: 1;
}
</style>
3 changes: 2 additions & 1 deletion src/components/NemCopyright.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<span>All Rights Reserved</span>
<span>|</span>
<span>
<a href="https://symbolplatform.com/privacy/">Privacy Policy</a>
<a href="/terms">Terms</a> &
<a href="/privacy">Privacy</a>
</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<b-row>
<b-col md="3" class="header-left">
<router-link to="/" class="d-none d-md-block">
<img v-if="isTestnet" src="../../styles/img/symbol_logo_white_testnet.png" class="header-logo"/>
<img v-if="isTestnet" src="../../styles/img/symbol_logo_white_testnet.png" class="header-logo"/>
<img v-else src="../../styles/img/symbol_logo_white_aw.png" class="header-logo"/>
</router-link>
</b-col>
Expand Down
3 changes: 3 additions & 0 deletions src/documents/privacy.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/documents/terms.json

Large diffs are not rendered by default.

Binary file added src/styles/img/tnp_bg.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 src/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $pink: $pink-color;
$blue: $blue-color;
$green: $green-color;
$orange: $orange-color;
$dark-white: $dark-white-color;

$grid-breakpoints: (
xxxs: 0,
Expand Down
1 change: 1 addition & 0 deletions src/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $accent-color: #f0f;
$blue-color: #00c8ff;
$green-color: #33dd50;
$orange-color: #ff9600;
$dark-white-color: #f3f4f8;

// --- General colors ---

Expand Down
Loading

0 comments on commit b5b3c88

Please sign in to comment.