Skip to content
This repository was archived by the owner on Jan 27, 2023. It is now read-only.

Commit 13eb32f

Browse files
wbrunowbruno
committed
grunt
1 parent 4fea756 commit 13eb32f

File tree

13 files changed

+1857
-359
lines changed

13 files changed

+1857
-359
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.DS_Store
2+
node_modules

‎Gruntfile.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module.exports = function (grunt) {
2+
'use strict';
3+
4+
grunt.initConfig({
5+
pkg: grunt.file.readJSON('package.json'),
6+
uglify: {
7+
options: {
8+
banner: '/*Minified JavaScript of wbruno */\n'
9+
},
10+
my_target: {
11+
files: {
12+
'javascript/all.min.js': ['src/javascript/all.js']
13+
}
14+
}
15+
},
16+
cssmin: {
17+
with_banner: {
18+
options: {
19+
banner: '/* \n' +
20+
'Theme Name: <%= pkg.name %> \n' +
21+
'Theme URI: <%= pkg.homepage %>\n' +
22+
'Description: <%= pkg.title %>\n' +
23+
'Author: William Bruno \n' +
24+
'Author URI: <%= pkg.repository.url %> \n' +
25+
'Version: <%= pkg.version %> \n' +
26+
'Tags: light, two-columns, left-sidebar, fluid-layout, sticky-post \n' +
27+
'License: GNU General Public License v2 or later \n' +
28+
'License URI: http://www.gnu.org/licenses/gpl-2.0.html \n' +
29+
'*/'
30+
},
31+
files: {
32+
'style.css': ['src/style.css', 'src/prettify.css']
33+
}
34+
}
35+
}
36+
});
37+
38+
grunt.loadNpmTasks('grunt-contrib-uglify');
39+
grunt.loadNpmTasks('grunt-contrib-cssmin');
40+
41+
grunt.registerTask('default', ['uglify', 'cssmin']);
42+
};

‎footer.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
</div><!-- /wrap_footer -->
2424
<?php wp_footer(); ?>
2525

26-
<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/javascript/all.js?ver=3.4.1"></script>
27-
<<<<<<< HEAD
26+
<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/javascript/all.min.js"></script>
2827
<script type="text/javascript">
2928
var _gaq = _gaq || [];
3029

@@ -40,7 +39,3 @@
4039
</script>
4140
</body>
4241
</html>
43-
=======
44-
</body>
45-
</html>
46-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd

‎functions.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ function get_previous_posts_link_attributes($attr){
102102
}
103103
}
104104

105-
<<<<<<< HEAD
106105
/**
107106
* Add a rel="nofollow" to the comment reply links
108107
*/
@@ -113,8 +112,6 @@ function add_nofollow_to_reply_link( $link ) {
113112
add_filter( 'comment_reply_link', 'add_nofollow_to_reply_link' );
114113

115114

116-
=======
117-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd
118115
if ( ! function_exists( 'parent_comment' ) ) :
119116
/**
120117
* Template for comments and pingbacks.
@@ -141,11 +138,7 @@ function parent_comment( $comment, $args, $depth ) {
141138

142139
<time datetime="<?php echo $comment->comment_date; ?>">
143140
<?php comment_date() ?>
144-
<<<<<<< HEAD
145141
@ <a href="#comment-<?php comment_ID() ?>" rel="nofollow">
146-
=======
147-
@ <a href="#comment-<?php comment_ID() ?>">
148-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd
149142
<?php comment_time() ?>
150143
</a>
151144
</time>
@@ -170,8 +163,4 @@ function parent_comment( $comment, $args, $depth ) {
170163
endswitch;
171164
}
172165
endif;
173-
<<<<<<< HEAD
174-
?>
175-
=======
176166
?>
177-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd

‎header.php

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,8 @@
2929
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3030
<meta name="author" content="William Bruno" />
3131

32-
<<<<<<< HEAD
33-
=======
34-
35-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd
3632
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" />
3733

38-
3934
<?php if (is_category() || is_tag() || is_month() || is_paged() || is_404()) { ?>
4035
<link rel="canonical" href= "<?php echo home_url(); ?>"/>
4136
<meta name="robots" content="noindex, follow" />
@@ -51,41 +46,24 @@
5146
<link rel="stylesheet" type="text/css" href="<?php bloginfo('stylesheet_url'); ?>" media="screen" />
5247
<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
5348
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
54-
<<<<<<< HEAD
55-
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
56-
57-
<link rel="stylesheet" href="<?php echo get_template_directory_uri(); ?>/prettify.css" />
58-
<script src="<?php echo get_template_directory_uri(); ?>/javascript/prettify.js"></script>
59-
60-
<?php wp_head(); ?>
61-
=======
6249

6350
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
6451

65-
<?php wp_head(); ?>
6652

6753
<link rel="stylesheet" href="<?php echo get_template_directory_uri(); ?>/prettify.css" />
6854
<script src="<?php echo get_template_directory_uri(); ?>/javascript/prettify.js"></script>
69-
70-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd
55+
56+
<?php wp_head(); ?>
57+
7158
</head>
7259
<body <?php body_class(); ?> role="document">
7360
<div id="wrap">
7461
<header id="header" class="fleft" role="banner">
75-
<<<<<<< HEAD
76-
77-
78-
<div id="author-blog">
79-
<h1><a href="<?php echo home_url(); ?>" id="blog_locaweb"><?php bloginfo('name'); ?></a></h1>
80-
81-
<img src="http://wbruno.com.br/wp-content/uploads/2014/02/67d0e7b8c79946ef6ab00c8c36b00efc.jpg" alt="<?php bloginfo('name'); ?>" width="200" />
82-
=======
8362
<div id="author-blog">
8463
<h1><a href="<?php echo home_url(); ?>" id="blog_locaweb"><?php bloginfo('name'); ?></a></h1>
8564

8665

87-
<img src="http://www.gravatar.com/avatar/<?php echo md5(trim(get_bloginfo('admin_email'))); ?>?s=200" alt="<?php bloginfo('name'); ?>" width="200" />
88-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd
66+
<img src="http://wbruno.com.br/wp-content/uploads/2014/02/67d0e7b8c79946ef6ab00c8c36b00efc.jpg" alt="<?php bloginfo('name'); ?>" width="200" />
8967
<p><?php bloginfo( 'description' ); ?></p>
9068

9169
<span id="switch">black theme</span>
@@ -94,8 +72,4 @@
9472
<ul id="header-sidebar">
9573
<?php dynamic_sidebar('header-sidebar'); ?>
9674
</ul><!-- #header-sidebar -->
97-
<<<<<<< HEAD
9875
</header><!-- #header -->
99-
=======
100-
</header><!-- #header -->
101-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd

‎index.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
get_header(); ?>
1818

1919
<main id="content" class="fleft" role="main">
20-
<<<<<<< HEAD
21-
22-
23-
=======
24-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd
2520
<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
2621

2722
<?php get_template_part( 'content' ); ?>
@@ -40,8 +35,4 @@
4035

4136
</main><!-- /content -->
4237

43-
<<<<<<< HEAD
44-
<?php get_footer(); ?>
45-
=======
4638
<?php get_footer(); ?>
47-
>>>>>>> 99fbfb6bc865cef2dfeb83cca0d22f77b54c71cd

‎javascript/all.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "wbruno",
3+
"version": "0.0.3",
4+
"title": "William Bruno - Desenvolvedor FrontEnd",
5+
"homepage": "http://wbruno.com.br",
6+
"devDependencies": {
7+
"grunt": "~0.4.2",
8+
"grunt-contrib-uglify": "~0.3.2",
9+
"grunt-contrib-cssmin": "~0.7.0"
10+
},
11+
"repository": {
12+
"type": "git",
13+
"url": "https://github.com/wbruno/blog-dev"
14+
}
15+
}

‎javascript/all.js renamed to ‎src/javascript/all.js

File renamed without changes.

0 commit comments

Comments
 (0)