Merge branch 'fix-modal-structure' of https://github.com/BobakOftadeh/bigbluebutton into testRecord

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>

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 {