Skip to content

Commit 024ada0

Browse files
committed
Switch to Bootstrap 4
1 parent 81d86d5 commit 024ada0

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

app/assets/stylesheets/accounts.css.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
2-
@import "bootstrap-sprockets";
31
@import "bootstrap";
42

53
body {

app/assets/stylesheets/publify_admin.css.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44
*= require tagmanager
55
*= require sidebar_admin
66
*/
7-
// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
8-
@import "bootstrap-sprockets";
97
@import "bootstrap";

lib/publify_core.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
require "publify_core/text_filter/twitterfilter"
1616
require "publify_core/string_ext"
1717

18-
require "bootstrap-sass"
18+
require "bootstrap"
1919
require "carrierwave"
2020
require "jquery-rails"
2121
require "jquery-ui-rails"

publify_core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
2121

2222
s.add_dependency "aasm", "~> 5.0"
2323
s.add_dependency "akismet", "~> 3.0"
24-
s.add_dependency "bootstrap-sass", "~> 3.4.0"
24+
s.add_dependency "bootstrap", "~> 4.6.2"
2525
s.add_dependency "cancancan", "~> 3.0"
2626
s.add_dependency "carrierwave", "~> 3.0"
2727
s.add_dependency "commonmarker", "~> 0.23.2"

0 commit comments

Comments
 (0)