Merge pull request #191 from AlexSCorey/175-BottomBorder

175 bottom border
This commit is contained in:
Alex Corey
2019-05-06 08:50:14 -04:00
committed by GitHub
4 changed files with 36 additions and 26 deletions

View File

@@ -230,7 +230,7 @@
.pf-c-card__close {
position: absolute;
top: 10px;
top: 5px;
right: 4px;
color: var(--pf-c-button--m-plain--Color);
@@ -330,14 +330,13 @@
margin-bottom: 10px;
}
.awx-c-form-action-group {
float: right;
display: block;
.awx-orgTabs-container{
display: flex
}
.pf-m-danger {
margin-top: 20px;
margin-right: 20px;
}
.awx-orgTabs__bottom-border{
flex-grow: 1;
border-bottom: 1px solid #d2d2d2
}
//
@@ -411,3 +410,5 @@
.pf-m-error p.pf-c-form__helper-text {
color: var(--pf-global--danger-color--100);
}

View File

@@ -112,8 +112,10 @@ class Organization extends Component {
isAdminOfThisOrg
} = this.state;
const tabsPaddingOverride = {
padding: '0',
const tabsStyle = {
paddingTop: '0px',
paddingLeft: '0px',
paddingRight: '0px',
};
const canSeeNotificationsTab = me.is_system_auditor || isNotifAdmin || isAuditorOfThisOrg;
@@ -141,18 +143,23 @@ class Organization extends Component {
loading ? ''
: (
<CardHeader
style={tabsPaddingOverride}
style={tabsStyle}
>
<I18n>
{({ i18n }) => (
<React.Fragment>
<RoutedTabs
match={match}
history={history}
labeltext={i18n._(t`Organization detail tabs`)}
tabsArray={tabsArray}
/>
<CardCloseButton linkTo="/organizations" />
<div className="awx-orgTabs-container">
<RoutedTabs
match={match}
history={history}
labeltext={i18n._(t`Organization detail tabs`)}
tabsArray={tabsArray}
/>
<CardCloseButton linkTo="/organizations" />
<div
className="awx-orgTabs__bottom-border"
/>
</div>
</React.Fragment>
)}
</I18n>