Merge branch 'master' of github.com:justinwalsh/daux.io

This commit is contained in:
Justin Walsh 2013-07-12 22:26:44 -05:00
commit 2ff95d383a
5 changed files with 10 additions and 22 deletions

View File

@ -6314,11 +6314,6 @@ Homepage
.homepage-hero h2 {
margin: 20px 0px;
}
.homepage-hero .homepage-image {
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
}
.hero-buttons.container-fluid {
padding: 20px 0px;
background-color: #c5c5cb;
@ -6792,6 +6787,7 @@ pre code {
.float-view .content-page p,
.float-view .content-page ul,
.float-view .content-page ol,
.float-view .content-page dl,
.float-view .content-page h2,
.float-view .content-page h3,
.float-view .content-page h4,
@ -6808,6 +6804,7 @@ pre code {
.float-view .content-page p:before,
.float-view .content-page ul:before,
.float-view .content-page ol:before,
.float-view .content-page dl:before,
.float-view .content-page h2:before,
.float-view .content-page h3:before,
.float-view .content-page h4:before,

View File

@ -6314,11 +6314,6 @@ Homepage
.homepage-hero h2 {
margin: 20px 0px;
}
.homepage-hero .homepage-image {
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
}
.hero-buttons.container-fluid {
padding: 20px 0px;
background-color: #a0d55d;
@ -6792,6 +6787,7 @@ pre code {
.float-view .content-page p,
.float-view .content-page ul,
.float-view .content-page ol,
.float-view .content-page dl,
.float-view .content-page h2,
.float-view .content-page h3,
.float-view .content-page h4,
@ -6808,6 +6804,7 @@ pre code {
.float-view .content-page p:before,
.float-view .content-page ul:before,
.float-view .content-page ol:before,
.float-view .content-page dl:before,
.float-view .content-page h2:before,
.float-view .content-page h3:before,
.float-view .content-page h4:before,

View File

@ -6314,11 +6314,6 @@ Homepage
.homepage-hero h2 {
margin: 20px 0px;
}
.homepage-hero .homepage-image {
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
}
.hero-buttons.container-fluid {
padding: 20px 0px;
background-color: #c5c5cb;
@ -6792,6 +6787,7 @@ pre code {
.float-view .content-page p,
.float-view .content-page ul,
.float-view .content-page ol,
.float-view .content-page dl,
.float-view .content-page h2,
.float-view .content-page h3,
.float-view .content-page h4,
@ -6808,6 +6804,7 @@ pre code {
.float-view .content-page p:before,
.float-view .content-page ul:before,
.float-view .content-page ol:before,
.float-view .content-page dl:before,
.float-view .content-page h2:before,
.float-view .content-page h3:before,
.float-view .content-page h4:before,

View File

@ -6314,11 +6314,6 @@ Homepage
.homepage-hero h2 {
margin: 20px 0px;
}
.homepage-hero .homepage-image {
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
}
.hero-buttons.container-fluid {
padding: 20px 0px;
background-color: #eeeeee;
@ -6792,6 +6787,7 @@ pre code {
.float-view .content-page p,
.float-view .content-page ul,
.float-view .content-page ol,
.float-view .content-page dl,
.float-view .content-page h2,
.float-view .content-page h3,
.float-view .content-page h4,
@ -6808,6 +6804,7 @@ pre code {
.float-view .content-page p:before,
.float-view .content-page ul:before,
.float-view .content-page ol:before,
.float-view .content-page dl:before,
.float-view .content-page h2:before,
.float-view .content-page h3:before,
.float-view .content-page h4:before,

View File

@ -95,7 +95,7 @@ Homepage
margin: 20px 0px;
}
.homepage-image {
.box-shadow(10px, rgba(0,0,0,0.20), 0px, 0px);
//.box-shadow(10px, rgba(0,0,0,0.20), 0px, 0px);
}
}
.hero-buttons.container-fluid {
@ -538,7 +538,7 @@ pre {
padding: 0px;
}
.page-header,
p, ul, ol, h2, h3,h4, h5, h6 {
p, ul, ol, dl, h2, h3,h4, h5, h6 {
float: left;
clear: left;
width: 47%;