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 inline styles from Relation.php #14141

Merged
merged 2 commits into from May 3, 2018

Conversation

Projects
None yet
3 participants
@mohitjawanjal

mohitjawanjal commented Mar 28, 2018

Related to #12262

Signed-off-by: Mohit Jawanjal mohit.jawanjal@imnica.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
Mohit Jawanjal
Remove inline styles from Relation.php
Signed-off-by: Mohit Jawanjal <mohit.jawanjal@imnica.com>
@@ -101,16 +101,16 @@ public function getRelationsParamDiagnostic(array $cfgRelation)
$retval = '<br>';
$messages = array();
$messages['error'] = '<span style="color:red"><strong>'
$messages['error'] = '<span class="span_color_red"><strong>'

This comment has been minimized.

@mauriciofauth

mauriciofauth Mar 28, 2018

Member

You can use the caution class here. See:

span.caution {
color: #FF0000;
}

. _pgettext('Correctly working', 'OK')
. '</strong></span>';
$messages['enabled'] = '<span style="color:green">' . __('Enabled') . '</span>';
$messages['disabled'] = '<span style="color:red">' . __('Disabled') . '</span>';
$messages['enabled'] = '<span class="span_color_green">' . __('Enabled') . '</span>';

This comment has been minimized.

@mauriciofauth

mauriciofauth Mar 28, 2018

Member

It would be interesting to use another class name instead of span_color_green, for example: is_enabled or success. What do you think?

This comment has been minimized.

@mohitjawanjal

mohitjawanjal Mar 29, 2018

Yup, success would be good. I'll look around for similar classes from the next time :-)

This comment has been minimized.

@mauriciofauth

mauriciofauth Mar 30, 2018

Member

Great! Once you submit the new changes, we can merge this pull request.

Mohit Jawanjal
Inline style fix for Relation.php
Signed-off-by: Mohit Jawanjal <mohit.jawanjal@imnica.com>
@phpmyadmin-bot

This comment has been minimized.

phpmyadmin-bot commented on c8d9471 Apr 2, 2018

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

Offending files: themes/pmahomme/css/common.css.php

@mohitjawanjal

This comment has been minimized.

mohitjawanjal commented Apr 2, 2018

Sorry my git kung-fu is not very good today. :( Going to re-submit it on a different PR. @mauriciofauth Do you think creating a new branch would be a good idea or should I work with master?

@@ -3434,4 +3437,4 @@
/* side menu */
#name-panel {
overflow:hidden;
}
}

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 2, 2018

Member

Could you add the new line at the end of file again?

@@ -3683,4 +3686,4 @@
/* side menu */
#name-panel {
overflow:hidden;
}
}

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 2, 2018

Member

Could you add the new line at the end of file again?

@mauriciofauth

This comment has been minimized.

Member

mauriciofauth commented Apr 2, 2018

@mohitjawanjal You can keep the master branch in this PR, but it is recommended to use a separate branch.

@@ -1026,6 +1026,9 @@
span.caution {
color: #FF0000;
}
span.success {
color: green;

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 2, 2018

Member

This line contains trailing whitespace. Could you remove it?

@mauriciofauth mauriciofauth merged commit 3178fac into phpmyadmin:master May 3, 2018

3 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Codacy/PR Quality Review Good work! A positive pull request.
Details
DCO All commits have a DCO sign-off from the author
Scrutinizer Analysis: No new issues – Tests: passed
Details
@mauriciofauth

This comment has been minimized.

Member

mauriciofauth commented May 3, 2018

Merged, thanks for your contribution!

@mauriciofauth mauriciofauth self-assigned this May 3, 2018

@mauriciofauth mauriciofauth added this to the 5.0.0 milestone May 3, 2018

mauriciofauth added a commit that referenced this pull request May 3, 2018

Add #14141 changes to Metro theme
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment