Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 8 Mar 2016 16:56:07 +0000 (11:56 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 8 Mar 2016 16:56:07 +0000 (11:56 -0500)
v1.1.2

1  2 
css/front.css
views/front/members/list.html

diff --cc css/front.css
Simple merge
@@@ -12,9 -12,9 +12,9 @@@
  
  {if $settings.list_show_search}
          
 -        <form action="{$thisURL}?glm_action=list" method="post" enctype="multipart/form-data">
 +        <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
              <div class="row">           
-                 <div class="small-12 columns glm-member-entry-container glm-member-container">
+                 <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
                      {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
                      <div class="row">
                          <div class="small-12 columns">