Merge branch 'master' into talmdal_dev

4 files changed, 4 insertions, 4 deletions

diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css
index cb51f349..fcebeea8 100644
--- a/themes/night_wind/css/fix-ie.css
+++ b/themes/night_wind/css/fix-ie.css
@@ -20,7 +20,7 @@ input.submit {
   float: none !important;
 }
 
-.g-pager .g-txt-right {
+.g-pager .g-text-right {
   width: 29%;
 }
 
diff --git a/themes/night_wind/views/movie.html.php b/themes/night_wind/views/movie.html.php
index 9254c7fe..a791f2d8 100644
--- a/themes/night_wind/views/movie.html.php
+++ b/themes/night_wind/views/movie.html.php
@@ -13,7 +13,7 @@
       <? endif; ?>
     </li>
     <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="g-txt-right">
+    <li class="g-text-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
diff --git a/themes/night_wind/views/pager.html.php b/themes/night_wind/views/pager.html.php
index ba325d03..af82b835 100644
--- a/themes/night_wind/views/pager.html.php
+++ b/themes/night_wind/views/pager.html.php
@@ -25,7 +25,7 @@
   <? endif ?>
   </li>
   <li class="g-info"><?= $from_to_msg ?></li>
-  <li class="g-txt-right">
+  <li class="g-text-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php
index e1231f65..a748daf2 100644
--- a/themes/night_wind/views/photo.html.php
+++ b/themes/night_wind/views/photo.html.php
@@ -26,7 +26,7 @@
       <? endif; ?>
     </li>
     <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="g-txt-right">
+    <li class="g-text-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>