ChiliProject is not maintained anymore. Please be advised that there will be no more updates.
We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.
Update CodeRay to 1.0.0 (Feature #649)
Description
CodeRay was updated to 1.0 recently. It was subsequently updated in Redmine. We should pull those patches. See remote issue URL for more info.
Associated revisions
- fixed broken translation when a plugin is installed (closes #649)
- small fix to the plugin API: options parameter added to Redmine::Plugin#menu
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1172 e93f8b46-1217-0410-a6f0-8f06a7374b81
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
[#649] Prevent the extra wiki styles from interfering with code highlighting.
History
Updated by Holger Just at 2011-10-08 06:24 pm
- Tracker changed from Bug to Feature
Updated by Kornelius Kalnbach at 2011-10-29 09:56 am
Pull request: https://github.com/chiliproject/chiliproject/pull/115
Updated by Eric Davis at 2011-11-07 01:35 am
I commented in the pull request for this:
"The code looks fine, will need to be tested (manual and automated). This should target the unstable branch (we can keep this pull request though)."
Anyone want to merge the code, run the tests, test the code rendering in a browser, and commit it for 3.0?
Updated by Felix Schäfer at 2011-11-13 08:01 pm
I've had a chance to test it and it all looks good except for a css collision:
The collision can be reproduced with this file: https://raw.github.com/chiliproject/chiliproject/master/public/stylesheets/context_menu.css
Once that and the small language adjustment I've commented on github are fixed, it's a go from me too.
- File important_collision.png added
Updated by Kornelius Kalnbach at 2011-11-15 11:10 am
Excuse me ^^ but what is a CSS collision? What's broken here, and how do I fix this?
Updated by Felix Schäfer at 2011-11-15 11:27 am
Kornelius Kalnbach wrote:
Excuse me ^^ but what is a CSS collision? What's broken here, and how do I fix this?
That means that there are two definitions for the "important" class in the css, one coming from the core, one coming from the "coderay" css definitions, that compete for styling this !important
, and the core ones win. The css for coderay/the syntax highlighting should be made more precise so that it "wins" to style this !important
.
Updated by Felix Schäfer at 2011-11-26 01:21 pm
Felix Schäfer wrote:
except for a css collision:
So the problem is the additional wiki styles on unstable: the span.important
rules in source:/public/stylesheets/application.css@01e43f2e#L2348 and source:/public/stylesheets/application.css@01e43f2e#L2385
Maybe we should throw in a reset in the .syntaxhl
block?
- Target version set to 3.0.0
Updated by Eric Davis at 2011-12-02 12:32 am
Felix Schäfer wrote:
Maybe we should throw in a reset in the
.syntaxhl
block?
If that is what CodeRay is using then I'd agree.
Updated by Felix Schäfer at 2011-12-03 05:52 pm
Eric Davis wrote:
Felix Schäfer wrote:
Maybe we should throw in a reset in the
.syntaxhl
block?If that is what CodeRay is using then I'd agree.
.syntaxhl
is what ChiliProject uses, .CodeRay
is the wrapper for everything CodeRay. The reset I came up with for the .important
part is:
1.syntaxhl .CodeRay .important {
2 background: none;
3 border: none;
4 display: inline;
5 margin: 0;
6 padding: 0;
7 min-height: 0;
8}
I don't like it much, but I fear we don't have many other choices (until we go CSS3 and/or SCSS/SASS).
Updated by Felix Schäfer at 2011-12-03 05:52 pm
Oh, and I plan on merging it next week if I don't hear any nays until then.
- Status changed from Open to Ready for review
Updated by Eric Davis at 2011-12-06 09:19 pm
Only other thing I'd do is document the .important reset ("Rest .wiki .important rules used by the icons") so we know when it's safe to remove.
I've been looking at some css auditing tools to see about removing some of our css.
Updated by Felix Schäfer at 2011-12-09 04:05 pm
Merged in fbde685, thanks everyone for your contributions!
- Status changed from Ready for review to Closed