Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Add Icons to Menus #184

Closed
wants to merge 1 commit into from

3 participants

@srsgores
  • Make forms use HTMl5 required and placeholder
  • Add icon property to any menu item. Icons reference the icomoon stylesheet, but this can be configured using the json file included
  • Fix toolbar elements not properly aligning
  • Add placeholder and required where I thought was necessary
  • Fix admin-menu.css import in html files. The file no longer exists.

Pics

calipsopic3
calipsopic3_2
calipsopic3_3
calipsopic3_4
calipsopic3_5
calipsopic3_6

@srsgores srsgores Add icons to menus.
Make forms use HTMl5 required and placeholder
6f14cf0
@richtera
Collaborator

Could you please pull upstream and rebase. I had fixed some stuff in terms of removing http: in front of the google font references and removing admin-menu.css.

Also by changing your branch configuration to do rebase it'll rebase automatically.
In each [branch] section in your .git/config file add "rebase=true"
This is how mine looks:

[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true

@richtera
Collaborator

Also this commit changed the code style again. Please revert the code style changes.

@srsgores

Ok, thanks for the heads up. My workflow for editing the JS files is to initially reformat them to my syntax settings (the way I find it easiest to read the code), then make changes. But what I don't understand is why you can't merge the conflicts and do a theirs resolution to the conflict. Or better yet, why not reformat the entire project to use tabs (in a separate, new commit)?

It is possible to put the else bracket on the same line. You just have to go to the bracket settings.

Really, I don't want you to have to hand-edit my changes. That's a waste of development time. How can we keep it so that I get to edit using my syntax settings, and you don't have to spend hours hand-editing them?

Let me know your thoughts.

@richtera
Collaborator
@dorudumi

Is the "code format xml file" public?
Do you have a link to it?

Thanks,
Alin

@richtera
Collaborator
@dorudumi
@richtera
Collaborator
@srsgores

Please explain how I should proceed with working on this repo. Do I just pull from devel, and then reformat, using the new settings before sending the pull request? Can you please specify a workflow for jetBrains editors like PHPStorm or Webstorm?

Thanks.

@richtera
Collaborator
@richtera
Collaborator

I did merge all these, forgot to close the pull request.

@richtera richtera closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 6, 2013
  1. @srsgores

    Add icons to menus.

    srsgores authored
    Make forms use HTMl5 required and placeholder
Something went wrong with that request. Please try again.