Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

refactor(ui): Change the layout of the network Sidemenu #897

Merged
merged 2 commits into from Dec 31, 2018
Merged

refactor(ui): Change the layout of the network Sidemenu #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b4c86
refactor(ui): Change the layout of the network Sidemenu
tpscrpt Dec 30, 2018
45a1637
Merge branch 'develop' into refactor/network-overview
alexbarnsley Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/renderer/components/App/AppSidemenu/AppSidemenuNetworkStatus.vue
View file
Open in desktop
Expand Up @@ -8,6 +8,14 @@
:is-horizontal="isHorizontal"
class="AppSidemenuNetworkStatus__peer"
>
<div class="text-xs mx-6 mb-2 text-theme-settings-heading">
<span class="float-left">
{{ $t('PEER.PEER') }}
</span>
<span class="float-right">
{{ $t('PEER.BEST') }}
</span>
</div>
<div class="bg-theme-settings-sub inline-block mx-6 rounded-l text-white relative px-3 py-2 inline-block select-none cursor-pointer">
<button
@click="toggleSelect('peers-menu')"
Expand All @@ -22,7 +30,6 @@
:value="currentPeerId"
:placeholder="peer ? `${peer.isHttps ? 'https://' : 'http://'}${peer.ip}` : $t('PEER.NONE')"
:pin-above="true"
:prefix="$t('PEER.PEER')"
class="inline-block text-white fill-white width-inherit"
@select="setPeer"
/>
Expand Down
8 changes: 7 additions & 1 deletion src/renderer/components/Menu/MenuDropdown/MenuDropdownHandler.vue
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
</slot>
</span>

<span class="flex pl-2 pr-1">
<span class="flex pl-2 pr-1 rotate-vertical">
<SvgIcon
:class="{ 'opacity-25': iconDisabled }"
name="arrow-dropdown"
Expand Down Expand Up @@ -74,3 +74,9 @@ export default {
}
}
</script>

<style scoped>
.rotate-vertical {
transform: rotate(-180deg);
}
</style>
11 changes: 6 additions & 5 deletions src/renderer/i18n/locales/en-US.js
View file
Open in desktop
Expand Up @@ -94,16 +94,17 @@ export default {
},

PEER: {
BEST: 'Connect to best',
CONNECTED: 'Connected to peer',
CONNECT_CUSTOM: 'Connect your peer',
CONNECT_CUSTOM: 'Connect custom peer',
CONNECT_FAILED: 'Failed to connect to peer',
DELAY: 'Delay',
DELAY: 'Latency',
FAILED_REFRESH: 'Failed to refresh peers',
HEIGHT: 'Height',
HEIGHT: 'Block height',
LAST_CHECKED: 'Last checked',
NONE: 'None',
NO_CONNECT: 'Could not connect',
PEER: 'Peer:',
PEER: 'Peer',
STATUS_CHECK_FAILED: 'Status check failed',
WRONG_NETWORK: 'Wrong network'
},
Expand Down Expand Up @@ -185,7 +186,7 @@ export default {
CURRENT_PROFILE: 'Your current profile is "{profileName}"',
DASHBOARD: 'Dashboard',
NETWORK: 'Network',
NETWORKS: 'My networks',
NETWORKS: 'Manage networks',
SETTINGS: {
CURRENCY: 'Currency',
DARK_MODE: 'Dark mode',
Expand Down