Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove font size feature #13925

Merged
merged 25 commits into from Apr 14, 2018
Merged

Remove font size feature #13925

merged 25 commits into from Apr 14, 2018

Conversation

@shucon
Copy link
Contributor

@shucon shucon commented 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
#13919
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@codecov
Copy link

@codecov codecov bot commented 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
Copy link
Member

@mauriciofauth mauriciofauth commented Jan 13, 2018

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

shucon added 2 commits Jan 13, 2018
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@shucon
Copy link
Contributor Author

@shucon shucon commented Jan 23, 2018

@mauriciofauth is this good?

@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented Jan 27, 2018

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

shucon added 3 commits Jan 29, 2018
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@devenbansod
Copy link
Member

@devenbansod devenbansod commented 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.

bs-video-logs-use-2-

@devenbansod
Copy link
Member

@devenbansod devenbansod commented 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.

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@shucon
Copy link
Contributor Author

@shucon shucon commented Jan 29, 2018

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

);

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

This comment has been minimized.

@mauriciofauth

mauriciofauth Feb 1, 2018
Member

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

ufosaga and others added 6 commits Feb 8, 2018
Signed-off-by: Thomas Wong <ufosaga@gmail.com>
Fix tests
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Fix Tests
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Fix Tests
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Fix textarea failed to popup (issue #13518)
@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented Feb 16, 2018

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

shucon added 7 commits Feb 23, 2018
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@shucon
Copy link
Contributor Author

@shucon shucon commented Mar 2, 2018

@mauriciofauth is this sufficient?

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

This comment has been minimized.

@mauriciofauth

mauriciofauth Mar 15, 2018
Member

You need to keep the font-size property here.

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

This comment has been minimized.

@mauriciofauth

mauriciofauth Mar 15, 2018
Member

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

This comment has been minimized.

@shucon

shucon Mar 15, 2018
Author Contributor

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

This comment has been minimized.

@mauriciofauth

mauriciofauth Mar 15, 2018
Member

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

@mauriciofauth mauriciofauth self-assigned this Mar 15, 2018
@mauriciofauth mauriciofauth added this to the 5.0.0 milestone Mar 15, 2018
@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented 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 added 2 commits Mar 15, 2018
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@shucon
Copy link
Contributor Author

@shucon shucon commented Mar 15, 2018

@mauriciofauth everything good now?

:default: '82%'

Font size to use, is applied in CSS.

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 8, 2018
Member

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

This comment has been minimized.

@shucon

shucon Apr 8, 2018
Author Contributor

Okay, got it! I'll fix it.

shucon added 2 commits Apr 13, 2018
Fix docs
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@@ -3232,6 +3232,11 @@ Theme manager settings
:type: string
:default: '82%'

.. deprecated:: 4.8.0

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 13, 2018
Member

Please, change to 5.0.0. Thanks!

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@mauriciofauth mauriciofauth merged commit d701f6f into phpmyadmin:master Apr 14, 2018
1 of 3 checks passed
1 of 3 checks passed
DCO The sign-off is missing.
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
Scrutinizer Analysis: 2489 Issues, 60 Patches – Tests: passed
Details
@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented Apr 14, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.