Merge pull request #28 from KiitoX/master

Update Fallen theme for 4.8

fallen/css/common.css.php

@@ -13,7 +13,7 @@ $brand = 'phpMyAdmin';
 // Do not edit!!!
 // Or the theme will be broken!
 $name = 'Fallen';
-$version = '0.4';
+$version = '0.7';
 $slug = 'fallen';
 $font_family_icon = 'Fallen' ?>
 /* ----------------------------------------------------- */

fallen/css/designer.css.php

@@ -29,17 +29,17 @@ if (!defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE')) {
   color: #000
 }
 
-canvas.pmd {
+canvas.designer {
   display: inline-block;
   overflow: hidden;
   text-align: left
 }
 
-canvas.pmd * {
+canvas.designer * {
   behavior: url(#default#VML)
 }
 
-.pmd_tab {
+.designer_tab {
   color: #333;
   border-collapse: collapse;
   border: 1px solid #ccc;
@@ -47,7 +47,7 @@ canvas.pmd * {
   -moz-user-select: none
 }
 
-.pmd_tab .header {
+.designer_tab .header {
   background-color: #f6f6f6
 }
 
@@ -88,7 +88,7 @@ canvas.pmd * {
   cursor: default
 }
 
-#pmd_hint {
+#designer_hint {
   white-space: nowrap;
   position: absolute;
   background-color: #99ff99;
@@ -104,7 +104,7 @@ canvas.pmd * {
   height: 500px
 }
 
-.pmd_Tabs {
+.designer_Tabs {
   cursor: default;
   color: #333;
   white-space: nowrap;
@@ -115,7 +115,7 @@ canvas.pmd * {
   border: #ccc solid 0
 }
 
-.pmd_Tabs2 {
+.designer_Tabs2 {
   cursor: default;
   color: #666;
   background: #eee;
@@ -218,7 +218,7 @@ canvas.pmd * {
   width: 100% !important;
 }
 
-.pmd_header {
+.designer_header {
   background-color: #f6f6f6;
   border-top: 20px solid #fff;
   color: #333;
@@ -233,14 +233,14 @@ canvas.pmd * {
   z-index: 101
 }
 
-.pmd_header a {
+.designer_header a {
   display: block;
   float: left;
   margin: 3px 1px 4px;
   height: 20px
 }
 
-.pmd_header .M_bord {
+.designer_header .M_bord {
   display: block;
   float: left;
   margin: 4px;
@@ -248,11 +248,11 @@ canvas.pmd * {
   width: 2px
 }
 
-.pmd_header a.first {
+.designer_header a.first {
   margin-right: 1em
 }
 
-.pmd_header a.last {
+.designer_header a.last {
   margin-left: 1em
 }
 
@@ -305,7 +305,7 @@ a.M_butt_Selected_down_IE:hover, a.M_butt_Selected_down:hover, a.M_butt:hover {
   width: 153px
 }
 
-#pmd_optionse {
+#designer_optionse {
   position: absolute;
   left: 636px;
   top: 85px;
@@ -314,7 +314,7 @@ a.M_butt_Selected_down_IE:hover, a.M_butt_Selected_down:hover, a.M_butt:hover {
 }
 
 #layer_menu_sizer {
-  background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png') ?>);
+  background-image: url(<?php echo $theme->getImgPath('designer/resize.png') ?>);
   cursor: ew-resize
 }
 
@@ -341,7 +341,7 @@ a.trigger {
   right: 0;
   color: #fff;
   padding: 10px 40px 10px 15px;
-  background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png') ?>) 85% 55% no-repeat;
+  background: #333 url(<?php echo $theme->getImgPath('designer/plus.png') ?>) 85% 55% no-repeat;
   border: 1px solid #444;
   display: block;
   z-index: 102
@@ -349,17 +349,17 @@ a.trigger {
 
 a.trigger:hover {
   color: #080808;
-  background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png') ?>) 85% 55% no-repeat;
+  background: #fff696 url(<?php echo $theme->getImgPath('designer/plus.png') ?>) 85% 55% no-repeat;
   border: 1px solid #999
 }
 
 a.active.trigger {
-  background: #222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png') ?>) 85% 55% no-repeat;
+  background: #222 url(<?php echo $theme->getImgPath('designer/minus.png') ?>) 85% 55% no-repeat;
   z-index: 999
 }
 
 a.active.trigger:hover {
-  background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png') ?>) 85% 55% no-repeat
+  background: #fff696 url(<?php echo $theme->getImgPath('designer/minus.png') ?>) 85% 55% no-repeat
 }
 
 .toggle_container .block {

fallen/css/fallen/common/elements.css.php

@@ -41,6 +41,10 @@ ul#topmenu li, ul#topmenu2 li {
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2)
 }
 
+.scrollindicator {
+  display: none
+}
+
 #topmenu .tabactive {
   background: #fff!important
 }
@@ -695,7 +699,7 @@ li#li_select_theme:hover {
 }
 
 li#li_change_password {
-  /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath() ?>s_passwd.png); */
+  /* list-style-image: url(<?php echo $theme->getImgPath() ?>s_passwd.png); */
   display: block;
   padding: 10px;
   padding-left: 20px;
@@ -707,7 +711,7 @@ li#li_change_password:hover {
 }
 
 li#li_user_preferences {
-  /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath() ?>b_tblops.png); */
+  /* list-style-image: url(<?php echo $theme->getImgPath() ?>b_tblops.png); */
   display: block;
   padding: 10px;
   padding-left: 20px;
@@ -939,7 +943,7 @@ input[type=text].invalid_value, input[type=password].invalid_value, input[type=n
   display: inline;
   left: 0;
   right: 0;
-  background-image: url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>");
+  background-image: url("<?php echo $theme->getImgPath('loader-blue.svg') ?>");
   background-repeat: no-repeat;
   background-position: 46%;
   margin: 0;

fallen/css/fallen/common/globals.css.php

@@ -304,7 +304,7 @@ caption a.top {
 }
 
 .cPointer {
-  background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');
+  background: url(<?php echo $theme->getImgPath('col_pointer.png');
   ?>);
   height: 20px;
   margin-left: -5px;
@@ -337,7 +337,7 @@ caption a.top {
 }
 
 .coldrop {
-  background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');
+  background: url(<?php echo $theme->getImgPath('col_drop.png');
   ?>);
   cursor: pointer;
   height: 16px;
@@ -429,12 +429,12 @@ caption a.top {
 }
 
 .cEdit .edit_box_posting {
-  background: #FFF url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>") no-repeat right center;
+  background: #FFF url("<?php echo $theme->getImgPath('loader-blue.svg') ?>") no-repeat right center;
   padding-right: 1.5em
 }
 
 .cEdit .edit_area_loading {
-  background: #FFF url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>") no-repeat center;
+  background: #FFF url("<?php echo $theme->getImgPath('loader-blue.svg') ?>") no-repeat center;
   height: 10em
 }
 
@@ -445,7 +445,7 @@ caption a.top {
 }
 
 .saving_edited_data {
-  background: url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>") no-repeat left;
+  background: url("<?php echo $theme->getImgPath('loader-blue.svg') ?>") no-repeat left;
   padding-left: 20px
 }
 
@@ -987,7 +987,7 @@ html.ie7 #pma_console .query_input {
 
 span.drag_icon {
   display: inline-block;
-  background-image: url('<?php echo $_SESSION['PMA_Theme']->getImgPath('s_sortable.png');?>');
+  background-image: url('<?php echo $theme->getImgPath('s_sortable.png');?>');
   background-position: center center;
   background-repeat: no-repeat;
   width: 1em;

fallen/css/fallen/common/tables.css.php

@@ -280,12 +280,12 @@ th.header .sorticon {
 }
 
 th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon {
-  background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_desc.png');
+  background-image: url(<?php echo $theme->getImgPath('s_desc.png');
   ?>)
 }
 
 th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon {
-  background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asc.png');
+  background-image: url(<?php echo $theme->getImgPath('s_asc.png');
   ?>)
 }
 /* end of styles of sortable tables */

fallen/info.inc.php

@@ -9,4 +9,4 @@
 
 // Theme info
 $theme_name = 'Fallen';
-$theme_full_version = '0.6';
+$theme_full_version = '0.7';

fallen/theme.json

@@ -1,8 +1,8 @@
 {
     "name": "Fallen",
-    "version": "0.6",
+    "version": "0.7",
     "description": "Fallen theme for phpMyAdmin",
     "author": "Frans Allen",
     "url": "https://www.fransallen.com/",
-    "supports": ["4.7"]
+    "supports": ["4.8"]
 }