aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/util/CurrentUserUtils.ts2
-rw-r--r--src/client/util/SettingsManager.scss2
-rw-r--r--src/client/views/AntimodeMenu.scss16
-rw-r--r--src/client/views/collections/CollectionStackingView.scss2
-rw-r--r--src/client/views/collections/CollectionViewChromes.scss2
-rw-r--r--src/client/views/collections/collectionFreeForm/InkOptionsMenu.scss18
-rw-r--r--src/client/views/nodes/AudioBox.scss2
-rw-r--r--src/client/views/nodes/PDFBox.scss2
-rw-r--r--src/client/views/nodes/PresBox.scss2
-rw-r--r--src/client/views/presentationview/PresElementBox.scss2
-rw-r--r--src/mobile/AudioUpload.scss95
-rw-r--r--src/mobile/MobileInterface.tsx10
-rw-r--r--src/mobile/MobileMenu.scss24
13 files changed, 45 insertions, 134 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index b7da4ae2f..5edb2225f 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -465,7 +465,7 @@ export class CurrentUserUtils {
static setupMobileButtons(doc?: Doc, buttons?: string[]) {
const docProtoData: { title: string, icon: string, drag?: string, ignoreClick?: boolean, click?: string, ischecked?: string, activePen?: Doc, backgroundColor?: string, info: string, dragFactory?: Doc }[] = [
- { title: "LIBRARY", icon: "bars", click: 'switchToLibrary()', backgroundColor: "#ffd6d6", info: "Navigate and access all of your documents within their respective collections." },
+ { title: "WORKSPACES", icon: "folder-open", click: 'openWorkspaces()', backgroundColor: "#ffd6d6", info: "Access your Workspaces from your mobile, and navigate through all of your documents. " },
{ title: "RECORD", icon: "microphone", click: 'openMobileAudio()', backgroundColor: "#ffbfbf", info: "Use your phone to record and upload audio onto Dash Web." },
{ title: "UPLOAD", icon: "upload", click: 'uploadImageMobile()', backgroundColor: "#ff9e9e", info: "Upload images or videos from your mobile device so they can be accessed on Dash Web." },
{ title: "PRESENTATION", icon: "desktop", click: 'openMobilePresentation()', backgroundColor: "#ff8080", info: "Use your phone as a remote for you presentation." },
diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 1eac9303b..0116c5294 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -135,7 +135,7 @@
}
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.settings-interface {
background-color: whitesmoke !important;
color: grey;
diff --git a/src/client/views/AntimodeMenu.scss b/src/client/views/AntimodeMenu.scss
index 170631422..43f45fb1c 100644
--- a/src/client/views/AntimodeMenu.scss
+++ b/src/client/views/AntimodeMenu.scss
@@ -41,7 +41,7 @@
}
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.antimodeMenu-cont {
position: absolute;
z-index: 10000;
@@ -51,31 +51,31 @@
border-radius: 0px 6px 6px 6px;
// overflow: hidden;
display: flex;
-
+
&.with-rows {
flex-direction: column-reverse;
}
-
+
.antimodeMenu-row {
display: flex;
height: 100%;
- width:100%;
+ width: 100%;
}
-
+
.antimodeMenu-button {
background-color: transparent;
width: 100px;
height: 100px;
-
+
&.active {
background-color: #121212;
}
}
-
+
.antimodeMenu-button:hover {
background-color: #121212;
}
-
+
.antimodeMenu-dragger {
height: 100%;
transition: width .2s;
diff --git a/src/client/views/collections/CollectionStackingView.scss b/src/client/views/collections/CollectionStackingView.scss
index 98efdfd23..342773db8 100644
--- a/src/client/views/collections/CollectionStackingView.scss
+++ b/src/client/views/collections/CollectionStackingView.scss
@@ -424,7 +424,7 @@
}
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.collectionStackingView .collectionStackingView-columnDragger,
.collectionMasonryView .collectionStackingView-columnDragger {
diff --git a/src/client/views/collections/CollectionViewChromes.scss b/src/client/views/collections/CollectionViewChromes.scss
index 54ee4ab3b..ec2d78735 100644
--- a/src/client/views/collections/CollectionViewChromes.scss
+++ b/src/client/views/collections/CollectionViewChromes.scss
@@ -80,7 +80,7 @@
// margin-top: 10px;
}
- @media only screen and (max-width: 1000) {
+ @media only screen and (max-device-width: 480px) {
.collectionViewBaseChrome-collapse {
display: none;
}
diff --git a/src/client/views/collections/collectionFreeForm/InkOptionsMenu.scss b/src/client/views/collections/collectionFreeForm/InkOptionsMenu.scss
index 72fdf5af9..4855dfea8 100644
--- a/src/client/views/collections/collectionFreeForm/InkOptionsMenu.scss
+++ b/src/client/views/collections/collectionFreeForm/InkOptionsMenu.scss
@@ -33,39 +33,39 @@
}
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.antimodeMenu-button {
.color-preview {
width: 100%;
height: 100%;
}
-
+
}
-
+
.sketch-picker {
background: #323232;
-
+
.flexbox-fit {
background: #323232;
}
}
-
+
.btn-group {
display: grid;
grid-template-columns: auto auto;
/* Make the buttons appear below each other */
}
-
+
.btn2-group {
display: block;
background: #323232;
grid-template-columns: auto;
-
+
/* Make the buttons appear below each other */
.antimodeMenu-button {
background: #323232;
display: block;
-
+
}
}
-}
+} \ No newline at end of file
diff --git a/src/client/views/nodes/AudioBox.scss b/src/client/views/nodes/AudioBox.scss
index 61ce4bd13..43dd698ad 100644
--- a/src/client/views/nodes/AudioBox.scss
+++ b/src/client/views/nodes/AudioBox.scss
@@ -174,7 +174,7 @@
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.audiobox-container,
.audiobox-container-interactive {
diff --git a/src/client/views/nodes/PDFBox.scss b/src/client/views/nodes/PDFBox.scss
index 1a31d2916..b19ddf1f5 100644
--- a/src/client/views/nodes/PDFBox.scss
+++ b/src/client/views/nodes/PDFBox.scss
@@ -224,7 +224,7 @@
}
}
-@media only screen and (max-width: 600px) {
+@media only screen and (max-device-width: 480px) {
.pdfBox .pdfBox-ui .pdfBox-settingsCont .pdfBox-settingsButton,
.pdfBox-interactive .pdfBox-ui .pdfBox-settingsCont .pdfBox-settingsButton {
diff --git a/src/client/views/nodes/PresBox.scss b/src/client/views/nodes/PresBox.scss
index e62aa48fb..1261cbfdd 100644
--- a/src/client/views/nodes/PresBox.scss
+++ b/src/client/views/nodes/PresBox.scss
@@ -81,7 +81,7 @@
}
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.presBox-cont .presBox-buttons {
position: absolute;
top: 70%;
diff --git a/src/client/views/presentationview/PresElementBox.scss b/src/client/views/presentationview/PresElementBox.scss
index 99fe2a3ba..79532995e 100644
--- a/src/client/views/presentationview/PresElementBox.scss
+++ b/src/client/views/presentationview/PresElementBox.scss
@@ -106,7 +106,7 @@
z-index: 2;
}
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-device-width: 480px) {
.presElementBox-buttons {
display: inline-flex;
position: relative;
diff --git a/src/mobile/AudioUpload.scss b/src/mobile/AudioUpload.scss
index 5f0ba465a..9fe442e55 100644
--- a/src/mobile/AudioUpload.scss
+++ b/src/mobile/AudioUpload.scss
@@ -7,77 +7,6 @@
align-items: center;
max-width: 400px;
min-width: 400px;
-
- .upload_label {
- font-size: 3em;
- font-weight: 700;
- color: white;
- background-color: black;
- display: inline-block;
- margin: 10;
- width: 100%;
- border-radius: 10px;
- }
-
- .file {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- direction: ltr;
- }
-
- .upload_label:hover {
- background-color: darkred;
- }
-
- .button_file {
- text-align: center;
- height: 50%;
- width: 50%;
- background-color: paleturquoise;
- color: grey;
- font-size: 3em;
- }
-
- .inputfile {
- width: 0.1px;
- height: 0.1px;
- opacity: 0;
- overflow: hidden;
- position: absolute;
- z-index: -1;
- }
-
- .inputfile+label {
- font-size: 3em;
- font-weight: 700;
- color: white;
- background-color: black;
- display: inline-block;
- margin: 10px;
- width: 100%;
- border-radius: 10px;
- }
-
- .inputfile:focus+label,
- .inputfile+label:hover {
- background-color: darkred;
- }
-
- .status {
- font-size: 2em;
- }
-
-}
-
-.backgroundUpload {
- height: 100vh;
- top: 0;
- z-index: 999;
- width: 100vw;
- position: absolute;
- background-color: lightgrey;
- opacity: 0.4;
}
.audio-upload {
@@ -92,28 +21,4 @@
height: 100vh;
width: 100vw;
opacity: 1;
-}
-
-.uploadContainer {
- top: 40;
- position: absolute;
- z-index: 1000;
- height: 20vh;
- width: 80vw;
- opacity: 1;
-}
-
-.loadingImage {
- display: inline-flex;
- width: max-content;
-}
-
-.loadingSlab {
- position: relative;
- width: 30px;
- height: 30px;
- margin: 10;
- border-radius: 20px;
- opacity: 0.3;
- background-color: black;
} \ No newline at end of file
diff --git a/src/mobile/MobileInterface.tsx b/src/mobile/MobileInterface.tsx
index 84a5975cb..ceda74da2 100644
--- a/src/mobile/MobileInterface.tsx
+++ b/src/mobile/MobileInterface.tsx
@@ -415,7 +415,7 @@ export class MobileInterface extends React.Component {
onClick={this.returnMain}
style={{ opacity: 0.7 }}>
<FontAwesomeIcon className="right" icon="angle-double-left" size="lg" />
- <div className="item-type">Return to library</div>
+ <div className="item-type">Return to workspaces</div>
</div>
</> :
<>
@@ -509,7 +509,7 @@ export class MobileInterface extends React.Component {
}
undo = () => {
- if (this._activeDoc.type === "collection" && this._activeDoc !== this._homeDoc) {
+ if (this._activeDoc.type === "collection" && this._activeDoc !== this._homeDoc && this._activeDoc.title !== "WORKSPACES") {
return (<>
<div className="docButton"
style={{ backgroundColor: "black", color: "white" }}
@@ -526,7 +526,7 @@ export class MobileInterface extends React.Component {
}
redo = () => {
- if (this._activeDoc.type === "collection" && this._activeDoc !== this._homeDoc) {
+ if (this._activeDoc.type === "collection" && this._activeDoc !== this._homeDoc && this._activeDoc.title !== "WORKSPACES") {
return (<>
<div className="docButton"
style={{ backgroundColor: "black", color: "white" }}
@@ -814,10 +814,10 @@ export class MobileInterface extends React.Component {
{this.pinToPresentation()}
{this.downloadDocument()}
{this.undo()}
+ {this.drawInk()}
{this.redo()}
- {this.upload()}
+ {/* {this.upload()} */}
{this.uploadImageButton()}
- {/* {this.drawInk()} */}
{/* {this.uploadAudioButton()} */}
</div>
{this.displayWorkspaces()}
diff --git a/src/mobile/MobileMenu.scss b/src/mobile/MobileMenu.scss
index 87731655a..53bc48034 100644
--- a/src/mobile/MobileMenu.scss
+++ b/src/mobile/MobileMenu.scss
@@ -19,7 +19,6 @@ body {
width: 100vw;
height: $navbar-height;
background-color: whitesmoke;
- border-bottom: 5px solid black;
z-index: 150;
}
@@ -221,14 +220,17 @@ body {
.back {
position: absolute;
- top: 44%;
left: 42px;
- background-color: black;
+ top: 0;
+ background: #1a1a1a;
width: 50px;
- height: 50px;
+ height: 100%;
+ display: flex;
+ justify-content: center;
text-align: center;
+ flex-direction: column;
+ align-items: center;
border-radius: 10px;
- transform: translate(0, -50%);
font-size: 25px;
user-select: none;
z-index: 100;
@@ -243,7 +245,7 @@ body {
border-radius: 0px;
width: 100%;
height: 80px;
- transition: all 400ms ease 50ms;
+ overflow: hidden;
}
.pathname {
@@ -291,14 +293,19 @@ body {
.scrollmenu {
overflow: auto;
+ width: 100%;
+ height: 100%;
white-space: nowrap;
+ display: inline-flex;
}
.pathbarItem {
position: relative;
- display: inline-flex;
+ display: flex;
+ align-items: center;
color: whitesmoke;
text-align: center;
+ justify-content: center;
user-select: none;
transform: translate(100px, 0px);
font-size: 30px;
@@ -311,7 +318,6 @@ body {
text-align: center;
height: 50px;
padding: 10px;
- background-color: rgb(48, 40, 40);
font-size: 30px;
border-radius: 10px;
text-transform: uppercase;
@@ -321,7 +327,7 @@ body {
.pathIcon {
- transform: translate(0px, 8px);
+ transform: translate(0px, 0px);
position: relative;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-10 19:39:44 +0000