Changeset 1534568

Timestamp:

11/15/2016 08:09:58 PM (9 years ago)

Author:

sociusmarketing

Message:

Updated CSS to not conflict with Bootstrap.

Location:

socius-marketing-page-taxonomy/trunk

Files:

• css/styles.css (modified) (5 diffs)
• inc/archive-pages.php (modified) (3 diffs)
• inc/template-archive.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

socius-marketing-page-taxonomy/trunk/css/styles.css

@@ -114 +114 @@
 }
 
-.row {
+.smct-row {
     margin-right: -15px;
     margin-left: -15px;
 }
 
-.row:before,
-.row:after {
+.smct-row:before,
+.smct-row:after {
     display:table;
     content:'';
 }
-.row:after {
+.smct-row:after {
     clear:both;
 }
@@ -132 +132 @@
     box-sizing: border-box;
 }
-.col-sm-3, .col-sm-4, .col-sm-6, .col-sm-8,
-.col-md-3, .col-md-4, .col-md-9 {
+.smct-col-sm-3, .smct-col-sm-4, .smct-col-sm-6, .smct-col-sm-8,
+.smct-col-md-3, .smct-col-md-4, .smct-col-md-9 {
     position: relative;
     min-height: 1px;
@@ -139 +139 @@
     padding-left: 15px;
 }
-.col-xs-12 {
+.smct-col-xs-12 {
     width:100%;
 }
@@ -145 +145 @@
 /* Small devices (tablets, 768px and up) */
 @media (min-width: 768px) { 
-    .col-sm-3, .col-sm-4, .col-sm-6, .col-sm-8,
-    .col-md-3, .col-md-4, .col-md-9 {
+    .smct-col-sm-3, .smct-col-sm-4, .smct-col-sm-6, .smct-col-sm-8,
+    .smct-col-md-3, .smct-col-md-4, .smct-col-md-9 {
         float:left;
     }
-    .col-sm-3 {
+    .smct-col-sm-3 {
         width: 25%;
     }
-    .col-sm-4 {
+    .smct-col-sm-4 {
         width:33.33333333%;
     }
-    .col-sm-6 {
+    .smct-col-sm-6 {
         width:50%;
     }
-    .col-sm-8 {
+    .smct-col-sm-8 {
         width:66.66666667%;
     }
@@ -170 +170 @@
 /* Medium devices (desktops, 992px and up) */
 @media (min-width: 992px) {
-    .col-md-3 {
+    .smct-col-md-3 {
         width: 25%;
     }
-    .col-md-4 {
+    .smct-col-md-4 {
         width: 33.33333333%;
     }
-    .col-md-9 {
+    .smct-col-md-9 {
         width: 75%;
     }

socius-marketing-page-taxonomy/trunk/inc/archive-pages.php

@@ -61 +61 @@
                     wp_reset_postdata();
 
-                $content .= '<div id="smct-' . $term->slug . '" class="col-md-4 col-sm-6 smct-category">';
+                $content .= '<div id="smct-' . $term->slug . '" class="smct-col-md-4 smct-col-sm-6 smct-category">';
                     $content .= '<h3><a href="' . esc_url( get_term_link( $term ) ) . '"><span class="smct-image-wrap" style="background-image:url(' . $first_image . ')"></span>' . $term->name . '</a></h3>';
                 $content .= '</div>';
@@ -98 +98 @@
             $content .= '<h1>Areas Served</h1>';
         }
-        $content .= '<div class="row">';
+        $content .= '<div class="smct-row">';
         foreach ( $terms as $term ) {
 
@@ -125 +125 @@
                     wp_reset_postdata();
                 if(get_option('smct_width_of_pages')[0] == 'full-width') {
-                    $width = 'col-md-3 col-sm-6 col-xs-12';
+                    $width = 'smct-col-md-3 smct-col-sm-6 smct-col-xs-12';
                 } else {
-                    $width = 'col-md-4 col-sm-6 col-xs-12';
+                    $width = 'smct-col-md-4 smct-col-sm-6 smct-col-xs-12';
                 }
                 $content .= '<div id="smct-' . $term->slug . '" class="' . $width . ' smct-state">';

socius-marketing-page-taxonomy/trunk/inc/template-archive.php

@@ -87 +87 @@
 
                     echo '<div id="smct-cities-listing">';
-                    echo '<div class="row">';
-                        echo '<div class="col-sm-4 col-xs-12"><p><span class="stateface cities">' . smct_determine_stateface($current_page->name) . '</span></p></div>';
-                        echo '<div class="col-sm-8 col-xs-12">';
+                    echo '<div class="smct-row">';
+                        echo '<div class="smct-col-sm-4 smct-col-xs-12"><p><span class="stateface cities">' . smct_determine_stateface($current_page->name) . '</span></p></div>';
+                        echo '<div class="smct-col-sm-8 smct-col-xs-12">';
                             echo '<ul>';
                             foreach ( $termchildren as $child ) {
                                 $term = get_term_by( 'id', $child, $taxonomy );
-                                echo '<li class="col-sm-6"><a href="' . get_term_link( $child, $taxonomy ) . '">' . $term->name . '</a></li>';
+                                echo '<li class="smct-col-sm-6"><a href="' . get_term_link( $child, $taxonomy ) . '">' . $term->name . '</a></li>';
                             }
                             echo '</ul>';
@@ -108 +108 @@
                     <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>               
 
-                        <div class="smct-archive-summary row">
-                            <div class="col-md-3 col-sm-4 col-xs-12 smct-image">
+                        <div class="smct-archive-summary smct-row">
+                            <div class="smct-col-md-3 smct-col-sm-4 smct-col-xs-12 smct-image">
                                 <a href="<?php the_permalink(); ?>"><span class="smct-image-wrap" style="background-image:url(<?php echo smct_grab_first_image(); ?>)"></span></a>
                                 <?php /* <img src="<?php echo smct_grab_first_image(); ?>" alt="<?php echo get_the_title();?>" />*/ ?>
                             </div>
-                            <div class="col-md-9 col-sm-8 col-xs-12 smct-text">
+                            <div class="smct-col-md-9 smct-col-sm-8 smct-col-xs-12 smct-text">
                                 <h3 class="smct-archive-title"><a href="<?php the_permalink(); ?>" title="<?php printf( the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark">
                                 <?php //Use Custom Page Title meta, if there is one

socius-marketing-page-taxonomy/trunk/readme.txt

@@ -62 +62 @@
 == Changelog ==
 
+= 1.0.1 =
+* Updated CSS to not conflict with Bootstrap.
+
 = 1.0.0 =
 * Custom Taxonomies.