From b630410698f690c8ecc24930ce4e3a826d114acd Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Sat, 7 Oct 2017 01:31:52 +0530 Subject: [PATCH 1/2] Changed element class names. --- .../public/themes/default/default-theme.css | 9 ++----- .../Application/ApplicationListing.jsx | 16 ++++++----- .../Edit/Base/ApplicationEditBaseLayout.jsx | 27 ++++++++++++++++--- .../components/Platform/PlatformListing.jsx | 2 +- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/themes/default/default-theme.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/themes/default/default-theme.css index f2594edf9a..5713e6779a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/themes/default/default-theme.css +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/themes/default/default-theme.css @@ -316,10 +316,6 @@ body { background-color: #E64A19; } -#app-main-content { - margin: 0 auto; -} - #sub-title-container { height: 100px; padding: 50px 0 20px 0; @@ -332,10 +328,9 @@ body { } /* Holds the app publisher pages. */ -#application-content { +.publisher-card { height: auto; background-color: white; - width: 100%; box-shadow: 2px 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); padding: 24px; } @@ -368,7 +363,7 @@ body { margin-right: 4px; } -#application-list { +.application-list { transition: margin-right .5s; } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx index fbd74aefa3..6effa9b7ea 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx @@ -182,12 +182,11 @@ class ApplicationListing extends Component { onRowClick(uuid) { let selectedApp = this.getSelectedApplication(uuid); let style = { - width: '550px', - marginLeft: '550px' + width: '35%' }; let appListStyle = { - marginRight: '550px', + marginRight: '35%', }; this.setState({drawer: style, appListStyle: appListStyle, application: selectedApp[0]}); @@ -217,15 +216,18 @@ class ApplicationListing extends Component { render() { //TODO: Move this to a data table component. + console.log(this.state.appListStyle); return ( -
+
{this.headers.map(header => { if (header.data_id === "applicationName") { return ( - {header.label}) + {header.label}) } else if (header.data_id === "image") { return ({header.label}) + } else if (header.data_id === "edit") { + return } return ({header.label}) })} @@ -242,13 +244,13 @@ class ApplicationListing extends Component { src={application.icon} /> - {application.name} + {application.name} {application.platform.name} {application.category.name} {application.currentLifecycle.lifecycleState.name} - +