Merge pull request #1684 from nisargjhaveri/page_settings_fix

Some fixes in page-related settings

2 files changed, 18 insertions, 16 deletions

diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index a2bc62059a..75cab2c225 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -820,20 +820,26 @@ div#tablestatistics table {
     white-space:        nowrap;
 }
 
-#goto_pagetop, #lock_page_icon {
+#page_nav_icons {
     position: fixed;
-    padding: .1em .3em;
     top: 0;
+    <?php echo $right; ?>: 0;
     z-index: 99;
+    padding: .1em 0;
+}
+
+#goto_pagetop, #lock_page_icon, #page_settings_icon {
+    padding: .3em;
     background: white;
 }
 
-#goto_pagetop {
-    <?php echo $right; ?>: 0;
+#page_settings_icon {
+    cursor: pointer;
+    display: none;
 }
 
-#lock_page_icon {
-    <?php echo $right; ?>: 2em;
+.page_settings_modal {
+    display: none;
 }
 
 #span_table_comment {
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index de768ddf72..3ed6a5c847 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1146,28 +1146,24 @@ div#tablestatistics table {
     color: #fff;
 }
 
-#goto_pagetop, #lock_page_icon, #page_settings_icon {
+#page_nav_icons {
     position: fixed;
-    padding: .25em .25em .2em;
     top: 0;
+    <?php echo $right; ?>: 0;
     z-index: 99;
-    background: #888;
+    padding: .25em 0;
 }
 
-#goto_pagetop {
-    <?php echo $right; ?>: 0;
+#goto_pagetop, #lock_page_icon, #page_settings_icon {
+    padding: .25em;
+    background: #888;
 }
 
 #page_settings_icon {
-    <?php echo $right; ?>: 2em;
     cursor: pointer;
     display: none;
 }
 
-#lock_page_icon {
-    <?php echo $right; ?>: 4em;
-}
-
 .page_settings_modal {
     display: none;
 }