[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 286d94: Revert previous fix for bug#4096

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 286d94d424afb1c25b487bb0563764a1487faaed https://github.com/phpmyadmin/phpmyadmin/commit/286d94d424afb1c25b487bb0563… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-12-19 (Thu, 19 Dec 2013) Changed paths: M js/makegrid.js M themes/pmahomme/css/common.css.php Log Message: ----------- Revert previous fix for bug#4096 Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 4c1951a06ec8c2ef9d290c1de1387f04c11dc885 https://github.com/phpmyadmin/phpmyadmin/commit/4c1951a06ec8c2ef9d290c1de13… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-12-19 (Thu, 19 Dec 2013) Changed paths: M js/navigation.js Log Message: ----------- fix navigation resizing with window scroll Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: bad4e440ec13bdeb3c7362191c5a57a84dcccfc3 https://github.com/phpmyadmin/phpmyadmin/commit/bad4e440ec13bdeb3c7362191c5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-20 (Fri, 20 Dec 2013) Changed paths: M js/makegrid.js M js/navigation.js M themes/pmahomme/css/common.css.php Log Message: ----------- Merge pull request #798 from zixtor/QA_4_1 Revert 4096 and fix nav resize Compare: https://github.com/phpmyadmin/phpmyadmin/compare/00b48015d6ff...bad4e440ec13