new orbit bar fixed..

Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb
This commit is contained in:
harrybomrah authored and saurabhbhatia committed 2013-07-30 16:43:35 +08:00
1 parent f7dbbf1bca
commit 79c7f8e90f
8 files changed
+502 -11

No files matched your search

@@ -14,7 +14,7 @@
!function ($) {
$.fn.searchClear = function (param){
_defaultSettings = {
inputName: ':input',
inputName: '.search-query',
inputIcon: 'inputIcon',
clearBtnIcon: 'clearBtnIcon',
};