Skip to content

Commit 85c8120

Browse files
committed
Fix checkbox style issue
1 parent 03027bb commit 85c8120

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ gem 'bower-rails', '~> 0.10.0'
3333

3434
gem 'carmen-rails'
3535

36-
gem 'font-awesome-sass', '~> 5.12.0'
36+
gem 'font-awesome-rails'
37+
gem 'font-awesome-sass', '~> 5.15.1'
3738

3839
gem 'gibbon', git: 'git://github.com/amro/gibbon.git'
3940

Gemfile.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,9 @@ GEM
384384
fog-xml (0.1.3)
385385
fog-core
386386
nokogiri (>= 1.5.11, < 2.0.0)
387-
font-awesome-sass (5.12.0)
387+
font-awesome-rails (4.7.0.7)
388+
railties (>= 3.2, < 7)
389+
font-awesome-sass (5.15.1)
388390
sassc (>= 1.11)
389391
formatador (0.2.5)
390392
globalid (0.4.2)
@@ -732,7 +734,8 @@ DEPENDENCIES
732734
faker (~> 1.8.4)
733735
file_validators
734736
fog
735-
font-awesome-sass (~> 5.12.0)
737+
font-awesome-rails
738+
font-awesome-sass (~> 5.15.1)
736739
gibbon!
737740
graphql-client
738741
jquery-rails

app/assets/javascripts/components/application_agree_checkbox.js.coffee

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
''
1313

1414
render: ->
15-
console.log(@props.value)
1615
React.DOM.div
1716
className: 'form-group'
1817
React.DOM.label null

app/assets/javascripts/components/application_checkbox_group.js.coffee

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
defaultValue: option.value || []
5050
defaultChecked: @checkedValue(option.value)
5151
onChange: @changeValue
52+
className: "styled"
5253
React.DOM.label
5354
htmlFor: final_id
5455
option.name

app/assets/stylesheets/application.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
@import "bootstrap-sass-official/assets/stylesheets/bootstrap";
99
@import "font-awesome-sprockets";
1010
@import "font-awesome";
11-
@import "awesome-bootstrap-checkbox"
11+
@import "awesome-bootstrap-checkbox";
1212

1313
//don't put css in this file

vendor/assets/stylesheets/awesome-bootstrap-checkbox.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ $check-icon: $fa-var-check !default;
7171
&:checked + label::after{
7272
font-family: $font-family-icon;
7373
content: $check-icon;
74-
color: #01b2ac;
7574
}
7675

7776
&:disabled + label{

0 commit comments

Comments
 (0)