diff --git a/archive.php b/archive.php index 6679b91..5e57bd6 100755 --- a/archive.php +++ b/archive.php @@ -15,7 +15,7 @@ -
+

- \ No newline at end of file diff --git a/header.php b/header.php index c98781a..9d57742 100755 --- a/header.php +++ b/header.php @@ -17,7 +17,6 @@ - diff --git a/image.php b/image.php index ee8063e..f066d7a 100755 --- a/image.php +++ b/image.php @@ -15,95 +15,98 @@
> -
-

- -
- at %4$s × %5$s in %7$s', 'symbol' ), - esc_attr( get_the_date( 'c' ) ), - esc_html( get_the_date() ), - wp_get_attachment_url(), - $metadata['width'], - $metadata['height'], - get_permalink( $post->post_parent ), - get_the_title( $post->post_parent ) - ); - ?> - | ', '' ); ?> -
- - -
- -
- -
-
+
+ +
+

+ +
$post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) ); - foreach ( $attachments as $k => $attachment ) { - if ( $attachment->ID == $post->ID ) - break; - } - $k++; - // If there is more than 1 attachment in a gallery - if ( count( $attachments ) > 1 ) { - if ( isset( $attachments[ $k ] ) ) - // get the URL of the next image attachment - $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID ); - else - // or get the URL of the first image attachment - $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID ); - } else { - // or, if there's only 1 image, get the URL of the image - $next_attachment_url = wp_get_attachment_url(); - } + $metadata = wp_get_attachment_metadata(); + printf( __( 'Published at %4$s × %5$s in %7$s', 'symbol' ), + esc_attr( get_the_date( 'c' ) ), + esc_html( get_the_date() ), + wp_get_attachment_url(), + $metadata['width'], + $metadata['height'], + get_permalink( $post->post_parent ), + get_the_title( $post->post_parent ) + ); ?> - - ID, $attachment_size ); - ?> -
- - post_excerpt ) ) : ?> -
- -
+ | ', '' ); ?> +
+ + +

+ +
+ +
+
+ $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) ); + foreach ( $attachments as $k => $attachment ) { + if ( $attachment->ID == $post->ID ) + break; + } + $k++; + // If there is more than 1 attachment in a gallery + if ( count( $attachments ) > 1 ) { + if ( isset( $attachments[ $k ] ) ) + // get the URL of the next image attachment + $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID ); + else + // or get the URL of the first image attachment + $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID ); + } else { + // or, if there's only 1 image, get the URL of the image + $next_attachment_url = wp_get_attachment_url(); + } + ?> + + ID, $attachment_size ); + ?> +
+ + post_excerpt ) ) : ?> +
+ +
+ +
+ + + '
' . __( 'Pages:', 'symbol' ), 'after' => '
' ) ); ?> + +
+ + + - + diff --git a/images/.DS_Store b/images/.DS_Store deleted file mode 100755 index 5008ddf..0000000 Binary files a/images/.DS_Store and /dev/null differ diff --git a/inc/licence.php b/inc/licence.php index 0628acd..4b4cdba 100644 --- a/inc/licence.php +++ b/inc/licence.php @@ -76,7 +76,7 @@ function licence_do_page() { - + diff --git a/js/.DS_Store b/js/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/js/.DS_Store and /dev/null differ diff --git a/options.php b/options.php new file mode 100644 index 0000000..40acbd9 --- /dev/null +++ b/options.php @@ -0,0 +1,177 @@ + __('One', 'options_check'), + 'two' => __('Two', 'options_check'), + 'three' => __('Three', 'options_check'), + 'four' => __('Four', 'options_check'), + 'five' => __('Five', 'options_check') + ); + + // Multicheck Array + $multicheck_array = array( + 'one' => __('French Toast', 'options_check'), + 'two' => __('Pancake', 'options_check'), + 'three' => __('Omelette', 'options_check'), + 'four' => __('Crepe', 'options_check'), + 'five' => __('Waffle', 'options_check') + ); + + // Multicheck Defaults + $multicheck_defaults = array( + 'one' => '1', + 'five' => '1' + ); + + // Background Defaults + $background_defaults = array( + 'color' => '', + 'image' => '', + 'repeat' => 'repeat', + 'position' => 'top center', + 'attachment'=>'scroll' ); + + // Typography Defaults + $typography_defaults = array( + 'size' => '15px', + 'face' => 'georgia', + 'style' => 'bold', + 'color' => '#bada55' ); + + // Typography Options + $typography_options = array( + 'sizes' => array( '6','12','14','16','20' ), + 'faces' => array( 'Helvetica Neue' => 'Helvetica Neue','Arial' => 'Arial' ), + 'styles' => array( 'normal' => 'Normal','bold' => 'Bold' ), + 'color' => false + ); + + // Pull all the categories into an array + $options_categories = array(); + $options_categories_obj = get_categories(); + foreach ($options_categories_obj as $category) { + $options_categories[$category->cat_ID] = $category->cat_name; + } + + // Pull all tags into an array + $options_tags = array(); + $options_tags_obj = get_tags(); + foreach ( $options_tags_obj as $tag ) { + $options_tags[$tag->term_id] = $tag->name; + } + + // Pull all the pages into an array + $options_pages = array(); + $options_pages_obj = get_pages('sort_column=post_parent,menu_order'); + $options_pages[''] = 'Select a page:'; + foreach ($options_pages_obj as $page) { + $options_pages[$page->ID] = $page->post_title; + } + + // If using image radio buttons, define a directory path + $imagepath = get_template_directory_uri() . '/images/'; + + $options = array(); + + $options[] = array( + 'name' => __('Basic Settings', 'options_check'), + 'type' => 'heading'); + + $options[] = array( + 'name' => __('Background', 'options_check'), + 'desc' => __('Change the background CSS.', 'options_check'), + 'id' => 'background', + 'std' => $background_defaults, + 'type' => 'background' ); + + $options[] = array( + 'name' => __('Container Width', 'options_check'), + 'desc' => __('Container width in pixels.', 'options_check'), + 'id' => 'container_width', + 'std' => '560px', + 'class' => 'mini', + 'type' => 'text'); + + $options[] = array( + 'name' => __('Header Image', 'options_check'), + 'desc' => __('This creates a full size uploader that previews the image.', 'options_check'), + 'id' => 'header_background_image', + 'type' => 'upload'); + + $options[] = array( + 'name' => __('Avatar Image', 'options_check'), + 'desc' => __('This creates a full size uploader that previews the image.', 'options_check'), + 'id' => 'avatar_image', + 'type' => 'upload'); + + $options[] = array( + 'name' => __('Biography', 'options_check'), + 'desc' => __('Default Biography.', 'options_check'), + 'id' => 'biography', + 'std' => 'Default Biography', + 'type' => 'textarea'); + + + $options[] = array( + 'name' => __('Navigation Background Color', 'options_check'), + 'desc' => __('No color selected by default.', 'options_check'), + 'id' => 'navigation_background_color', + 'std' => '', + 'type' => 'color' ); + + $options[] = array( + 'name' => __('Navigation Text Color', 'options_check'), + 'desc' => __('No color selected by default.', 'options_check'), + 'id' => 'navigation_text_color', + 'std' => '', + 'type' => 'color' ); + + $options[] = array( + 'name' => __('Biography Background Color', 'options_check'), + 'desc' => __('No color selected by default.', 'options_check'), + 'id' => 'biography_background_color', + 'std' => '', + 'type' => 'color' ); + + $options[] = array( + 'name' => __('Biography Box Text Color', 'options_check'), + 'desc' => __('No color selected by default.', 'options_check'), + 'id' => 'biography_text_color', + 'std' => '', + 'type' => 'color' ); + + $options[] = array( + 'name' => __('Footer Text', 'options_check'), + 'id' => 'footer_text', + 'std' => 'Footer Text', + 'type' => 'text'); + return $options; +} \ No newline at end of file diff --git a/style.css b/style.css index e084d4f..1a72712 100755 --- a/style.css +++ b/style.css @@ -240,6 +240,9 @@ body { .site-main { position: relative; } +.next-image { + float: right; +} /* =Article -------------------------------------------------------------- */ .site-navigation.post-navigation div div { @@ -258,6 +261,7 @@ body { display: block; } article.post, +article.attachment, article.page { border-bottom: 1px solid #ebebeb; padding: 50px 0; @@ -266,51 +270,61 @@ article.page { /* Images */ } article.post h1, +article.attachment h1, article.page h1 { font-size: 30px; line-height: 40px; } article.post p a, +article.attachment p a, article.page p a { color: #000; text-decoration: underline; } article.post p < code, +article.attachment p < code, article.page p < code { width: 100%; display: none; } article.post code, +article.attachment code, article.page code, article.post pre, +article.attachment pre, article.page pre { border: none; - border: 1px solid #d2d2d2; background-color: #f8f8f8; - padding: 0 4px; + padding: 0 10px; font-size: 13px; width: auto; display: inline-block; } article.post code, +article.attachment code, article.page code { border-radius: 4px; } article.post pre, +article.attachment pre, article.page pre { padding: 20px 30px; + border: 1px solid #d2d2d2; display: block; border-left: none; border-right: none; overflow-x: scroll; } article.post blockquote p:last-child, +article.attachment blockquote p:last-child, article.page blockquote p:last-child { margin-bottom: 0; } article.post p iframe, +article.attachment p iframe, article.page p iframe, article.post p object, +article.attachment p object, article.page p object { display: block; margin: 0; @@ -319,10 +333,13 @@ article.page p object { float: none; } article.post img, +article.attachment img, article.page img, article.post iframe, +article.attachment iframe, article.page iframe, article.post object, +article.attachment object, article.page object { display: block; margin: 0; @@ -331,18 +348,22 @@ article.page object { float: none; } article.post p iframe, +article.attachment p iframe, article.page p iframe, article.post p object, +article.attachment p object, article.page p object { min-height: 250px; min-width: 0; } article.post img, +article.attachment img, article.page img { height: auto; width: auto; } article.post .embed-container, +article.attachment .embed-container, article.page .embed-container { position: relative; padding-bottom: 56.25%; @@ -354,10 +375,13 @@ article.page .embed-container { margin-bottom: 30px; } article.post .embed-container iframe, +article.attachment .embed-container iframe, article.page .embed-container iframe, article.post .embed-container object, +article.attachment .embed-container object, article.page .embed-container object, article.post .embed-container embed, +article.attachment .embed-container embed, article.page .embed-container embed { position: absolute; top: 0; @@ -540,7 +564,7 @@ nav.paging-navigation .nav-next, padding: 0 0 24px 60px; position: relative; } -.comments-area ol.commentlist li:last-child { +.comments-area ol.commentlist li.comment:last-child { border-bottom: none; margin-bottom: 0; } diff --git a/style.styl b/style.styl index ff71e5c..30f2676 100755 --- a/style.styl +++ b/style.styl @@ -198,6 +198,8 @@ body.admin-bar header.site-header, body .site-main position: relative; +.next-image + float: right /* =Article -------------------------------------------------------------- */ @@ -208,7 +210,7 @@ body.admin-bar header.site-header, body .center-content, #disqus_thread max-width: 580px; margin: 0 100px 0 140px; padding: 0 20px; display: block; -article.post, article.page +article.post, article.attachment, article.page border-bottom: 1px solid #ebebeb; padding: 50px 0; font-size: 18px; @@ -224,9 +226,8 @@ article.post, article.page code,pre border: none; - border: 1px solid #d2d2d2; background-color: #f8f8f8; - padding: 0 4px; + padding: 0 10px; font-size: 13px; width: auto; display: inline-block; @@ -235,6 +236,7 @@ article.post, article.page border-radius: 4px; pre padding: 20px 30px; + border: 1px solid #d2d2d2; display: block; border-left: none; border-right: none; @@ -377,7 +379,7 @@ nav.paging-navigation, #nav-below ol.commentlist list-style:none; margin:0; padding: 0; max-width: 500px; li.comment{border-bottom:1px solid #e7e7e7; line-height:24px; margin:0 0 24px 0; padding:0 0 24px 60px; position:relative} - li:last-child{border-bottom:none; margin-bottom:0} + li.comment:last-child{border-bottom:none; margin-bottom:0} .avatar{position:absolute; border-radius: 100px; top:4px; left:0} .comment-author{font-weight: bold; font-size: 13px} .comment-author cite{color:#000; font-style:normal; font-weight:bold}