Make g-inline more specific, replace universal selector with an li since this class will most often be used with order and unordered lists. Apply g-inline to the the login menu and footer credits.

6 files changed, 16 insertions, 24 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 77653d00..51d50dfc 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -482,7 +482,7 @@ div#g-action-status {
 
 /* Inline layout  ~~~~~~~~~~ */
 
-.g-inline * {
+.g-inline li {
   float: left;
   margin-right: .4em;
 }
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 9be218c0..3b327e31 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu">
+<ul id="g-login-menu" class="g-inline">
   <? if ($user->guest): ?>
   <li class="first">
     <a href="<?= url::site("login/ajax") ?>"
diff --git a/themes/night_wind/css/screen.css b/themes/night_wind/css/screen.css
index 7711a329..dfc94b6d 100644
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@@ -446,15 +446,6 @@ li.g-error select {
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-login-menu li,
-#g-footer #g-credits li {
-  display: inline;
-}
-
-#g-banner #g-login-menu li {
-  padding-left: 1.2em;
-}
-
 #g-footer #g-credits li {
   padding-right: 1.2em;
 }
@@ -480,6 +471,10 @@ li.g-error select {
   float: right;
 }
 
+#g-banner #g-login-menu li {
+  padding-left: 1.2em;
+}
+
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-site-menu {
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index f5c6b0df..a14a3278 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -124,14 +124,14 @@
           <? endif ?>
         </div>
       </div>
-      <div id="g-footer">
+      <div id="g-footer" class="ui-helper-clearfix">
         <?= $theme->footer() ?>
         <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
         <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="g-credits">
+        <ul id="g-credits" class="g-inline">
           <?= $theme->credits() ?>
         </ul>
         <? endif ?>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index fcbf63ea..ef2f1510 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -12,6 +12,8 @@
  *  6)  Browser hacks
  *  7)  jQuery and jQuery UI
  *  8)  Right-to-left language styles
+ *
+ *  @todo Move #g-admin-g2-import stuff to g2import module
  */
 
 /** *******************************************************************
@@ -329,15 +331,6 @@ td {
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-login-menu li,
-#g-footer #g-credits li {
-  display: inline;
-}
-
-#g-banner #g-login-menu li {
-  padding-left: 1.2em;
-}
-
 #g-footer #g-credits li {
   padding-right: 1.2em;
 }
@@ -362,6 +355,10 @@ td {
   float: right;
 }
 
+#g-banner #g-login-menu li {
+  padding-left: 1.2em;
+}
+
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-site-menu {
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index f5c6b0df..a14a3278 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -124,14 +124,14 @@
           <? endif ?>
         </div>
       </div>
-      <div id="g-footer">
+      <div id="g-footer" class="ui-helper-clearfix">
         <?= $theme->footer() ?>
         <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
         <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="g-credits">
+        <ul id="g-credits" class="g-inline">
           <?= $theme->credits() ?>
         </ul>
         <? endif ?>