yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-08 14:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docs-self-data

Browse Source
This commit is contained in:
Alexandre BODIN 2020-02-20 21:21:51 +01:00 committed by GitHub
commit adc714c9c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-admin/admin/src/components/LeftMenuHeader/Wrapper.js
View File

@ -5,7 +5,7 @@ import Logo from '../../assets/images/logo-strapi.png';
const Wrapper = styled.div`
background-color: #007eff;
height: ${props => props.theme.main.sizes.header.height};
height: ${props => props.theme.main.sizes.leftMenu.height};
.leftMenuHeaderLink {
&:hover {
@ -18,7 +18,7 @@ const Wrapper = styled.div`
height: 100%;
width: 100%;
text-align: center;
height: ${props => props.theme.main.sizes.header.height};
height: ${props => props.theme.main.sizes.leftMenu.height};
vertical-align: middle;
font-size: 2rem;
letter-spacing: 0.2rem;

4
packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/Wrapper.js
View File

@ -4,12 +4,12 @@ import PropTypes from 'prop-types';
const Wrapper = styled.div`
padding-top: 0.7rem;
position: absolute;
top: 6rem;
top: ${props => props.theme.main.sizes.leftMenu.height};
right: 0;
bottom: 0;
left: 0;
overflow-y: auto;
height: calc(100vh - (6rem + 10.2rem));
height: calc(100vh - (${props => props.theme.main.sizes.leftMenu.height} + 10.2rem));
box-sizing: border-box;
.title {