aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-06-30 19:09:23 +0800
committercrupest <crupest@outlook.com>2021-06-30 19:09:23 +0800
commita1c593ee087c47937f98dee4459c8d50fdd7b9d7 (patch)
tree7766247b307f238bebae31e548a71848df196181 /FrontEnd/src
parent3a72b36663cc21a81c74615428559a38157129fa (diff)
downloadtimeline-a1c593ee087c47937f98dee4459c8d50fdd7b9d7.tar.gz
timeline-a1c593ee087c47937f98dee4459c8d50fdd7b9d7.tar.bz2
timeline-a1c593ee087c47937f98dee4459c8d50fdd7b9d7.zip
...
Diffstat (limited to 'FrontEnd/src')
-rw-r--r--FrontEnd/src/views/common/dailog/FullPageDialog.css4
-rw-r--r--FrontEnd/src/views/common/dailog/FullPageDialog.tsx2
-rw-r--r--FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx5
-rw-r--r--FrontEnd/src/views/timeline-common/index.css1
4 files changed, 7 insertions, 5 deletions
diff --git a/FrontEnd/src/views/common/dailog/FullPageDialog.css b/FrontEnd/src/views/common/dailog/FullPageDialog.css
index 65f16041..a7033398 100644
--- a/FrontEnd/src/views/common/dailog/FullPageDialog.css
+++ b/FrontEnd/src/views/common/dailog/FullPageDialog.css
@@ -24,3 +24,7 @@
.cru-full-page-content-container {
overflow: scroll;
}
+
+.cru-full-page-back-button {
+ color: var(--cru-text-on-primary-color);
+}
diff --git a/FrontEnd/src/views/common/dailog/FullPageDialog.tsx b/FrontEnd/src/views/common/dailog/FullPageDialog.tsx
index 72c9b269..2e77dbb0 100644
--- a/FrontEnd/src/views/common/dailog/FullPageDialog.tsx
+++ b/FrontEnd/src/views/common/dailog/FullPageDialog.tsx
@@ -23,7 +23,7 @@ const FullPageDialog: React.FC<FullPageDialogProps> = ({
>
<div className="cru-full-page-top-bar">
<i
- className="icon-button bi-arrow-left text-white ms-3"
+ className="icon-button bi-arrow-left ms-3 cru-full-page-back-button"
onClick={onBack}
/>
</div>
diff --git a/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx b/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx
index 4802ca93..5c2fb275 100644
--- a/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx
+++ b/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx
@@ -112,10 +112,7 @@ const TimelinePageCardTemplate: React.FC<TimelineCardTemplateProps> = ({
return (
<>
- <Card
- className={classnames("p-2 cru-clearfix", className)}
- style={{ zIndex: collapse ? 1029 : 1031 }}
- >
+ <Card className={classnames("p-2 cru-clearfix", className)}>
<div className="cru-float-right ms-3 d-flex align-items-center">
<ConnectionStatusBadge status={connectionStatus} className="me-2" />
<CollapseButton collapse={collapse} onClick={toggleCollapse} />
diff --git a/FrontEnd/src/views/timeline-common/index.css b/FrontEnd/src/views/timeline-common/index.css
index 70a1646d..6929f9ae 100644
--- a/FrontEnd/src/views/timeline-common/index.css
+++ b/FrontEnd/src/views/timeline-common/index.css
@@ -239,6 +239,7 @@
.timeline-template-card {
position: fixed;
+ z-index: 1029;
top: 56px;
right: 0;
margin: 0.5em;