From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 9 Jun 2016 20:48:27 +0000 (-0400)
Subject: Merge tag 'v2.0.9' into develop
X-Git-Tag: v2.1^2~9^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=aa1f1a5e70142cc23dcf1b6e4939926ce2fe4fe5;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.0.9' into develop

fixing merge conflicts with admin.css

Conflicts:
	css/admin.css
---

aa1f1a5e70142cc23dcf1b6e4939926ce2fe4fe5
diff --cc css/admin.css
index 3dd28c1b,4f793a7f..c821ff6e
--- a/css/admin.css
+++ b/css/admin.css
@@@ -339,35 -339,16 +339,41 @@@ input[type=submit], input[type=file] 
      cursor: pointer;
  }
  .showLists, .showDetails{
-     margin:0;
+ 
+ /*    margin:0;
      float:left;
-     width:50%; 
+     width:50%; */
 -}
+ 
 +}
  #showDetail > label, #showList > label{  
-     margin:0;
+ 
++
+ /*    margin:0;
      float:left;
-     width:50%;
+     width:50%;*/
+     display: block;
++
  }
 +
 +
 +/* Placeholder fixes for certain browsers */
 +::-webkit-input-placeholder { /* Chrome, Safari, Opera */
 +    color: #888;
 +    font-weight: 400;
 +}
 +::-moz-placeholder {  /* Firefox */
 +    color: #888;
 +    font-weight: 400;
 +}
 +:-ms-input-placeholder { /* IE10–11 */
 +    color: #888 !important;
 +    font-weight: 400 !important;
 +}
 +::-ms-input-placeholder { /* Edge */
 +    color: #888;
 +    font-weight: 400;
 +}
 +::placeholder { /* CSS Working Draft */
 +    color: #888;
 +    font-weight: 400;
 +}