Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
*.caches


*.log
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ gem 'coffee-rails', '~> 4.1.0'
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# gem 'jquery-turbolinks'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

gem 'twitter', '5.16.0'

# gem 'bootstrap-sass', '~> 3.3.7'

gem 'json'

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
Expand All @@ -37,7 +37,7 @@ gem 'sentimental'

gem 'font-awesome-rails'

gem 'toastr-rails'
# gem 'toastr-rails'

# gem 'frontend-generators'
# Use ActiveModel has_secure_password
Expand Down
55 changes: 26 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
arel (6.0.4)
binding_of_caller (0.7.2)
Expand All @@ -52,56 +52,56 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
debug_inspector (0.0.2)
domain_name (0.5.20170223)
debug_inspector (0.0.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.10)
erubis (2.7.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1)
globalid (0.3.7)
activesupport (>= 4.1.0)
font-awesome-rails (4.7.0.2)
railties (>= 3.2, < 5.2)
globalid (0.4.0)
activesupport (>= 4.2.0)
http (1.0.4)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (1.0.1)
http-form_data (1.0.3)
http_parser.rb (0.6.0)
i18n (0.8.1)
jbuilder (2.6.3)
activesupport (>= 3.0.0, < 5.2)
multi_json (~> 1.2)
jquery-rails (4.2.2)
jbuilder (2.6.4)
activesupport (>= 3.0.0)
multi_json (>= 1.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mail (2.6.5)
mime-types (>= 1.16, < 4)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
minitest (5.10.2)
multi_json (1.12.1)
multipart-post (2.0.0)
naught (1.1.0)
nokogiri (1.7.0.1)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.0.1-x86-mingw32)
nokogiri (1.7.2-x86-mingw32)
mini_portile2 (~> 2.1.0)
public_suffix (2.0.5)
rack (1.6.5)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.6)
Expand Down Expand Up @@ -132,7 +132,7 @@ GEM
rdoc (4.3.0)
ruby-stemmer (0.9.6)
ruby-stemmer (0.9.6-x86-mingw32)
sass (3.4.23)
sass (3.4.24)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand All @@ -144,7 +144,7 @@ GEM
rdoc (~> 4.0)
sentimental (1.4.1)
simple_oauth (0.3.1)
spring (2.0.1)
spring (2.0.2)
activesupport (>= 4.2)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
Expand All @@ -158,12 +158,10 @@ GEM
stemmer (1.0.1)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.6)
toastr-rails (1.0.3)
railties (>= 3.1.0)
tilt (2.0.7)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
turbolinks-source (5.0.3)
twitter (5.16.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
Expand All @@ -175,16 +173,16 @@ GEM
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
tzinfo-data (1.2017.1)
tzinfo-data (1.2017.2)
tzinfo (>= 1.0.0)
uglifier (3.1.8)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unf_ext (0.0.7.2-x86-mingw32)
unf_ext (0.0.7.4)
unf_ext (0.0.7.4-x86-mingw32)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
Expand All @@ -210,7 +208,6 @@ DEPENDENCIES
spring
sqlite3
stemmer
toastr-rails
turbolinks
twitter (= 5.16.0)
tzinfo-data
Expand Down
Binary file removed app/assets/images/logo.png
Binary file not shown.
Binary file modified app/assets/images/portfolio/p_01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/portfolio/p_03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/portfolio/p_04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/portfolio/p_05.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/portfolio/p_06.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/portfolio/p_07.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/portfolio/p_09.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/portfolio/p_10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/slider0.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/slider1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/slider2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/slider3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 6 additions & 20 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,14 @@
// about supported directives.
//
//= require jquery
//= require toastr
//= require jquery_ujs
//= require bootstrap
//= require jquery.lazyload
// require turbolinks
//= require_tree .

$(document).ready(function() {

toastr.options = {
"closeButton": false,
"debug": false,
"positionClass": "toast-top-right",
"onclick": null,
"showDuration": "300",
"hideDuration": "1000",
"timeOut": "5000",
"extendedTimeOut": "1000",
"showEasing": "swing",
"hideEasing": "linear",
"showMethod": "fadeIn",
"hideMethod": "fadeOut"
}

jQuery(document).ready(function ($) {
$("img").lazyload({
effect: "fadeIn"
});
});


22 changes: 9 additions & 13 deletions app/assets/javascripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$(".all-portfolios").isotope({
itemSelector : '.single-portfolio',

layoutMode: 'fitRows',
layoutMode: 'fitRows'
});
$('ul.filter li').click(function(){
$("ul.filter li").removeClass("active");
Expand All @@ -15,19 +15,16 @@ filter: selector,
animationOptions: {
duration: 750,
easing: 'linear',
queue: false,
queue: false
}
});
return false;
});
});




jQuery(document).ready(function () {


/*----------------------------------------------------*/
/* Animated Progress Bars
/*----------------------------------------------------*/
Expand All @@ -43,7 +40,7 @@ jQuery(document).ready(function () {
});

/*----------------------------------------------------*/
/* Crousel Team
/* Carousel Team
/*----------------------------------------------------*/
$('.all_team').owlCarousel({
items:4,
Expand All @@ -64,7 +61,7 @@ jQuery(document).ready(function () {
items:4
}
}
})
});

/*----------------------------------------------------*/
/* Testimonial crousel
Expand All @@ -88,7 +85,7 @@ jQuery(document).ready(function () {
items:1
}
}
})
});

/*----------------------------------------------------*/
/* Happy Client crousel
Expand All @@ -112,16 +109,15 @@ jQuery(document).ready(function () {
items:6
}
}
})
});



/*preloader*/
$(window).load(function() { // makes sure the whole site is loaded
$('#status').fadeOut(); // will first fade out the loading animation
$('#loader-wrapper').delay(200).fadeOut('slow'); // will fade out the white DIV that covers the website.
$('body').delay(200).css({'overflow-x':'hidden'});
$('#loader-wrapper').delay(250).fadeOut('slow'); // will fade out the white DIV that covers the website.
$('body').delay(250).css({'overflow-x':'hidden'});
})

});

});
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*
*= require bootstrap
*= require font-awesome
*= require toastr
* require_self
* require_tree .
*/
2 changes: 1 addition & 1 deletion app/assets/stylesheets/bootstrap-theme.min.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion app/assets/stylesheets/owl.carousel.css
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
.owl-carousel .owl-controls .owl-nav .owl-next,
.owl-carousel .owl-controls .owl-dot {
cursor: pointer;
cursor: hand;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
Expand Down
Loading