Permalink
Browse files

Merge pull request #13 from melriksdesign/master

Two minor modifications
  • Loading branch information...
2 parents 88ff1d0 + 8ae301e commit 757f660550c458b50fa766a47e034bba19401d2b @wycks committed Sep 11, 2014
Showing with 7 additions and 8 deletions.
  1. +2 −0 functions.php
  2. +5 −8 style.css
View
@@ -34,6 +34,7 @@
));
//Enqueue_styles
+if ( ! function_exists( 'Wps_load_styles' ) ) {
function Wps_load_styles() {
wp_register_style( 'skeleton-style', get_template_directory_uri() . '/style.css');
@@ -46,3 +47,4 @@ function Wps_load_styles() {
}
add_action('wp_enqueue_scripts', 'Wps_load_styles');
+} // endif
View
@@ -30,10 +30,6 @@ Use it to make something cool, have fun, and share what you've learned with othe
/*.column, .columns { float: left; display: inline;}*/
.row { margin-bottom: 20px; }
- /* Nested Column Classes */
- .column.alpha, .columns.alpha { margin-left: 0; }
- .column.omega, .columns.omega { margin-right: 0; }
-
/* Base Grid */
.container .one.column { width: 40px; }
.container .two.columns { width: 100px; }
@@ -72,11 +68,12 @@ Use it to make something cool, have fun, and share what you've learned with othe
.container .offset-by-fourteen { padding-left: 840px; }
.container .offset-by-fifteen { padding-left: 900px; }
-
+ /* Nested Column Classes */
+ .column.alpha, .columns.alpha { margin-left: 0; }
+ .column.omega, .columns.omega { margin-right: 0; }
+
/* WordPress sidebar*/
- .one-third.column{
- margin-left: 30px;
- }
+ #side .one-third.column{ margin-left: 30px; }
/* #Tablet (Portrait)

0 comments on commit 757f660

Please sign in to comment.