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.

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

Flint 1.2 #155

Merged
merged 43 commits into from
Apr 6, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ed797dc
Merge pull request #11 from starverte/master
mbeall Mar 8, 2014
c04f6a2
Make blockquote border-left-color dynamic
mbeall Mar 9, 2014
60ff2d0
Add Strait font
mbeall Mar 22, 2014
010db2c
Add Strait font as option
mbeall Mar 22, 2014
1cce09a
Allow for different post types on front-page.php
mbeall Mar 22, 2014
20e5111
Update template-tags.php to accommodate steel_product
mbeall Mar 22, 2014
53ac40e
Create type-steel_product.php
mbeall Mar 22, 2014
8cd92bd
Clean up spacing
mbeall Mar 22, 2014
9bd6f11
Add type-specific action to footer area widget
mbeall Mar 24, 2014
4febd34
Slight changes to footer
mbeall Mar 24, 2014
72d3eec
Define variables correctly for flint_content_nav
mbeall Mar 24, 2014
5f04a8a
Reorder css to match standards
mbeall Mar 24, 2014
7fe0ace
Register new widget areas
mbeall Mar 24, 2014
f2a7f48
Implement new widget areas
mbeall Mar 24, 2014
4c0fc64
Merge pull request #148 from mbeall/master
mbeall Mar 24, 2014
482a1ff
Add styling for Jetpack Contact Form
mbeall Mar 31, 2014
5556cdf
Add .csscomb.json to project
mbeall Mar 31, 2014
46347fe
Change rule for remove-empty-rulesets
mbeall Mar 31, 2014
44448ce
CSSComb style.css
mbeall Mar 31, 2014
7481fec
Change csscomb settings
mbeall Mar 31, 2014
db193c0
Add back leading zeroes
mbeall Mar 31, 2014
a449b2e
CSSComb editor-style.css
mbeall Mar 31, 2014
d298db0
Merge pull request #154 from mbeall/master
mbeall Apr 5, 2014
28ac10f
Standardize function names and clean up comments
mbeall Apr 5, 2014
543f34c
Clean up code
mbeall Apr 5, 2014
5d7ea0c
Keep titles from disappearing on home blogroll
mbeall Apr 5, 2014
73c4d73
Increase version number
mbeall Apr 5, 2014
18b3295
Add theme support for HTML5
mbeall Apr 5, 2014
d830b66
Upgrade Twitter Bootstrap fonts
mbeall Apr 5, 2014
5f9ec13
Update flint_widgets_init
mbeall Apr 5, 2014
c96bf9e
Remove theme options for widget areas
mbeall Apr 5, 2014
86f9360
Make Sticky Post stand out
mbeall Apr 5, 2014
de8339a
Posts should be single-column when left/right widget area
mbeall Apr 6, 2014
6333002
Add new widget areas to Minimal page template
mbeall Apr 6, 2014
5c61c2e
Make sticky posts slightly narrower than other posts
mbeall Apr 6, 2014
9ff4770
Clean up spacing
mbeall Apr 6, 2014
be14680
Update screenshot
mbeall Apr 6, 2014
5e36607
Merge pull request #156 from mbeall/master
mbeall Apr 6, 2014
cf8cfbb
Increase version numbers
mbeall Apr 6, 2014
e5cb253
Fix text domain errors
mbeall Apr 6, 2014
64f600f
Fix text domain errors
mbeall Apr 6, 2014
9e8770d
Update screenshot
mbeall Apr 6, 2014
e295891
Merge pull request #157 from mbeall/master
mbeall Apr 6, 2014
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
297 changes: 297 additions & 0 deletions .csscomb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
{
"always-semicolon": true,
"block-indent": 2,
"colon-space": true,
"color-case": "lower",
"color-shorthand": true,
"combinator-space": true,
"element-case": "lower",
"eof-newline": true,
"leading-zero": true,
"remove-empty-rulesets": false,
"rule-indent": 2,
"stick-brace": true,
"strip-spaces": true,
"unitless-zero": true,
"vendor-prefix-align": true,
"sort-order": [
[
"position",
"top",
"right",
"bottom",
"left",
"z-index",
"display",
"float",
"width",
"min-width",
"max-width",
"height",
"min-height",
"max-height",
"-webkit-box-sizing",
"-moz-box-sizing",
"box-sizing",
"-webkit-appearance",
"padding",
"padding-top",
"padding-right",
"padding-bottom",
"padding-left",
"margin",
"margin-top",
"margin-right",
"margin-bottom",
"margin-left",
"overflow",
"overflow-x",
"overflow-y",
"-webkit-overflow-scrolling",
"-ms-overflow-x",
"-ms-overflow-y",
"-ms-overflow-style",
"clip",
"clear",
"font",
"font-family",
"font-size",
"font-style",
"font-weight",
"font-variant",
"font-size-adjust",
"font-stretch",
"font-effect",
"font-emphasize",
"font-emphasize-position",
"font-emphasize-style",
"font-smooth",
"-webkit-hyphens",
"-moz-hyphens",
"hyphens",
"line-height",
"color",
"text-align",
"-webkit-text-align-last",
"-moz-text-align-last",
"-ms-text-align-last",
"text-align-last",
"text-emphasis",
"text-emphasis-color",
"text-emphasis-style",
"text-emphasis-position",
"text-decoration",
"text-indent",
"text-justify",
"text-outline",
"-ms-text-overflow",
"text-overflow",
"text-overflow-ellipsis",
"text-overflow-mode",
"text-shadow",
"text-transform",
"text-wrap",
"-webkit-text-size-adjust",
"-ms-text-size-adjust",
"letter-spacing",
"-ms-word-break",
"word-break",
"word-spacing",
"-ms-word-wrap",
"word-wrap",
"-moz-tab-size",
"-o-tab-size",
"tab-size",
"white-space",
"vertical-align",
"list-style",
"list-style-position",
"list-style-type",
"list-style-image",
"pointer-events",
"cursor",
"visibility",
"zoom",
"flex-direction",
"flex-order",
"flex-pack",
"flex-align",
"table-layout",
"empty-cells",
"caption-side",
"border-spacing",
"border-collapse",
"content",
"quotes",
"counter-reset",
"counter-increment",
"resize",
"-webkit-user-select",
"-moz-user-select",
"-ms-user-select",
"-o-user-select",
"user-select",
"nav-index",
"nav-up",
"nav-right",
"nav-down",
"nav-left",
"background",
"background-color",
"background-image",
"-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
"filter:progid:DXImageTransform.Microsoft.gradient",
"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
"filter",
"background-repeat",
"background-attachment",
"background-position",
"background-position-x",
"background-position-y",
"-webkit-background-clip",
"-moz-background-clip",
"background-clip",
"background-origin",
"-webkit-background-size",
"-moz-background-size",
"-o-background-size",
"background-size",
"border",
"border-color",
"border-style",
"border-width",
"border-top",
"border-top-color",
"border-top-style",
"border-top-width",
"border-right",
"border-right-color",
"border-right-style",
"border-right-width",
"border-bottom",
"border-bottom-color",
"border-bottom-style",
"border-bottom-width",
"border-left",
"border-left-color",
"border-left-style",
"border-left-width",
"border-radius",
"border-top-left-radius",
"border-top-right-radius",
"border-bottom-right-radius",
"border-bottom-left-radius",
"-webkit-border-image",
"-moz-border-image",
"-o-border-image",
"border-image",
"-webkit-border-image-source",
"-moz-border-image-source",
"-o-border-image-source",
"border-image-source",
"-webkit-border-image-slice",
"-moz-border-image-slice",
"-o-border-image-slice",
"border-image-slice",
"-webkit-border-image-width",
"-moz-border-image-width",
"-o-border-image-width",
"border-image-width",
"-webkit-border-image-outset",
"-moz-border-image-outset",
"-o-border-image-outset",
"border-image-outset",
"-webkit-border-image-repeat",
"-moz-border-image-repeat",
"-o-border-image-repeat",
"border-image-repeat",
"outline",
"outline-width",
"outline-style",
"outline-color",
"outline-offset",
"-webkit-box-shadow",
"-moz-box-shadow",
"box-shadow",
"filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
"-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
"opacity",
"-ms-interpolation-mode",
"-webkit-transition",
"-moz-transition",
"-ms-transition",
"-o-transition",
"transition",
"-webkit-transition-delay",
"-moz-transition-delay",
"-ms-transition-delay",
"-o-transition-delay",
"transition-delay",
"-webkit-transition-timing-function",
"-moz-transition-timing-function",
"-ms-transition-timing-function",
"-o-transition-timing-function",
"transition-timing-function",
"-webkit-transition-duration",
"-moz-transition-duration",
"-ms-transition-duration",
"-o-transition-duration",
"transition-duration",
"-webkit-transition-property",
"-moz-transition-property",
"-ms-transition-property",
"-o-transition-property",
"transition-property",
"-webkit-transform",
"-moz-transform",
"-ms-transform",
"-o-transform",
"transform",
"-webkit-transform-origin",
"-moz-transform-origin",
"-ms-transform-origin",
"-o-transform-origin",
"transform-origin",
"-webkit-animation",
"-moz-animation",
"-ms-animation",
"-o-animation",
"animation",
"-webkit-animation-name",
"-moz-animation-name",
"-ms-animation-name",
"-o-animation-name",
"animation-name",
"-webkit-animation-duration",
"-moz-animation-duration",
"-ms-animation-duration",
"-o-animation-duration",
"animation-duration",
"-webkit-animation-play-state",
"-moz-animation-play-state",
"-ms-animation-play-state",
"-o-animation-play-state",
"animation-play-state",
"-webkit-animation-timing-function",
"-moz-animation-timing-function",
"-ms-animation-timing-function",
"-o-animation-timing-function",
"animation-timing-function",
"-webkit-animation-delay",
"-moz-animation-delay",
"-ms-animation-delay",
"-o-animation-delay",
"animation-delay",
"-webkit-animation-iteration-count",
"-moz-animation-iteration-count",
"-ms-animation-iteration-count",
"-o-animation-iteration-count",
"animation-iteration-count",
"-webkit-animation-direction",
"-moz-animation-direction",
"-ms-animation-direction",
"-o-animation-direction",
"animation-direction"
]
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flint 1.1.3
Flint 1.2.0
=====
A responsive, minimalist theme built on Twitter's Bootstrap 3 and based on Automattic's _s theme. Make it your own with a custom background, custom header, custom menus, custom colors and more.

Expand Down
27 changes: 21 additions & 6 deletions archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,34 @@
* The template for displaying Archive pages
*
* @package Flint
* @since 1.1.1
* @since 1.2.0
*/

get_header(); ?>
<?php flint_get_widgets('header'); ?>

<section id="primary" class="content-area container">
<div id="content" class="site-content" role="main">

<?php flint_get_widgets('left'); ?>

<div id="content" class="site-content<?php if ( is_active_sidebar( 'left' ) | is_active_sidebar( 'right' ) ) { if ( is_active_sidebar( 'left' ) && is_active_sidebar( 'right' ) ) { echo ' col-lg-6 col-md-6'; } else { echo ' col-lg-9 col-md-9'; } } ?>" role="main">

<?php if ( have_posts() ) : ?>

<header class="page-header">
<h1 class="page-title">
<?php
//Template actions before title
/**
* Template actions before title
*/
if ( is_category() ) { do_action('flint_open_cat_title'); }
elseif ( is_tag() ) { do_action('flint_open_tag_title'); }
elseif ( is_tax() ) { do_action('flint_open_' . single_term_title( '', false ) . '_title'); }
else { do_action('flint_open_archive_title'); }

//Title of archive page
/**
* Title of archive page
*/
if ( is_category() ) { printf( __( '%s', 'flint' ), '<span>' . single_cat_title( '', false ) . '</span>' ); }
elseif ( is_tag() ) { printf( __( '%s', 'flint' ), '<span>' . single_tag_title( '', false ) . '</span>' ); }

Expand All @@ -44,15 +52,19 @@

else { _e( '<span>' . 'Archives' . '</span>', 'flint' ); }

//Template actions after title
/**
* Template actions after title
*/
if ( is_category() ) { do_action('flint_close_cat_title'); }
elseif ( is_tag() ) { do_action('flint_close_tag_title'); }
elseif ( is_tax() ) { do_action('flint_close_' . single_term_title( '', false ) . '_title'); }
else { do_action('flint_close_archive_title'); }
?>
</h1>
<?php
//Term Description
/**
* Term Description
*/
if ( is_category() ) {
$category_description = category_description();
if ( ! empty( $category_description ) ) { echo apply_filters( 'category_archive_meta', '<div class="taxonomy-description">' . $category_description . '</div>' ); }
Expand Down Expand Up @@ -84,6 +96,9 @@
<?php endif; ?>

</div><!-- #content -->

<?php flint_get_widgets('right'); ?>

</section><!-- #primary -->

<?php flint_get_widgets('footer'); ?>
Expand Down
Loading