Skip to content

Fixes #875 - Get simple version of cssfixme working #876

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.

Sign up for GitHub

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

Merged
hallvors merged 2 commits into from
Dec 16, 2015
Merged

Fixes #875 - Get simple version of cssfixme working #876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad6b71
Issue #875. Move cssfixme scripts to lib/ (and fix css-fixme typo)
Dec 16, 2015
29f0931
Issue #875. Init and update submodule for Travis.
Dec 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Issue #875. Move cssfixme scripts to lib/ (and fix css-fixme typo)
  • Loading branch information
Mike Taylor committed Dec 16, 2015
commit 9ad6b71c4aa1d0da556fd30181c339bd4d7ba80f
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ webcompat/static/js/diagnose.js
webcompat/static/js/issues.js
webcompat/static/js/issue-list.js
webcompat/static/js/user-activity.js
webcompat/static/js/cssfixme/cssfixme.js
webcompat/static/js/cssfixme.js
webcompat/**/*.min.js
webcompat/**/*.min.css
webcompat/**/*.dev.css
Expand Down
2 changes: 1 addition & 1 deletion grunt-tasks/concat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module.exports = function(grunt) {
'git_modules/css-fixme/js/css-fixme.js',
'<%= jsPath %>/lib/css-fixme-ui.js'
],
dest: '<%= jsPath %>/cssfixme/cssfixme.js'
dest: '<%= jsPath %>/cssfixme.js'
}
});
};
2 changes: 1 addition & 1 deletion webcompat/templates/cssfixme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{%- if config.PRODUCTION or config.DEVELOPMENT -%}
<script src="{{ url_for('static', filename='js/cssfixme.min.js')|bust_cache }}"></script>
{%- else -%}
<script src="{{ url_for('static', filename='js/lib/css-fixme.js') }}"></script>
<script src="{{ url_for('static', filename='js/cssfixme.js') }}"></script>
{%- endif -%}
{%- endblock %}
</main>
Expand Down