Remove font size feature #13925

shucon · 2018-01-11T09:41:02Z

#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

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

codecov · 2018-01-11T10:17:43Z

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 · 2018-01-13T18:37:49Z

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

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

shucon · 2018-01-23T18:23:20Z

@MauricioFauth is this good?

MauricioFauth · 2018-01-27T18:00:03Z

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

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

devenbansod · 2018-01-29T17:02:46Z

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 · 2018-01-29T17:04:06Z

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

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

shucon · 2018-01-29T18:51:13Z

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

MauricioFauth · 2018-02-01T00:24:57Z

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.

Signed-off-by: Thomas Wong <ufosaga@gmail.com>

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

Fix textarea failed to popup (issue #13518)

MauricioFauth · 2018-02-16T15:17:59Z

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

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

shucon · 2018-03-02T17:27:56Z

@MauricioFauth is this sufficient?

MauricioFauth · 2018-03-15T01:46:17Z

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 · 2018-03-15T01:57:54Z

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 · 2018-03-15T02:05:03Z

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.

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

shucon · 2018-03-15T22:25:59Z

@MauricioFauth everything good now?

MauricioFauth · 2018-04-08T07:19:46Z

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.

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

MauricioFauth · 2018-04-13T23:19:27Z

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!

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

MauricioFauth · 2018-04-14T10:23:11Z

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

Remove font size feature

48a0ac1

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

shucon added 2 commits January 14, 2018 04:50

Remove font size feature

2548e93

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

Update Config.php

6e0e145

shucon added 3 commits January 29, 2018 11:35

Removed FontSize configuration directive

5e365d8

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

Fix Broken Testcases

3bc4b68

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

Travis Rerun

8ab9d67

Fix Broken Dependency

daf3019

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

MauricioFauth reviewed Feb 1, 2018

View reviewed changes

ufosaga and others added 6 commits February 9, 2018 10:13

Fix textarea failed to popup (issue #13518)

4a5ae16

Signed-off-by: Thomas Wong <ufosaga@gmail.com>

Fix tests

c92c013

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

Fix Tests

419c8ea

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

Fix Tests

311fbf5

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

fix whitespace

eaecce2

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

Merge pull request #13978 from ufosaga/master

607ed03

Fix textarea failed to popup (issue #13518)

shucon added 7 commits February 23, 2018 19:22

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

a1f24c3

FontSize config

3d0c48c

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

Fix PR problem

0fbc05f

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

Remove Config

517771e

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

Fix Travis

d5487c2

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

Fix Travis

3405e3a

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

Fix Whitespace

b564539

MauricioFauth reviewed Mar 15, 2018

View reviewed changes

MauricioFauth self-assigned this Mar 15, 2018

MauricioFauth added this to the 5.0.0 milestone Mar 15, 2018

shucon added 2 commits March 15, 2018 15:01

Fix font-size CSS

67381f7

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

Fix Comment

d420834

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

MauricioFauth approved these changes Mar 16, 2018

View reviewed changes

MauricioFauth reviewed Apr 8, 2018

View reviewed changes

shucon added 2 commits April 14, 2018 03:13

Fix docs

44e783c

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

Fix spaces

2da7bdd

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

MauricioFauth requested changes Apr 13, 2018

View reviewed changes

Fix version number

10635d9

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

MauricioFauth merged commit d701f6f into phpmyadmin:master Apr 14, 2018

Remove font size feature #13925

Remove font size feature #13925

shucon commented Jan 11, 2018 •

edited

codecov bot commented Jan 11, 2018 •

edited

MauricioFauth commented Jan 13, 2018

shucon commented Jan 23, 2018

MauricioFauth commented Jan 27, 2018

devenbansod commented Jan 29, 2018

devenbansod commented Jan 29, 2018

shucon commented Jan 29, 2018

MauricioFauth Feb 1, 2018

MauricioFauth commented Feb 16, 2018

shucon commented Mar 2, 2018

MauricioFauth Mar 15, 2018

MauricioFauth Mar 15, 2018

shucon Mar 15, 2018

MauricioFauth Mar 15, 2018

MauricioFauth commented Mar 15, 2018

shucon commented Mar 15, 2018

MauricioFauth Apr 8, 2018

shucon Apr 8, 2018

MauricioFauth Apr 13, 2018

MauricioFauth commented Apr 14, 2018

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

Remove font size feature #13925

Remove font size feature #13925

Conversation

shucon commented Jan 11, 2018 • edited

codecov bot commented Jan 11, 2018 • edited

Codecov Report

MauricioFauth commented Jan 13, 2018

shucon commented Jan 23, 2018

MauricioFauth commented Jan 27, 2018

devenbansod commented Jan 29, 2018

devenbansod commented Jan 29, 2018

shucon commented Jan 29, 2018

Choose a reason for hiding this comment

MauricioFauth commented Feb 16, 2018

shucon commented Mar 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MauricioFauth commented Mar 15, 2018

shucon commented Mar 15, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MauricioFauth commented Apr 14, 2018

shucon commented Jan 11, 2018 •

edited

codecov bot commented Jan 11, 2018 •

edited