Skip to content

Commit a0eec2c

Browse files
cenderinrickr
cenderin
authored and
rickr
committed
fix a bunch of issues I saw with the ui. (OperationCode#655)
* fix a bunch of issues I saw with the ui, probably still many improvements that could be made
1 parent 883df05 commit a0eec2c

11 files changed

Lines changed: 437 additions & 417 deletions

File tree

‎app/assets/stylesheets/application.css.scss‎

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,48 @@
1010
$navbar-height: 64px;
1111

1212
// Match logo to size of navbar
13-
.navbar-fixed .nav-wrapper .brand-logo img {
13+
.navbar-fixed .nav-wrapper .brand-logo {
1414
height: $navbar-height;
15+
text-align: center;
16+
@media only screen and (max-width: 600px) {
17+
height: 56px;
18+
}
19+
@media only screen and (max-width: 320px) {
20+
height: 40px;
21+
margin-top: 10px;
22+
}
23+
img {
24+
height: 100%;
25+
}
26+
}
27+
.nav-wrapper {
28+
.button-collapse {
29+
padding-left: 15px;
30+
span {
31+
position: absolute;
32+
top: -11px;
33+
font-size: .8rem;
34+
font-weight: 400;
35+
left: 18px;
36+
color: #626365;
37+
@media only screen and (min-width: 500px) {
38+
top: -14px;
39+
}
40+
}
41+
i {
42+
color: #626365;
43+
line-height: 1.8;
44+
45+
46+
}
47+
}
48+
}
49+
.collapsible-header {
50+
padding: 1rem;
51+
.collapsible-header--question {
52+
margin: 0;
53+
font-size: 1.4rem;
54+
}
1555
}
1656

1757
.navbar-fixed .nav-wrapper.container {
@@ -30,15 +70,18 @@ nav ul li a {
3070
// Fix vertical alignment in main page slider
3171
.slider .slides li .caption {
3272
color: $white;
33-
left: 10%;
3473
opacity: 0;
3574
position: absolute;
36-
top: 40% !important;
37-
width: 80%;
75+
top: 30% !important;
76+
text-align: center;
77+
left: 0;
78+
right: 0;
79+
margin: 0 auto;
80+
width: 90%;
3881
text-shadow: 1px 1px 7px $black;
3982
@media only screen and (min-width: 992px){
40-
left: 15%;
4183
width: 65%;
84+
top: 40%;
4285
}
4386
h3{
4487
font-size: 2.2rem;
@@ -77,9 +120,10 @@ i.fa.medium {
77120
display: block;
78121
font-size: 1rem;
79122
font-weight: bold;
80-
height: 64px;
81-
line-height: 64px;
82-
padding: 0 30px;
123+
padding: 0 15px;
124+
text-transform: uppercase;
125+
margin: 0;
126+
line-height: 4;
83127
}
84128

85129
// fixes bullets for FAQs

‎app/assets/stylesheets/deploy.css.scss‎

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -494,51 +494,55 @@ a.btn.btn-default:hover {
494494
//=========================================== apprentice profiles
495495

496496

497-
div#profile-container {
498-
display: flex;
499-
flex-direction: column;
500-
justify-content: space-between;
501-
}
502-
div#profile-container figure {
503-
margin-bottom: 4rem;
504-
&:last-child {
505-
margin-bottom: 0;
506-
}
507-
}
508-
div#profile-container figure div {
509-
margin: 0 auto;
510-
border-radius: 50%;
511-
overflow: hidden;
512-
background-blend-mode: luminosity;
513-
border: 5px solid #000;
514-
width: 24rem; height: 24rem;
515-
transition: .4s linear;
516-
}
517-
div#profile-container figure div:hover {
518-
border: 8px solid #000;
519-
background-color: transparent;
520-
}
521-
div#profile-container figcaption {
522-
margin-top: 1rem;
497+
.person-wrapper {
523498
text-align: center;
524-
}
499+
@media only screen and (max-width: 992px) {
500+
margin-bottom: 20px;
501+
}
502+
.person1, .person2, .person3 {
503+
background-blend-mode: luminosity;
504+
background-size: cover;
505+
border-radius: 50%;
506+
border: 5px solid $black;
507+
height: 20rem;
508+
margin: 0 auto;
509+
overflow: hidden;
510+
transition: 0.4s linear;
511+
width: 20rem;
512+
513+
&:hover {
514+
background-color: transparent;
515+
border: 8px solid $black;
516+
}
517+
518+
}
519+
.person1 {
520+
background: url('https://s3-us-west-2.amazonaws.com/operationcode/mingz.jpeg') no-repeat center
521+
hsl(200, 50%, 50%);
522+
}
523+
524+
.person2 {
525+
background: url('https://s3-us-west-2.amazonaws.com/operationcode/ewingk.jpg') no-repeat center
526+
hsl(200, 50%, 50%);
527+
}
528+
529+
.person3 {
530+
background: url('https://s3-us-west-2.amazonaws.com/operationcode/jhampton.jpeg') no-repeat center
531+
hsl(200, 50%, 50%);
532+
}
533+
534+
p {
535+
margin-top: 1rem;
536+
text-align: center;
537+
}
525538

526-
.person1 {
527-
background: url(https://s3-us-west-2.amazonaws.com/operationcode/mingz.jpeg) no-repeat center
528-
hsl(200,50%,50%);
529-
background-size: cover;
530-
}
531-
.person2 {
532-
background: url(https://s3-us-west-2.amazonaws.com/operationcode/ewingk.jpg) no-repeat center
533-
hsl(200,50%,50%);
534-
background-size: cover;
535-
}
536-
.person3 {
537-
background: url(https://s3-us-west-2.amazonaws.com/operationcode/jhampton.jpeg) no-repeat center
538-
hsl(200,50%,50%);
539-
background-size: cover;
540539
}
541540

541+
542+
543+
544+
545+
542546
.veterans-map { height: 480px; }
543547

544548
.key {
@@ -566,12 +570,7 @@ div#profile-container {
566570
.navbar-fixed .white .nav-wrapper.container {
567571
width: 100%;
568572
}
569-
nav .brand-logo {
570-
right: 0;
571-
-webkit-transform: translateX(-50%);
572-
transform: translate(0,-50%);
573-
top: 59%;
574-
}
573+
575574
.navbar-fixed nav {
576575
position: relative;
577576
}

‎app/assets/stylesheets/success_stories.css.scss‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
.success-stories-item {
22

3-
&:nth-of-type(even) {
4-
img {
5-
margin-left: 20px;
6-
}
3+
img {
4+
margin: 0 20px;
5+
}
76

7+
&:nth-of-type(even) {
88
.success-stories-accounts {
99
margin-left: 50px;
1010
}
1111
}
1212

1313
&:nth-of-type(odd) {
14-
img {
15-
margin-right: 20px;
16-
}
17-
1814
.success-stories-accounts {
1915
margin-right: 50px;
2016
}

0 commit comments

Comments
 (0)