Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[Contest-6] No hard-coded icons in css #200

Merged
lem9 merged 5 commits intophpmyadmin:masterphpmyadmin/phpmyadmin:masterfrom
hisamith:css_changehisamith/phpmyadmin:css_changeCopy head branch name to clipboard
Mar 15, 2013
Merged

[Contest-6] No hard-coded icons in css #200
lem9 merged 5 commits intophpmyadmin:masterphpmyadmin/phpmyadmin:masterfrom
hisamith:css_changehisamith/phpmyadmin:css_changeCopy head branch name to clipboard

Conversation

@hisamith
Copy link
Contributor

@hisamith hisamith commented Mar 5, 2013

All of the hard-coded images that are also available as a css sprite replaced by their sprite counterparts.
Remove unused css styles for iconic view for ul items.
Update the css file in the "original" theme.

hisamith added 2 commits March 2, 2013 22:07
Modified "list-style-type" to "none" for the list items that has an image as the bullet point and aligned them
…replaced by their sprite counterparts.

Remove unused css styles for iconic view for ul items.
Update the CSS file in the "original" theme.
@nijel
Copy link
Contributor

nijel commented Mar 6, 2013

Please fix the testsuite so that it does not fail with your changes.

@hisamith
Copy link
Contributor Author

hisamith commented Mar 6, 2013

Hi Michal,
I have updated the test cases, according to the modifications that I have done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try to avoid space characters on empty lines

@ruleant
Copy link
Contributor

ruleant commented Mar 8, 2013

a few general remarks:

  • our coding style defines not to use lines longer than 85 characters. You can use phpcs (PHP Code Sniffer, see http://wiki.phpmyadmin.net/pma/Jenkins_Setup to install) to check violations against the codingstyle we use
  • when concatenating with . leave a space before and after the dot. This makes the code more readable
  • watch out for space characters on empty lines and trailing spaces

@ruleant
Copy link
Contributor

ruleant commented Mar 13, 2013

Coding style looks good, thanks!

@ruleant
Copy link
Contributor

ruleant commented Mar 14, 2013

Tested and it seems to work.
I noticed that some sections where removed from the css files, (fe. common.css.php lines 1284-1302, 1308-1362, fe. li_mysql_collations) but no code was added to insert this icon in the appropriate place.

Can someone else confirm that the right icons are already in the code? @roccivic, @lem9, @nijel?

@lem9
Copy link
Contributor

lem9 commented Mar 14, 2013

Dieter,
do you mean li_select_mysql_collation ? I see that some code has been inserted by hisamith in index.php to call
PMA_Util::getImage('s_asci.png').

@ruleant
Copy link
Contributor

ruleant commented Mar 15, 2013

No, for the removed lines in common.css.php 1654-1680, you see a replacement in index.php, but the lines in common.css.php I mentioned in the previous comment, I don't see a replacement in other code. That's why I was wondering if there should be a replacement in the code, or maybe it is already there and the icon's in the css are obsolete already.
Looking for those items in the code (I tried 'grep -r li_select_mysql_collation *') doesn't turn up a match, so that's why I'm wondering if they are still needed.

@lem9
Copy link
Contributor

lem9 commented Mar 15, 2013

Dieter,
let's take an example. You mention lines 1284-1302 (I believe you refer to bc47ff4). On line 1285, we see he removed the reference to b_newdb.png. However, in c88420a we see that he added a reference to this icon in libraries/display_create_database.lib.php.

@ruleant
Copy link
Contributor

ruleant commented Mar 15, 2013

The lines 1284-1302 are OK, the icons were removed from the css and inserted to the appropriate places in the code. I referenced the wrong range (1284-1302) in a previous comment, my bad.

I mean the lines 1308-1362 (1678-1732 in the pmahomme version) : 'li_mysql_variables' to 'li_user_preferences'
A quick look for some of the icons (*.png) in the current code base, turns up they are used, so I guess their occurence in the css files is obsolete and they can be removed.
But because I didn't see any replacement in hisamith's patch, I was wondering if they were forgotten, or were obsolete and could be removed.

@lem9
Copy link
Contributor

lem9 commented Mar 15, 2013

Yes, they must be obsolete.

lem9 pushed a commit that referenced this pull request Mar 15, 2013
[Contest-6] No hard-coded icons in css
@lem9 lem9 merged commit 79b7d3c into phpmyadmin:master Mar 15, 2013
@lem9
Copy link
Contributor

lem9 commented Mar 15, 2013

We have a winner for Contest 6, congratulations.

@hisamith
Copy link
Contributor Author

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.