diff --git a/ashes/src/components/activity-notifications/panel.jsx b/ashes/src/components/activity-notifications/panel.jsx index 14dd305829..e47ac9cfd8 100644 --- a/ashes/src/components/activity-notifications/panel.jsx +++ b/ashes/src/components/activity-notifications/panel.jsx @@ -6,7 +6,7 @@ import PropTypes from 'prop-types'; import classNames from 'classnames'; // components -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import NotificationItem from '../activity-notifications/item'; import { PrimaryButton } from 'components/core/button'; diff --git a/ashes/src/components/channels/amazon.jsx b/ashes/src/components/channels/amazon.jsx index b4433f5e28..fca5305494 100644 --- a/ashes/src/components/channels/amazon.jsx +++ b/ashes/src/components/channels/amazon.jsx @@ -9,7 +9,7 @@ import { bindActionCreators } from 'redux'; // components import { PageTitle } from 'components/section-title'; import { PrimaryButton } from 'components/core/button'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import FormField from 'components/forms/formfield'; import Spinner from 'components/core/spinner'; diff --git a/ashes/src/components/common/totals.jsx b/ashes/src/components/common/totals.jsx index d4ec08d636..9de75fb708 100644 --- a/ashes/src/components/common/totals.jsx +++ b/ashes/src/components/common/totals.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import _ from 'lodash'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import Currency from './currency'; const TotalsFooter = props => { diff --git a/ashes/src/components/core/content-box/content-box.css b/ashes/src/components/core/content-box/content-box.css new file mode 100644 index 0000000000..0d5125fb58 --- /dev/null +++ b/ashes/src/components/core/content-box/content-box.css @@ -0,0 +1,32 @@ +.box { + color: #484848; + position: relative; + border: 1px solid #d9d9d9; + margin-bottom: 20px; +} + +.header { + display: flex; + align-items: center; + padding: 22px 20px 21px; + + background-color: #f7f7f7; + border-bottom: 1px solid #d9d9d9; + + font-size: 16px; + font-weight: 600; + line-height: 1; +} + +.title { + flex: 1; +} + +.controls { + +} + +.body { + padding: 20px; + background-color: #fff; +} diff --git a/ashes/src/components/core/content-box/content-box.jsx b/ashes/src/components/core/content-box/content-box.jsx new file mode 100644 index 0000000000..029e2dafe1 --- /dev/null +++ b/ashes/src/components/core/content-box/content-box.jsx @@ -0,0 +1,47 @@ +/* @flow */ + +// libs +import { isEmpty } from 'lodash'; +import classNames from 'classnames'; +import React, { Element } from 'react'; + +// styles +import s from './content-box.css'; + +type Props = { + id: string, + title: string | Element, + className: string, + bodyClassName: string, + actionBlock: Element, + children: Element, + footer: Element, + indentContent: boolean, + renderContent: Function, + viewContent: Element, +} + +export default (props: Props) => { + let body = props.children; + + if (isEmpty(body)) { + if (props.renderContent) { + body = props.renderContent(); + } else if (props.viewContent) { + body = props.viewContent; + } + } + + return ( +
+
+
{props.title}
+
{props.actionBlock}
+
+
+ {body} +
+ {props.footer} +
+ ); +}; diff --git a/ashes/src/components/core/content-box/index.js b/ashes/src/components/core/content-box/index.js new file mode 100644 index 0000000000..44b4b00be3 --- /dev/null +++ b/ashes/src/components/core/content-box/index.js @@ -0,0 +1 @@ +export default from './content-box'; diff --git a/ashes/src/components/coupons/form/coupon-codes.jsx b/ashes/src/components/coupons/form/coupon-codes.jsx index b05ec91856..7426f062fd 100644 --- a/ashes/src/components/coupons/form/coupon-codes.jsx +++ b/ashes/src/components/coupons/form/coupon-codes.jsx @@ -7,7 +7,7 @@ import { autobind } from 'core-decorators'; import { connect } from 'react-redux'; // components -import ContentBox from '../../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import RadioButton from 'components/core/radio-button'; import Counter from 'components/core/counter'; import FormField from '../../forms/formfield'; diff --git a/ashes/src/components/coupons/form/usage-rules.jsx b/ashes/src/components/coupons/form/usage-rules.jsx index 314bf3ae5b..9c0bc183b5 100644 --- a/ashes/src/components/coupons/form/usage-rules.jsx +++ b/ashes/src/components/coupons/form/usage-rules.jsx @@ -6,7 +6,7 @@ import React, { Component, Element } from 'react'; import { autobind } from 'core-decorators'; // components -import ContentBox from '../../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import RadioButton from 'components/core/radio-button'; import Counter from 'components/core/counter'; diff --git a/ashes/src/components/customers-groups/group-details.jsx b/ashes/src/components/customers-groups/group-details.jsx index 3f38f46fc1..c30c365720 100644 --- a/ashes/src/components/customers-groups/group-details.jsx +++ b/ashes/src/components/customers-groups/group-details.jsx @@ -34,7 +34,7 @@ import BulkMessages from 'components/bulk-actions/bulk-messages'; import { SelectableSearchList, makeTotalCounter } from 'components/list-page'; import { PrimaryButton, Button } from 'components/core/button'; import MultiSelectRow from 'components/table/multi-select-row'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import Criterion from './editor/criterion-view'; import CustomerGroupStats from './stats'; import SearchCustomersModal from './customers/search-modal'; diff --git a/ashes/src/components/customers/account-password.jsx b/ashes/src/components/customers/account-password.jsx index 1a7f682959..242a0e8483 100644 --- a/ashes/src/components/customers/account-password.jsx +++ b/ashes/src/components/customers/account-password.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; export default class CustomerAccountPassword extends React.Component { diff --git a/ashes/src/components/customers/account-status.jsx b/ashes/src/components/customers/account-status.jsx index 04e3ec1e68..4045fec461 100644 --- a/ashes/src/components/customers/account-status.jsx +++ b/ashes/src/components/customers/account-status.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import { SliderCheckbox } from 'components/core/checkbox'; import { connect } from 'react-redux'; import * as CustomersActions from '../../modules/customers/details'; diff --git a/ashes/src/components/customers/address-book.jsx b/ashes/src/components/customers/address-book.jsx index d66e8074d6..b2611554a6 100644 --- a/ashes/src/components/customers/address-book.jsx +++ b/ashes/src/components/customers/address-book.jsx @@ -2,7 +2,7 @@ import _ from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import Addresses, { createAddressBox } from '../addresses/addresses'; import AddressBox from '../addresses/address-box'; import AddressForm from '../addresses/address-form'; diff --git a/ashes/src/components/customers/contacts.jsx b/ashes/src/components/customers/contacts.jsx index 7ee1fb8b22..8fee0dcf1b 100644 --- a/ashes/src/components/customers/contacts.jsx +++ b/ashes/src/components/customers/contacts.jsx @@ -9,7 +9,7 @@ import { connect } from 'react-redux'; import * as CustomerContactActions from '../../modules/customers/contacts'; // components -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import FormField from '../forms/formfield'; import Form from '../forms/form'; import { ApiErrors } from 'components/utils/errors'; diff --git a/ashes/src/components/customers/credit-cards.jsx b/ashes/src/components/customers/credit-cards.jsx index 3a7f27c2f0..76f29827c9 100644 --- a/ashes/src/components/customers/credit-cards.jsx +++ b/ashes/src/components/customers/credit-cards.jsx @@ -6,7 +6,7 @@ import { autobind } from 'core-decorators'; import * as CustomerCreditCardActions from '../../modules/customers/credit-cards'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import EmptyText from '../content-box/empty-text'; import CreditCardBox from '../credit-cards/card-box'; import ConfirmationModal from 'components/core/confirmation-modal'; diff --git a/ashes/src/components/customers/groups/groups.jsx b/ashes/src/components/customers/groups/groups.jsx index 69d2213ed1..22fb970de7 100644 --- a/ashes/src/components/customers/groups/groups.jsx +++ b/ashes/src/components/customers/groups/groups.jsx @@ -9,7 +9,7 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import classNames from 'classnames'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import { AddButton, DeleteButton } from 'components/core/button'; import SearchGroupModal from './search-group-modal'; diff --git a/ashes/src/components/customers/notification-settings.jsx b/ashes/src/components/customers/notification-settings.jsx index 87695afbf2..0766f7ab09 100644 --- a/ashes/src/components/customers/notification-settings.jsx +++ b/ashes/src/components/customers/notification-settings.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import { SliderCheckbox } from 'components/core/checkbox'; export default class CustomerNotificationSettings extends React.Component { diff --git a/ashes/src/components/customers/roles.jsx b/ashes/src/components/customers/roles.jsx index 95c53a3a71..6600e2b50b 100644 --- a/ashes/src/components/customers/roles.jsx +++ b/ashes/src/components/customers/roles.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; export default class CustomerRoles extends React.Component { diff --git a/ashes/src/components/customers/suggest-products.jsx b/ashes/src/components/customers/suggest-products.jsx index 5dd3c3329c..1f4ef9a0f6 100644 --- a/ashes/src/components/customers/suggest-products.jsx +++ b/ashes/src/components/customers/suggest-products.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import { Button } from 'components/core/button'; import Api from 'lib/api'; diff --git a/ashes/src/components/discounts-panel/discounts-panel.jsx b/ashes/src/components/discounts-panel/discounts-panel.jsx index 032b1c538c..ac1b3edc8e 100644 --- a/ashes/src/components/discounts-panel/discounts-panel.jsx +++ b/ashes/src/components/discounts-panel/discounts-panel.jsx @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import _ from 'lodash'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import PanelHeader from 'components/panel-header/panel-header'; import DiscountRow from './discount-row'; import TableView from 'components/table/tableview'; diff --git a/ashes/src/components/merchant-applications/details.jsx b/ashes/src/components/merchant-applications/details.jsx index 3d220319f4..0f6f78778a 100644 --- a/ashes/src/components/merchant-applications/details.jsx +++ b/ashes/src/components/merchant-applications/details.jsx @@ -10,7 +10,7 @@ import _ from 'lodash'; import { Dropdown } from 'components/dropdown'; import { PageTitle } from 'components/section-title'; import { PrimaryButton } from 'components/core/button'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import Spinner from 'components/core/spinner'; // redux diff --git a/ashes/src/components/object-form/object-form.jsx b/ashes/src/components/object-form/object-form.jsx index 354c049616..af5f5a74b0 100644 --- a/ashes/src/components/object-form/object-form.jsx +++ b/ashes/src/components/object-form/object-form.jsx @@ -2,7 +2,7 @@ import React from 'react'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import ObjectFormInner from './object-form-inner'; type Props = { diff --git a/ashes/src/components/object-page/object-details-deux.jsx b/ashes/src/components/object-page/object-details-deux.jsx index 4e4bda427f..760341c0cc 100644 --- a/ashes/src/components/object-page/object-details-deux.jsx +++ b/ashes/src/components/object-page/object-details-deux.jsx @@ -14,7 +14,7 @@ import { addKeys } from 'lib/react-utils'; // components import { Form } from 'components/forms'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import ObjectFormInner from 'components/object-form/object-form-inner'; import ObjectScheduler from 'components/object-scheduler/object-scheduler'; import Tags from 'components/tags/tags'; diff --git a/ashes/src/components/object-page/object-details.jsx b/ashes/src/components/object-page/object-details.jsx index a459e5c2e3..10262d9439 100644 --- a/ashes/src/components/object-page/object-details.jsx +++ b/ashes/src/components/object-page/object-details.jsx @@ -11,7 +11,7 @@ import { expandRefs } from 'lib/object-schema'; import { addKeys } from 'lib/react-utils'; // components -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import ObjectFormInner from '../object-form/object-form-inner'; import ObjectScheduler from '../object-scheduler/object-scheduler'; import { Form } from '../forms'; diff --git a/ashes/src/components/orders/order-coupons.jsx b/ashes/src/components/orders/order-coupons.jsx index 5d70f1d9d8..7dc1c46a77 100644 --- a/ashes/src/components/orders/order-coupons.jsx +++ b/ashes/src/components/orders/order-coupons.jsx @@ -3,7 +3,7 @@ import React, { Component, Element } from 'react'; import _ from 'lodash'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import CouponsPanel from 'components/coupons-panel/coupons-panel'; import PanelHeader from 'components/panel-header/panel-header'; diff --git a/ashes/src/components/orders/order-line-items.jsx b/ashes/src/components/orders/order-line-items.jsx index 0790c0d33e..58f99314f7 100644 --- a/ashes/src/components/orders/order-line-items.jsx +++ b/ashes/src/components/orders/order-line-items.jsx @@ -2,7 +2,7 @@ import React from 'react'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import SkuLineItems from 'components/sku-line-items/sku-line-items'; import OrderParagon from 'paragons/order'; diff --git a/ashes/src/components/orders/payments.jsx b/ashes/src/components/orders/payments.jsx index 59a20a1ca7..e98b817790 100644 --- a/ashes/src/components/orders/payments.jsx +++ b/ashes/src/components/orders/payments.jsx @@ -2,7 +2,7 @@ import React, { Element } from 'react'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import PanelHeader from 'components/panel-header/panel-header'; import PaymentsPanel from 'components/payments-panel/payments-panel'; diff --git a/ashes/src/components/orders/shipments/shipment.jsx b/ashes/src/components/orders/shipments/shipment.jsx index ba10553f36..3c363ca6bd 100644 --- a/ashes/src/components/orders/shipments/shipment.jsx +++ b/ashes/src/components/orders/shipments/shipment.jsx @@ -6,7 +6,7 @@ import React, { Component, Element } from 'react'; import { autobind } from 'core-decorators'; // components -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import TableView from 'components/table/tableview'; import ShipmentRow from './shipment-row'; diff --git a/ashes/src/components/orders/shipments/unshipped-items.jsx b/ashes/src/components/orders/shipments/unshipped-items.jsx index 42e16eb8f2..e38327e68e 100644 --- a/ashes/src/components/orders/shipments/unshipped-items.jsx +++ b/ashes/src/components/orders/shipments/unshipped-items.jsx @@ -9,7 +9,7 @@ import { autobind } from 'core-decorators'; import { itemStateTitles, itemReasonsTitles } from 'paragons/shipment'; // components -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import TableView from 'components/table/tableview'; import TableRow from 'components/table/row'; import TableCell from 'components/table/cell'; diff --git a/ashes/src/components/orders/shipping-address.jsx b/ashes/src/components/orders/shipping-address.jsx index e2dc1ccb7e..01b5e81714 100644 --- a/ashes/src/components/orders/shipping-address.jsx +++ b/ashes/src/components/orders/shipping-address.jsx @@ -1,7 +1,7 @@ import React from 'react'; import AddressDetails from '../addresses/address-details'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; type Props = { order: Object, diff --git a/ashes/src/components/origin-integrations/details.jsx b/ashes/src/components/origin-integrations/details.jsx index 82bbb76272..2c5aa45528 100644 --- a/ashes/src/components/origin-integrations/details.jsx +++ b/ashes/src/components/origin-integrations/details.jsx @@ -10,7 +10,7 @@ import { getUserId } from 'lib/claims'; // components import { PageTitle } from 'components/section-title'; import { PrimaryButton } from 'components/core/button'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import FormField from 'components/forms/formfield'; import Spinner from 'components/core/spinner'; diff --git a/ashes/src/components/payment/payment.jsx b/ashes/src/components/payment/payment.jsx index 27fa9b3ecf..eb0bd776fe 100644 --- a/ashes/src/components/payment/payment.jsx +++ b/ashes/src/components/payment/payment.jsx @@ -2,7 +2,7 @@ import _ from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; import TableView from '../table/tableview'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; export default class RmaPayment extends React.Component { render() { diff --git a/ashes/src/components/products/options/option-entry.jsx b/ashes/src/components/products/options/option-entry.jsx index 5fb1da4f45..2076373bb5 100644 --- a/ashes/src/components/products/options/option-entry.jsx +++ b/ashes/src/components/products/options/option-entry.jsx @@ -9,7 +9,7 @@ import { autobind } from 'core-decorators'; import { assoc } from 'sprout-data'; // components -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import ValueEntry from './value-entry'; import ValueEditDialog from './value-edit-dialog'; diff --git a/ashes/src/components/products/options/option-list.jsx b/ashes/src/components/products/options/option-list.jsx index 0eb982140f..d50825a097 100644 --- a/ashes/src/components/products/options/option-list.jsx +++ b/ashes/src/components/products/options/option-list.jsx @@ -10,7 +10,7 @@ import { autoAssignVariants } from 'paragons/variants'; import { skuId } from 'paragons/product'; // components -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import ConfirmationModal from 'components/core/confirmation-modal'; import OptionEntry from './option-entry'; import OptionEditDialog from './option-edit-dialog'; diff --git a/ashes/src/components/products/product-amazon.jsx b/ashes/src/components/products/product-amazon.jsx index b7ceb99137..83c31a01be 100644 --- a/ashes/src/components/products/product-amazon.jsx +++ b/ashes/src/components/products/product-amazon.jsx @@ -22,7 +22,7 @@ import * as schemaActions from 'modules/object-schema'; // components import Spinner from 'components/core/spinner'; -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import SaveCancel from 'components/core/save-cancel'; import Form from 'components/forms/form'; import ProductAmazonMain from './product-amazon-main'; diff --git a/ashes/src/components/products/skus/sku-content-box.jsx b/ashes/src/components/products/skus/sku-content-box.jsx index 4fd65dfb3f..c7c0cf12b2 100644 --- a/ashes/src/components/products/skus/sku-content-box.jsx +++ b/ashes/src/components/products/skus/sku-content-box.jsx @@ -9,7 +9,7 @@ import _ from 'lodash'; import { assoc, dissoc } from 'sprout-data'; // components -import ContentBox from 'components/content-box/content-box'; +import ContentBox from 'components/core/content-box'; import SkuList from './sku-list'; import ConfirmationModal from 'components/core/confirmation-modal'; import { Checkbox } from 'components/core/checkbox'; diff --git a/ashes/src/components/rmas/payment.jsx b/ashes/src/components/rmas/payment.jsx index 9900638451..99c1aeaefd 100644 --- a/ashes/src/components/rmas/payment.jsx +++ b/ashes/src/components/rmas/payment.jsx @@ -2,7 +2,7 @@ import _ from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; import TableView from '../table/tableview'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; export default class RmaPayment extends React.Component { render() { diff --git a/ashes/src/components/rmas/rma.jsx b/ashes/src/components/rmas/rma.jsx index 6f33cd623c..853745bedf 100644 --- a/ashes/src/components/rmas/rma.jsx +++ b/ashes/src/components/rmas/rma.jsx @@ -8,7 +8,7 @@ import { PageTitle } from '../section-title'; import { PrimaryButton } from 'components/core/button'; import PageNav from 'components/core/page-nav'; import { PanelList, PanelListItem } from '../panel/panel-list'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import State from '../common/state'; import * as rmaActions from '../../modules/rmas/details'; diff --git a/ashes/src/components/shipping/shipping-method.jsx b/ashes/src/components/shipping/shipping-method.jsx index 07dbdadf4d..12b557b2ba 100644 --- a/ashes/src/components/shipping/shipping-method.jsx +++ b/ashes/src/components/shipping/shipping-method.jsx @@ -2,7 +2,7 @@ import _ from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; import EditableContentBox from '../content-box/editable-content-box'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import TableView from '../table/tableview'; import ShippingMethodRow from './shipping-method-row'; diff --git a/ashes/src/components/users/account-state.jsx b/ashes/src/components/users/account-state.jsx index 932c7f2142..d11510c4ba 100644 --- a/ashes/src/components/users/account-state.jsx +++ b/ashes/src/components/users/account-state.jsx @@ -7,8 +7,8 @@ import { connect } from 'react-redux'; // components import { Dropdown } from '../dropdown'; -import ContentBox from '../content-box/content-box'; import ConfirmationModal from 'components/core/confirmation-modal'; +import ContentBox from 'components/core/content-box'; // actions import * as UserActions from '../../modules/users/details'; diff --git a/ashes/src/components/users/user-form.jsx b/ashes/src/components/users/user-form.jsx index de3183425a..6c3c1bf5f5 100644 --- a/ashes/src/components/users/user-form.jsx +++ b/ashes/src/components/users/user-form.jsx @@ -9,7 +9,7 @@ import { assoc } from 'sprout-data'; // components import ObjectFormInner from '../object-form/object-form-inner'; import UserInitials from '../user-initials/initials'; -import ContentBox from '../content-box/content-box'; +import ContentBox from 'components/core/content-box'; import { RoundedPill } from 'components/core/rounded-pill'; import { Form, FormField } from '../forms'; import { Button } from 'components/core/button'; diff --git a/ashes/src/less/modules/_content-box.less b/ashes/src/less/modules/_content-box.less index 8f2629f801..c1c182478a 100644 --- a/ashes/src/less/modules/_content-box.less +++ b/ashes/src/less/modules/_content-box.less @@ -9,7 +9,6 @@ background-color: @color-decor12; border-bottom: 1px solid @color-decor9; - .font-spec(16px, 600, 24px); height: 60px; display: flex; align-items: center;