Changeset [45bc95e449d897b4f793317103aa8f54e0b3a7ef] by Yomi Colledge
Revision 45bc95e449d897b4f793317103aa8f54e0b3a7ef,
committed by Yomi Colledge
· May 10th, 2010 @ 05:08 PM
Merge branch 'panel_tool_tips' into client_side_improvements
Conflicts:
features/step_definitions/selenium_steps.rb
http://github.com/baphled/salad/commit/45bc95e449d897b4f793317103aa...
16 changed files
-
A
app/stylesheets/partials/_tooltip.sass -
A
features/enhanced/panel_tooltip_functionality.feature -
A
public/images/black_arrow.png -
A
public/javascripts/tooltips.js -
M
app/helpers/application_helper.rb -
M
app/stylesheets/screen.sass -
M
app/views/features/show.html.erb -
M
app/views/features/system_merge.html.erb -
M
app/views/projects/show.html.erb -
M
app/views/steps/show.html.erb -
M
app/views/stories/show.html.erb -
M
features/step_definitions/features_steps.rb -
M
features/step_definitions/selenium_steps.rb -
M
features/step_definitions/steps_steps.rb -
M
lib/feature_file.rb -
M
spec/fixtures/features.yml