Skip to content
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

style: align Heading and Items #6988

Merged
merged 20 commits into from
Feb 1, 2024
Merged

style: align Heading and Items #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8a993d1
style: align SidebarHeading with TopHeading
olegfedak Nov 22, 2023
ab761c3
Merge branch 'master' into master
martinjagodic Nov 23, 2023
2f3eb53
style: bring to shorthand property
olegfedak Nov 23, 2023
5a32c9a
Merge branch 'master' of https://github.com/olegfedak/decap-cms
olegfedak Nov 23, 2023
8c4867d
style: fix guides
olegfedak Nov 28, 2023
31c607a
Merge branch 'decaporg:master' into master
olegfedak Nov 28, 2023
d1f881f
Merge branch 'master' into master
martinjagodic Nov 29, 2023
2e718e0
style: update after testing
olegfedak Nov 29, 2023
04098a0
Merge branch 'master' of https://github.com/olegfedak/decap-cms
olegfedak Nov 29, 2023
07e9970
style: align items in sidebar
olegfedak Dec 1, 2023
c284425
Merge branch 'decaporg:master' into master
olegfedak Dec 7, 2023
7f8fbfd
Merge branch 'master' into master
olegfedak Dec 7, 2023
adec1dc
Merge branch 'master' into master
martinjagodic Dec 11, 2023
afbb629
style: update after testing
olegfedak Dec 14, 2023
dc2e3c7
Merge branch 'master' into master
olegfedak Dec 22, 2023
5e8f650
Merge branch 'master' into master
olegfedak Jan 7, 2024
51b55de
Merge branch 'master' into master
martinjagodic Jan 8, 2024
35d4500
Update config.yml
olegfedak Jan 18, 2024
f8273d8
Merge branch 'master' into master
martinjagodic Jan 18, 2024
2cb0035
Merge branch 'master' into master
martinjagodic Feb 1, 2024
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
6 changes: 3 additions & 3 deletions packages/decap-cms-core/src/components/Collection/CollectionSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const SearchInput = styled.input`
background-color: #eff0f4;
border-radius: ${lengths.borderRadius};
font-size: 14px;
padding: 10px 6px 10px 32px;
padding: 10px 6px 10px 34px;
width: 100%;
position: relative;
z-index: ${zIndex.zIndex1};
Expand Down Expand Up @@ -62,7 +62,7 @@ const Suggestions = styled.ul`
`;

const SuggestionHeader = styled.li`
padding: 0 6px 6px 32px;
padding: 0 6px 6px 34px;
font-size: 12px;
color: ${colors.text};
`;
Expand All @@ -71,7 +71,7 @@ const SuggestionItem = styled.li(
({ isActive }) => `
color: ${isActive ? colors.active : colorsRaw.grayDark};
background-color: ${isActive ? colors.activeBackground : 'inherit'};
padding: 6px 6px 6px 32px;
padding: 6px 6px 6px 34px;
cursor: pointer;
position: relative;

Expand Down
4 changes: 3 additions & 1 deletion packages/decap-cms-core/src/components/Collection/Entries/EntriesCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ import { selectCollectionEntriesCursor } from '../../../reducers/cursors';
import Entries from './Entries';

const GroupHeading = styled.h2`
font-size: 23px;
font-size: 22px;
font-weight: 600;
line-height: 37px;
padding-inline-start: 20px;
color: ${colors.textLead};
`;

Expand Down
4 changes: 2 additions & 2 deletions packages/decap-cms-core/src/components/Collection/Entries/EntryCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const ListCard = styled.li`
const ListCardLink = styled(Link)`
display: block;
max-width: 100%;
padding: 16px 22px;
padding: 16px 20px;

&:hover {
background-color: ${colors.foreground};
Expand Down Expand Up @@ -63,7 +63,7 @@ const CardHeading = styled.h2`
`;

const CardBody = styled.div`
padding: 16px 22px;
padding: 16px 20px;
height: 90px;
position: relative;
margin-bottom: ${props => props.hasImage && 0};
Expand Down
4 changes: 2 additions & 2 deletions packages/decap-cms-core/src/components/Collection/NestedCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ const TreeNavLink = styled(NavLink)`
font-weight: 500;
align-items: center;
padding: 8px;
padding-left: ${props => props.depth * 20 + 12}px;
padding-left: ${props => props.depth * 16 + 18}px;
border-left: 2px solid #fff;

${Icon} {
margin-right: 8px;
margin-right: 4px;
flex-shrink: 0;
}

Expand Down
11 changes: 6 additions & 5 deletions packages/decap-cms-core/src/components/Collection/Sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,16 @@ const SidebarContainer = styled.aside`
`;

const SidebarHeading = styled.h2`
font-size: 23px;
font-size: 22px;
font-weight: 600;
line-height: 37px;
padding: 0;
margin: 18px 12px 12px;
margin: 10px 20px;
color: ${colors.textLead};
`;

const SidebarNavList = styled.ul`
margin: 16px 0 0;
margin: 12px 0 0;
list-style: none;
overflow: auto;
`;
Expand All @@ -48,12 +49,12 @@ const SidebarNavLink = styled(NavLink)`
font-size: 14px;
font-weight: 500;
align-items: center;
padding: 8px 12px;
padding: 8px 18px;
border-left: 2px solid #fff;
z-index: -1;

${Icon} {
margin-right: 8px;
margin-right: 4px;
flex-shrink: 0;
}

Expand Down
28 changes: 14 additions & 14 deletions ...-cms-core/src/components/Collection/__tests__/__snapshots__/NestedCollection.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ exports[`NestedCollection should render connected component 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 12px;
padding-left: 18px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -100,12 +100,12 @@ exports[`NestedCollection should render connected component 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 32px;
padding-left: 34px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -169,12 +169,12 @@ exports[`NestedCollection should render connected component 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 32px;
padding-left: 34px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -243,12 +243,12 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 12px;
padding-left: 18px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -329,12 +329,12 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 32px;
padding-left: 34px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -398,12 +398,12 @@ exports[`NestedCollection should render correctly with nested entries 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 32px;
padding-left: 34px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -472,12 +472,12 @@ exports[`NestedCollection should render correctly with no entries 1`] = `
-ms-flex-align: center;
align-items: center;
padding: 8px;
padding-left: 12px;
padding-left: 18px;
border-left: 2px solid #fff;
}

.emotion-0 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down
36 changes: 20 additions & 16 deletions ...ges/decap-cms-core/src/components/Collection/__tests__/__snapshots__/Sidebar.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ exports[`Sidebar should render nested collection with filterTerm 1`] = `
}

.emotion-2 {
font-size: 23px;
font-size: 22px;
font-weight: 600;
line-height: 37px;
padding: 0;
margin: 18px 12px 12px;
margin: 10px 20px;
color: #313d3e;
}

.emotion-4 {
margin: 16px 0 0;
margin: 12px 0 0;
list-style: none;
overflow: auto;
}
Expand Down Expand Up @@ -80,15 +81,16 @@ exports[`Sidebar should render sidebar with a nested collection 1`] = `
}

.emotion-2 {
font-size: 23px;
font-size: 22px;
font-weight: 600;
line-height: 37px;
padding: 0;
margin: 18px 12px 12px;
margin: 10px 20px;
color: #313d3e;
}

.emotion-4 {
margin: 16px 0 0;
margin: 12px 0 0;
list-style: none;
overflow: auto;
}
Expand Down Expand Up @@ -139,15 +141,16 @@ exports[`Sidebar should render sidebar with a simple collection 1`] = `
}

.emotion-2 {
font-size: 23px;
font-size: 22px;
font-weight: 600;
line-height: 37px;
padding: 0;
margin: 18px 12px 12px;
margin: 10px 20px;
color: #313d3e;
}

.emotion-4 {
margin: 16px 0 0;
margin: 12px 0 0;
list-style: none;
overflow: auto;
}
Expand All @@ -163,13 +166,13 @@ exports[`Sidebar should render sidebar with a simple collection 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
padding: 8px 12px;
padding: 8px 18px;
border-left: 2px solid #fff;
z-index: -1;
}

.emotion-6 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -235,15 +238,16 @@ exports[`Sidebar should render sidebar without search 1`] = `
}

.emotion-2 {
font-size: 23px;
font-size: 22px;
font-weight: 600;
line-height: 37px;
padding: 0;
margin: 18px 12px 12px;
margin: 10px 20px;
color: #313d3e;
}

.emotion-4 {
margin: 16px 0 0;
margin: 12px 0 0;
list-style: none;
overflow: auto;
}
Expand All @@ -259,13 +263,13 @@ exports[`Sidebar should render sidebar without search 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
padding: 8px 12px;
padding: 8px 18px;
border-left: 2px solid #fff;
z-index: -1;
}

.emotion-6 mocked-icon {
margin-right: 8px;
margin-right: 4px;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down
Loading