Skip to content

Commit 8e7d713

Browse files
authored
Merge pull request #26 from Knifa/ui-tweaks
Tighten up new design
2 parents 6b1feff + 54e6d1f commit 8e7d713

File tree

8 files changed

+44
-17
lines changed

8 files changed

+44
-17
lines changed

public/screenshot.png

122 KB
Loading

src/App.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "./scss/variables";
22
@import "./scss/mixins";
33

4-
$split-breakpoint: $block-width * 2 + ($spacing * 4);
4+
$split-breakpoint: $block-width * 2 + ($spacing * 8);
55

66
.App {
77
display: flex;
@@ -14,25 +14,30 @@ $split-breakpoint: $block-width * 2 + ($spacing * 4);
1414
display: flex;
1515
justify-content: center;
1616
flex-grow: 1;
17-
background-color: black;
17+
background-color: $dark-color;
1818
box-shadow: $shadow-big;
1919
z-index: 1;
2020

2121
@media screen and (min-width: $split-breakpoint) {
2222
justify-content: flex-end;
23+
padding: $spacing;
2324
}
2425
}
2526

2627
.LightSide {
2728
display: flex;
2829
flex-direction: column;
2930
flex-grow: 1;
30-
padding: $spacing;
31-
background-color: $primary-color;
31+
padding: $spacing * 2;
32+
33+
background-image: $primary-gradient;
34+
background-attachment: fixed;
35+
background-size: cover;
3236

3337
@media screen and (max-width: $split-breakpoint) {
3438
align-items: center;
3539
justify-content: flex-start;
40+
padding: $spacing;
3641
}
3742
}
3843
}

src/Block.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,17 @@
5454
color: white;
5555
box-shadow: $shadow-small;
5656

57-
background-color: $input-bg;
57+
background-image: $input-gradient;
58+
background-attachment: fixed;
59+
background-size: cover;
60+
5861
border: none;
5962
outline: none;
6063

6164
border-radius: $border-radius;
6265

6366
&:hover {
64-
background-color: $input-bg-hover;
67+
background-image: $input-gradient-hover;
6568
}
6669

6770
&:disabled {

src/CopyCode.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
display: block;
55
margin: $spacing 0;
66
padding: $spacing;
7-
background-color: $input-bg;
7+
background-color: $dark-input-bg;
88
border-radius: 0.5em;
99
box-shadow: $shadow-small;
1010
line-height: 1;
1111

1212
&:hover {
13-
background-color: $input-bg-hover;
13+
background-color: $dark-input-bg-hover;
1414
cursor: pointer;
1515
}
1616
}

src/TestShapes.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
text-align: center;
2020

2121
padding: ($spacing / 2) $spacing;
22-
background-color: $input-bg;
22+
background-color: $dark-input-bg;
2323
border-radius: $border-radius;
2424
box-shadow: $shadow-small;
2525

@@ -32,7 +32,7 @@
3232
}
3333

3434
&:hover {
35-
background-color: $input-bg-hover;
35+
background-color: $dark-input-bg-hover;
3636
}
3737

3838
video,

src/blocks/SummaryBlock.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
tbody tr {
3636
font-size: 12pt;
37-
background-color: $block-bg-content;
37+
background-color: $block-bg-content-alt;
3838

3939
&:nth-child(2n + 1) {
40-
background-color: $block-bg-content-alt;
40+
background-color: $block-bg-content;
4141
}
4242
}
4343

src/forms/FormContainer.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
border-radius: $border-radius;
4141
overflow: hidden;
4242

43-
background-color: $input-bg;
43+
background-image: $input-gradient;
44+
background-attachment: fixed;
45+
background-size: cover;
4446

4547
.FormContainer__inputIcon {
4648
padding: 0.25em 0.5em;

src/scss/variables.scss

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
@import "~sass-material-colors";
22

3-
$primary-color: material-color("light-green", "700");
3+
$primary-color: material-color("pink", "700");
4+
$alt-color: material-color("deep-purple", "700");
5+
$dark-color: material-color("grey", "900");
6+
7+
$primary-gradient: linear-gradient($primary-color, $alt-color);
8+
9+
$input-gradient: linear-gradient(
10+
adjust-color($primary-color, $lightness: -10, $saturation: -20),
11+
adjust-color($alt-color, $lightness: -10, $saturation: -20)
12+
);
13+
14+
$input-gradient-hover: linear-gradient(
15+
adjust-color($primary-color, $lightness: -5, $saturation: -20),
16+
adjust-color($alt-color, $lightness: -5, $saturation: -20)
17+
);
418

519
$glass-white-color: rgba(white, 0.1);
620
$glass-black-color: rgba(black, 0.2);
@@ -14,9 +28,12 @@ $shadow-big: ($spacing / 4) ($spacing / 4) rgba(0, 0, 0, 0.15);
1428
$block-width: 600px;
1529
$mobile-max-width: 650px;
1630

17-
$block-bg-title: change-color($primary-color, $lightness: 15);
18-
$block-bg-content: black;
19-
$block-bg-content-alt: change-color($primary-color, $lightness: 5);
31+
$block-bg-title: rgba(black, 0.5);
32+
$block-bg-content: $dark-color;
33+
$block-bg-content-alt: adjust-color($block-bg-content, $lightness: 2);
2034

2135
$input-bg: change-color($primary-color, $lightness: 15);
2236
$input-bg-hover: adjust-color($input-bg, $lightness: 5);
37+
38+
$dark-input-bg: #333;
39+
$dark-input-bg-hover: adjust-color($dark-input-bg, $lightness: 5);

0 commit comments

Comments
 (0)