Skip to content

A little more compact, slightly different header and footer, no more … #24

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
Sep 17, 2019
Merged

A little more compact, slightly different header and footer, no more … #24

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
5 changes: 5 additions & 0 deletions src/renderer/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ html {
body {
margin: 0;
font-family: 'IBM Plex Mono', monospace;
-webkit-font-smoothing: antialiased;
}

button {
Expand All @@ -16,3 +17,7 @@ button {
transform: rotate(360deg);
}
}

::-webkit-scrollbar {
display: none;
}
2 changes: 1 addition & 1 deletion src/renderer/components/layout/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const closeApp = () => {
}

export const Footer = () => (
<Flex flexWrap='wrap' justifyContent='flex-end' bg='white' sx={{ overflow: 'hidden', borderTop: '1px solid', borderColor: 'shadow' }}>
<Flex flexWrap='wrap' justifyContent='flex-end' variant='barGradient' sx={{ overflow: 'hidden', borderTop: '1px solid', borderColor: 'shadow' }}>
<RouterLink to='/config' title='Settings'>
<Box p={2} color='gray' sx={{ ':hover': { color: 'black' } }}>
<SettingsIcon fontSize='small' />
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/layout/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react'
import { Box, Heading } from 'rebass'

export const Header = () => (
<Box p={2} bg='white' sx={{ borderBottom: '1px solid', overflow: 'hidden', borderColor: 'shadow' }}>
<Box p={2} variant='barGradient' sx={{ borderBottom: '1px solid', overflow: 'hidden', borderColor: 'shadow' }}>
<Heading textAlign='center' fontWeight='bold' fontSize={2}>
Merge Requests
</Heading>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/list/MergeRequestGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface MergeRequestGroupProps {
export const MergeRequestGroup: React.FunctionComponent<MergeRequestGroupProps> = ({ label, children }) => (
<Box>
<Box py={1} px={2} sx={{ position: 'sticky', top: 0, borderBottom: '1px solid', borderColor: 'shadow' }} bg='siteBackground'>
<Text fontWeight='bold' color='blackTinted' letterSpacing={1} sx={{ textTransform: 'uppercase' }} fontSize={1}>
<Text fontWeight='bold' color='blackTinted' letterSpacing={1} sx={{ textTransform: 'uppercase' }} fontSize={0}>
{label}
</Text>
</Box>
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/components/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const theme = {
breakpoints: ['40em', '52em', '64em'],
fontSizes: [12, 14, 16, 24],
fontSizes: [10, 12, 16, 24],
colors: {
siteBackground: '#f5f5f5',
blue: '#192CFD',
Expand Down Expand Up @@ -38,6 +38,10 @@ export const theme = {
width: '2.25rem',
height: '2.25rem',
},
barGradient: {
backgroundColor: 'white',
backgroundImage: 'linear-gradient(white, #d2d2da4f)',
},
},
text: {
uppercase: {
Expand Down