Remove font size feature #13925

shucon · Jan 11, 2018

#13919
Signed-off-by: Saksham Gupta shucon01@gmail.com

Before submitting pull request, please check that every commit:

Has proper Signed-Off-By
Has commit message which describes it
Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
Any new functionality is covered by tests

codecov · Jan 11, 2018

Codecov Report

❗️ No coverage uploaded for pull request base (master@1421722). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #13925   +/-   ##
=========================================
  Coverage          ?   52.89%           
  Complexity        ?    14326           
=========================================
  Files             ?      492           
  Lines             ?    63665           
  Branches          ?        0           
=========================================
  Hits              ?    33676           
  Misses            ?    29989           
  Partials          ?        0

mauriciofauth · Jan 13, 2018

Apparently you just remove the font size form. The font size feature goes beyond that.

shucon · Jan 23, 2018

@mauriciofauth is this good?

mauriciofauth · Jan 27, 2018

In addition to removing the form, I think removing the FontSize configuration directive is also necessary.

phpmyadmin-bot · Jan 29, 2018

This commit contains trailing whitespace, what is prohibited in phpMyAdmin. Please check our Developer guidelines for more information.

Offending files: libraries/classes/Config.php

phpmyadmin-bot · Jan 29, 2018

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

phpmyadmin-bot · Jan 29, 2018

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

devenbansod · Jan 29, 2018

Hi @shucon I tried restarting the selenium job but the same test PhpMyAdmin\Tests\Selenium\SettingsTest::testHideDatabase failed again. Attached is the screen recording of them same.

I'd recommend you to try running the test locally (or run down the flow manually), if it fails that'd mean that your changes in this PR unknowingly seem to have broken the flow being tested in the above test or the test has been broken since a last few commits but no one caught it.

devenbansod · Jan 29, 2018

Also, I can see an error on the settings page saying: 'Field FontSize has no type' which seems related to this PR.

shucon · Jan 29, 2018

@devenbansod both the issues are fixed on my side , can you please confirm the same .

mauriciofauth · Feb 1, 2018

mauriciofauth reviewed Feb 1, 2018

View changes

mauriciofauth · Feb 1, 2018

test/classes/ConfigTest.php

-        );
-
-        //test getFontsizeOptions for "em" unit
-        $fontsize = $GLOBALS['PMA_Config']->get('FontSize');


There are more places where the FontSize setting is used with the Config class.

phpmyadmin-bot · Feb 9, 2018

This commit contains trailing whitespace, what is prohibited in phpMyAdmin. Please check our Developer guidelines for more information.

Offending files: test/classes/ConfigTest.php

mauriciofauth · Feb 16, 2018

This pull request is incomplete, there are still several places where the FontSize configuration is used.

phpmyadmin-bot · Feb 23, 2018

This commit contains trailing whitespace, what is prohibited in phpMyAdmin. Please check our Developer guidelines for more information.

Offending files: yarn-error.log

phpmyadmin-bot · Feb 25, 2018

This commit is using tab character for indentation instead of spaces, what is mandated by phpMyAdmin. Please check our Developer guidelines for more information.

Offending files: libraries/classes/Config.php, test/classes/ConfigTest.php

phpmyadmin-bot · Feb 25, 2018

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

shucon · Mar 2, 2018

@mauriciofauth is this sufficient?

mauriciofauth · Mar 15, 2018

mauriciofauth reviewed Mar 15, 2018

View changes

mauriciofauth · Mar 15, 2018

themes/pmahomme/css/common.css.php

@@ -14,9 +14,6 @@
 ?>
 /******************************************************************************/
 /* general tags */
-html {
-    font-size: <?php echo $theme->getFontSize(); ?>
-}


You need to keep the font-size property here.

mauriciofauth · Mar 15, 2018

mauriciofauth reviewed Mar 15, 2018

View changes

mauriciofauth · Mar 15, 2018

libraries/classes/Config.php

@@ -1191,13 +1191,7 @@ public function getSource()
     */
    public function getThemeUniqueValue()


You should update the doc for this method to reflect the changes.

I can't find anything related to this in the doc, please help.

I'm referring to the comment block just above the method.

mauriciofauth · Mar 15, 2018

I don't think it's a good idea to include this in 4.8 branch. This is a major change and should only be included in 5.0 branch.

shucon · Mar 15, 2018

@mauriciofauth everything good now?

mauriciofauth · Mar 16, 2018

mauriciofauth approved these changes Mar 16, 2018

View changes

mauriciofauth · Apr 8, 2018

mauriciofauth reviewed Apr 8, 2018

View changes

mauriciofauth · Apr 8, 2018

doc/config.rst

-    :default: '82%'
-
-    Font size to use, is applied in CSS.
-


I don't think this should be simply removed. See this example: 8cc6de4#diff-5a2f160c43a637ce34c72d79c769e4cf

Okay, got it! I'll fix it.

phpmyadmin-bot · Apr 13, 2018

This commit is using tab character for indentation instead of spaces, what is mandated by phpMyAdmin. Please check our Developer guidelines for more information.

Offending files: doc/config.rst

phpmyadmin-bot · Apr 13, 2018

This commit contains trailing whitespace, what is prohibited in phpMyAdmin. Please check our Developer guidelines for more information.

Offending files: doc/config.rst

mauriciofauth · Apr 13, 2018

mauriciofauth requested changes Apr 13, 2018

View changes

mauriciofauth · Apr 13, 2018

doc/config.rst

@@ -3232,6 +3232,11 @@ Theme manager settings

    :type: string
    :default: '82%'
+    
+    .. deprecated:: 4.8.0


Please, change to 5.0.0. Thanks!

mauriciofauth · Apr 14, 2018

Merged! Thank you for your contribution and your patience with the various requests for change.

Remove font size feature
#13919 Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

48a0ac1

Removed FontSize configuration directive
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

5e365d8

shucon added some commits Jan 29, 2018

Fix Broken Testcases
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

3bc4b68

Travis Rerun

Loading status checks…

8ab9d67

Fix Broken Dependency
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

daf3019

shucon added some commits Feb 23, 2018

Merge remote-tracking branch 'origin/master' into font

a1f24c3

FontSize config
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

3d0c48c

Fix PR problem
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

0fbc05f

Fix Whitespace

Loading status checks…

b564539

mauriciofauth self-assigned this Mar 15, 2018

mauriciofauth added this to the 5.0.0 milestone Mar 15, 2018

shucon added some commits Mar 15, 2018

Fix font-size CSS
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

67381f7

Fix Comment
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

d420834

Fix docs
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

44e783c

Fix spaces
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

2da7bdd

Fix version number
Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Loading status checks…

10635d9

phpmyadmin/phpmyadmin

Join GitHub today

Remove font size feature #13925

Conversation

shucon commented Jan 11, 2018 • edited

This comment has been minimized.

codecov bot commented Jan 11, 2018 • edited

Codecov Report

This comment has been minimized.

mauriciofauth commented Jan 13, 2018

shucon added some commits Jan 13, 2018

This comment has been minimized.

shucon commented Jan 23, 2018

This comment has been minimized.

mauriciofauth commented Jan 27, 2018

This comment has been minimized.

phpmyadmin-bot commented on 2548e93 Jan 29, 2018

This comment has been minimized.

phpmyadmin-bot commented on 6e0e145 Jan 29, 2018

shucon added some commits Jan 29, 2018

This comment has been minimized.

phpmyadmin-bot commented on 8ab9d67 Jan 29, 2018

This comment has been minimized.

devenbansod commented Jan 29, 2018

This comment has been minimized.

devenbansod commented Jan 29, 2018

This comment has been minimized.

shucon commented Jan 29, 2018

mauriciofauth reviewed Feb 1, 2018 View changes

This comment has been minimized.

ufosaga and others added some commits Feb 8, 2018

This comment has been minimized.

phpmyadmin-bot commented on 311fbf5 Feb 9, 2018

shucon and others added some commits Feb 10, 2018

This comment has been minimized.

mauriciofauth commented Feb 16, 2018

shucon added some commits Feb 23, 2018

This comment has been minimized.

phpmyadmin-bot commented on 3d0c48c Feb 23, 2018

shucon added some commits Feb 23, 2018

This comment has been minimized.

phpmyadmin-bot commented on 3405e3a Feb 25, 2018

This comment has been minimized.

phpmyadmin-bot commented on b564539 Feb 25, 2018

This comment has been minimized.

shucon commented Mar 2, 2018

mauriciofauth reviewed Mar 15, 2018 View changes

This comment has been minimized.

mauriciofauth reviewed Mar 15, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

mauriciofauth self-assigned this Mar 15, 2018

mauriciofauth added this to the 5.0.0 milestone Mar 15, 2018

This comment has been minimized.

mauriciofauth commented Mar 15, 2018

shucon added some commits Mar 15, 2018

This comment has been minimized.

shucon commented Mar 15, 2018

mauriciofauth approved these changes Mar 16, 2018 View changes

mauriciofauth reviewed Apr 8, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

phpmyadmin-bot commented on 44e783c Apr 13, 2018

This comment has been minimized.

phpmyadmin-bot commented on 2da7bdd Apr 13, 2018

mauriciofauth requested changes Apr 13, 2018 View changes

This comment has been minimized.

Hide details View details mauriciofauth merged commit d701f6f into phpmyadmin:master Apr 14, 2018 1 of 3 checks passed

1 of 3 checks passed

This comment has been minimized.

mauriciofauth commented Apr 14, 2018

shucon commented Jan 11, 2018 •

edited

codecov bot commented Jan 11, 2018 •

edited

phpmyadmin-bot commented on `2548e93` Jan 29, 2018

phpmyadmin-bot commented on `6e0e145` Jan 29, 2018

phpmyadmin-bot commented on `8ab9d67` Jan 29, 2018

mauriciofauth reviewed Feb 1, 2018

View changes

phpmyadmin-bot commented on `311fbf5` Feb 9, 2018

phpmyadmin-bot commented on `3d0c48c` Feb 23, 2018

phpmyadmin-bot commented on `3405e3a` Feb 25, 2018

phpmyadmin-bot commented on `b564539` Feb 25, 2018

mauriciofauth reviewed Mar 15, 2018

View changes

mauriciofauth reviewed Mar 15, 2018

View changes

mauriciofauth approved these changes Mar 16, 2018

View changes

mauriciofauth reviewed Apr 8, 2018

View changes

phpmyadmin-bot commented on `44e783c` Apr 13, 2018

phpmyadmin-bot commented on `2da7bdd` Apr 13, 2018

mauriciofauth requested changes Apr 13, 2018

View changes

mauriciofauth merged commit `d701f6f` into phpmyadmin:master Apr 14, 2018
1 of 3 checks passed