[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9619:71b7aa45075f
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/71b7aa45075f
user: Tom
date: Mon Aug 24 22:48:23 2015 -0400
description:
Merged with upstream

diffstat:

 public_html/layout/denim/admin/config/configuration.thtml |  2 +-
 public_html/layout/denim/comment/commentbar.thtml         |  4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r c0623e60b671 -r 71b7aa45075f public_html/layout/denim/admin/config/configuration.thtml
--- a/public_html/layout/denim/admin/config/configuration.thtml	Mon Aug 24 22:47:02 2015 -0400
+++ b/public_html/layout/denim/admin/config/configuration.thtml	Mon Aug 24 22:48:23 2015 -0400
@@ -9,7 +9,7 @@
     </form>
 
     <div id="config_menu">
-        <section id="search-configuration-container" role="search">
+        <section id="search-configuration-container" class="uk-form" role="search">
             <h2 class="block-title">{search_configuration_label}</h2>
             <input name="search-configuration" id="search-configuration" type="text" value="{search_configuration_value}"{xhtml}>
             <input name="tab-id" id="tab-id" type="hidden" value="{tab_id_value}"{xhtml}>
diff -r c0623e60b671 -r 71b7aa45075f public_html/layout/denim/comment/commentbar.thtml
--- a/public_html/layout/denim/comment/commentbar.thtml	Mon Aug 24 22:47:02 2015 -0400
+++ b/public_html/layout/denim/comment/commentbar.thtml	Mon Aug 24 22:48:23 2015 -0400
@@ -36,9 +36,7 @@
 <p class="disclaimer">{lang_disclaimer}</p>
 
 <!-- BEGIN commenteditform_jumplink -->
-      <div style="padding:0.3em;">
-          <a class="button" href="#commenteditform">{lang_reply}</a>
-      </div>
+      <a class="uk-button" href="#commenteditform">{lang_reply}</a>
 <!-- END commenteditform_jumplink -->
 
 <!-- } comment/commentbar.thtml -->