diff --git a/404.php b/404.php index 932d6ed..5c4ef32 100644 --- a/404.php +++ b/404.php @@ -1,8 +1,8 @@ -
+
-
+
@@ -21,8 +21,8 @@

-
-
+
+
diff --git a/README.md b/README.md index 89fcc71..33b4a3a 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,9 @@ Stuff you need to start a WordPress project with Bootstrap and Sass. ## Discrepancies from [WordPress Bootstrap](https://github.com/320press/wordpress-bootstrap) -* All `.DS_Store` files have been deleted and git ignored. -* `style.css` is no longer called in the `functions.php` (look below). -* LESS has been replaced by Sass... +* LESS has been replaced by Sass ## Discrepancies from [Sass Twitter Bootstrap](https://github.com/jlong/sass-twitter-bootstrap) * Organized `.scss` files in a `partials` folder. -* New file added named `_wp.scss` with stuff from `style.css` (with exception to the theme information). * Added a [`_shame.scss`](http://csswizardry.com/2013/04/shame-css/). \ No newline at end of file diff --git a/archive.php b/archive.php index 860832b..a137e0b 100644 --- a/archive.php +++ b/archive.php @@ -1,8 +1,8 @@ -
+
-
+
diff --git a/attachment.php b/attachment.php index b5bd623..a652e5e 100644 --- a/attachment.php +++ b/attachment.php @@ -1,8 +1,8 @@ -
+
-
+
diff --git a/author.php b/author.php index 365ebf0..0987c91 100644 --- a/author.php +++ b/author.php @@ -1,8 +1,8 @@ -
+
-
+

diff --git a/footer.php b/footer.php index b8f6a92..ba6a2b5 100644 --- a/footer.php +++ b/footer.php @@ -15,9 +15,9 @@ -

Mashing together Sass Twitter Bootstrap and WordPress Bootstrap.

+

320press

-

©

+

©

diff --git a/functions.php b/functions.php index 1a13ab3..f7c6436 100644 --- a/functions.php +++ b/functions.php @@ -474,10 +474,7 @@ function add_active_class($classes, $item) { function theme_styles() { // This is the compiled css file from LESS - this means you compile the LESS file locally and put it in the appropriate directory if you want to make any changes to the master bootstrap.css. wp_register_style( 'bootstrap', get_template_directory_uri() . '/library/css/bootstrap.css', array(), '1.0', 'all' ); - wp_register_style( 'bootstrap-responsive', get_template_directory_uri() . '/library/css/responsive.css', array(), '1.0', 'all' ); - wp_enqueue_style( 'bootstrap' ); - wp_enqueue_style( 'bootstrap-responsive' ); } } add_action( 'wp_enqueue_scripts', 'theme_styles' ); diff --git a/header.php b/header.php index ede56fc..b1e778d 100644 --- a/header.php +++ b/header.php @@ -1,4 +1,4 @@ - + @@ -39,39 +39,33 @@ >
- -
-
-
-
- - - - - - -
-
-
- -
+
+
+ + + + + + + +
+ +
+ + + + + +
+
-
+
diff --git a/image.php b/image.php index 8446556..c014fb7 100644 --- a/image.php +++ b/image.php @@ -8,9 +8,9 @@ get_header(); ?> -
+
-
+
@@ -77,7 +77,7 @@
-