diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx index 0310964efa5a54aa4f7c01fbf45481ebf7db3efc..fdca95119603efb15c1e0f3bbd2e405959297885 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 dc3f9c01a8340f341cbe45977cdd95bee8f004a4..3f9893bab8ddefbba57091c1db987f2d57e3122b 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 {