From 37471169c82de12460207037ff5b6c4d02bc3d66 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Fri, 21 Dec 2018 18:53:21 +0000
Subject: [PATCH] Impoved hideBorder implementation
---
.../ui/components/modal/simple/component.jsx | 15 ++-------------
.../ui/components/modal/simple/styles.scss | 10 ++++------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
index 0310964efa..fdca951196 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
@@ -51,7 +51,7 @@ class ModalSimple extends Component {
contentLabel={title}
{...otherProps}
>
- {hideBorder ? <header className={styles.headerNoBorder}>
+ <header className={hideBorder ? styles.headerNoBorder : styles.header}>
<h1 className={styles.title}>{title}</h1>
<Button
className={styles.dismiss}
@@ -62,18 +62,7 @@ class ModalSimple extends Component {
onClick={this.handleDismiss}
aria-describedby="modalDismissDescription"
/>
- </header> : <header className={styles.header}>
- <h1 className={styles.title}>{title}</h1>
- <Button
- className={styles.dismiss}
- label={dismiss.label}
- icon="close"
- circle
- hideLabel
- onClick={this.handleDismiss}
- aria-describedby="modalDismissDescription"
- />
- </header>}
+ </header>
<div className={styles.content}>
{this.props.children}
</div>
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
index dc3f9c01a8..3f9893bab8 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
@@ -15,16 +15,14 @@
padding: var(--line-height-computed) 0;
}
-.header {
+.headerNoBorder, .header {
display: flex;
- padding: calc(var(--line-height-computed) / 2) 0;
- border-bottom: var(--border-size) solid var(--color-gray-lighter);
flex-shrink: 0;
}
-.headerNoBorder {
- display: flex;
- flex-shrink: 0;
+.header {
+ padding: calc(var(--line-height-computed) / 2) 0;
+ border-bottom: var(--border-size) solid var(--color-gray-lighter);
}
.title {
--
GitLab