Skip to content

Commit 7c7548c

Browse files
authored
Merge pull request #2870 from jeff1evesque/feature-2866
#2866: Gently style analysis component
2 parents 36e4202 + 6ed16c0 commit 7c7548c

File tree

4 files changed

+58
-11
lines changed

4 files changed

+58
-11
lines changed

src/scss/_navigation.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
.menu-container {
3636
.side-menu {
3737
a {
38-
color: $gray-6;
38+
color: $gray-7;
3939
}
4040

4141
a:hover {
4242
background-color: $gray-1;
4343
border-right: .35rem solid $green-4;
44-
color: $gray-7;
44+
color: $gray-8;
4545
}
4646
}
4747

src/scss/_variables.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
// Note: '//' comment(s), will not appear in the corresponding compiled css,
99
// whereas, '/* */' comment(s), will be preserved in the compiled output.
1010

11+
$focus: #88d5e9;
1112
$gutter-1: 2rem;
12-
$gray-7: #1a1a1a;
13-
$gray-6: #333;
14-
$gray-5: #777;
13+
$gray-8: #1a1a1a;
14+
$gray-7: #333;
15+
$gray-6: #777;
16+
$gray-5: #bebebe;
1517
$gray-4: #d5d5d5;
1618
$gray-3: #ccc;
1719
$gray-2: #ddd;

src/scss/_webform.scss

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,41 @@
2525
}
2626

2727
form {
28+
input,
29+
select,
30+
textarea {
31+
border: 1px solid #gray-5;
32+
-moz-box-sizing: border-box;
33+
-webkit-box-sizing: border-box;
34+
box-sizing: border-box;
35+
margin: 0;
36+
outline: none;
37+
padding: .438rem;
38+
-moz-transition: all .30s ease-in-out;
39+
-ms-transition: all .30s ease-in-out;
40+
-o-transition: all .30s ease-in-out;
41+
-webkit-transition: all .30s ease-in-out;
42+
}
43+
44+
input:focus,
45+
select:focus,
46+
textarea:focus {
47+
border: 1px solid $focus;
48+
-moz-box-shadow: 0 0 .5rem $focus;
49+
-webkit-box-shadow: 0 0 .5rem $focus;
50+
box-shadow: 0 0 .5rem $focus;
51+
}
52+
53+
fieldset {
54+
padding: .75rem 1.5rem 1rem;
55+
}
56+
2857
> fieldset {
58+
border: 1px solid $gray-2;
2959
margin-top: $gutter-1 / 2;
3060

3161
> fieldset {
62+
border: 1px solid $gray-1;
3263
margin-top: $gutter-1 / 4;
3364
}
3465
}
@@ -38,20 +69,26 @@ form {
3869
}
3970

4071
label {
41-
color: $gray-6;
72+
color: $gray-7;
4273
}
4374

4475
.input-block {
4576
border: 1px solid $gray-4;
4677
border-radius: .1875rem;
4778
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .085);
4879
box-sizing: border-box;
49-
color: $gray-6;
80+
color: $gray-7;
5081
display: block;
5182
font-size: .875rem;
5283
padding: .425rem .55rem;
5384
width: 100%;
5485
}
86+
87+
legend {
88+
color: $gray-7;
89+
font-size: .938rem;
90+
padding: 0 $gutter-1 / 4;
91+
}
5592
}
5693

5794
.form-group {
@@ -68,6 +105,14 @@ fieldset .error {
68105
padding-top: 1.25rem;
69106
}
70107

108+
.analysis-container {
109+
form {
110+
margin: .625rem auto;
111+
padding: 0 0 .625rem 1.25rem;
112+
113+
}
114+
}
115+
71116
.login-form {
72117
margin: 0 auto;
73118
width: 24rem;
@@ -105,7 +150,7 @@ fieldset .error {
105150
}
106151

107152
.register-form {
108-
color: $gray-6;
153+
color: $gray-7;
109154
margin: 0 auto;
110155
width: 28rem;
111156

@@ -115,7 +160,7 @@ fieldset .error {
115160
}
116161

117162
label {
118-
color: $gray-6;
163+
color: $gray-7;
119164
display: block;
120165
font-weight: 600;
121166
margin: 0 0 .4rem;

src/scss/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ h6 {
5353
background-image: linear-gradient($white-2, $gray-1);
5454
border: 1px solid $gray-4;
5555
border-radius: 3px;
56-
color: $gray-6;
56+
color: $gray-7;
5757
cursor: pointer;
5858
display: inline-block;
5959
font-size: 13px;
@@ -94,7 +94,7 @@ h6 {
9494
}
9595

9696
.note {
97-
color: $gray-5;
97+
color: $gray-6;
9898
font-size: .75rem;
9999
margin: .4rem 0 .3rem;
100100
}

0 commit comments

Comments
 (0)