consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3606 from consul/fontawesome

Browse Source 
Add Font Awesome icons
This commit is contained in:
Alberto
2020-01-18 11:07:03 +01:00
committed by GitHub
parent 4653841284 974064a742
commit 34c75fec4b
5 changed files with 102 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -17,6 +17,7 @@ gem "delayed_job_active_record", "~> 4.1.3"
gem "devise", "~> 4.7.1" gem "devise", "~> 4.7.1"
gem "devise-async", "~> 1.0.0" gem "devise-async", "~> 1.0.0"
gem "devise_security_extension", git: "https://github.com/phatworx/devise_security_extension.git" #, "~> 0.10" gem "devise_security_extension", git: "https://github.com/phatworx/devise_security_extension.git" #, "~> 0.10"
gem "font-awesome-sass", "~> 5.8.1"
gem "foundation-rails", "~> 6.4.3.0" gem "foundation-rails", "~> 6.4.3.0"
gem "foundation_rails_helper", "~> 3.0.0" gem "foundation_rails_helper", "~> 3.0.0"
gem "globalize", "~> 5.2.0" gem "globalize", "~> 5.2.0"

3
Gemfile.lock
View File

@@ -223,6 +223,8 @@ GEM
faraday-http-cache (2.0.0) faraday-http-cache (2.0.0)
faraday (~> 0.8) faraday (~> 0.8)
ffi (1.11.1) ffi (1.11.1)
font-awesome-sass (5.8.1)
sassc (>= 1.11)
foundation-rails (6.4.3.0) foundation-rails (6.4.3.0)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
@@ -626,6 +628,7 @@ DEPENDENCIES
erb_lint erb_lint
factory_bot_rails (~> 4.8.2) factory_bot_rails (~> 4.8.2)
faker (~> 1.8.7) faker (~> 1.8.7)
font-awesome-sass (~> 5.8.1)
foundation-rails (~> 6.4.3.0) foundation-rails (~> 6.4.3.0)
foundation_rails_helper (~> 3.0.0) foundation_rails_helper (~> 3.0.0)
github_changelog_generator (~> 1.15.0) github_changelog_generator (~> 1.15.0)

2
app/assets/stylesheets/application.scss
View File

@@ -1,6 +1,8 @@
@import "social-share-button"; @import "social-share-button";
@import "foundation_and_overrides"; @import "foundation_and_overrides";
@import "fonts"; @import "fonts";
@import "font-awesome-sprockets";
@import "font-awesome";
@import "icons"; @import "icons";
@import "mixins"; @import "mixins";
@import "admin"; @import "admin";

181
app/assets/stylesheets/icons.scss
View File

@@ -11,286 +11,295 @@
font-style: normal; font-style: normal;
} }
[data-icon]::before { [data-icon]::before,
font-family: "icons" !important;
content: attr(data-icon);
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
[class^="icon-"]::before, [class^="icon-"]::before,
[class*=" icon-"]::before { [class*=" icon-"]::before {
font-family: "icons" !important; font-family: "Font Awesome 5 Free";
font-style: normal !important; font-weight: bold;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
speak: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
} }
.icon-angle-down::before { .icon-angle-down::before {
content: "\61"; content: "\f107";
} }
.icon-angle-left::before { .icon-angle-left::before {
content: "\62"; content: "\f104";
} }
.icon-angle-right::before { .icon-angle-right::before {
content: "\63"; content: "\f105";
} }
.icon-angle-up::before { .icon-angle-up::before {
content: "\64"; content: "\f106";
} }
.icon-comments::before { .icon-comments::before {
content: "\65"; content: "\f086";
font-weight: normal;
} }
.icon-twitter::before { .icon-twitter::before {
content: "\66"; content: "\f099";
} }
.icon-calendar::before { .icon-calendar::before {
content: "\67"; content: "\f133";
font-weight: normal;
} }
.icon-debates::before { .icon-debates::before {
content: "\69"; content: "\f27a";
} }
.icon-unlike::before { .icon-unlike::before {
content: "\6a"; content: "\f165";
} }
.icon-like::before { .icon-like::before {
content: "\6b"; content: "\f164";
} }
.icon-check::before { .icon-check::before {
content: "\6c"; content: "\f00c";
} }
.icon-edit::before { .icon-edit::before {
content: "\6d"; content: "\f303";
} }
.icon-user::before { .icon-user::before {
content: "\6f"; content: "\f007";
} }
.icon-settings::before { .icon-settings::before {
content: "\71"; content: "\f013";
} }
.icon-stats::before { .icon-stats::before {
content: "\72"; content: "\f201";
} }
.icon-proposals::before { .icon-proposals::before {
content: "\68"; content: "\f0eb";
} }
.icon-organizations::before { .icon-organizations::before {
content: "\73"; content: "\f0c0";
} }
.icon-deleted::before { .icon-deleted::before {
content: "\74"; content: "\f05e";
} }
.icon-tag::before { .icon-tag::before {
content: "\75"; content: "\f02b";
} }
.icon-eye::before { .icon-eye::before {
content: "\70"; content: "\f06e";
font-weight: normal;
} }
.icon-x::before { .icon-x::before {
content: "\76"; content: "\f00d";
} }
.icon-flag::before { .icon-flag::before {
content: "\77"; content: "\f024";
font-weight: normal;
} }
.icon-comment::before { .icon-comment::before {
content: "\79"; content: "\f075";
} }
.icon-reply::before { .icon-reply::before {
content: "\7a"; content: "\f122";
} }
.icon-facebook::before { .icon-facebook::before {
content: "\41"; content: "\f39e";
} }
.icon-google-plus::before { .icon-google-plus::before {
content: "\42"; content: "\f0d5";
} }
.icon-search::before { .icon-search::before {
content: "\45"; content: "\f002";
} }
.icon-external::before { .icon-external::before {
content: "\46"; content: "\f35d";
} }
.icon-video::before { .icon-video::before {
content: "\44"; content: "\f144";
} }
.icon-document::before { .icon-document::before {
content: "\47"; content: "\f15b";
font-weight: normal;
} }
.icon-print::before { .icon-print::before {
content: "\48"; content: "\f02f";
} }
.icon-blog::before { .icon-blog::before {
content: "\4a"; content: "\f19a";
} }
.icon-box::before { .icon-box::before {
content: "\49"; content: "\f187";
} }
.icon-youtube::before { .icon-youtube::before {
content: "\4b"; content: "\f167";
} }
.icon-letter::before { .icon-letter::before {
content: "\4c"; content: "\f0e0";
font-weight: normal;
} }
.icon-circle::before { .icon-circle::before {
content: "\43"; content: "\f111";
} }
.icon-circle-o::before { .icon-circle-o::before {
content: "\4d"; content: "\f111";
font-weight: normal;
} }
.icon-help::before { .icon-help::before {
content: "\4e"; content: "\f059";
} }
.icon-budget::before { .icon-budget::before {
content: "\53"; content: "\f200";
} }
.icon-notification::before { .icon-notification::before {
content: "\6e"; content: "\f0f3";
} }
.icon-no-notification::before { .icon-no-notification::before {
content: "\78"; content: "\f0f3";
font-weight: normal;
} }
.icon-whatsapp::before { .icon-whatsapp::before {
content: "\50"; content: "\f232";
} }
.icon-zip::before { .icon-zip::before {
content: "\4f"; content: "\f1c6";
font-weight: normal;
} }
.icon-banner::before { .icon-banner::before {
content: "\51"; content: "\f00b";
} }
.icon-arrow-down::before { .icon-arrow-down::before {
content: "\52"; content: "\f0dd";
} }
.icon-arrow-left::before { .icon-arrow-left::before {
content: "\54"; content: "\f0d9";
} }
.icon-arrow-right::before { .icon-arrow-right::before {
content: "\55"; content: "\f0da";
} }
.icon-check-circle::before { .icon-check-circle::before {
content: "\56"; content: "\f058";
} }
.icon-arrow-top::before { .icon-arrow-top::before {
content: "\57"; content: "\f0de";
} }
.icon-checkmark-circle::before { .icon-checkmark-circle::before {
content: "\59"; content: "\f058";
font-weight: normal;
} }
.icon-minus-square::before { .icon-minus-square::before {
content: "\58"; content: "\f146";
font-weight: normal;
} }
.icon-plus-square::before { .icon-plus-square::before {
content: "\5a"; content: "\f0fe";
font-weight: normal;
} }
.icon-expand::before { .icon-expand::before {
content: "\30"; content: "\f31e";
} }
.icon-telegram::before { .icon-telegram::before {
content: "\31"; content: "\f3fe";
} }
.icon-instagram::before { .icon-instagram::before {
content: "\32"; content: "\f16d";
} }
.icon-image::before { .icon-image::before {
content: "\33"; content: "\f03e";
font-weight: normal;
} }
.icon-search-plus::before { .icon-search-plus::before {
content: "\34"; content: "\f00e";
} }
.icon-search-minus::before { .icon-search-minus::before {
content: "\35"; content: "\f010";
} }
.icon-calculator::before { .icon-calculator::before {
content: "\36"; content: "\f1ec";
} }
.icon-map-marker::before { .icon-map-marker::before {
content: "\37"; content: "\f3c5";
} }
.icon-user-plus::before { .icon-user-plus::before {
content: "\38"; content: "\f234";
} }
.icon-file-text-o::before { .icon-file-text-o::before {
content: "\39"; content: "\f15c";
font-weight: normal;
} }
.icon-file-text::before { .icon-file-text::before {
content: "\21"; content: "\f15c";
} }
.icon-bars::before { .icon-bars::before {
content: "\22"; content: "\f0c9";
}
.icon-blog,
.icon-facebook,
.icon-google-plus,
.icon-instagram,
.icon-telegram,
.icon-twitter,
.icon-whatsapp,
.icon-youtube {
&::before {
font-family: "Font Awesome 5 Brands";
}
} }
.icon-quote-before::before { .icon-quote-before::before {

2
app/assets/stylesheets/layout.scss
View File

@@ -346,6 +346,7 @@ a {
clear: both; clear: both;
color: $text-medium; color: $text-medium;
display: inline-block; display: inline-block;
padding-right: $line-height / 2;
} }
.back:not([class^="icon-"]) { .back:not([class^="icon-"]) {
@@ -2230,7 +2231,6 @@ table {
.flag-disable, .flag-disable,
.flag-active { .flag-active {
line-height: 0; line-height: 0;
vertical-align: sub;
} }
.flag-disable { .flag-disable {