diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 index c8082cc84dd..a8acc0e2f04 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 @@ -154,7 +154,7 @@ export default Ember.Controller.extend({ @computed("maximized") maximizeIcon(maximized) { - return maximized ? "compress" : "expand"; + return maximized ? "discourse-compress" : "discourse-expand"; }, @computed("model.isSaving") diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js.es6 index e1172df2e29..def2000913f 100644 --- a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6 @@ -26,6 +26,8 @@ export default Ember.Component.extend({ @computed("composeState") fullscreenIcon(composeState) { - return composeState === "fullscreen" ? "compress" : "expand"; + return composeState === "fullscreen" + ? "discourse-compress" + : "discourse-expand"; } }); diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss index 4f96f0592d7..03aefbae8e6 100644 --- a/app/assets/stylesheets/common/base/lightbox.scss +++ b/app/assets/stylesheets/common/base/lightbox.scss @@ -60,8 +60,9 @@ right: 7px; &:before { // ideally, the SVG used here should be in HTML and reference the SVG sprite + // the SVG used here is the "expand" icon from FontAwesome 4.7.0 content: svg-uri( - ' ' + '' ); opacity: 0.8; } diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb index 0a8a7e18dbc..6d5f8b7e1cf 100644 --- a/lib/svg_sprite/svg_sprite.rb +++ b/lib/svg_sprite/svg_sprite.rb @@ -50,6 +50,8 @@ module SvgSprite "crosshairs", "cube", "desktop", + "discourse-compress", + "discourse-expand", "download", "ellipsis-h", "ellipsis-v", @@ -59,7 +61,6 @@ module SvgSprite "exclamation-circle", "exclamation-triangle", "external-link-alt", - "expand", "fab-apple", "fab-discourse", "fab-facebook-f", @@ -223,7 +224,7 @@ Discourse SVG subset of #{fa_license} """.dup - Dir["#{Rails.root}/vendor/assets/svg-icons/fontawesome/*.svg"].each do |fname| + Dir["#{Rails.root}/vendor/assets/svg-icons/**/*.svg"].each do |fname| svg_file = Nokogiri::XML(File.open(fname)) do |config| config.options = Nokogiri::XML::ParseOptions::NOBLANKS end @@ -247,7 +248,7 @@ Discourse SVG subset of #{fa_license} def self.search(searched_icon) searched_icon = process(searched_icon.dup) - Dir["#{Rails.root}/vendor/assets/svg-icons/fontawesome/*.svg"].each do |fname| + Dir["#{Rails.root}/vendor/assets/svg-icons/**/*.svg"].each do |fname| svg_file = Nokogiri::XML(File.open(fname)) svg_filename = "#{File.basename(fname, ".svg")}" diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg new file mode 100644 index 00000000000..fa9e9f03bc0 --- /dev/null +++ b/vendor/assets/svg-icons/discourse-additional.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + +