Skip to content

Commit

Permalink
Merge pull request #1649 from ten-protocol/jennifer/2402-updated-uis-…
Browse files Browse the repository at this point in the history 
…with-placeholder-logo-and-create-as-pr

UI: replace Obscuro logos with Ten
  • Loading branch information
@Jennievon
Jennievon authored Nov 16, 2023
2 parents 35b5ce4 + 49a7468 commit bb3a2bd
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 86 deletions.
2 changes: 1 addition & 1 deletion tools/obscuroscan_v2/frontend/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>ObscuroScan</title>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon-32x32.png" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script
strategy="lazyOnload"
Expand Down
Binary file added tools/obscuroscan_v2/frontend/public/favicon.ico
View file
Binary file not shown.
18 changes: 0 additions & 18 deletions tools/obscuroscan_v2/frontend/src/assets/imgs/obscuro.svg
View file

This file was deleted.

6 changes: 6 additions & 0 deletions tools/obscuroscan_v2/frontend/src/assets/imgs/ten.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
106 changes: 59 additions & 47 deletions tools/obscuroscan_v2/frontend/src/views/NavbarView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,65 @@
<header>
<el-container class="align-vertical">
<el-main>
<el-row justify="space-around">
<el-col :span="2" >
<img src="@/assets/imgs/obscuro.svg" alt="obscu.ro" class="header-image" style="max-height: 5vh;"/>
</el-col>
<el-col :span="10" :offset="7">
<nav class="nav-bar">
<el-radio-group size="default">
<RouterLink to="/"> <el-button link class="paddedTop"> Home</el-button></RouterLink>
<RouterLink to="/personal"> <el-button link class="paddedTop">Personal</el-button></RouterLink>
<el-button link class="paddedTop">
<el-dropdown>
<span class="el-dropdown-link">
Blockchain
</span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/transactions"> <el-dropdown-item>Transactions</el-dropdown-item></RouterLink>
<RouterLink to="/batches"> <el-dropdown-item>Batches</el-dropdown-item></RouterLink>
<RouterLink to="/blocks"> <el-dropdown-item>Blocks</el-dropdown-item></RouterLink>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
<el-button link class="paddedTop" style="margin: 0px">
<el-dropdown>
<span class="el-dropdown-link">
Resources
</span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/decrypt"> <el-dropdown-item>Decrypt</el-dropdown-item></RouterLink>
<RouterLink to="/verified"> <el-dropdown-item>Verified Data</el-dropdown-item></RouterLink>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
</el-radio-group>
</nav>
</el-col>
<el-col :span="5" >
<meta-mask-connect-button />
</el-col>
<!-- <el-col :span="4" >-->
<!-- <search-bar-item />-->
<!-- </el-col>-->
</el-row>
<el-row justify="space-around">
<el-col :span="2">
<img
src="@/assets/imgs/ten.svg"
alt="obscu.ro"
class="header-image"
style="max-height: 5vh"
/>
</el-col>
<el-col :span="10" :offset="7">
<nav class="nav-bar">
<el-radio-group size="default">
<RouterLink to="/"> <el-button link class="paddedTop"> Home</el-button></RouterLink>
<RouterLink to="/personal">
<el-button link class="paddedTop">Personal</el-button></RouterLink
>
<el-button link class="paddedTop">
<el-dropdown>
<span class="el-dropdown-link"> Blockchain </span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/transactions">
<el-dropdown-item>Transactions</el-dropdown-item></RouterLink
>
<RouterLink to="/batches">
<el-dropdown-item>Batches</el-dropdown-item></RouterLink
>
<RouterLink to="/blocks">
<el-dropdown-item>Blocks</el-dropdown-item></RouterLink
>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
<el-button link class="paddedTop" style="margin: 0px">
<el-dropdown>
<span class="el-dropdown-link"> Resources </span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/decrypt">
<el-dropdown-item>Decrypt</el-dropdown-item></RouterLink
>
<RouterLink to="/verified">
<el-dropdown-item>Verified Data</el-dropdown-item></RouterLink
>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
</el-radio-group>
</nav>
</el-col>
<el-col :span="5">
<meta-mask-connect-button />
</el-col>
<!-- <el-col :span="4" >-->
<!-- <search-bar-item />-->
<!-- </el-col>-->
</el-row>
</el-main>
</el-container>
</header>
Expand Down Expand Up @@ -76,5 +89,4 @@ export default {
.paddedTop {
padding: 10px;
}
</style>
Binary file added tools/walletextension/api/staticOG/favicon.ico
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions tools/walletextension/api/staticOG/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>Obscuro Gateway</title>
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="32x32" href="favicon.ico" />
<script
src="https://cdn.ethers.io/lib/ethers-5.2.umd.min.js"
type="application/javascript"
Expand All @@ -26,7 +26,7 @@

<body>
<div class="container-fluid">
<img src="obscuro.svg" alt="Obscuro logo" class="logo" />
<img src="ten.svg" alt="Ten logo" class="logo" />
</div>

<div class="spinner" id="spinner"></div>
Expand Down
18 changes: 0 additions & 18 deletions tools/walletextension/api/staticOG/obscuro.svg
View file

This file was deleted.

3 changes: 3 additions & 0 deletions tools/walletextension/api/staticOG/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ ol li {
}

.logo {
width: 100px;
height: 100px;
object-fit: contain;
padding: 10px;
}

.begin-box {
Expand Down
6 changes: 6 additions & 0 deletions tools/walletextension/api/staticOG/ten.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bb3a2bd

Please sign in to comment.