diff --git a/android/app/src/main/assets/public/blah/en-us.json b/android/app/src/main/assets/public/blah/en-us.json index 43bce67b..4a2db461 100644 --- a/android/app/src/main/assets/public/blah/en-us.json +++ b/android/app/src/main/assets/public/blah/en-us.json @@ -61,7 +61,11 @@ "placeholder.create.group.input": "My group", "placeholder.create.space.input": "My space", "title.name": "Name", - "desc.create.space": "Create, a space for your community", + "desc.create.space": "Create a space for your community", + "desc.join.space": "Join a community that fits you", + "title.join.space": "Join space", + "title.space.id": "Space id", + "title.sign.up": "Sign Up", "title.sign.in": "Sign In", diff --git a/android/app/src/main/assets/public/index.html b/android/app/src/main/assets/public/index.html index 0442796d..301c2159 100644 --- a/android/app/src/main/assets/public/index.html +++ b/android/app/src/main/assets/public/index.html @@ -21,22 +21,15 @@ - @@ -37,11 +45,43 @@ var createSpaceScreen = `

desc.create.space


- +
+`; +var joinSpaceScreen = ` +
+ + title.join.space +

desc.join.space

+
+
+ + +
+
+ + +
+
+ +
+
+`; + + +//context menus +var addSpaceMenu = ` + + `; \ No newline at end of file diff --git a/android/app/src/main/assets/public/style.css b/android/app/src/main/assets/public/style.css index ec2c944a..4205e4e7 100644 --- a/android/app/src/main/assets/public/style.css +++ b/android/app/src/main/assets/public/style.css @@ -5,6 +5,7 @@ :root { --main-bg-color: rgb(20, 20, 20); --text-color: rgb(240, 240, 245); + --darker-text-color: rgb(210, 210, 215); --icon-button-size: 2rem; --press-scale: scale(0.92); --light-border-color: rgba(255, 255, 255, 0.08); @@ -393,10 +394,53 @@ sidebarelement:has(.icon-button:active) indicator:not(.active) { transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem)); } -blah { +blah, inherit, .inherit { all: inherit; padding: 0; margin: 0; display: inline; opacity: 1; +} +space{ + margin-left: 0.4rem; +} + +.context-menu { + position: fixed; + background: var(--main-bg-color); + border: var(--border-width) solid var(--light-border-color); + border-radius: 0.8rem; + padding: 0.4rem; + display: flex; + flex-direction: column; + gap: 0.2rem; + z-index: 2000; + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.4); + + opacity: 0; + transform: scale(0.95); + transform-origin: center left; + pointer-events: none; +} + +.context-menu.show { + opacity: 1; + transform: scale(1); + pointer-events: auto; +} + +.context-menu button { + margin: 0; + padding: 0.5rem 1rem; + border: none; + background: transparent; + width: 100%; + min-width: 10rem; + justify-content: flex-start; + gap: 0.5rem; + font-weight: 600; +} + +.context-menu button:hover { + background-color: rgba(255, 255, 255, 0.08); } \ No newline at end of file diff --git a/electron/assets/icon.png b/electron/assets/icon.png index eba3e9ad..e05914d3 100644 Binary files a/electron/assets/icon.png and b/electron/assets/icon.png differ diff --git a/icons/icon.png b/icons/icon.png index eba3e9ad..e05914d3 100644 Binary files a/icons/icon.png and b/icons/icon.png differ diff --git a/webroot/blah/en-us.json b/webroot/blah/en-us.json index 43bce67b..4a2db461 100644 --- a/webroot/blah/en-us.json +++ b/webroot/blah/en-us.json @@ -61,7 +61,11 @@ "placeholder.create.group.input": "My group", "placeholder.create.space.input": "My space", "title.name": "Name", - "desc.create.space": "Create, a space for your community", + "desc.create.space": "Create a space for your community", + "desc.join.space": "Join a community that fits you", + "title.join.space": "Join space", + "title.space.id": "Space id", + "title.sign.up": "Sign Up", "title.sign.in": "Sign In", diff --git a/webroot/index.html b/webroot/index.html index 0442796d..301c2159 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -21,22 +21,15 @@
- @@ -37,11 +45,43 @@ var createSpaceScreen = `

desc.create.space


- +
+`; +var joinSpaceScreen = ` +
+ + title.join.space +

desc.join.space

+
+
+ + +
+
+ + +
+
+ +
+
+`; + + +//context menus +var addSpaceMenu = ` + + `; \ No newline at end of file diff --git a/webroot/style.css b/webroot/style.css index ec2c944a..4205e4e7 100644 --- a/webroot/style.css +++ b/webroot/style.css @@ -5,6 +5,7 @@ :root { --main-bg-color: rgb(20, 20, 20); --text-color: rgb(240, 240, 245); + --darker-text-color: rgb(210, 210, 215); --icon-button-size: 2rem; --press-scale: scale(0.92); --light-border-color: rgba(255, 255, 255, 0.08); @@ -393,10 +394,53 @@ sidebarelement:has(.icon-button:active) indicator:not(.active) { transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem)); } -blah { +blah, inherit, .inherit { all: inherit; padding: 0; margin: 0; display: inline; opacity: 1; +} +space{ + margin-left: 0.4rem; +} + +.context-menu { + position: fixed; + background: var(--main-bg-color); + border: var(--border-width) solid var(--light-border-color); + border-radius: 0.8rem; + padding: 0.4rem; + display: flex; + flex-direction: column; + gap: 0.2rem; + z-index: 2000; + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.4); + + opacity: 0; + transform: scale(0.95); + transform-origin: center left; + pointer-events: none; +} + +.context-menu.show { + opacity: 1; + transform: scale(1); + pointer-events: auto; +} + +.context-menu button { + margin: 0; + padding: 0.5rem 1rem; + border: none; + background: transparent; + width: 100%; + min-width: 10rem; + justify-content: flex-start; + gap: 0.5rem; + font-weight: 600; +} + +.context-menu button:hover { + background-color: rgba(255, 255, 255, 0.08); } \ No newline at end of file