From 3bc53f9f09c13bb1b9f6dc736b940899f28a41f2 Mon Sep 17 00:00:00 2001 From: Alexey Stoletniy Date: Tue, 25 Apr 2017 11:47:22 +0300 Subject: [PATCH] Remove Premium-only styles from Free, cleanup styles [PREMIUM-1] --- assets/css/src/listing/newsletters.styl | 15 --------------- assets/js/src/newsletters/badges/badge.jsx | 3 +-- assets/js/src/newsletters/badges/stats.jsx | 8 +------- views/layout.html | 3 +++ 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/assets/css/src/listing/newsletters.styl b/assets/css/src/listing/newsletters.styl index eb46c81e8d..a8a030f3f6 100644 --- a/assets/css/src/listing/newsletters.styl +++ b/assets/css/src/listing/newsletters.styl @@ -2,7 +2,6 @@ $excellent-badge-color = #2993ab $good-badge-color = #f0b849 $bad-badge-color = #d54e21 $green-badge-color = #55bd56 -$grey-stat-color = #707070 #newsletters_container h2.nav-tab-wrapper @@ -23,20 +22,6 @@ $grey-stat-color = #707070 &_bad color: $bad-badge-color - &_grey - color: $grey-stat-color - - &_big - font-size: 23px - font-weight: 600 - line-height: normal - - &_spaced - margin-bottom: 1rem - - &_triple-spaced - margin-bottom: 3rem - &_hidden display: none diff --git a/assets/js/src/newsletters/badges/badge.jsx b/assets/js/src/newsletters/badges/badge.jsx index 8e4c873c1a..04d10512ea 100644 --- a/assets/js/src/newsletters/badges/badge.jsx +++ b/assets/js/src/newsletters/badges/badge.jsx @@ -6,8 +6,7 @@ class Badge extends React.Component { render() { const badgeClasses = classNames( 'mailpoet_badge', - this.props.type ? `mailpoet_badge_${this.props.type}` : '', - this.props.size ? `mailpoet_badge_size_${this.props.size}` : '' + this.props.type ? `mailpoet_badge_${this.props.type}` : '' ); const tooltip = this.props.tooltip ? this.props.tooltip.replace(/\n/g, '
') : false; diff --git a/assets/js/src/newsletters/badges/stats.jsx b/assets/js/src/newsletters/badges/stats.jsx index 6f3230b53b..1926a6e9d8 100644 --- a/assets/js/src/newsletters/badges/stats.jsx +++ b/assets/js/src/newsletters/badges/stats.jsx @@ -1,6 +1,5 @@ import MailPoet from 'mailpoet' import React from 'react' -import classNames from 'classnames' import Badge from './badge.jsx' @@ -90,14 +89,9 @@ class StatsBadge extends React.Component { ); if (this.props.headline) { - const headlineClasses = classNames( - `mailpoet_stat_${badgeType}`, - this.props.size ? `mailpoet_badge_size_${this.props.size}` : '' - ); - return (
- + {this.props.headline} {content}
diff --git a/views/layout.html b/views/layout.html index 091ae71d5d..bbdb4e7782 100644 --- a/views/layout.html +++ b/views/layout.html @@ -31,6 +31,9 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last') <%= stylesheet( 'admin.css' )%> + +<%= do_action('mailpoet_styles_admin_after') %> + <% if is_rtl %> <%= stylesheet('rtl.css') %>