diff --git a/index.html b/index.html index 53f4469f2..6566546c7 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,8 @@ - ActivityWatch - + Prescribing Care Direct + diff --git a/src/App.vue b/src/App.vue index 09ae113e1..baf33921d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,7 +9,7 @@ div#wrapper(v-if="loaded") new-release-notification(v-if="isNewReleaseCheckEnabled") router-view - aw-footer + //- aw-footer + + diff --git a/src/route.js b/src/route.js index b1d1e58f1..37e20da74 100644 --- a/src/route.js +++ b/src/route.js @@ -25,6 +25,7 @@ const Report = () => import('./views/Report.vue'); const TimespiralView = () => import('./views/TimespiralView.vue'); const Dev = () => import('./views/Dev.vue'); const Graph = () => import('./views/Graph.vue'); +const PcdAdmin = () => import('./views/PcdAdmin.vue'); const NotFound = () => import('./views/NotFound.vue'); Vue.use(VueRouter); @@ -85,6 +86,7 @@ const router = new VueRouter({ { path: '/search', component: Search }, { path: '/graph', component: Graph }, { path: '/dev', component: Dev }, + { path: '/pcd-admin', component: PcdAdmin }, // NOTE: Will break with Vue 3: https://stackoverflow.com/questions/40193634/vue-router-redirect-on-page-not-found-404/64186073#64186073 { path: '*', diff --git a/src/style/_globals.scss b/src/style/_globals.scss index d1d20d6e4..9c6c15d5f 100644 --- a/src/style/_globals.scss +++ b/src/style/_globals.scss @@ -2,4 +2,4 @@ $textColor: rgb(60, 66, 87); $backgroundColor: rgb(247, 250, 252); $lightBorderColor: darken(white, 12%); -$activeHighlightColor: rgb(10, 120, 255); +$activeHighlightColor: #0B9DD0; diff --git a/src/style/style.scss b/src/style/style.scss index 5eb206ce9..212a9a5fb 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -31,3 +31,29 @@ body { border: 1px solid $lightBorderColor; border-radius: 5px; } + +// PCD brand color overrides +$pcd-primary: #0B9DD0; +$pcd-secondary: #08A160; + +.btn-primary, .badge-primary, .bg-primary { + background-color: $pcd-primary !important; + border-color: $pcd-primary !important; +} + +.btn-primary:hover, .btn-primary:focus, .btn-primary:active { + background-color: darken($pcd-primary, 8%) !important; + border-color: darken($pcd-primary, 8%) !important; +} + +.btn-success, .badge-success, .bg-success { + background-color: $pcd-secondary !important; + border-color: $pcd-secondary !important; +} + +a { color: $pcd-primary; } +a:hover { color: darken($pcd-primary, 10%); } + +.aw-navbar { + border-top: 3px solid $pcd-primary; +} diff --git a/src/views/Home.vue b/src/views/Home.vue index 55eca33de..a3283d647 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -70,14 +70,18 @@ div i | You can change which page opens when you open ActivityWatch (instead of this page) in the #[router-link(to="/settings") settings]. + PCDAdminPanel + diff --git a/static/logo.svg b/static/logo.svg new file mode 100644 index 000000000..a39142da8 --- /dev/null +++ b/static/logo.svg @@ -0,0 +1,9 @@ + + + + + + + + +