diff --git a/.gitignore b/.gitignore
index 40bb230..76d3ff7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ temp/
.Trashes
.svn
+
+/node_modules
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..0506732
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,87 @@
+module.exports = function(grunt) {
+
+ // 1. All configuration goes here
+ grunt.initConfig({
+ pkg: grunt.file.readJSON('package.json'),
+
+ concat: {
+ dist: {
+ src: [
+ 'library/js/libs/*.js', // All JS in the libs folder
+ 'library/js/fitvid.js', // This specific file
+ 'library/js/FitVids.js-master/jquery.fitvids.js', // This specific file
+ 'library/js/scripts.js' // This specific file
+ ],
+ dest: 'library/js/prod.js',
+ }
+ },
+
+ uglify: {
+ build: {
+ src: 'library/js/prod.js',
+ dest: 'library/js/prod.min.js'
+ }
+ },
+
+ //imagemin is not stable, it will break your images
+// imagemin: {
+// dynamic: {
+// files: [{
+// expand: true,
+// cwd: 'library/images/',
+// src: ['**/*.{png,jpg,gif}'],
+// dest: 'library/images/'
+// }]
+// }
+// },
+
+ watch: {
+ scripts: {
+ files: [
+ 'library/js/libs/*.js', // All JS in the libs folder
+ 'library/js/fitvid.js', // This specific file
+ 'library/js/FitVids.js-master/jquery.fitvids.js', // This specific file
+ 'library/js/scripts.js' // This specific file
+ ],
+ tasks: ['concat', 'uglify'],
+ options: {
+ spawn: false,
+ },
+ },
+ css: {
+ files: [
+ 'library/less/*.less',
+ 'library/less/**/*.less'
+ ],
+ tasks: ['less'],
+ options: {
+ spawn: false,
+ }
+ }
+ },
+
+ less: {
+ dist: {
+ options: {
+ style: 'compressed'
+ },
+ files: {
+ 'library/css/style.css': 'library/less/style.less',
+ 'library/css/font-awesome/css/font-awesome.css': 'library/less/font-awesome/less/font-awesome.less',
+ 'library/admin/ReduxCore/assets/css/admin.css': 'library/admin/ReduxCore/assets/css/admin.less'
+ }
+ }
+ }
+
+ });
+
+ // 3. Where we tell Grunt we plan to use this plug-in.
+ grunt.loadNpmTasks('grunt-contrib-concat');
+ grunt.loadNpmTasks('grunt-contrib-uglify');
+// grunt.loadNpmTasks('grunt-contrib-imagemin');
+ grunt.loadNpmTasks('grunt-contrib-watch');
+ grunt.loadNpmTasks('grunt-contrib-less');
+
+ // 4. Where we tell Grunt what to do when we type "grunt" into the terminal.
+ grunt.registerTask('default', ['concat', 'uglify', 'less']);
+};
\ No newline at end of file
diff --git a/comments.php b/comments.php
index 4320a6f..1e44bbc 100755
--- a/comments.php
+++ b/comments.php
@@ -18,26 +18,6 @@
-
-
-
-
This is a section created by adding a filter to the sections array. Can be used by child themes to add/remove sections from the options.
', 'brew-framework'), - 'icon' => 'el-icon-paper-clip', + 'icon' => 'fa fa-paperclip', // Leave this as a blank section, no options just some intro text set above. 'fields' => array() ); @@ -247,7 +247,7 @@ public function setSections() { // ACTUAL DECLARATION OF SECTIONS $this->sections[] = array( - 'icon' => 'el-icon-wrench', + 'icon' => 'fa fa-beer', 'title' => __('General Settings', 'brew-framework'), 'fields' => array ( array ( @@ -264,7 +264,7 @@ public function setSections() { ); $this->sections[] = array( - 'icon' => 'el-icon-folder', + 'icon' => 'fa fa-folder', 'title' => __('Content Settings', 'brew-framework'), 'desc' => __('Choose how certain content is displayed'), 'fields' => array ( @@ -335,7 +335,7 @@ public function setSections() { $this->sections[] = array( - 'icon' => 'el-icon-info-sign', + 'icon' => 'fa fa-info-circle', 'title' => __('Theme Information', 'brew-framework'), 'desc' => __('This is the Description. Again HTML is allowed
', 'brew-framework'), 'fields' => array( @@ -350,7 +350,7 @@ public function setSections() { if(file_exists(trailingslashit(dirname(__FILE__)) . 'README.html')) { $tabs['docs'] = array( - 'icon' => 'el-icon-book', + 'icon' => 'fa fa-book', 'title' => __('Documentation', 'brew-framework'), 'content' => nl2br(file_get_contents(trailingslashit(dirname(__FILE__)) . 'README.html')) ); @@ -410,7 +410,7 @@ public function setArguments() { 'page_permissions' => 'manage_options', // Permissions needed to access the options panel. 'menu_icon' => '', // Specify a custom URL to an icon 'last_tab' => '', // Force your panel to always open to a specific tab (by id) - 'page_icon' => 'icon-themes', // Icon displayed in the admin panel next to your menu_title + 'page_icon' => 'fa fa-bell-o', // Icon displayed in the admin panel next to your menu_title 'page_slug' => '_options', // Page slug used to denote the panel 'save_defaults' => true, // On load save the defaults to DB before user clicks save or not 'default_show' => false, // If true, shows the default value next to each field that is not the default value. @@ -441,13 +441,13 @@ public function setArguments() { $this->args['share_icons'][] = array( 'url' => 'https://github.com/slightlyoffbeat', 'title' => 'My GitHub', - 'icon' => 'el-icon-github' + 'icon' => 'fa fa-github-square' // 'img' => '', // You can use icon OR img. IMG needs to be a full URL. ); $this->args['share_icons'][] = array( 'url' => 'http://twitter.com/slightlyoffbeat', 'title' => 'Follow me on Twitter', - 'icon' => 'el-icon-twitter' + 'icon' => 'fa fa-twitter-square' ); @@ -507,3 +507,20 @@ function redux_validate_callback_function($field, $value, $existing_value) { return $return; } endif; + +function newIconFont() { + // Uncomment this to remove elusive icon from the panel completely + wp_deregister_style( 'redux-elusive-icon' ); + wp_deregister_style( 'redux-elusive-icon-ie7' ); + + wp_register_style( + 'redux-font-awesome', + '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css', + array(), + time(), + 'all' + ); + wp_enqueue_style( 'redux-font-awesome' ); +} +// This example assumes the opt_name is set to redux_demo. Please replace it with your opt_name value. +add_action( 'redux/page/brew_options/enqueue', 'newIconFont' ); diff --git a/package.json b/package.json new file mode 100644 index 0000000..dd41597 --- /dev/null +++ b/package.json @@ -0,0 +1,12 @@ +{ + "name": "brew", + "version": "0.9.0", + "devDependencies": { + "grunt": "~0.4.1", + "grunt-contrib-concat": "~0.3.0", + "grunt-contrib-uglify": "~0.4.0", + "grunt-contrib-imagemin": "~0.5.0", + "grunt-contrib-watch": "~0.6.0", + "grunt-contrib-less": "~0.10.0" + } +} diff --git a/page.php b/page.php index 7fb6068..668794d 100755 --- a/page.php +++ b/page.php @@ -36,9 +36,7 @@ - - - + diff --git a/sidebar.php b/sidebar.php index e80ad80..9db36c1 100755 --- a/sidebar.php +++ b/sidebar.php @@ -1,4 +1,4 @@ -+ + + + +-
+ %link', __( '', 'bones' ) . ' ' . brew_truncate_text( get_previous_post()->post_title, $trunc_limit ) ); ?>
+
+
+
+
+ -
+ %link', ' ' . brew_truncate_text( get_next_post()->post_title, $trunc_limit ) . ' ' . __( '', 'bones' ) ); ?>
+
+
+
+
+