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

This commit is contained in:
Justin Walsh 2013-06-21 12:53:14 -05:00
commit f4cee0e2b1
5 changed files with 63 additions and 10 deletions

View File

@ -6486,6 +6486,11 @@ body {
width: 76.4866339334%; width: 76.4866339334%;
margin-left: 0px; margin-left: 0px;
} }
@media (min-width: 1200px) {
.columns .right-column.span9 {
width: 76.8866339334%;
}
}
.columns .right-column .content-page { .columns .right-column .content-page {
padding: 20px; padding: 20px;
min-height: 100%; min-height: 100%;
@ -6641,7 +6646,7 @@ code {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar .navbar-inner { .navbar .navbar-inner {
padding: 6px 30px; padding: 6px 10px;
} }
.navbar .navbar-inner .navbar-text { .navbar .navbar-inner .navbar-text {
line-height: 16px; line-height: 16px;
@ -6654,6 +6659,12 @@ code {
position: fixed; position: fixed;
} }
} }
@media (max-width: 767px) {
.navbar.navbar-fixed-top {
margin-left: 0px;
margin-right: 0px;
}
}
.nav.nav-list { .nav.nav-list {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
@ -6714,7 +6725,7 @@ code {
} }
.page-header { .page-header {
margin: 10px 0px; margin: 10px 0px;
padding: 0px 20px; padding: 0px;
} }
.page-header h1 { .page-header h1 {
margin-top: 0px; margin-top: 0px;

View File

@ -6486,6 +6486,11 @@ body {
width: 76.4866339334%; width: 76.4866339334%;
margin-left: 0px; margin-left: 0px;
} }
@media (min-width: 1200px) {
.columns .right-column.span9 {
width: 76.8866339334%;
}
}
.columns .right-column .content-page { .columns .right-column .content-page {
padding: 20px; padding: 20px;
min-height: 100%; min-height: 100%;
@ -6641,7 +6646,7 @@ code {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar .navbar-inner { .navbar .navbar-inner {
padding: 6px 30px; padding: 6px 10px;
} }
.navbar .navbar-inner .navbar-text { .navbar .navbar-inner .navbar-text {
line-height: 16px; line-height: 16px;
@ -6654,6 +6659,12 @@ code {
position: fixed; position: fixed;
} }
} }
@media (max-width: 767px) {
.navbar.navbar-fixed-top {
margin-left: 0px;
margin-right: 0px;
}
}
.nav.nav-list { .nav.nav-list {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
@ -6714,7 +6725,7 @@ code {
} }
.page-header { .page-header {
margin: 10px 0px; margin: 10px 0px;
padding: 0px 20px; padding: 0px;
} }
.page-header h1 { .page-header h1 {
margin-top: 0px; margin-top: 0px;

View File

@ -6486,6 +6486,11 @@ body {
width: 76.4866339334%; width: 76.4866339334%;
margin-left: 0px; margin-left: 0px;
} }
@media (min-width: 1200px) {
.columns .right-column.span9 {
width: 76.8866339334%;
}
}
.columns .right-column .content-page { .columns .right-column .content-page {
padding: 20px; padding: 20px;
min-height: 100%; min-height: 100%;
@ -6641,7 +6646,7 @@ code {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar .navbar-inner { .navbar .navbar-inner {
padding: 6px 30px; padding: 6px 10px;
} }
.navbar .navbar-inner .navbar-text { .navbar .navbar-inner .navbar-text {
line-height: 16px; line-height: 16px;
@ -6654,6 +6659,12 @@ code {
position: fixed; position: fixed;
} }
} }
@media (max-width: 767px) {
.navbar.navbar-fixed-top {
margin-left: 0px;
margin-right: 0px;
}
}
.nav.nav-list { .nav.nav-list {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
@ -6714,7 +6725,7 @@ code {
} }
.page-header { .page-header {
margin: 10px 0px; margin: 10px 0px;
padding: 0px 20px; padding: 0px;
} }
.page-header h1 { .page-header h1 {
margin-top: 0px; margin-top: 0px;

View File

@ -6486,6 +6486,11 @@ body {
width: 76.4866339334%; width: 76.4866339334%;
margin-left: 0px; margin-left: 0px;
} }
@media (min-width: 1200px) {
.columns .right-column.span9 {
width: 76.8866339334%;
}
}
.columns .right-column .content-page { .columns .right-column .content-page {
padding: 20px; padding: 20px;
min-height: 100%; min-height: 100%;
@ -6641,7 +6646,7 @@ code {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar .navbar-inner { .navbar .navbar-inner {
padding: 6px 30px; padding: 6px 10px;
} }
.navbar .navbar-inner .navbar-text { .navbar .navbar-inner .navbar-text {
line-height: 16px; line-height: 16px;
@ -6654,6 +6659,12 @@ code {
position: fixed; position: fixed;
} }
} }
@media (max-width: 767px) {
.navbar.navbar-fixed-top {
margin-left: 0px;
margin-right: 0px;
}
}
.nav.nav-list { .nav.nav-list {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
@ -6714,7 +6725,7 @@ code {
} }
.page-header { .page-header {
margin: 10px 0px; margin: 10px 0px;
padding: 0px 20px; padding: 0px;
} }
.page-header h1 { .page-header h1 {
margin-top: 0px; margin-top: 0px;

View File

@ -237,6 +237,9 @@ html, body {
&.span9 { &.span9 {
width: 76.4866339334%; width: 76.4866339334%;
margin-left: 0px; margin-left: 0px;
@media (min-width: 1200px) {
width: 76.8866339334%;
}
} }
.content-page { .content-page {
padding: 20px; padding: 20px;
@ -387,7 +390,7 @@ code {
} }
} }
@media (max-width: 767px) { @media (max-width: 767px) {
padding: 6px 30px; padding: 6px 10px;
.navbar-text { .navbar-text {
line-height: 16px; line-height: 16px;
margin: 12px 6px; margin: 12px 6px;
@ -400,6 +403,12 @@ code {
position: fixed; position: fixed;
} }
} }
@media (max-width: 767px) {
&.navbar-fixed-top {
margin-left: 0px;
margin-right: 0px;
}
}
} }
//Sidebar Nav List //Sidebar Nav List
@ -465,7 +474,7 @@ code {
.page-header { .page-header {
margin: 10px 0px; margin: 10px 0px;
padding: 0px 20px; padding: 0px;
h1 { h1 {
margin-top: 0px; margin-top: 0px;
} }