diff --git a/app/assets/fonts/zocial-regular-webfont.eot b/app/assets/fonts/zocial-regular-webfont.eot deleted file mode 100644 index 5db5d2166..000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/zocial-regular-webfont.svg b/app/assets/fonts/zocial-regular-webfont.svg deleted file mode 100644 index 130d83ca1..000000000 --- a/app/assets/fonts/zocial-regular-webfont.svg +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/fonts/zocial-regular-webfont.ttf b/app/assets/fonts/zocial-regular-webfont.ttf deleted file mode 100644 index a04356636..000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/zocial-regular-webfont.woff b/app/assets/fonts/zocial-regular-webfont.woff deleted file mode 100644 index 5a91cf305..000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.woff and /dev/null differ diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c19763d3c..3f87f8fb9 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,7 +1,7 @@ @import "vendor/normalize"; +@import "vendor/font_awesome/font-awesome"; @import "common/foundation/helpers"; @import "common/foundation/base"; -@import "vendor/font_awesome/font-awesome"; @import "vendor/select2"; @import "common/foundation/mixins"; @import "common/foundation/variables"; diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index 0964956a8..0c05fd198 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -5,6 +5,7 @@ // Base // -------------------------------------------------- + .btn { display: inline-block; margin: 0; @@ -125,20 +126,21 @@ color: $secondary; } &:before { - margin-right: 7px; - font-family: zocial; - line-height: 0.9; + margin-right: 9px; + font-family: FontAwesome; + line-height: 1.6em; + font-size: 1.3em; } &.google, &.google_oauth2 { background: $google; &:before { - content: "G"; + content: $fa-var-google; } } &.facebook { background: $facebook; &:before { - content: "f"; + content: $fa-var-facebook; } } &.cas { @@ -147,19 +149,19 @@ &.twitter { background: $twitter; &:before { - content: "T"; + content: $fa-var-twitter; } } &.yahoo { background: $yahoo; &:before { - content: "Y"; + content: $fa-var-yahoo; } } &.github { background: $github; &:before { - content: "g"; + content: $fa-var-github; } } } diff --git a/app/views/common/_special_font_face.html.erb b/app/views/common/_special_font_face.html.erb index d6b169e35..27e5cb67e 100644 --- a/app/views/common/_special_font_face.html.erb +++ b/app/views/common/_special_font_face.html.erb @@ -21,12 +21,4 @@ font-weight: normal; font-style: normal; } - - @font-face { - font-family: 'zocial'; - src: url('<%=asset_path "zocial-regular-webfont.woff" %>?<%= font_domain %>') format('woff'), - url('<%=asset_path "zocial-regular-webfont.ttf" %>?<%= font_domain %>') format('truetype'); - font-weight: normal; - font-style: normal; - }