Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

touching up css - removing !importants and fixing positions

Browse Source
This commit is contained in:
Alex Windett 2017-02-07 10:53:41 +00:00
parent 8ca6de880e
commit 3d50f4201d
4 changed files with 16 additions and 7643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/header/index.js
View File

@ -68,7 +68,7 @@ const StyledAvatarWrapper = styled.div`
const StyledTooltipWrapper = styled.div` const StyledTooltipWrapper = styled.div`
position: absolute; position: absolute;
left: ${remcalc(-40)}; right: ${remcalc-18};
bottom: ${remcalc(-180)}; bottom: ${remcalc(-180)};
`; `;

12
frontend/src/components/navigation/org.js
View File

@ -37,7 +37,7 @@ const StyledNav = styled.div`
& ul { & ul {
height: ${remcalc(60)}; height: ${remcalc(60)};
margin: 0px 0px 0px 0px !important; margin: 0;
} }
`; `;
@ -45,14 +45,14 @@ const StyledNav = styled.div`
const NavigationLinkContainer = styled.div` const NavigationLinkContainer = styled.div`
position: relative; position: relative;
padding: ${remcalc(11)} ${remcalc(12)} ${remcalc(12)}; padding: ${remcalc(11)} ${remcalc(12)} ${remcalc(12)};
color: #646464; color: ${colors.base.secondaryDark};
border: ${remcalc(1)} solid ${colors.base.greyDark}; border: ${remcalc(1)} solid ${colors.base.greyDark};
height: ${remcalc(24)}; height: ${remcalc(24)};
background-color: #f2f2f2; background-color: #f2f2f2;
&.active { &.active {
background-color: #fafafa; background-color: ${colors.base.grey};
border-bottom: solid ${remcalc(1)} #fafafa; border-bottom: solid ${remcalc(1)} ${colors.base.grey};
} }
`; `;
@ -61,7 +61,7 @@ const OrgImage = styled.div`
`; `;
const OrgAvatar = styled(Avatar)` const OrgAvatar = styled(Avatar)`
display: block !important; display: block;
`; `;
const OrgName = styled.span` const OrgName = styled.span`
@ -75,7 +75,7 @@ const NavLi = styled.li`
padding-left: ${remcalc(3)}; padding-left: ${remcalc(3)};
& a { & a {
text-decoration: none !important; text-decoration: none;
} }
`; `;

9
frontend/src/components/section/index.js
View File

@ -5,6 +5,7 @@ const Styled = require('styled-components');
const Li = require('@ui/components/horizontal-list/li'); const Li = require('@ui/components/horizontal-list/li');
const NavLink = require('@ui/components/nav-link'); const NavLink = require('@ui/components/nav-link');
const constants = require('@ui/shared/constants'); const constants = require('@ui/shared/constants');
const fns = require('@ui/shared/functions');
const PropTypes = require('@root/prop-types'); const PropTypes = require('@root/prop-types');
const Ul = require('@ui/components/horizontal-list/ul'); const Ul = require('@ui/components/horizontal-list/ul');
const Breadcrumb = require('@components/breadcrumb'); const Breadcrumb = require('@components/breadcrumb');
@ -21,6 +22,10 @@ const {
breakpoints, breakpoints,
} = constants; } = constants;
const {
remcalc,
} = fns;
const StyledHorizontalList = styled(Ul)` const StyledHorizontalList = styled(Ul)`
padding: 0; padding: 0;
`; `;
@ -29,6 +34,10 @@ const StyledHorizontalListItem = styled(Li)`
${breakpoints.smallOnly` ${breakpoints.smallOnly`
display: block; display: block;
`} `}
& + li {
margin-left: ${remcalc(21)};
}
`; `;
const Section = (props) => { const Section = (props) => {

7636
frontend/yarn.lock
View File

File diff suppressed because it is too large Load Diff