Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Cutout/Cutout.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export const StyledCutout = styled.div`
border-bottom-color: ${({ theme }) => theme.borderLight};

pointer-events: none;
${props => props.shadow && `box-shadow:${insetShadow};`}
${props =>
props.theme.shadow && props.shadow && `box-shadow:${insetShadow};`}
}
`;

Expand Down
10 changes: 6 additions & 4 deletions src/common/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ export const createBorderStyles = ({
border-top-color: ${({ theme }) => theme.borderDarkest};
border-right-color: ${({ theme }) => theme.borderLightest};
border-bottom-color: ${({ theme }) => theme.borderLightest};
box-shadow: ${props => props.shadow && `${shadow}, `} inset 1px 1px 0px
1px ${({ theme }) => theme.borderDark},
box-shadow: ${props =>
props.theme.shadow && props.shadow && `${shadow}, `}
inset 1px 1px 0px 1px ${({ theme }) => theme.borderDark},
inset -1px -1px 0 1px ${({ theme }) => theme.borderLight};
`
: css`
Expand All @@ -77,8 +78,9 @@ export const createBorderStyles = ({
windowBorders ? theme.borderLight : theme.borderLightest};
border-right-color: ${({ theme }) => theme.borderDarkest};
border-bottom-color: ${({ theme }) => theme.borderDarkest};
box-shadow: ${props => props.shadow && `${shadow}, `} inset 1px 1px 0px
1px
box-shadow: ${props =>
props.theme.shadow && props.shadow && `${shadow}, `}
inset 1px 1px 0px 1px
${({ theme }) =>
windowBorders ? theme.borderLightest : theme.borderLight},
inset -1px -1px 0 1px ${({ theme }) => theme.borderDark};
Expand Down
1 change: 1 addition & 0 deletions src/common/themes/aiee.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(250,254,255)',
materialTextInvert: 'rgb(0,62,109)',
progress: 'rgb(251,211,61)',
shadow: true,
tooltip: 'rgb(255,243,185)'
};
1 change: 1 addition & 0 deletions src/common/themes/ash.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ export default {
materialTextDisabledShadow: 'rgb(175, 175, 175)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(0, 0, 0)',
shadow: true,
tooltip: 'rgb(0, 0, 0)'
};
1 change: 1 addition & 0 deletions src/common/themes/azureOrange.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#7ebfff',
materialTextInvert: '#000000',
progress: '#F46036',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/bee.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#f8df6e',
materialTextInvert: '#ffffff',
progress: '#0C1618',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/blackAndWhite.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#000000',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/blue.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(211, 228, 248)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(51, 153, 255)',
shadow: true,
tooltip: 'rgb(225, 225, 255)'
};
1 change: 1 addition & 0 deletions src/common/themes/brick.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#8e0101',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/candy.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#EFF1F3',
materialTextInvert: '#EFF1F3',
progress: '#256EFF',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/cherry.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(255, 255, 255)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(106, 10, 36)',
shadow: true,
tooltip: 'rgb(225, 254, 255)'
};
1 change: 1 addition & 0 deletions src/common/themes/coldGray.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ export default {
materialTextDisabledShadow: '#c7c7df',
materialTextInvert: '#c7c7df',
progress: '#8d88c2',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/counterStrike.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#788475',
materialTextInvert: '#fefefe',
progress: '#978830',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/darkTeal.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(88, 139, 139)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(0, 128, 128)',
shadow: true,
tooltip: 'rgb(0, 32, 32)'
};
1 change: 1 addition & 0 deletions src/common/themes/denim.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(191, 191, 255)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(10, 36, 106)',
shadow: true,
tooltip: 'rgb(255, 255, 225)'
};
1 change: 1 addition & 0 deletions src/common/themes/eggplant.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#cee8e3',
materialTextInvert: '#ffffff',
progress: '#4b8178',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/fxDev.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(107, 113, 122)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(7, 77, 117)',
shadow: true,
tooltip: 'rgb(243, 242, 219)'
};
1 change: 1 addition & 0 deletions src/common/themes/highContrast.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#8e0284',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/honey.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(255, 220, 128)',
materialTextInvert: 'rgb(255, 255, 0)',
progress: 'rgb(170, 123, 0)',
shadow: true,
tooltip: 'rgb(255, 220, 128)'
};
1 change: 1 addition & 0 deletions src/common/themes/hotChocolate.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(219, 200, 181)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(128, 96, 64)',
shadow: true,
tooltip: 'rgb(219, 200, 181)'
};
1 change: 1 addition & 0 deletions src/common/themes/hotdogStand.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ export default {
materialTextDisabledShadow: 'rgb(0, 0, 0)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(0, 0, 0)',
shadow: true,
tooltip: 'rgb(255, 255, 225)'
};
1 change: 1 addition & 0 deletions src/common/themes/lilac.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#5e4dba',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/lilacRoseDark.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ export default {
materialTextDisabledShadow: '#ecbfe3',
materialTextInvert: '#ecbfe3',
progress: '#713259',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/maple.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#8e0101',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/marine.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#000080',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/matrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#a7a7a7',
materialTextInvert: '#ffffff',
progress: '#000000',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/millenium.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ffffff',
materialTextInvert: '#ffffff',
progress: '#00256e',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/modernDark.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#121317',
materialTextInvert: '#202127',
progress: '#f88702',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/molecule.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#d79099',
materialTextInvert: '#f1f5f6',
progress: '#a03d49',
shadow: true,
tooltip: '#fefbcc'
};
Empty file removed src/common/themes/monochrome.js
Empty file.
1 change: 1 addition & 0 deletions src/common/themes/ninjaTurtles.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#55fd55',
materialTextInvert: '#000000',
progress: '#FF1D15',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/olive.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#fcfd3e',
materialTextInvert: '#000000',
progress: '#F3DE2C',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/original.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#fefefe',
materialTextInvert: '#fefefe',
progress: '#060084',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/pamelaAnderson.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#ff7ebf',
materialTextInvert: '#F1E4E8',
progress: '#004FFF',
shadow: true,
tooltip: '#fefbcc'
};
5 changes: 4 additions & 1 deletion src/common/themes/peggysPastels.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ const theme = {
WindowText: 'rgb(0, 0, 0)'
};

export default mapFromWindowsTheme('peggysPastels', theme, true);
export default mapFromWindowsTheme('peggysPastels', theme, {
useGradients: true,
useShadows: true
});
1 change: 1 addition & 0 deletions src/common/themes/plum.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#e8dad6',
materialTextInvert: '#ffffff',
progress: '#483f63',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/polarized.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(60, 60, 194)',
materialTextInvert: 'rgb(0, 0, 255)',
progress: 'rgb(192, 192, 64)',
shadow: true,
tooltip: 'rgb(16, 16, 240)'
};
1 change: 1 addition & 0 deletions src/common/themes/powerShell.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ export default {
materialTextDisabledShadow: 'rgb(128, 128, 128)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(0, 128, 128)',
shadow: true,
tooltip: 'rgb(255, 255, 225)'
};
1 change: 1 addition & 0 deletions src/common/themes/rainyDay.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#b7cee5',
materialTextInvert: '#ffffff',
progress: '#4b6480',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/raspberry.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(200, 204, 206)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(10, 36, 106)',
shadow: true,
tooltip: 'rgb(255, 255, 225)'
};
1 change: 1 addition & 0 deletions src/common/themes/redWine.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(192, 64, 56)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(192, 0, 0)',
shadow: true,
tooltip: 'rgb(64, 0, 0)'
};
1 change: 1 addition & 0 deletions src/common/themes/rose.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#f1d4dc',
materialTextInvert: '#ffffff',
progress: '#ab5a71',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/seawater.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ export default {
materialTextDisabledShadow: 'rgb(167, 194, 224)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(0, 128, 128)',
shadow: true,
tooltip: 'rgb(255, 255, 225)'
};
1 change: 1 addition & 0 deletions src/common/themes/shelbiTeal.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(204, 224, 224)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(0, 128, 128)',
shadow: true,
tooltip: 'rgb(224, 255, 255)'
};
1 change: 1 addition & 0 deletions src/common/themes/slate.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#c3d9e9',
materialTextInvert: '#f2ffff',
progress: '#448199',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/solarizedDark.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ export default {
materialTextDisabledShadow: 'rgb(0, 43, 54)',
materialTextInvert: 'rgb(238, 232, 213)',
progress: 'rgb(211, 54, 130)',
shadow: true,
tooltip: 'rgb(253, 246, 227)'
};
1 change: 1 addition & 0 deletions src/common/themes/solarizedLight.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(253, 246, 227)',
materialTextInvert: 'rgb(238, 232, 213)',
progress: 'rgb(211, 54, 130)',
shadow: true,
tooltip: 'rgb(253, 246, 227)'
};
1 change: 1 addition & 0 deletions src/common/themes/spruce.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#cdead2',
materialTextInvert: '#fcfff6',
progress: '#3d9961',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/stormClouds.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(159, 171, 172)',
materialTextInvert: 'rgb(255, 255, 255)',
progress: 'rgb(128, 128, 0)',
shadow: true,
tooltip: 'rgb(48, 64, 80)'
};
1 change: 1 addition & 0 deletions src/common/themes/theSixtiesUSA.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#df9be7',
materialTextInvert: '#010001',
progress: '#0f0',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/tokyoDark.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#93a0a1',
materialTextInvert: '#ffffff',
progress: '#F61067',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/toner.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ export default {
materialTextDisabledShadow: 'rgb(127, 127, 127)',
materialTextInvert: 'rgb(0, 0, 0)',
progress: 'rgb(255, 255, 255)',
shadow: true,
tooltip: 'rgb(128, 128, 128)'
};
1 change: 1 addition & 0 deletions src/common/themes/tooSexy.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#fe5757',
materialTextInvert: '#ffffff',
progress: '#474973',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/travel.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#baae9f',
materialTextInvert: '#ffffff',
progress: '#48604f',
shadow: true,
tooltip: '#fefbcc'
};
1 change: 1 addition & 0 deletions src/common/themes/vaporTeal.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ export default {
materialTextDisabledShadow: '#58ffff',
materialTextInvert: '#000000',
progress: '#FF99C8',
shadow: true,
tooltip: '#fefbcc'
};
Loading