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
4 changes: 2 additions & 2 deletions app/assets/stylesheets/casein/casein.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'bootstrap-sprockets';
@import "bootstrap/functions";
@import 'bootstrap';
@import 'casein-bootstrap-overrides';

Expand Down Expand Up @@ -254,4 +254,4 @@ label.control-label small {
width: 14%;
margin-bottom: 0px;
}
}
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/casein/login.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "bootstrap-sprockets";
@import "bootstrap/functions";
@import "bootstrap";
@import "casein-bootstrap-overrides";

Expand Down Expand Up @@ -71,4 +71,4 @@ body.casein-login {
border-radius: 6px;
}
}
}
}
2 changes: 1 addition & 1 deletion app/views/casein/admin_user_sessions/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= form_for @admin_user_session, url: casein_admin_user_session_path do |f| %>
<% if @admin_user_session.errors.any? %>
<div id="error_messages" class="alert alert-danger">
<% @admin_user_session.errors.keys.each do |key| %>
<% @admin_user_session.errors.attribute_names.each do |key| %>
<%= (key.to_s.humanize + " ") unless key == :base %>
<%= @admin_user_session.errors[key].first %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion casein.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
]

s.add_dependency 'authlogic', '~> 6.1'
s.add_dependency 'bootstrap-sass', '~> 3.4.0'
s.add_dependency 'bootstrap', '~> 5.3.3'
s.add_dependency 'jquery-rails', '>= 0'
s.add_dependency 'sassc-rails', '>= 2.0.0'
s.add_dependency 'scrypt', '>= 1.2.1'
Expand Down
2 changes: 1 addition & 1 deletion lib/casein/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'casein'
require 'rails'
require 'bootstrap-sass'
require 'bootstrap'
require 'jquery-rails'

module Casein
Expand Down
2 changes: 1 addition & 1 deletion lib/casein/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

module Casein
VERSION_HASH = { major: 5, minor: 5, patch: 1, build: 0 }
VERSION_HASH = { major: 5, minor: 5, patch: 3, build: 0 }
VERSION = VERSION_HASH.values.join('.')
end