From 927480956f246dee55eed82dd9d7bcf39e59ec81 Mon Sep 17 00:00:00 2001 From: Praveen Arimbrathodiyil Date: Thu, 10 Sep 2015 22:42:18 +0530 Subject: [PATCH 1/2] switch back to jquery-colorbox they provide the same assets and name change was not intentional --- app/assets/javascripts/jsxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js index 606060b25..79b376d79 100644 --- a/app/assets/javascripts/jsxc.js +++ b/app/assets/javascripts/jsxc.js @@ -1,5 +1,5 @@ //= require jquery.slimscroll -//= require colorbox +//= require jquery-colorbox //= require favico.js //= require jquery-fullscreen-plugin //= require diaspora_jsxc From 1af7a0b4108db6e99ca2b33d9722dbaabae9ba3d Mon Sep 17 00:00:00 2001 From: Praveen Arimbrathodiyil Date: Thu, 17 Sep 2015 18:50:54 +0530 Subject: [PATCH 2/2] remove colorbox.scss colorbox.scss is used only in examples --- app/assets/stylesheets/_application.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index b47584a22..461670d26 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -72,7 +72,6 @@ @import 'stream'; @import 'stream_element'; @import 'comments'; -@import 'colorbox'; @import 'diaspora_jsxc'; @import 'chat'; @import 'markdown-content';