diff --git a/ui/src/components/Common/Settings/Settings.scss b/ui/src/components/Common/Settings/Settings.scss index f65a0add7..dda7f602d 100644 --- a/ui/src/components/Common/Settings/Settings.scss +++ b/ui/src/components/Common/Settings/Settings.scss @@ -8,7 +8,14 @@ margin: 0 !important; } #setting-page { - width: 100% !important; + display: flex; + width: 100%; + .PageLayout { + width: 100%; + } + .PageLayout__head { + border-left: 0 none; + } } .deleteButton { position: fixed !important; @@ -50,19 +57,6 @@ z-index: 10; height: 600px; } -.PageLayout { - display: flex; - width: 100%; -} -.PageLayout__content { - // flex-grow: 1; - width: 100%; -} -.PageLayout--primary .PageLayout__content.PageLayout__content--full > div { - display: flex; - width: 100%; - margin-left: $px-80; -} .stack-settings__heading { color: $color-base-black-base; diff --git a/ui/src/components/LegacyCms/legacyCms.scss b/ui/src/components/LegacyCms/legacyCms.scss index 3fa830224..ff0fecb77 100644 --- a/ui/src/components/LegacyCms/legacyCms.scss +++ b/ui/src/components/LegacyCms/legacyCms.scss @@ -25,9 +25,8 @@ border-top: $px-5 solid $color-brand-primary-base !important; } .legacy-cms-container { - margin-top: $px-60 !important; + padding: $px-60 0 $px-60 10% !important; width: $px-850 !important; - margin-left: 10% !important; } .service_list_search { diff --git a/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss b/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss index 8b2e203cb..11f38d647 100644 --- a/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss +++ b/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss @@ -41,28 +41,38 @@ font-weight: $font-weight-semi-bold; flex: 2; } -#newMigration .PageLayout__leftSidebar { - border-top: 0 none; - display: flex; - width: initial; - position: relative; - padding: 10px 0 0; - border-right: 0 none; -} -#newMigration .PageLayout__head { - position: relative; - top: 0 !important; - z-index: 12; - height: 60px; - background: $color-brand-white-base; - margin-left: auto; - width: auto; -} -#newMigration .PageLayout__body { - background-color: $color-base-white-10 !important; - display: flex; - margin: 0; - position: relative; - padding: 0; - width: auto; -} +#newMigration { + .PageLayout.PageLayout--primary { + display: flex; + } + .PageLayout__leftSidebar { + border-top: 0 none; + display: flex; + width: initial; + position: relative; + padding: 0; + border-right: 0 none; + } + .PageLayout__content { + width: calc(100% - 380px); + } + .PageLayout__head { + position: relative; + top: 0 !important; + z-index: 12; + height: 60px; + background: $color-brand-white-base; + margin-left: auto; + width: auto; + } + .PageLayout__body { + background-color: $color-base-white-10 !important; + display: flex; + margin: 0; + position: relative; + padding: 0; + width: auto; + height: calc(100vh - 7.25rem)!important; + } +} + diff --git a/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.tsx b/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.tsx index 43120517f..c3a36d695 100644 --- a/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.tsx +++ b/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.tsx @@ -6,6 +6,7 @@ import { Navigate, Outlet, Params, useNavigate, useParams } from 'react-router'; import { PageLayout } from '@contentstack/venus-components'; // Services +import { getMigrationData } from '../../../services/api/migration.service'; //import { getEntries } from '../../../services/contentstackSDK'; import { getCMSDataFromFile } from '../../../cmsData/cmsSelector'; @@ -25,14 +26,10 @@ import { // Components import { ActionTitle } from './ActionTitle'; import MigrationFlow from '../../../components/MigrationFlow'; -import Settings from '../../Common/Settings'; // Styles import './NewMigrationWrapper.scss'; -import contentData from './DummyJSON.json'; - -import { getMigrationData } from '../../../services/api/migration.service'; import { MigrationResponse, defaultMigrationResponse diff --git a/ui/src/pages/MigrationEditor/index.tsx b/ui/src/pages/MigrationEditor/index.tsx index 1e655cbca..65c48114c 100644 --- a/ui/src/pages/MigrationEditor/index.tsx +++ b/ui/src/pages/MigrationEditor/index.tsx @@ -35,7 +35,6 @@ const MigrationEditor = () => { const bodyContent = { component: }; - console.log('selectedOrganisation', selectedOrganisation, params); /******** Function to get project ********/ const fetchProject = async () => { diff --git a/ui/src/scss/App.scss b/ui/src/scss/App.scss index 922b82a5c..e43bbf9ea 100644 --- a/ui/src/scss/App.scss +++ b/ui/src/scss/App.scss @@ -41,7 +41,7 @@ } .page-wrapper { - align-items: center; + // align-items: center; background-color: $color-base-white-10; display: flex; height: 100vh; @@ -274,7 +274,7 @@ /* Handle on hover */ ::-webkit-scrollbar-thumb:hover { - background: #9a9a9b; + background: #4d4d58; } html,