Changeset 1038441

Timestamp:

12/04/2014 09:28:55 PM (11 years ago)

Author:

tjsantilo

Message:

bug fixes

Location:

because/trunk

Files:

• README.txt (modified) (1 diff)
• public/assets/css/public.css (modified) (2 diffs)
• public/assets/js/public.js (modified) (2 diffs)
• public/class-social-polling.php (modified) (1 diff)
• public/includes/class-sp_comments.php (modified) (2 diffs)
• social-polling.php (modified) (1 diff)

because/trunk/README.txt

@@ -7 +7 @@
 Tested up to: 4.0
 <<<<<<< .mine
-Stable tag: 1.5.2
+Stable tag: 1.5.3
 =======
-Stable tag: 1.5.2
+Stable tag: 1.5.3
 >>>>>>> .r969865
 License: GPLv2 or later

because/trunk/public/assets/css/public.css

@@ -518 +518 @@
 }
 
-<<<<<<< .mine
 #commentform .comment-form-comment label{
     margin: 0 0 10px 0;
@@ -591 +590 @@
 
 
-=======
-#commentform .comment-form-comment label{
-    margin: 0 0 10px 0;
-    float: none!important;
-}
-
-
-#respond textarea{
-    width: 100%!important;
-    height: auto!important;
-    padding: 3px!important;
-    border-radius: 3px;
-    border: 1px solid #cccccc!important;
-}
-
-
-
-/*.joindiscussion,
-.comment-form #submit{
-    background-color:#499bea;
-    margin:auto;
-    display:block;
-    font-size: 2em;
-    font-weight: 100;
-    width:90%;
-    letter-spacing: -0.04em;
-    color:#ffffff;
-    text-shadow: 1px 1px #666;
-    min-height:2em;
-}*/
-
-.joindiscussion, .comment-form #submit{
-    color: white!important;
-    background: #bcbcbc!important;
-    padding: 4px 8px 4px 8px!important;
-    display: inline-block!important;
-    border-radius: 3px!important;
-    border: 0!important;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif !important;
-    font-weight: 200!important;
-    line-height: 1.5!important;
-    width: 80%!important;
-    font-size: 1.4em!important;
-    text-transform: initial!important;
-    display: block!important;
-    margin: 0 auto!important;
-    margin-bottom: 10px !important;
-    box-shadow: none!important;
-    text-shadow:none!important;
-    background-image: none!important;
-    float: none!important;
-    height: auto!important;
-    text-indent: 0!important;
-}
-
-#respond .form-submit{
-    margin: 10px 0 20px 0;
-}
-
-#submit:HOVER
-{
-    background-color:#9F9F9F!important;
-}
-.form-allowed-tags{
-    display: none!important;
-
-}
-
-
->>>>>>> .r1038433
 /*
 //----------------------------

because/trunk/public/assets/js/public.js

@@ -502 +502 @@
     })
 
-<<<<<<< .mine
     $('.reply-vote-share-container').mouseover(function(){
         clearTimeout($(this).data('timeout'));      
     });
-=======
-    $('.reply-vote-share-container').mouseover(function(){
-        clearTimeout(fadeOut);      
-    });
->>>>>>> .r1038433
-
-<<<<<<< .mine
+
     $('.reply-vote-share-container').mouseleave(function(){
             if($(this).children('.comment-social-share').css('opacity') === '1'){
@@ -526 +519 @@
                 $(this).data('timeout', fadeOut);
             }
-=======
-    $('.reply-vote-share-container').mouseleave(function(){
-            if($(this).children('.comment-social-share').css('opacity') === '1'){
-                $(this).children('.comment-social-share').stop();
-                var tempDiv = $(this);
-                fadeOut = setTimeout(function(){
-                    tempDiv.children('.comment-social-share').animate({
-                        opacity: 0
-                    },300, function(){
-                        $(this).css('display','none');
-                    });
-                },700)
-                    
-            }
->>>>>>> .r1038433
 
             

because/trunk/public/class-social-polling.php

@@ -93 +93 @@
         
         // add_filter('wp_insert_comment', array( $this, 'message_reply_email'),  2, 2 );
-        // add_filter('wp_insert_comment', array( $this, 'message_reply_email'),  2, 2 );
-
         // do_action( 'wp_insert_comment', $id, $comment );
          

because/trunk/public/includes/class-sp_comments.php

@@ -1674 +1674 @@
   <div class="comment-collapse">
 
-<<<<<<< .mine
 
   <span class="<?php echo comment_vote_choice($comment); ?>">
@@ -1683 +1682 @@
 
   
-=======
-  <?php comment_text() ?>
-
-  
-
-  
->>>>>>> .r1038433
 <?php   //Upvote DownVote Actions
 

because/trunk/social-polling.php

@@ -34 +34 @@
 
 <<<<<<< .mine
- * Version:           1.5.2
+ * Version:           1.5.3
 =======
- * Version:           1.5.2
+ * Version:           1.5.3
 >>>>>>> .r969865