diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css index ca73e58738..3eb44f4ddb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.css @@ -39,41 +39,11 @@ padding: 5px; } -.logo-image { - height: 31px; - margin: 0 5px 16px 24px; - float: left; -} - -.logo-image img{ - height: 35px; -} - .main-container{ background: #f0f2f5; min-height: 780px } -.profile{ - float:right; - margin-right: 2%; -} - -.mobile-layout{ - visibility: hidden; - position: absolute; -} - -.mobile-menu-button{ - margin-left: 4%; - position: fixed; -} - -.nav-icon{ - margin-top: 10%; - font-size: 27px; -} - @media only screen and (min-width: 768px) { .main-container{ @@ -81,43 +51,3 @@ } } - -@media screen and (max-width: 768px) { - - .web-layout{ - visibility: hidden; - } - - .mobile-layout{ - visibility: visible; - z-index: 1; - } - - .mobile-menu-button{ - margin-top: 4%; - } - - Header{ - position: fixed; - z-index: 1; - width: 100%; - } - - .dashboard-body{ - margin-top: 14%; - } - - .logo-image { - margin-left: 20%; - } - -} - -@media screen and (max-height: 500px) { - .mobile-menu-button{ - margin-top: 2%; - } - .dashboard-body{ - margin-top: 9%; - } -} \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.css index bd48256ff6..030832abea 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.css +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.css @@ -20,11 +20,8 @@ cursor: pointer; } -Table{ - width: 100%; -} - .apps-table{ display: block; overflow: auto; + width: 100%; } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js index fd3055b85f..c589ab7de6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js @@ -132,7 +132,6 @@ class AppsTable extends React.Component { componentDidUpdate(prevProps, prevState, snapshot) { const {filters} = this.props; if (prevProps.filters !== this.props.filters) { - // console.log("d", this.props.filters); this.setState({ filters }); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.css new file mode 100644 index 0000000000..ba4ccf364c --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.css @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * + * Entgra (pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.logo-image { + height: 31px; + margin: 0 5px 16px 24px; + float: left; +} + +.logo-image img{ + height: 35px; +} + +.profile{ + float:right; + margin-right: 2%; +} + +.mobile-layout{ + visibility: hidden; + position: absolute; +} + +.mobile-menu-button{ + margin-left: 4%; + position: fixed; +} + +.bar-icon{ + margin-top: 10%; + font-size: 27px; +} + +@media screen and (max-width: 768px) { + + .web-layout{ + visibility: hidden; + } + + .mobile-layout{ + visibility: visible; + z-index: 1; + } + + .mobile-menu-button{ + margin-top: 4%; + } + + Header{ + position: fixed; + z-index: 1; + width: 100%; + } + + .dashboard-body{ + margin-top: 14%; + } + + .logo-image { + margin-left: 20%; + } + +} + +@media screen and (max-height: 500px) { + .mobile-menu-button{ + margin-top: 2%; + } + .dashboard-body{ + margin-top: 9%; + } +} + + + + + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js index 807aec1273..40b7ba5ec4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js @@ -21,7 +21,7 @@ import {Layout, Menu, Icon, Drawer, Button} from 'antd'; import {Switch, Link} from "react-router-dom"; import RouteWithSubRoutes from "../../components/RouteWithSubRoutes" import {Redirect} from 'react-router' -import "../../App.css"; +import "./Dashboard.css"; import {withConfigContext} from "../../context/ConfigContext"; import Logout from "./logout/Logout"; @@ -112,7 +112,7 @@ class Dashboard extends React.Component {