External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 18:50:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191 from AlexSCorey/175-BottomBorder

Browse Source 
175 bottom border
This commit is contained in:
Alex Corey
2019-05-06 08:50:14 -04:00
committed by GitHub
parent 500765cea5 1200c23ebc
commit a4899d4dbb
4 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationNotifications.test.jsx.snap
View File

@@ -182,6 +182,7 @@ exports[`<OrganizationNotifications /> initially renders succesfully 1`] = `
> >
<DataListToolbar <DataListToolbar
add={null} add={null}
addBtnToolTipContent="Add"
addUrl={null} addUrl={null}
columns={ columns={
Array [ Array [
@@ -211,6 +212,7 @@ exports[`<OrganizationNotifications /> initially renders succesfully 1`] = `
noLeftMargin={false} noLeftMargin={false}
onCompact={null} onCompact={null}
onExpand={null} onExpand={null}
onOpenDeleteModal={null}
onSearch={[Function]} onSearch={[Function]}
onSelectAll={null} onSelectAll={null}
onSort={[Function]} onSort={[Function]}

16
package-lock.json generated
View File

@@ -2616,7 +2616,7 @@
}, },
"readable-stream": { "readable-stream": {
"version": "2.3.6", "version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -4138,7 +4138,7 @@
}, },
"camelcase-keys": { "camelcase-keys": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -10665,7 +10665,7 @@
}, },
"load-json-file": { "load-json-file": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -10995,7 +10995,7 @@
}, },
"meow": { "meow": {
"version": "3.7.0", "version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -11013,7 +11013,7 @@
"dependencies": { "dependencies": {
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true "dev": true
} }
@@ -11525,7 +11525,7 @@
}, },
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
"dev": true "dev": true
} }
@@ -13890,7 +13890,7 @@
}, },
"os-locale": { "os-locale": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -14666,7 +14666,7 @@
}, },
"readable-stream": { "readable-stream": {
"version": "2.3.6", "version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true, "dev": true,
"requires": { "requires": {

17
src/app.scss
View File

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

27
src/pages/Organizations/screens/Organization/Organization.jsx
View File

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