Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	assets/css/styles.main.less
	assets/css/styles.min.css
	page-home.php
  • Loading branch information
Craig Fowler committed May 30, 2015
2 parents 71bbccd + 4d7bfd8 commit af3978c
Show file tree
Hide file tree
Showing 110 changed files with 23,864 additions and 15,531 deletions.
6 changes: 4 additions & 2 deletions assets/css/styles.main.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

// Pages

@import '../src/less/_page-splash.less';
@import '../src/less/_page-home.less';
<<<<<<< HEAD
//@import '../src/less/_page-board.less';
//@import '../src/less/_page-whatwefund.less';
//@import '../src/less/_page-calendar.less';
Expand All @@ -33,4 +33,6 @@

// Fonts

@import '../fonts/ss-gizmo.less';
@import '../fonts/ss-gizmo.less';
=======
>>>>>>> origin/master
23 changes: 13 additions & 10 deletions assets/css/styles.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -2871,7 +2871,7 @@ body {
font-size: 1rem;
-webkit-font-smoothing: antialiased;
background: #ffffff;
color: #7d7d8e;
color: #58595b;
line-height: 1.5;
overflow-x: hidden;
}
Expand Down Expand Up @@ -2907,7 +2907,7 @@ h5 small,
h6 small {
font-size: 80%;
font-weight: 400;
color: #7d7d8e;
color: #58595b;
}
h1 {
font-size: 50px;
Expand Down Expand Up @@ -3000,19 +3000,19 @@ a {
text-decoration: none;
}
p {
color: #7d7d8e;
color: #58595b;
margin: 0 0 10px;
line-height: 1.7;
}
p.emphasized {
font-size: 18px;
font-size: 1.125rem;
color: #7d7d8e;
color: #58595b;
margin: 15px 0;
}
p a {
border-bottom: 1px solid #bbb;
color: #7d7d8e;
color: #58595b;
}
ol,
ul {
Expand All @@ -3024,7 +3024,7 @@ li {
display: block;
line-height: 1.5;
margin: 5px 0 0;
color: #7d7d8e;
color: #58595b;
}
li:before {
width: 5px;
Expand Down Expand Up @@ -3106,13 +3106,13 @@ form input[type=text]:focus,
form input[type=email]:focus,
form input[type=password]:focus,
form textarea:focus {
border: 1px solid #7d7d8e;
border: 1px solid #58595b;
}
.alert {
font-size: 15px;
font-size: 0.9375rem;
background: #e7e7ec;
color: #7d7d8e;
color: #58595b;
display: block;
margin: 0 0 10px 0;
font-weight: 400;
Expand Down Expand Up @@ -3262,10 +3262,10 @@ body {
}
.btn.btn-primary {
color: #ffffff;
background: #7d7d8e;
background: #58595b;
}
.btn.btn-primary:hover {
background: #646474;
background: #3f4041;
}
.btn.btn-danger {
color: #ffffff;
Expand All @@ -3285,6 +3285,7 @@ body {
background: none;
box-shadow: inset 0 0 0 1px #74c080;
}
<<<<<<< HEAD
html {
height: 100%;
}
Expand Down Expand Up @@ -5047,3 +5048,5 @@ html {
.ss-share.right:after {
content: '';
}
=======
>>>>>>> origin/master
26 changes: 0 additions & 26 deletions assets/src/less/_page-home.less
Original file line number Diff line number Diff line change
@@ -1,26 +0,0 @@
#home--slider {

background: @lighterGray;

@media @mobile {
height: 300px;
}

@media @tablet {
height: 450px;
}

@media @desktop {
height: 400px;
}

@media @max {
height: 400px;
}


}

#home--mission {
background: @white;
}
20 changes: 12 additions & 8 deletions assets/src/less/_setup.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,16 @@
@desktop: ~"screen and (min-width: 980px)";
@max: ~"screen and (min-width: 1220px)";

@mobileC: ~"screen and (min-width: 0px) and (max-width: 499px)";
@tabletC: ~"screen and (min-width: 500px) and (max-width: 768px)";
@desktopC: ~"screen and (min-width: 769px) and (max-width: 979px)";
@maxC: ~"screen and (min-width: 980px) and (max-width: 1279px)";
@superMax: ~"screen and (min-width: 1280px) and (max-width: 99999px)";

// Colors

@textGray: #7D7D8E;
@textGray: #58595B;
@bgGray: #f8f8f8;
@lighterGray: #E7E7EC;
@lightGray: #CBCBD2;

@yellow: #FED406;
@green: #51A74E;
@green: #227D52;
@darkgreen: #0A693A;
@blue: #1CA4DE;
@brown: #9E6927;

Expand All @@ -45,6 +40,15 @@

@spaced: 25px;

.bg {
&.green {
background: @green;
}
&.lightgray {
background: @lightestGray;
}
}

// Mixins

.font_size(@px_size) {
Expand Down
Binary file removed assets/vid/lamm-vid.mp4
Binary file not shown.
Binary file removed assets/vid/video-poster.jpg
Binary file not shown.
Loading

0 comments on commit af3978c

Please sign in to comment.