diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index 72f46b28be..51063a6bfe 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -36,12 +36,12 @@ nav { .top-bar-section .has-dropdown > a { padding-right: ($topbar-height / 3) !important; - i.ofn-i_022-cog, i.fa{ + i.ofn-i_022-cog, .ofn-i_071-globe { font-size: 24px; line-height: $topbar-height; } - i.fa.fa-globe { + i.ofn-i_071-globe { color: #666; font-size: 27px } diff --git a/app/assets/stylesheets/darkswarm/style.css.scss b/app/assets/stylesheets/darkswarm/style.css.scss index 3d2a98276b..f3eca6b24b 100644 --- a/app/assets/stylesheets/darkswarm/style.css.scss +++ b/app/assets/stylesheets/darkswarm/style.css.scss @@ -233,3 +233,6 @@ .ofn-i_070-shop-map-reversed:before { content: "\e645"; } +.ofn-i_071-globe:before { + content: "\e646"; +} diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 3df5328d6c..c612388071 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -13,7 +13,6 @@ - else = favicon_link_tag "/favicon-staging.ico" %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"} - %link{href: "https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css", rel: "stylesheet"} = yield :scripts %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"} diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 18b9660927..96347a5d80 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -61,9 +61,9 @@ %a{href: '/'} = t 'title' - if I18n.available_locales.count > 1 - %li.language-switcher.has-dropdown.not-click + %li.language-switcher.has-dropdown %a{href: '#'} - %i.fa.fa-globe + %i.ofn-i_071-globe %ul.dropdown - I18n.available_locales.each do |l| %li diff --git a/public/OFN.eot b/public/OFN.eot old mode 100755 new mode 100644 index b1eddc19e9..81a9ae07b0 Binary files a/public/OFN.eot and b/public/OFN.eot differ diff --git a/public/OFN.svg b/public/OFN.svg old mode 100755 new mode 100644 index 94db6c7ac5..956c951a2c --- a/public/OFN.svg +++ b/public/OFN.svg @@ -6,75 +6,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/OFN.ttf b/public/OFN.ttf old mode 100755 new mode 100644 index f901ac82d6..05ba6831e2 Binary files a/public/OFN.ttf and b/public/OFN.ttf differ diff --git a/public/OFN.woff b/public/OFN.woff old mode 100755 new mode 100644 index 5c54beb452..d19723458d Binary files a/public/OFN.woff and b/public/OFN.woff differ