diff --git a/.meteor/packages b/.meteor/packages index 070e3aa23..2bc420ec6 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -52,6 +52,7 @@ tsega:bootstrap3-datetimepicker@3.1.3_1 momentjs:moment aslagle:reactive-table aramk:tinycolor +fortawesome:fontawesome # Testing @@ -90,4 +91,3 @@ telescope-subscribe-to-posts telescope-tagline-banner # Custom Packages -svg-injector diff --git a/.meteor/versions b/.meteor/versions index e6a6d4318..ba81b9285 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -35,6 +35,7 @@ ejson@1.0.6 email@1.0.6 facebook@1.1.4 fastclick@1.0.3 +fortawesome:fontawesome@4.2.0_2 fourseven:scss@1.0.0 geojson-utils@1.0.3 handlebars@1.0.3 @@ -110,7 +111,6 @@ spiderable@1.0.7 srp@1.0.3 standard-app-packages@1.0.5 stylus@1.0.7 -svg-injector@0.0.1 tap:i18n@1.4.1 telescope-api@0.0.0 telescope-base@0.0.0 diff --git a/client/helpers/handlebars.js b/client/helpers/handlebars.js index 7f479cd61..bd294558d 100644 --- a/client/helpers/handlebars.js +++ b/client/helpers/handlebars.js @@ -87,4 +87,8 @@ UI.registerHelper('displayName', function(userOrUserId) { if (!!user) { return getDisplayName(user); } +}); + +UI.registerHelper('icon', function(iconName, iconClass) { + return getIcon(iconName, iconClass); }); \ No newline at end of file diff --git a/client/main.js b/client/main.js index 92c013639..3c807bd7a 100644 --- a/client/main.js +++ b/client/main.js @@ -12,15 +12,4 @@ Meteor.startup(function () { $('#rss-link').attr('title', i18n.t('new_posts')); }); -// AutoForm.debug(); - -Template.onRendered(function () { - var $svgs = this.$('img.svg'); - if ($svgs.length) { - SVGInjector($svgs, { - each: function (svg) { - $(svg).css('visibility', 'visible'); - } - }); - } -}); \ No newline at end of file +// AutoForm.debug(); \ No newline at end of file diff --git a/client/views/common/css.html b/client/views/common/css.html index 08b52a99b..60dd3ec1d 100644 --- a/client/views/common/css.html +++ b/client/views/common/css.html @@ -31,9 +31,14 @@ background-color: {{getSetting "buttonColor"}}; color: {{getSetting "buttonTextColor"}}; } - a:hover, .post-content .post-heading .post-title:hover, .post-content .post-upvote .upvote-link i, .comment-actions a i, .comment-actions.upvoted .upvote i, .comment-actions.downvoted .downvote i, .toggle-actions-link, .post-meta a:hover, .action:hover, .post-upvote .upvote-link i{ + a:hover, .post-content .post-heading .post-title:hover, .post-content .post-upvote .icon, .comment-actions a i, .comment-actions.upvoted .upvote i, .comment-actions.downvoted .downvote i, .toggle-actions-link, .post-meta a:hover, .action:hover, .post-upvote .upvote-link i, .post-actions .icon, .post-share .icon-share{ color: {{getSetting "buttonColor"}}; } + @media screen and (max-width: 600px) { + .post-discuss .icon, .post-discuss .action-count{ + color: {{getSetting "buttonColor"}}; + } + } .post-upvote .upvote-link i{ border-color: {{getSetting "buttonColor"}}; } @@ -44,6 +49,10 @@ /*color: {{getSetting "secondaryColor"}};*/ } + .xyz{ + color: {{getSetting "buttonColorHalfOpacity"}}; + } + .logo-image a{ max-height:{{getSetting "logoHeight"}}px; max-width:{{getSetting "logoWidth"}}px; diff --git a/client/views/common/css.js b/client/views/common/css.js index ee290d5fd..1d9151886 100644 --- a/client/views/common/css.js +++ b/client/views/common/css.js @@ -26,5 +26,8 @@ Template[getTemplate('css')].helpers({ }, headerTextColorHalfOpacity: function () { return tinycolor(getSetting("headerTextColor")).setAlpha(0.5); + }, + buttonColorHalfOpacity: function () { + return tinycolor(getSetting("buttonColor")).setAlpha(0.5); } }); \ No newline at end of file diff --git a/client/views/nav/dropdown_component.html b/client/views/nav/dropdown_component.html index 43c8a2fd7..53d977813 100644 --- a/client/views/nav/dropdown_component.html +++ b/client/views/nav/dropdown_component.html @@ -50,8 +50,8 @@ dropdownMode (String) [optional] {{/with}} - - + {{{icon "open"}}} + {{{icon "close"}}} diff --git a/client/views/posts/modules/post_actions.html b/client/views/posts/modules/post_actions.html index 1cf0989c5..49e0c1450 100644 --- a/client/views/posts/modules/post_actions.html +++ b/client/views/posts/modules/post_actions.html @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/client/views/posts/modules/post_discuss.html b/client/views/posts/modules/post_discuss.html index ac904a227..b43bbc242 100644 --- a/client/views/posts/modules/post_discuss.html +++ b/client/views/posts/modules/post_discuss.html @@ -1,6 +1,6 @@