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

Conversation

Projects
None yet
5 participants
@shucon
Contributor

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
Remove font size feature
#13919
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@codecov

This comment has been minimized.

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

This comment has been minimized.

Member

mauriciofauth commented Jan 13, 2018

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

shucon added some commits Jan 13, 2018

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

This comment has been minimized.

Contributor

shucon commented Jan 23, 2018

@mauriciofauth is this good?

@mauriciofauth

This comment has been minimized.

Member

mauriciofauth commented Jan 27, 2018

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

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

This comment has been minimized.

phpmyadmin-bot commented on 2548e93 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

This comment has been minimized.

phpmyadmin-bot commented on 6e0e145 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.

shucon added some commits Jan 29, 2018

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

This comment has been minimized.

phpmyadmin-bot commented on 8ab9d67 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

This comment has been minimized.

Member

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

This comment has been minimized.

Member

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.

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

This comment has been minimized.

Contributor

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 some commits Feb 8, 2018

Fix textarea failed to popup (issue #13518)
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>
@phpmyadmin-bot

This comment has been minimized.

phpmyadmin-bot commented on 311fbf5 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

shucon and others added some commits Feb 10, 2018

fix whitespace
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Merge pull request #13978 from ufosaga/master
Fix textarea failed to popup (issue #13518)
@mauriciofauth

This comment has been minimized.

Member

mauriciofauth commented Feb 16, 2018

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

shucon added some commits Feb 23, 2018

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

This comment has been minimized.

phpmyadmin-bot commented on 3d0c48c 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

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

shucon added some commits Feb 23, 2018

Remove Config
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Fix Travis
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
Fix Travis
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
@phpmyadmin-bot

This comment has been minimized.

phpmyadmin-bot commented on 3405e3a 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

This comment has been minimized.

phpmyadmin-bot commented on b564539 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

This comment has been minimized.

Contributor

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

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

This comment has been minimized.

Member

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 some commits Mar 15, 2018

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

This comment has been minimized.

Contributor

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

Contributor

Okay, got it! I'll fix it.

@phpmyadmin-bot

This comment has been minimized.

phpmyadmin-bot commented on 44e783c 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

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

This comment has been minimized.

phpmyadmin-bot commented on 2da7bdd 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

Fix spaces
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!

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

@mauriciofauth mauriciofauth merged commit d701f6f into phpmyadmin:master Apr 14, 2018

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

This comment has been minimized.

Member

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