diff --git a/frontend/src/components/FeedStream.vue b/frontend/src/components/FeedStream.vue
index b40552028..28734c84a 100644
--- a/frontend/src/components/FeedStream.vue
+++ b/frontend/src/components/FeedStream.vue
@@ -50,8 +50,8 @@
{{ stream.collaborators.length }}
mdi-account-outline
- mdi-lock-open
- mdi-lock-outline
+ mdi-link
+ mdi-link-lock
diff --git a/frontend/src/components/ListItemStream.vue b/frontend/src/components/ListItemStream.vue
index 760a1e1fe..d043e7461 100644
--- a/frontend/src/components/ListItemStream.vue
+++ b/frontend/src/components/ListItemStream.vue
@@ -37,8 +37,8 @@
{{ stream.collaborators.length }}
- mdi-lock-open
- mdi-lock-outline
+ mdi-link
+ mdi-link-lock
diff --git a/frontend/src/components/SidebarStream.vue b/frontend/src/components/SidebarStream.vue
index dc3ef484e..f9cc8ed09 100644
--- a/frontend/src/components/SidebarStream.vue
+++ b/frontend/src/components/SidebarStream.vue
@@ -51,11 +51,11 @@
- mdi-lock-open
+ mdi-link
link sharing on
- mdi-lock-outline
+ mdi-link-lock
link sharing off
diff --git a/frontend/src/plugins/vuetify.js b/frontend/src/plugins/vuetify.js
index 122626d9f..fc7bce187 100644
--- a/frontend/src/plugins/vuetify.js
+++ b/frontend/src/plugins/vuetify.js
@@ -11,12 +11,12 @@ export default new Vuetify({
theme: {
themes: {
light: {
- primary: "#2196f3",
- secondary: "#607d8b",
- accent: "#03a9f4",
- error: "#ff5722",
- warning: "#ffc107",
- info: "#3f51b5",
+ primary: "#047EFB", //blue
+ secondary: "#7BBCFF", //light blue
+ accent: "#FCF25E", //yellow
+ error: "#FF5555", //red
+ warning: "#FF9100", //orange
+ info: "#313BCF", //dark blue
success: "#4caf50"
}
}
diff --git a/knexfile.js b/knexfile.js
index 15441af21..3e2defd92 100644
--- a/knexfile.js
+++ b/knexfile.js
@@ -29,7 +29,7 @@ let migrationDirs = walk( './modules' )
module.exports = {
test: {
client: 'pg',
- connection: process.env.POSTGRES_URL || 'postgres://localhost/speckle2_test',
+ connection: 'postgres://localhost/speckle2_test',
migrations: {
directory: migrationDirs
},
diff --git a/modules/core/graph/schemas/branchesAndCommits.graphql b/modules/core/graph/schemas/branchesAndCommits.graphql
index 68599ead5..a64bb72a1 100644
--- a/modules/core/graph/schemas/branchesAndCommits.graphql
+++ b/modules/core/graph/schemas/branchesAndCommits.graphql
@@ -13,7 +13,7 @@ type Branch {
id: String!
name: String!
author: User!
- description: String!
+ description: String
commits(limit: Int! = 25, cursor: String): CommitCollection
}