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.3.4 #180

Merged
merged 10 commits into from
Apr 1, 2015
Merged
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
17 changes: 10 additions & 7 deletions .csscomb.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@
"css/bootstrap.min.css"
],
"always-semicolon": true,
"block-indent": 2,
"color-case": "lower",
"block-indent": " ",
"color-shorthand": true,
"element-case": "lower",
"eof-newline": true,
"leading-zero": true,
"quotes": "double",
"remove-empty-rulesets": true,
"sort-order-fallback": "abc",
"space-before-colon": "",
"space-after-colon": " ",
"space-before-combinator": " ",
"space-after-combinator": " ",
"space-after-colon": 1,
"space-after-combinator": 1,
"space-before-selector-delimiter": 0,
"space-between-declarations": "\n",
"space-before-opening-brace": " ",
"space-after-opening-brace": "\n",
"space-before-selector-delimiter": "",
"space-before-closing-brace": "\n",
"space-before-colon": 0,
"space-before-combinator": 1,
"space-before-opening-brace": 1,
"strip-spaces": true,
"tab-size": true,
"unitless-zero": true,
Expand Down Expand Up @@ -121,6 +122,8 @@
"list-style-type",
"list-style-image",
"pointer-events",
"-ms-touch-action",
"touch-action",
"cursor",
"visibility",
"zoom",
Expand Down
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
25 changes: 16 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
###Flint 1.3.4
For complete diff, check out [Pull Request](https://github.com/starverte/flint/pull/180)
- Upgraded to Bootstrap 3.3.4
- Properly closed `#page` div element on archive pages
- New $nav_menus variable for child theme development
- Removed no longer necessary "default" values in Customizer (now handled by flint_get_options function)

###Flint 1.3.3
For complete diff, check out [Pull Request](https://github.com/starverte/flint/pull/176)
- Fixed bug that was causing navigation menu to not work on mobile layouts
Expand Down Expand Up @@ -59,7 +66,7 @@ For complete diff, check out [Pull Request](https://github.com/starverte/flint/p
###Flint 1.1.2
Alias for Flint 1.1.1 for WordPress.org

###Flint 1.1.1 - March 1, 2014
###Flint 1.1.1
For complete diff, check out [Pull Request](https://github.com/starverte/flint/pull/141)
- Upgrade to Bootstrap 3.1.1
- Thinner font styles
Expand All @@ -78,7 +85,7 @@ For complete diff, check out [Pull Request](https://github.com/starverte/flint/p
- `flint_entry_meta_above_$term` / `flint_entry_meta_below_$term`


###Flint 1.1.0 - November 20, 2013
###Flint 1.1.0
For complete diff, check out [Pull Request](https://github.com/starverte/flint/pull/109)
- Upgraded to Bootstrap 3.0.2
- Added templates: Clear, Minimal, Wide, Full, Narrow, Slim
Expand All @@ -91,35 +98,35 @@ For complete diff, check out [Pull Request](https://github.com/starverte/flint/p
- Minimal: Navigation, content width, widget area


###Flint 1.0.5 - October 3, 2013
###Flint 1.0.5
- Update branding
- Add bottom margin to articles

###Flint 1.0.4 - October 3, 2013
###Flint 1.0.4
- Add `get_sidebar()` to `front-page.php` to display sidebar on front page
- Change sidebar display name from "Sidebar" to "Footer" for clarity
- Change sidebar functional name from `sidebar-1` to `footer` for clarity

###Flint 1.0.3 - September 23, 2013
###Flint 1.0.3
- Removed `.hentry { margin: 0 0 6em; }`
- Added spacing and top border to `#comments`

###Flint 1.0.2 - August 27, 2013
###Flint 1.0.2
- Renamed "font" directory to "fonts" so glyphicon font can work (fixes [#103](https://github.com/starverte/flint/issues/103))
- Fixed footer for small screens (fixes [#101](https://github.com/starverte/flint/issues/101))
- Updated editor-style.css (fixes [#98](https://github.com/starverte/flint/issues/98))

###Flint 1.0.1 - August 24, 2013
###Flint 1.0.1
- Shipped with Bootstrap 3
- Changed `is_single()` to `is_singular()` for `type-page.php` and `type.php`
- Sidebar no longer shows up if there are not any widgets
- `h1.entry-title` is now slightly larger than `h1`

###Flint 1.0.0 - August 24, 2013
###Flint 1.0.0
- Shipped with Bootstrap 3 (stable)
- Removed Font Awesome files (weren't used)
- Updated template structure (see issue [#91](https://github.com/starverte/flint/issues/91))

###Flint 0.14.0 - August 18, 2013
###Flint 0.14.0
- Initial release
- Shipped with Bootstrap 3 RC 2 and Font Awesome 3.2.1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flint 1.3.3
Flint 1.3.4
=====
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
4 changes: 3 additions & 1 deletion archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* The template for displaying Archive pages
*
* @package Flint
* @since 1.3.0
* @since 1.3.4
*/

get_header(); ?>
Expand Down Expand Up @@ -107,6 +107,8 @@

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

</div><!-- #page -->

<?php flint_get_widgets('footer'); ?>
<?php get_footer(); ?>

48 changes: 33 additions & 15 deletions css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/bootstrap.min.css

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Flint functions and definitions
*
* @package Flint
* @version 1.3.3
* @version 1.3.4
*/

/**
Expand Down Expand Up @@ -32,9 +32,11 @@ function flint_after_setup_theme() {

load_theme_textdomain( 'flint', get_template_directory() . '/languages' );

register_nav_menus( array(
$nav_menus = array(
'primary' => __( 'Primary Menu', 'flint' ),
) );
);
$nav_menus = apply_filters('flint_nav_menus', $nav_menus);
register_nav_menus( $nav_menus );

add_editor_style( 'editor-style.css' );

Expand Down
Loading