Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/helpers/user.php

3 files changed, 3 insertions, 16 deletions

diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css
index be6e22be..60abc08d 100644
--- a/themes/night_wind/css/fix-ie.css
+++ b/themes/night_wind/css/fix-ie.css
@@ -19,7 +19,7 @@ input.submit {
   width: 110px;
 }
 
-#g-dialog a.g-cancel {
+#g-dialog .g-cancel {
   display: inline-block !important;
   float: none !important;
 }
diff --git a/themes/night_wind/css/screen.css b/themes/night_wind/css/screen.css
index 8b01fac5..6bb0e368 100644
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@@ -234,18 +234,6 @@ li.g-error select {
   margin-top: 1em;
 }
 
-/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form .g-error,
-.g-pager .g-info {
-  background-color: #000 !important;
-}
-
-.g-pager .g-info {
-  background-image: none !important;
-  padding: 0 !important;
-}
-
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
 
 .g-short-form li {
@@ -408,7 +396,7 @@ form .g-error,
 
 #g-content #g-item .g-fullsize-link img {
   display: block;
-  margin: 1em auto !important;
+  margin: 1em auto;
 }
 
 #g-content #g-comments {
@@ -916,7 +904,6 @@ form .g-error,
 }
 
 .rtl .g-left,
-.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php
index 2520cb0c..c9c30017 100644
--- a/themes/night_wind/views/photo.html.php
+++ b/themes/night_wind/views/photo.html.php
@@ -15,7 +15,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager">
+  <ul class="g-pager g-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">