Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions config.codekit
Original file line number Diff line number Diff line change
Expand Up @@ -538,22 +538,6 @@
"shouldRunBless": 0,
"useLibsass": 0
},
"\/scss\/_header.scss": {
"createSourceMap": 0,
"debugStyle": 0,
"decimalPrecision": 10,
"fileType": 4,
"ignore": 1,
"ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/scss\/_header.scss",
"outputAbbreviatedPath": "\/css\/_header.css",
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0,
"outputStyle": 0,
"shouldRunAutoprefixer": 0,
"shouldRunBless": 0,
"useLibsass": 0
},
"\/scss\/_jetpack.scss": {
"createSourceMap": 0,
"debugStyle": 0,
Expand All @@ -570,38 +554,6 @@
"shouldRunBless": 0,
"useLibsass": 0
},
"\/scss\/_navigation.scss": {
"createSourceMap": 0,
"debugStyle": 0,
"decimalPrecision": 10,
"fileType": 4,
"ignore": 1,
"ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/scss\/_navigation.scss",
"outputAbbreviatedPath": "\/css\/_navigation.css",
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0,
"outputStyle": 0,
"shouldRunAutoprefixer": 0,
"shouldRunBless": 0,
"useLibsass": 0
},
"\/scss\/_page.scss": {
"createSourceMap": 0,
"debugStyle": 0,
"decimalPrecision": 10,
"fileType": 4,
"ignore": 1,
"ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/scss\/_page.scss",
"outputAbbreviatedPath": "\/css\/_page.css",
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0,
"outputStyle": 0,
"shouldRunAutoprefixer": 0,
"shouldRunBless": 0,
"useLibsass": 0
},
"\/scss\/_portfolio.scss": {
"createSourceMap": 0,
"debugStyle": 0,
Expand Down Expand Up @@ -784,15 +736,6 @@
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0
},
"\/style.css": {
"fileType": 16,
"ignore": 1,
"ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/style.css",
"outputAbbreviatedPath": "No Output Path",
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0
},
"\/tgm-plugin-activation.php": {
"fileType": 8192,
"ignore": 0,
Expand Down
25 changes: 20 additions & 5 deletions scss/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.footer-widgets {
max-width: 710px;
margin: 0 auto 1.5em;
width: 80%;
padding-top: 50px;
}

Expand Down Expand Up @@ -71,16 +69,33 @@ body.single .padding {
* Footer copyright
*/
.site-info {
width: 80%;
max-width: 710px;
width: 100%;
max-width: 1200px;
margin: 0 auto;
padding: 1em 0;
font-size: .8em;
font-style: italic;
}

body.home .site-info .widget-area {
width: 400px;
display: inline-block;
padding: 0 30px;
}

body.page .footer-widgets {
padding: 0 40px;
max-width: 640px;
}

body.page .footer-widgets .widget-area {
width: 280px;
padding: 0 20px;
display: inline-block;
}

#site-navigation #main-menu .inner-menu .menu-widgets .widget_tag_cloud .tagcloud a {
background: none;
border: none;
}
}

3 changes: 2 additions & 1 deletion scss/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ body.page, body.single, body.archive, body.search, body.error404 {
left: 0;
top: 0;
text-align: center;
padding-top: 32px;
}
#site-top a {
background: none;
}
#site-top img {
height: 140px;
height: 100px;
width: auto;
}
.site-title, .site-logo-link {
Expand Down
8 changes: 8 additions & 0 deletions scss/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,12 @@ body #site-navigation {
top: -20px;
position: fixed;
z-index: 2;
}

body.admin-bar #site-navigation {
padding-top: 32px;
}

#site-navigation a, #site-navigation a:link, #site-navigation a:visited {
display: block;
}
12 changes: 9 additions & 3 deletions scss/_single.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
body.single .main-menu, body.page .main-menu {
padding-left: 200px;
max-width: 1000px;
right: 0;
float: right;
}

body.single #site-top a, body.page #site-top a {
Expand All @@ -18,17 +20,21 @@ body.single #site-top img, body.page #site-top img {
}

body.single #site-top, body.page #site-top {
margin-top: 25px;
margin-top: 22px;
padding-top: 0;
}

body.single.admin-bar #site-top, body.page.admin-bar #site-top {
padding-top: 32px;
}
body.single #masthead, body.page #masthead{
width: 50%;
height: 100vh;
float: left;
position: fixed;
}

body.single #content {
body.single #content, body.page #content {
margin-left: 50vw;
}

Expand Down
18 changes: 6 additions & 12 deletions sidebar-footer-frontpage.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,19 @@

<?php
if ( is_active_sidebar( 'footer-frontpage-left' ) ) {
?>
<div id="footer-frontpage-left" class="widget-area" role="complementary">
?><div id="footer-frontpage-left" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'footer-frontpage-left' ); ?>
</div><!-- #footer-left -->
<?php
</div><?php
}
if ( is_active_sidebar( 'footer-frontpage-mid' ) ) {
?>
<div id="footer-frontpage-mid" class="widget-area" role="complementary">
?><div id="footer-frontpage-mid" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'footer-frontpage-mid' ); ?>
</div><!-- #footer-mid -->
<?php
</div><?php
}
if ( is_active_sidebar( 'footer-frontpage-right' ) ) {
?>
<div id="footer-frontpage-right" class="widget-area" role="complementary">
?><div id="footer-frontpage-right" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'footer-frontpage-right' ); ?>
</div><!-- #footer-right -->
<?php
</div><?php
}
?>

Expand Down
13 changes: 4 additions & 9 deletions sidebar-footer-innerpage.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,15 @@

<?php
if ( is_active_sidebar( 'footer-innerpage-left' ) ) {
?>
<div id="footer-innerpage-left" class="widget-area" role="complementary">
?><div id="footer-innerpage-left" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'footer-innerpage-left' ); ?>
</div><!-- #footer-left -->
<?php
</div><?php
}
if ( is_active_sidebar( 'footer-innerpage-right' ) ) {
?>
<div id="footer-innerpage-right" class="widget-area" role="complementary">
?><div id="footer-innerpage-right" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'footer-innerpage-right' ); ?>
</div><!-- #footer-right -->
<?php
</div><?php
}

?>

</div>
43 changes: 34 additions & 9 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,12 @@ body #site-navigation {
position: fixed;
z-index: 2; }

body.admin-bar #site-navigation {
padding-top: 32px; }

#site-navigation a, #site-navigation a:link, #site-navigation a:visited {
display: block; }

header#masthead, body.home header#masthead, body.home.page header#masthead {
height: 100vh;
min-height: 600px; }
Expand Down Expand Up @@ -983,13 +989,14 @@ body.page #masthead, body.single #masthead, body.archive #masthead, body.search
right: 0;
left: 0;
top: 0;
text-align: center; }
text-align: center;
padding-top: 32px; }

#site-top a {
background: none; }

#site-top img {
height: 140px;
height: 100px;
width: auto; }

.site-title, .site-logo-link {
Expand Down Expand Up @@ -1201,9 +1208,7 @@ footer .widget-grofile {
text-align: center; }

.footer-widgets {
max-width: 710px;
margin: 0 auto 1.5em;
width: 80%;
padding-top: 50px; }

.footer-widgets #footer-frontpage,
Expand Down Expand Up @@ -1258,13 +1263,27 @@ body.single .padding {
* Footer copyright
*/
.site-info {
width: 80%;
max-width: 710px;
width: 100%;
max-width: 1200px;
margin: 0 auto;
padding: 1em 0;
font-size: .8em;
font-style: italic; }

body.home .site-info .widget-area {
width: 400px;
display: inline-block;
padding: 0 30px; }

body.page .footer-widgets {
padding: 0 40px;
max-width: 640px; }

body.page .footer-widgets .widget-area {
width: 280px;
padding: 0 20px;
display: inline-block; }

#site-navigation #main-menu .inner-menu .menu-widgets .widget_tag_cloud .tagcloud a {
background: none;
border: none; }
Expand Down Expand Up @@ -1914,7 +1933,9 @@ body .saboxplugin-wrap {
body .saboxplugin-wrap > div[class*=saboxplugin] {
text-align: center; } }
body.single .main-menu, body.page .main-menu {
padding-left: 200px; }
max-width: 1000px;
right: 0;
float: right; }

body.single #site-top a, body.page #site-top a {
position: absolute;
Expand All @@ -1930,15 +1951,19 @@ body.single #site-top img, body.page #site-top img {
height: 70px; }

body.single #site-top, body.page #site-top {
margin-top: 25px; }
margin-top: 22px;
padding-top: 0; }

body.single.admin-bar #site-top, body.page.admin-bar #site-top {
padding-top: 32px; }

body.single #masthead, body.page #masthead {
width: 50%;
height: 100vh;
float: left;
position: fixed; }

body.single #content {
body.single #content, body.page #content {
margin-left: 50vw; }

body.single article.hentry, body.page article.hentry {
Expand Down