Skip to content

Commit 38e4514

Browse files
committed
Rework Styling and Fix Borders
1 parent d29fcd7 commit 38e4514

3 files changed

Lines changed: 23 additions & 17 deletions

File tree

app/components/Applications.tsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,19 @@ const Applications = () => {
4343
paper: {
4444
height: 340,
4545
textAlign: 'center',
46-
color: 'white',
46+
color: 'rgba(33, 34, 41, 1.2)',
47+
fontWeight: 700,
4748
fontSize: '3rem',
4849
whiteSpace: 'nowrap',
49-
backgroundColor: '#24262f',
50-
border: '2px solid black',
51-
boxShadow: '0 3px 5px 2px rgba(255, 105, 135, .3)',
52-
'&:hover, &.Mui-focusVisible': { background: 'rgba(33, 34, 41, 0.75)' },
50+
backgroundColor: 'rgba(33, 34, 41, 0.2)',
51+
border: '3px ridge #808080',
52+
boxShadow: '0 10px 10px rgba(0,0,0,0.5)',
53+
'&:hover, &.Mui-focusVisible': { color: 'white', background: 'rgba(33, 34, 41, 1.2)' },
5354
},
5455
hover: {
55-
color: 'white',
56+
position: 'relative',
57+
bottom: 20,
58+
right: 40,
5659
boxShadow: 'none',
5760
'&:hover, &.Mui-focusVisible': { color: 'red' },
5861
},
@@ -105,4 +108,6 @@ const Applications = () => {
105108
export default Applications;
106109

107110
//name, desc, creation date
108-
// start lighter and becomes darker
111+
// three cards a row, same width
112+
// move trash can
113+
//change the font

app/components/Occupied.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@ const Occupied: React.FC = () => {
1111

1212
const useStyles = makeStyles(theme => ({
1313
paper: {
14-
color: 'white',
14+
color: 'rgba(33, 34, 41, 0.7)',
1515
height: 340,
1616
width: '100%',
17-
backgroundColor: '#24262f',
18-
boxShadow: '0 3px 5px 2px rgba(255, 105, 135, .3)',
17+
backgroundColor: 'rgba(33, 34, 41, 0.2)',
18+
border: '3px ridge #808080',
19+
boxShadow: '0 10px 10px rgba(0,0,0,0.5)',
1920
'&:hover, &.Mui-focusVisible': {
20-
backgroundColor: 'rgba(33, 34, 41, 0.75)',
21+
backgroundColor: 'rgba(33, 34, 41, 1.2)',
2122
color: 'rgb(255, 243, 72)',
2223
},
2324
},
2425
grid: {
2526
margin: '0 auto',
26-
maxWidth: '60vw',
27+
maxWidth: '50vw',
2728
maxHeight: '75vh',
2829
},
2930
icon: {

app/stylesheets/Applications.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#card-hover {
22
cursor: pointer;
3-
position: relative;
43
transition: all 1s;
54
&:after,
65
&:before {
@@ -13,16 +12,17 @@
1312
&:after {
1413
top: -1px;
1514
right: -1px;
16-
border-top: 2px solid white;
17-
border-right: 2px solid white;
15+
border-top: 2px solid rgba(255, 243, 72, 0.7);
16+
border-right: 2px solid rgba(255, 243, 72, 0.7);
1817
}
1918
&:before {
2019
bottom: -1px;
2120
left: -1px;
22-
border-bottom: 2px solid white;
23-
border-left: 2px solid white;
21+
border-bottom: 2px solid rgba(255, 243, 72, 0.7);
22+
border-left: 2px solid rgba(255, 243, 72, 0.7);
2423
}
2524
&:hover {
25+
position: relative;
2626
border-top-right-radius: 0px;
2727
border-bottom-left-radius: 0px;
2828
&:before,

0 commit comments

Comments
 (0)