Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Aschweigert #8

Merged
merged 12 commits into from
Jul 23, 2012
Merged

Aschweigert #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eb729cf
add clear fix to comment section
aschweigert Jul 23, 2012
c8d4bd4
re-organize the theme settings
aschweigert Jul 23, 2012
11a58c0
setup the sidebars
aschweigert Jul 23, 2012
e64e110
some minor tweaks
aschweigert Jul 23, 2012
fca7f31
use the new copyright message function
aschweigert Jul 23, 2012
caf5320
reorganize, add comments for new functions
aschweigert Jul 23, 2012
8d1d870
use the donate link from theme options
aschweigert Jul 23, 2012
d3ff5bb
add a function to show the donate button in the top header
aschweigert Jul 23, 2012
5edb323
minor style tweak
aschweigert Jul 23, 2012
b8e1e2d
re-organize functions a bit
aschweigert Jul 23, 2012
e1f16ee
add user options
aschweigert Jul 23, 2012
aa36a55
cleanup
aschweigert Jul 23, 2012
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
2 changes: 1 addition & 1 deletion comments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* located in the functions.php file.
*/
?>
<div id="comments">
<div id="comments" class="clearfix">
<?php if ( post_password_required() ) : ?>
<p class="nopassword">This post is password protected. Enter the password to view any comments.</p>
</div><!-- #comments -->
Expand Down
137 changes: 132 additions & 5 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ a:hover {
color: #005580;
text-decoration: underline;
}
a.more-link {
white-space: nowrap;
}
p,
dl,
hr,
Expand Down Expand Up @@ -186,10 +189,6 @@ h1.entry-title {
h2 {
font-size: 44px;
}
h2.widgettitle {
font-size: 24px;
margin-bottom: 6px;
}
h3 {
font-size: 36px;
}
Expand Down Expand Up @@ -320,7 +319,8 @@ del {
color: #999999;
}
blockquote {
padding: 0 15px;
clear: both;
padding: 5px 15px;
margin: 0 0 24px;
background-color: #eeeeee;
border-left: 5px solid #999999;
Expand Down Expand Up @@ -3669,6 +3669,132 @@ p.comment-form-comment {
.form-allowed-tags {
display: none;
}
#sidebar .widget {
margin-bottom: 19.56px;
padding: 12px;
background-color: #f3f3f3;
background-image: -moz-linear-gradient(top, #efefef, #fafafa);
background-image: -ms-linear-gradient(top, #efefef, #fafafa);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#efefef), to(#fafafa));
background-image: -webkit-linear-gradient(top, #efefef, #fafafa);
background-image: -o-linear-gradient(top, #efefef, #fafafa);
background-image: linear-gradient(top, #efefef, #fafafa);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#fafafa', GradientType=0);
border: 1px solid #ddd;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.05);
-moz-box-shadow: 0 1px 3px rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.05);
box-shadow: 0 1px 3px rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.05);
}
.widget-title {
font-size: 24px;
margin-bottom: 6px;
}
#sidebar .widget-title {
margin-bottom: 8px;
padding: 3px 8px;
border: 1px solid #ddd;
font-size: 13.04px;
text-transform: uppercase;
color: #fff;
font-weight: bold;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.8);
background-color: #858585;
background-image: -moz-linear-gradient(top, #999999, #666666);
background-image: -ms-linear-gradient(top, #999999, #666666);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#999999), to(#666666));
background-image: -webkit-linear-gradient(top, #999999, #666666);
background-image: -o-linear-gradient(top, #999999, #666666);
background-image: linear-gradient(top, #999999, #666666);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#999999', endColorstr='#666666', GradientType=0);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
#sidebar .widget p,
#sidebar .widget ul {
padding: 0 5px;
font-size: 13.04px;
}
#sidebar .widget ul {
margin: 4.8px 0 0 16px;
line-height: 1.2;
}
#sidebar .widget ul ul {
margin-bottom: 4.8px;
}
#sidebar .widget.rev {
color: #ffffff;
background-color: #1f6aaa;
background-image: -moz-linear-gradient(top, #2275bb, #1a5a90);
background-image: -ms-linear-gradient(top, #2275bb, #1a5a90);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2275bb), to(#1a5a90));
background-image: -webkit-linear-gradient(top, #2275bb, #1a5a90);
background-image: -o-linear-gradient(top, #2275bb, #1a5a90);
background-image: linear-gradient(top, #2275bb, #1a5a90);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2275bb', endColorstr='#1a5a90', GradientType=0);
}
#sidebar .widget.rev .widget-title {
color: #333;
text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.3);
background-color: #eeeeee;
background-image: -moz-linear-gradient(top, #e6e6e6, #f9f9f9);
background-image: -ms-linear-gradient(top, #e6e6e6, #f9f9f9);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#f9f9f9));
background-image: -webkit-linear-gradient(top, #e6e6e6, #f9f9f9);
background-image: -o-linear-gradient(top, #e6e6e6, #f9f9f9);
background-image: linear-gradient(top, #e6e6e6, #f9f9f9);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6e6e6', endColorstr='#f9f9f9', GradientType=0);
}
#sidebar .widget.rev a {
color: #ffffff;
font-weight: bold;
}
#sidebar .widget.no-bg {
background: none;
border: none;
padding: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
#sidebar .widget.no-bg p,
#sidebar .widget.no-bg ul {
background: none;
padding: 0;
border: none;
}
#sidebar .widget.no-bg .widget-title {
color: #ffffff;
}
.twitter-follow-button {
display: block;
margin: 12px 0;
}
.fb-like,
.fb-like span,
.fb-like.fb_iframe_widget span iframe {
width: 100% !important;
}
.largo-about p {
margin-bottom: 0;
}
.argo-more-featured h5 {
font-size: 16px;
margin-bottom: 6px;
}
.argo-more-featured p {
font-size: 13.04px;
}
.footer-bg {
background-color: #555555;
background-color: #2c2c2c;
Expand All @@ -3687,6 +3813,7 @@ p.comment-form-comment {
box-shadow: 0 -1px 10px 0 #000000;
padding: 18px 0;
border-top: 1px solid #333333;
margin-bottom: 0;
}
#site-footer {
color: #ffffff;
Expand Down
2 changes: 1 addition & 1 deletion footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</div>
<div id="boilerplate" class="row-fluid clearfix">
<?php //wp_nav_menu( array( 'theme_location' => 'footer', 'container' => false, 'depth' => 1 ) ); ?>
<p><?php argo_copyright_message(); ?></p>
<p><?php largo_copyright_message(); ?></p>
<p class="back-to-top"><a href="#page">Back to top &uarr;</a></p>
</div><!-- /#boilerplate -->
</footer>
Expand Down
61 changes: 27 additions & 34 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
require_once( TEMPLATEPATH . '/inc/widgets.php' );
require_once( TEMPLATEPATH . '/inc/nav-menus.php' );
require_once( TEMPLATEPATH . '/inc/taxonomies.php' );
require_once( TEMPLATEPATH . '/inc/argo-theme-settings.php' );
require_once( TEMPLATEPATH . '/inc/largo-theme-settings.php' );
require_once( TEMPLATEPATH . '/inc/editor.php' );
require_once( TEMPLATEPATH . '/inc/images.php' );
require_once( TEMPLATEPATH . '/inc/related-content.php' );
Expand Down Expand Up @@ -257,7 +257,7 @@ function argo_admin_header_image() { ?>
<?php }
endif; // argo_admin_header_image

// Prints HTML with meta information for the current post-date/time and author.
// For posts in the last 24 hours, show time since posted instead of the regular date and time

function largo_time() {
// Change to the date after a certain time
Expand All @@ -269,7 +269,7 @@ function largo_time() {
};
}

if ( ! function_exists( 'largo_byline' ) ) :
// Print the byline

function largo_byline() {
printf( '<span class="by-author"><span class="sep">By:</span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span></span> | <time class="entry-date" datetime="%4$s" pubdate>%5$s</time>',
Expand All @@ -280,7 +280,15 @@ function largo_byline() {
largo_time()
);
}
endif;

// print the copyright message in the footer

function largo_copyright_message() {
$msg = get_option( 'copyright_msg' );
if ( ! $msg )
$msg = 'Copyright %s';
printf( $msg, date( 'Y' ) );
}

/**
* Sets the post excerpt length to 35 words.
Expand Down Expand Up @@ -477,11 +485,6 @@ function argo_enqueue_js() {
wp_enqueue_script( 'bootstrap_dropdown', get_bloginfo('template_url') . '/js/bootstrap-dropdown.js', array( 'jquery' ), '1.0', true );
wp_enqueue_script( 'bootstrap_collapse', get_bloginfo('template_url') . '/js/bootstrap-collapse.js', array( 'jquery' ), '1.0', true );

if ( wp_script_is( 'hoverIntent' ) )
wp_enqueue_script( 'hoverIntent' );
else
wp_enqueue_script( 'hoverIntent', includes_url( "/js/hoverIntent.js" ), array('jquery'), '20090102', true );

if ( get_option( 'show_related_content', true ) )
wp_enqueue_script( 'idTabs', get_bloginfo('template_url') . '/js/jquery.idTabs.js', array( 'jquery' ), '1.0', true );
}
Expand All @@ -495,28 +498,6 @@ function argo_footer_js() { ?>
//html5 placeholders
$("input[placeholder]").textPlaceholder();

//main navigation
//function megaHoverOver(){
// $(this).find(".sub").stop().fadeTo('fast', 1).show();
//}

//function megaHoverOut(){
// $(this).find(".sub").stop().fadeTo('fast', 0, function() {
// $(this).hide();
// });
//}
//var config = {
// sensitivity: 2, // number = sensitivity threshold (must be 1 or higher)
// interval: 100, // number = milliseconds for onMouseOver polling interval
// over: megaHoverOver, // function = onMouseOver callback (REQUIRED)
// timeout: 500, // number = milliseconds delay before onMouseOut
// out: megaHoverOut // function = onMouseOut callback (REQUIRED)
//};

//$("#topnav li .sub").css({'opacity':'0'});
//$("#topnav li").hoverIntent(config);
//$('.dropdown-toggle').dropdown();

$(window).scroll(function(){
if (($(window).scrollTop() > 50)) {
$('#left-nav').fadeIn(500);
Expand All @@ -536,12 +517,12 @@ function argo_footer_js() { ?>
// dim sidebar
$(window).scroll(function(){
if (($(window).scrollTop() > 300)) {
$('#sidebar').animate({opacity: '0.5'}, 100);
$('.showey-hidey').animate({opacity: '0.5'}, 100);
} else if (($(window).scrollTop() < 300)) {
$('#sidebar').animate({opacity: '1'}, 100);
$('.showey-hidey').animate({opacity: '1'}, 100);
}
});
$('#sidebar').hover(function() {
$('.showey-hidey').hover(function() {
$(this).animate({opacity: '1'}, 100);
}, function() {
if (($(window).scrollTop() < 300)) {
Expand All @@ -555,6 +536,18 @@ function argo_footer_js() { ?>

</script>

<!-- FB and Twitter buttons -->
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=375948615804689";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>

<?php }

//hide the admin bar
Expand Down
5 changes: 2 additions & 3 deletions header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,8 @@
wp_nav_menu($args);
?>
<div class="nav-right">
<div class="donate-btn">
<a href=""><i class="icon-heart icon-white"></i>Donate Now</a>
</div>

<?php largo_donate_button(); ?>

<div id="header-search">
<form class="form-search" role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
Expand Down
Loading