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

fix: theme color issues; closes #492; closes #488 #518

Merged
merged 2 commits into from
Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

# Ambianic Client UI

[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ambianic/ambianic-ui)

![CI for Ambianic UI](https://github.com/ambianic/ambianic-ui/workflows/CI%20for%20Ambianic%20UI/badge.svg)
[![npm version](https://badge.fury.io/js/ambianic-ui.svg)](https://badge.fury.io/js/ambianic-ui)
[![Netlify Status](https://api.netlify.com/api/v1/badges/70a4b25a-2765-4d6b-bbd8-a7e5dd6e98cb/deploy-status)](https://app.netlify.com/sites/happy-franklin-69b6d4/deploys)
Expand All @@ -10,8 +12,6 @@
![Lighthouse PWA CI](https://github.com/ambianic/ambianic-ui/workflows/Lighthouse%20CI/badge.svg)
[![codecov](https://codecov.io/gh/ambianic/ambianic-ui/branch/master/graph/badge.svg)](https://codecov.io/gh/ambianic/ambianic-ui)

[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ambianic/ambianic-ui)

Ambianic Client UI is an Offline-first Progressive Web App (PWA) to manage Ambianic Edge deployments.


Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

11 changes: 0 additions & 11 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,3 @@ export default {
}
}
</script>

<style scoped>
.theme--light.v-application {
background: rgb(65, 131, 194) !important;
background: linear-gradient(
180deg,
rgb(49, 30, 102) 0%,
rgb(94, 48, 99) 100%
);
}
</style>
12 changes: 5 additions & 7 deletions src/components/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<v-app-bar
app
color="blue darken-3"
dark
>
<v-toolbar-title
style="width: 300px"
Expand Down Expand Up @@ -46,7 +45,6 @@
data-cy="heart"
is-icon
icon="heart"
btn-color="pink lighten-2"
:badge-content="newFavorites"
:badge-value="newFavorites"
/>
Expand Down Expand Up @@ -185,7 +183,7 @@ export default {
newAlerts: 2,
logo: '../assets/logo5.svg',
items: [
{ icon: 'history', color: 'warning', text: 'Timeline', link: '/timeline' },
{ icon: 'history', text: 'Timeline', link: '/timeline' },
// { icon: 'mdi-account-heart-outline', text: 'People', link: '/people' },
// class: 'hidden-sm-and-down' ensures that an item is not shown
// on small screens. For example flows are only visible on screens with
Expand Down Expand Up @@ -213,10 +211,10 @@ export default {
// },
// { icon: 'mdi-video-input-antenna', text: 'Connect', link: '/edge-connect' },
// { icon: 'mdi-video-input-antenna', text: 'Connect Remote', link: '/remote-edge-connection' },
{ icon: 'settings', color: 'blue lighten-3', text: 'Settings', link: '/settings' },
{ icon: 'chat_bubble', color: 'accent', text: 'Send feedback', link: '/feedback' },
{ icon: 'help', color: 'indigo lighten-2', text: 'Help', link: '/help' },
{ icon: 'info', color: 'info', text: 'About Ambianic', link: '/about' }
{ icon: 'settings', text: 'Settings', link: '/settings' },
{ icon: 'chat_bubble', text: 'Send feedback', link: '/feedback' },
{ icon: 'help', text: 'Help', link: '/help' },
{ icon: 'info', text: 'About Ambianic', link: '/about' }
]
}),
computed: {
Expand Down
5 changes: 0 additions & 5 deletions src/components/shared/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<v-icon
slot="icon"
size="36"
:color="iconColor"
>
mdi-{{ icon }}
</v-icon>
Expand Down Expand Up @@ -37,10 +36,6 @@ export default {
type: String,
default: null
},
iconColor: {
type: String,
default: null
},
progress: {
type: Boolean,
default: false
Expand Down
5 changes: 0 additions & 5 deletions src/components/shared/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<v-btn
:icon="isIcon"
:to="to"
:color="btnColor"
>
<v-badge
v-if="withBadge"
Expand Down Expand Up @@ -47,10 +46,6 @@ export default {
to: {
type: String,
default: null
},
btnColor: {
type: String,
default: null
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions src/components/shared/ListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<template>
<v-list-item :two-line="twoLine">
<v-list-item-icon>
<v-icon :color="iconColor">
<v-icon>
mdi-{{ iconName }}
</v-icon>
</v-list-item-icon>
Expand Down Expand Up @@ -90,10 +90,6 @@ export default {
twoLine: {
type: Boolean,
default: false
},
iconColor: {
type: String,
default: null
}
},
data () {
Expand Down
4 changes: 2 additions & 2 deletions src/views/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</v-layout>
<v-card-actions>
<v-btn
outlined
text
color="info"
:to="'timeline'"
id="btn-timeline"
Expand All @@ -58,7 +58,7 @@
</v-btn>
<v-spacer />
<v-btn
outlined
text
color="info"
:to="'settings'"
id="btn-settings"
Expand Down
4 changes: 1 addition & 3 deletions src/views/Feedback.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@
id="feedback-title"
icon-name="comment-quote-outline"
title="Send Feedback"
icon-color="accent"
subtitle="We currently use github to gather user feedbaack. Click the button below to open an issue."
/>
</v-list>
<v-card-actions>
<v-btn
id="btn-feedback"
outlined
text
href="https://github.com/ambianic/ambianic-ui/issues"
target="_blank"
color="accent"
>
Open Feedback Page
</v-btn>
Expand Down
3 changes: 0 additions & 3 deletions src/views/Help.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
id="help-title"
icon-name="help-circle-outline"
title="Need Help with Ambianic?"
icon-color="accent"
subtitle="Please reference our online docs or connect on Twitter."
/>
</v-list>
Expand All @@ -34,7 +33,6 @@
<v-icon
left
dark
color="accent"
>
mdi-file-document-box-check-outline
</v-icon>
Expand All @@ -49,7 +47,6 @@
<v-icon
left
dark
color="accent"
>
mdi-twitter
</v-icon>
Expand Down
5 changes: 1 addition & 4 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
>
<v-card flat>
<v-card-title
class="light teal lighten-4"
data-cy="titlecard"
>
Ambianic Edge connection details
Expand Down Expand Up @@ -79,7 +78,7 @@
<amb-banner
banner-class="text-left"
icon="wifi-off"
icon-color="pink"
icon-color="info"
text="Let's find your Ambianic Edge device and connect to it..."
/>
<v-stepper
Expand Down Expand Up @@ -172,7 +171,6 @@
>
<v-card>
<v-card-title
class="light teal lighten-4"
data-cy="localtitlecard"
>
Pair with local Ambianic Edge device
Expand Down Expand Up @@ -219,7 +217,6 @@
>
<v-card>
<v-card-title
class="light teal lighten-4"
data-cy="remotetitlecard"
>
Pair with remote Ambianic Edge device
Expand Down
2 changes: 0 additions & 2 deletions src/views/Timeline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<v-icon
slot="icon"
size="36"
color="pink"
>
mdi-wifi-off
</v-icon>
Expand All @@ -42,7 +41,6 @@
<v-card-actions>
<v-btn
outlined
color="accent"
id="btn-settings"
data-cy="settings"
to="/settings"
Expand Down