Skip to content

Resolved Legacy CMS height and CTA issue #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Resolved Legacy CMS height and CTA issue #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions ui/src/components/Common/Settings/Settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions ui/src/components/LegacyCms/legacyCms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
60 changes: 35 additions & 25 deletions ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

5 changes: 1 addition & 4 deletions ui/src/components/Migrations/NewMigration/NewMigrationWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion ui/src/pages/MigrationEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const MigrationEditor = () => {
const bodyContent = {
component: <NewMigrationWrapper />
};
console.log('selectedOrganisation', selectedOrganisation, params);

/******** Function to get project ********/
const fetchProject = async () => {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/scss/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}

.page-wrapper {
align-items: center;
// align-items: center;
background-color: $color-base-white-10;
display: flex;
height: 100vh;
Expand Down Expand Up @@ -274,7 +274,7 @@

/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: #9a9a9b;
background: #4d4d58;
}

html,
Expand Down