Skip to content

Commit cf23bf2

Browse files
adamfortunaadamfortuna
committed
Merge branch 'master' into angular_and_course
2 parents 7f36a5e + 2c5baef commit cf23bf2

30 files changed

Lines changed: 678 additions & 90 deletions

‎Gruntfile.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
module.exports = function(grunt) {
2+
3+
grunt.loadNpmTasks('grunt-svgstore');
4+
5+
grunt.initConfig({
6+
7+
svgstore: {
8+
'default': {
9+
options: {
10+
cleanup: ['fill'],
11+
includeTitleElement: false
12+
},
13+
files: {
14+
'public/images/icons/icons.svg': ['public/images/icons/icon-*.svg']
15+
}
16+
}
17+
}
18+
19+
});
20+
21+
grunt.registerTask('default', ['svgstore']);
22+
23+
};

‎app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ app.use(function(err, req, res, next) {
7171
module.exports = app;
7272

7373
// Set absolute paths for partials
74-
app.locals.basedir = path.join(__dirname, 'views');
74+
app.locals.basedir = path.join(__dirname, '');

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"express": "~4.11.1",
1818
"express-session": "^1.10.2",
1919
"feedparser": "^0.19.2",
20+
"grunt": "^0.4.5",
21+
"grunt-svgstore": "^0.5.0",
2022
"jade": "~1.9.1",
2123
"mailchimp-api": "^2.0.7",
2224
"morgan": "~1.5.1",

‎public/images/icons/icon-twitter.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎public/images/icons/icons.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎public/stylesheets/application.css‎

Lines changed: 143 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,21 @@ td, th {
340340
height: 150%;
341341
width: 0; }
342342

343+
.lr {
344+
list-style-type: none;
345+
margin: 0;
346+
padding: 0; }
347+
348+
.srt {
349+
border: 0;
350+
clip: rect(0 0 0 0);
351+
height: 1px;
352+
margin: -1px;
353+
overflow: hidden;
354+
padding: 0;
355+
position: absolute;
356+
width: 1px; }
357+
343358
@font-face {
344359
font-family: 'OpenSans';
345360
font-style: normal;
@@ -387,16 +402,16 @@ h1, .h1, h2, .h2, h3, .h3, h4, .h4 {
387402
margin-top: 0; }
388403

389404
h1, .h1 {
390-
font-size: 200%; }
405+
font-size: 225%; }
391406

392407
h2, .h2 {
393-
font-size: 150%; }
408+
font-size: 175%; }
394409

395410
h3, .h3 {
396-
font-size: 125%; }
411+
font-size: 137.5%; }
397412

398413
h4, .h4 {
399-
font-size: 110%; }
414+
font-size: 112.5%; }
400415

401416
a {
402417
color: #e5bb31;
@@ -405,9 +420,10 @@ a {
405420
a:active, a:focus, a:hover {
406421
color: #caa019; }
407422

408-
img {
423+
img, svg {
409424
height: auto;
410-
max-width: 100%; }
425+
max-width: 100%;
426+
vertical-align: middle; }
411427

412428
.bucket--flag {
413429
display: table; }
@@ -421,7 +437,7 @@ img {
421437
.bucket-media {
422438
float: left;
423439
margin-right: 1.25em; }
424-
.bucket-media > img {
440+
.bucket-media > img, .bucket-media svg {
425441
display: block;
426442
max-width: none; }
427443

@@ -437,36 +453,54 @@ img {
437453
.bucket-media {
438454
float: left;
439455
margin-right: 1.25em; }
440-
.bucket-media > img {
456+
.bucket-media > img, .bucket-media svg {
441457
display: block;
442458
max-width: none; }
443459

444460
.btn {
445-
border-radius: 6px;
446-
border: 0;
461+
border: 1px solid transparent;
447462
cursor: pointer;
448463
display: inline-block;
464+
text-align: center;
465+
text-decoration: none;
466+
-webkit-user-select: none;
467+
-moz-user-select: none;
468+
-ms-user-select: none;
469+
user-select: none;
470+
white-space: nowrap;
471+
background: #e55c52;
472+
border-radius: 4px;
473+
color: #fff;
449474
font-family: 'Open Sans', Arial, Helvetica, sans-serif;
450-
font-size: 16px;
475+
font-family: 'Open Sans', Arial, Helvetica, sans-serif;
476+
font-size: 100%;
451477
line-height: 3;
452478
padding: 0 2.5em;
453-
text-align: center;
454-
text-decoration: none;
455479
transition: all 0.3s ease-in-out; }
456-
457-
.btn--a {
458-
background: #e55c52;
459-
color: #fff; }
460-
.btn--a:active, .btn--a:focus, .btn--a:hover {
480+
.btn:active, .btn:focus, .btn:hover {
461481
background: #ce5249;
462482
color: #fff; }
463483

484+
.btn--block {
485+
display: block; }
486+
487+
.btn--a--bordered {
488+
background: transparent;
489+
border-color: #e55c52;
490+
color: #e55c52; }
491+
.btn--a--bordered:active, .btn--a--bordered:focus, .btn--a--bordered:hover {
492+
background: #e55c52;
493+
color: #fff; }
494+
464495
.btn--b {
465-
background: #f1d332;
466-
color: #fff; }
496+
background: #f1d332; }
467497
.btn--b:active, .btn--b:focus, .btn--b:hover {
468-
background: #e4c82f;
469-
color: #fff; }
498+
background: #d8bd2d; }
499+
500+
.has-btn > .btn {
501+
margin-right: 0.3125em; }
502+
.has-btn > .btn:last-child {
503+
margin-right: 0; }
470504

471505
.cell {
472506
margin-left: auto;
@@ -506,16 +540,16 @@ img {
506540
transition: all 0.3s ease-in-out;
507541
width: 100%; }
508542
.form-input::-webkit-input-placeholder {
509-
color: #bcbcbc;
543+
color: #6d7c79;
510544
font-style: italic; }
511545
.form-input::-moz-placeholder {
512-
color: #bcbcbc;
546+
color: #6d7c79;
513547
font-style: italic; }
514548
.form-input:-ms-input-placeholder {
515-
color: #bcbcbc;
549+
color: #6d7c79;
516550
font-style: italic; }
517551
.form-input::placeholder {
518-
color: #bcbcbc;
552+
color: #6d7c79;
519553
font-style: italic; }
520554
.form-input:focus {
521555
border-color: #e5bb31;
@@ -548,7 +582,7 @@ img {
548582

549583
.form-label {
550584
display: block;
551-
font-size: 90%;
585+
font-size: 87.5%;
552586
font-weight: bold;
553587
margin-bottom: 0.3125em; }
554588

@@ -666,6 +700,44 @@ img {
666700
.g-b--l--4of5 {
667701
width: 80%; } }
668702

703+
.list {
704+
list-style-type: none;
705+
margin: 0;
706+
padding: 0; }
707+
708+
.list--divided > .list-item {
709+
border-bottom: 2px solid #efefef;
710+
padding-bottom: 1.25em; }
711+
.list--divided > .list-item:last-child {
712+
border-bottom: 0;
713+
padding-bottom: 0; }
714+
715+
.list--divided--f > .list-item {
716+
padding-bottom: 0; }
717+
718+
.list--inline > .list-item {
719+
display: inline;
720+
margin-right: 1.25em; }
721+
.list--inline > .list-item:last-child {
722+
margin-right: 0; }
723+
724+
.list--inline--divided > .list-item:not(:first-child)::before {
725+
content: '|';
726+
margin-left: -1ch;
727+
margin-right: 0.625em; }
728+
729+
.list--f > .list-item {
730+
margin-bottom: 0; }
731+
732+
.list--l > .list-item {
733+
margin-bottom: 2.5em; }
734+
735+
.list-item {
736+
display: block;
737+
margin-bottom: 1.25em; }
738+
.list-item:last-child {
739+
margin-bottom: 0; }
740+
669741
.row {
670742
overflow: hidden;
671743
padding: 0 1.25em; }
@@ -674,7 +746,30 @@ img {
674746
background: #e5bb31; }
675747

676748
.row--b {
677-
background: #bcbcbc; }
749+
background: #6d7c79; }
750+
751+
.sector {
752+
position: relative; }
753+
.sector::before {
754+
content: '';
755+
height: 9999px;
756+
left: 0;
757+
position: absolute;
758+
top: 0;
759+
width: 9999px;
760+
z-index: -1; }
761+
.sector:first-child::before {
762+
left: auto;
763+
right: 0; }
764+
765+
.sector--white::before {
766+
background: #fff; }
767+
768+
.sector--snow::before {
769+
background: #f9f9f7; }
770+
771+
.has-sector {
772+
overflow: hidden; }
678773

679774
.well {
680775
margin-bottom: 1.25em;
@@ -715,14 +810,26 @@ img {
715810
.header-nav-item--btn:active, .header-nav-item--btn:focus, .header-nav-item--btn:hover {
716811
border: 0; }
717812

813+
.icon {
814+
fill: currentColor; }
815+
816+
.label {
817+
color: #6d7c79;
818+
display: block;
819+
font-family: 'Open Sans', Arial, Helvetica, sans-serif;
820+
font-weight: bold; }
821+
822+
.label--highlight {
823+
color: #e5bb31; }
824+
718825
.bch {
719826
background: #e5bb31; }
720827

721828
.bci {
722829
background: #000; }
723830

724831
.bcs {
725-
background: #bcbcbc; }
832+
background: #6d7c79; }
726833

727834
.bc-bostonBlue {
728835
background: #4399af; }
@@ -948,7 +1055,7 @@ img {
9481055
color: #fff; }
9491056

9501057
.tcs {
951-
color: #bcbcbc; }
1058+
color: #6d7c79; }
9521059

9531060
.tct {
9541061
color: #37443d; }
@@ -959,17 +1066,17 @@ img {
9591066
.tfh {
9601067
font-family: 'Open Sans', Arial, Helvetica, sans-serif; }
9611068

962-
.tsxs {
963-
font-size: 75%; }
964-
9651069
.tss {
966-
font-size: 90%; }
1070+
font-size: 87.5%; }
9671071

9681072
.tsl {
969-
font-size: 115%; }
1073+
font-size: 112.5%; }
9701074

9711075
.tsxl {
972-
font-size: 150%; }
1076+
font-size: 125%; }
1077+
1078+
.tsxxl {
1079+
font-size: 137.5%; }
9731080

9741081
.tsi {
9751082
font-style: italic; }

‎public/stylesheets/application.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/stylesheets/application.sass‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@
2424
@import 'components/cell'
2525
@import 'components/form'
2626
@import 'components/grid'
27+
@import 'components/list'
2728
@import 'components/row'
29+
@import 'components/sector'
2830
@import 'components/well'
2931

3032
// -------------------------------------
3133
// Structures
3234
// -------------------------------------
3335
3436
@import 'structures/header'
37+
@import 'structures/icon'
38+
@import 'structures/label'
3539

3640
// -------------------------------------
3741
// Vendor

‎public/stylesheets/components/_bucket.sass‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
float: left
5050
margin-right: $b-space
5151

52-
> img
52+
> img, svg
5353
display: block
5454
max-width: none

0 commit comments

Comments
 (0)