Skip to content

Commit

Permalink
Додане верхнє меню, додані стилі, доданий bootstrap, змінені стилі ст…
Browse files Browse the repository at this point in the history
…орінок
  • Loading branch information
lakatoshv committed May 25, 2018
1 parent 97ac65b commit fd07069
Show file tree
Hide file tree
Showing 1,345 changed files with 41,881 additions and 194 deletions.
12 changes: 11 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end


gem 'bootstrap-sass'

gem 'sass-rails', '~> 5.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.2'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', group: :development
gem 'sqlite3'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
Expand Down Expand Up @@ -55,3 +59,9 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'bootstrap', '~> 4.0.0.alpha6'

source 'https://rails-assets.org' do
gem 'rails-assets-tether', '>= 1.3.3'
end
13 changes: 13 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actioncable (5.0.2)
actionpack (= 5.0.2)
Expand Down Expand Up @@ -39,8 +40,16 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
autoprefixer-rails (6.7.7.2)
execjs
bcrypt (3.1.11)
bindex (0.5.0)
bootstrap (4.0.0.alpha6)
autoprefixer-rails (>= 6.0.3)
sass (>= 3.4.19)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.3)
byebug (9.0.6)
coffee-rails (4.2.1)
Expand Down Expand Up @@ -104,6 +113,7 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.2)
sprockets-rails (>= 2.0.0)
rails-assets-tether (1.4.0)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
Expand Down Expand Up @@ -166,6 +176,8 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap (~> 4.0.0.alpha6)
bootstrap-sass
byebug
coffee-rails (~> 4.2)
devise
Expand All @@ -174,6 +186,7 @@ DEPENDENCIES
listen (~> 3.0.5)
puma (~> 3.0)
rails (~> 5.0.2)
rails-assets-tether (>= 1.3.3)!
sass-rails (~> 5.0)
spring
spring-watcher-listen (~> 2.0.0)
Expand Down
Binary file added app/assets/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
288 changes: 288 additions & 0 deletions app/assets/fonts/glyphicons-halflings-regular.svg
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/fonts/glyphicons-halflings-regular.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require tether
//= require bootstrap-sprockets
//= require bootstrap
//= require_tree .

12 changes: 12 additions & 0 deletions app/assets/javascripts/bootstrap-sprockets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//= require ./bootstrap/transition
//= require ./bootstrap/alert
//= require ./bootstrap/button
//= require ./bootstrap/carousel
//= require ./bootstrap/collapse
//= require ./bootstrap/dropdown
//= require ./bootstrap/modal
//= require ./bootstrap/tab
//= require ./bootstrap/affix
//= require ./bootstrap/scrollspy
//= require ./bootstrap/tooltip
//= require ./bootstrap/popover
Loading

0 comments on commit fd07069

Please sign in to comment.