@@ -212,7 +295,7 @@ class SidebarMenu extends ImmutablePureComponent {
-
-
- {
- replyCount !== 0 &&
- {replyCount}
- }
-
+
+
+
+ { /* favoriteCount !== 0 && {favoriteCount} */ }
+
-
-
- {reblogCount !== 0 && {reblogCount}}
-
+
+
+ { /*
+ replyCount !== 0 &&
+ {replyCount}
+ */
+ }
+
-
-
-
-
-
- {favoriteCount !== 0 && {favoriteCount}}
-
+
+
+ { /* reblogCount !== 0 && {reblogCount} */ }
+
-
-
+ {/*
+
+
*/}
+
+ {/*
+
+
*/}
+
+
+ {/**/}
);
diff --git a/app/javascript/gabsocial/components/status_action_bar/status_action_bar.scss b/app/javascript/gabsocial/components/status_action_bar/status_action_bar.scss
index 8e22707f..6c11c721 100644
--- a/app/javascript/gabsocial/components/status_action_bar/status_action_bar.scss
+++ b/app/javascript/gabsocial/components/status_action_bar/status_action_bar.scss
@@ -1,21 +1,51 @@
.status-action-bar {
- display: flex;
- align-items: center;
- margin-top: 25px;
+ display: block;
+ margin-top: 10px;
z-index: 4;
+ @include horizontal-padding(10px);
+
&__dropdown {
@include size(23px);
}
+
+ &__items {
+ display: flex;
+ align-items: center;
+ border-top: 1px solid #161616;
+
+ @include size(100%, 42px);
+ }
+
+ &__comment {
+
+ }
}
.status-action-bar-item {
display: inline-flex;
- margin-right: 22px;
align-items: center;
+ justify-content: center;
+ height: 42px;
+ width: 33%;
+ padding: 5px;
+ box-sizing: border-box;
&__btn {
+ border-radius: 4px;
margin-right: 4px;
+ font-size: 14px;
+ font-weight: 500;
+
+ @include size(100%);
+
+ &:hover {
+ background-color: #000;
+ }
+
+ i {
+ margin-right: 4px;
+ }
}
&__link {
diff --git a/app/javascript/gabsocial/components/status_content/status_content.js b/app/javascript/gabsocial/components/status_content/status_content.js
index 477ef850..7e980647 100644
--- a/app/javascript/gabsocial/components/status_content/status_content.js
+++ b/app/javascript/gabsocial/components/status_content/status_content.js
@@ -167,7 +167,6 @@ export default class StatusContent extends ImmutablePureComponent {
const readMoreButton = (
);
diff --git a/app/javascript/gabsocial/components/status_content/status_content.scss b/app/javascript/gabsocial/components/status_content/status_content.scss
index 77e427d2..14e62cd4 100644
--- a/app/javascript/gabsocial/components/status_content/status_content.scss
+++ b/app/javascript/gabsocial/components/status_content/status_content.scss
@@ -8,7 +8,8 @@
color: $primary-text-color;
@include text-overflow(normal, break-word);
- @include text-sizing(15px, 400, 20px);
+ @include text-sizing(14px, 400, 20px);
+ @include horizontal-padding(10px);
&:focus {
outline: 0;
@@ -102,6 +103,7 @@
border: 0;
background: transparent;
padding: 8px 0 0 0;
+ margin-left: 10px;
@include text-sizing(15px, 400, 20px);
diff --git a/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/group_icon.js b/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/group_icon.js
deleted file mode 100644
index d671049b..00000000
--- a/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/group_icon.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const GroupIcon = ({
- className = 'tabs-bar-icon',
- width = '18px',
- height = '18px',
- viewBox = '0 0 48 48'
-}) => (
-
-)
-
-export default GroupIcon
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/home_icon.js b/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/home_icon.js
deleted file mode 100644
index f0b49d7c..00000000
--- a/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/home_icon.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const HomeIcon = ({
- className = 'tabs-bar-icon',
- width = '16px',
- height = '16px',
- viewBox = '0 0 48 48'
-}) => (
-
-)
-
-export default HomeIcon
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/notifications_icon.js b/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/notifications_icon.js
deleted file mode 100644
index f0d37034..00000000
--- a/app/javascript/gabsocial/components/tabs_bar/assets/tabs_bar_icon/notifications_icon.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const NotificationsIcon = ({
- className = 'tabs-bar-icon',
- width = '16px',
- height = '16px',
- viewBox = '0 0 48 48'
-}) => (
-
-)
-
-export default NotificationsIcon
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/tabs_bar/index.js b/app/javascript/gabsocial/components/tabs_bar/index.js
deleted file mode 100644
index 17102cde..00000000
--- a/app/javascript/gabsocial/components/tabs_bar/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './tabs_bar';
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js b/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js
deleted file mode 100644
index 152f33a3..00000000
--- a/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { NavLink, withRouter } from 'react-router-dom';
-import { FormattedMessage } from 'react-intl';
-import { openModal } from '../../actions/modal';
-import { me } from '../../initial_state';
-import SearchContainer from '../../features/compose/containers/search_container';
-import ActionBar from '../../features/compose/components/action_bar';
-import Avatar from '../avatar';
-import NotificationsCounter from '../notification_counter';
-import GabLogo from './assets/gab_logo/gab_logo';
-import {
- GroupIcon,
- HomeIcon,
- NotificationsIcon,
- SearchIcon,
-} from './assets/tabs_bar_icon';
-
-import './tabs_bar.scss';
-
-const mapStateToProps = state => {
- return {
- account: state.getIn(['accounts', me]),
- };
-};
-
-const mapDispatchToProps = (dispatch) => ({
- onOpenCompose() {
- dispatch(openModal('COMPOSE'));
- },
-});
-
-export default @connect(mapStateToProps, mapDispatchToProps)
-@withRouter
-class TabsBar extends ImmutablePureComponent {
-
- static propTypes = {
- history: PropTypes.object.isRequired,
- onOpenCompose: PropTypes.func.isRequired,
- account: ImmutablePropTypes.map.isRequired,
- };
-
- render () {
- const { account, onOpenCompose } = this.props;
-
- if (!account) {
- return (
-
- );
- }
-
- return (
-
- );
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/tabs_bar/tabs_bar.scss b/app/javascript/gabsocial/components/tabs_bar/tabs_bar.scss
deleted file mode 100644
index e8f60d7b..00000000
--- a/app/javascript/gabsocial/components/tabs_bar/tabs_bar.scss
+++ /dev/null
@@ -1,204 +0,0 @@
-.tabs-bar {
- display: flex;
- box-sizing: border-box;
- background: #000;
- flex: 0 0 auto;
- overflow-y: auto;
- height: 50px;
- position: sticky;
- top: 0;
- z-index: 4;
-
- &__container {
- display: flex;
- box-sizing: border-box;
- width: 100%;
- max-width: 1200px;
- padding: 0 15px;
-
- @include margin-center;
-
- // NOTE - might need to adjust this based on column sizing
- @media screen and (max-width: $nav-breakpoint-4) {
- padding: 0 20px;
- }
-
- }
-
- &__split {
- display: flex;
- width: auto;
-
- &--left {
- margin-right: auto;
- }
-
- &--right {
- margin-left: auto;
- padding-top: 8px;
-
- @media screen and (max-width: $nav-breakpoint-3) {
- padding-top: 4px;
- }
- }
- }
-
- &__search-container {
- display: block;
- width: 251px;
-
- @media screen and (max-width: $nav-breakpoint-2) {
- display: none;
- }
-
- .search {
- margin: 0;
- }
- }
-
- &__profile {
- position: relative;
- overflow: hidden;
- margin: 0 0 0 20px;
-
- @include size(34px);
-
- @media screen and (max-width: $nav-breakpoint-3) {
- margin: 0;
-
- @include size(42px);
- }
-
- .account__avatar {
- background-size: 34px 34px;
-
- @include size(34px);
-
- @media screen and (max-width: $nav-breakpoint-3) {
- background-size: 42px 42px;
-
- @include size(42px);
- }
- }
-
- .compose__action-bar {
- display: block;
-
- @include abs-position(0, 0, 0, -5px);
-
- i {
- display: none;
- }
- }
- }
-
- &__button-compose {
- display: block;
- margin-left: 20px;
- border-radius: 17px;
-
- @include size(70px, 34px);
-
- @media screen and (max-width: $nav-breakpoint-3) {
- display: none;
- }
-
- &:hover {
- background-color: lighten($gab-brand-default, 5%);
- }
-
- span {
- display: none;
- }
- }
-
- &__button {
- margin-left: 12px;
- height: 34px;
- }
-
- .flex {
- display: flex;
- }
-
- @media screen and (max-width: 630px) and (max-height: 400px) {
- will-change: margin-top;
- transition: margin-top 400ms 100ms;
- }
-}
-
-.tabs-bar-item {
- display: flex;
- position: relative;
- flex: 1 1 auto;
- margin: 0 25px 0 0;
- color: white;
- text-decoration: none;
- padding-top: 14px;
- box-sizing: border-box;
-
- @media screen and (max-width: $nav-breakpoint-1) {
- margin: 0;
- padding-top: 12px !important;
-
- @include size(46px, 50px);
-
- &.active {
- border-bottom: 2px solid $gab-brand-default;
- }
-
- &>span {
- display: none;
- }
- }
-
- &.optional {
- display: none;
-
- @media screen and (max-width: $nav-breakpoint-2) {
- display: flex;
- }
- }
-
- &.active {
- color: $gab-text-highlight;
-
- .tabs-bar-icon__path {
- fill: $gab-text-highlight;
- }
- }
-
- &--logo {
- display: block;
- margin-right: 35px;
- padding-top: 10px;
- border: none;
- box-sizing: border-box;
-
- @include size(50px);
-
- @media (min-width: $nav-breakpoint-4) and (max-width: $nav-breakpoint-1) {
- margin-right: 15px;
- }
-
- @media screen and (max-width: $nav-breakpoint-4) {
- display: none;
- }
-
- & span {
- display: none !important;
- }
- }
-
- .tabs-bar-icon {
- margin-right: 6px;
-
- &__path {
- fill: $white;
- }
-
- @media screen and (max-width: $nav-breakpoint-1) {
- margin: 0 auto;
- }
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/verified_icon/verified_icon.scss b/app/javascript/gabsocial/components/verified_icon/verified_icon.scss
index d31d6910..c8a229e4 100644
--- a/app/javascript/gabsocial/components/verified_icon/verified_icon.scss
+++ b/app/javascript/gabsocial/components/verified_icon/verified_icon.scss
@@ -1,6 +1,7 @@
.verified-icon {
display: inline-block;
- margin: 0 4px 0 1px;
+ margin-top: 1px;
+ margin-left: 4px;
vertical-align: top;
position: relative;
diff --git a/app/javascript/gabsocial/features/compose/components/upload_form/index.js b/app/javascript/gabsocial/features/compose/components/upload_form/index.js
index e69de29b..be54af57 100644
--- a/app/javascript/gabsocial/features/compose/components/upload_form/index.js
+++ b/app/javascript/gabsocial/features/compose/components/upload_form/index.js
@@ -0,0 +1 @@
+export { default } from './upload_form';
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/status/components/detailed_status/detailed_status.js b/app/javascript/gabsocial/features/status/components/detailed_status/detailed_status.js
index 776005f7..dfd0f928 100644
--- a/app/javascript/gabsocial/features/status/components/detailed_status/detailed_status.js
+++ b/app/javascript/gabsocial/features/status/components/detailed_status/detailed_status.js
@@ -203,9 +203,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
{media}
- {status.get('quote') &&
}
+ /> */ }
diff --git a/app/javascript/gabsocial/features/ui/ui.js b/app/javascript/gabsocial/features/ui/ui.js
index dffda6ec..3c0ef068 100644
--- a/app/javascript/gabsocial/features/ui/ui.js
+++ b/app/javascript/gabsocial/features/ui/ui.js
@@ -20,12 +20,10 @@ import NotificationsContainer from '../../containers/notifications_container';
import LoadingBarContainer from '../../containers/loading_bar_container';
import ModalContainer from '../../containers/modal_container';
import UploadArea from '../../components/upload_area';
-import TabsBar from '../../components/tabs_bar';
import FooterBar from '../../components/footer_bar';
// import TrendsPanel from './components/trends_panel';
import { WhoToFollowPanel } from '../../components/panel';
import LinkFooter from '../../components/link_footer';
-import SidebarMenu from '../../components/sidebar_menu';
import ProfilePage from '../../pages/profile_page';
// import GroupsPage from 'gabsocial/pages/groups_page';
import GroupPage from '../../pages/group_page';
@@ -534,19 +532,19 @@ class UI extends PureComponent {
return (
-
{children}
-
+ { /* */ }
- {me && floatingActionButton}
+ { /* me && floatingActionButton */ }
+ { /*
- {me && }
+ */ }
);
diff --git a/app/javascript/gabsocial/features/ui/util/wrapped_route.js b/app/javascript/gabsocial/features/ui/util/wrapped_route.js
index ae592f63..0d0b4b4a 100644
--- a/app/javascript/gabsocial/features/ui/util/wrapped_route.js
+++ b/app/javascript/gabsocial/features/ui/util/wrapped_route.js
@@ -1,5 +1,5 @@
import { Route } from 'react-router-dom';
-import ColumnsArea from '../../../components/columns_area';
+import PageLayout from '../../../components/page_layout';
import BundleColumnError from '../../../components/bundle_column_error';
import Bundle from './bundle';
import { me } from '../../../initial_state';
@@ -42,11 +42,11 @@ export default class WrappedRoute extends Component {
{Component =>
(
-
+
{content}
-
+
)
}
diff --git a/app/javascript/gabsocial/pages/group_page.js b/app/javascript/gabsocial/pages/group_page.js
index 390af745..b575dc42 100644
--- a/app/javascript/gabsocial/pages/group_page.js
+++ b/app/javascript/gabsocial/pages/group_page.js
@@ -5,7 +5,7 @@ import { fetchGroup } from '../actions/groups';
import HeaderContainer from '../features/groups/timeline/containers/header_container';
import GroupPanel from '../features/groups/timeline/components/panel';
import GroupSidebarPanel from '../features/groups/sidebar_panel';
-import ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
import { WhoToFollowPanel } from '../components/panel';
import LinkFooter from '../components/link_footer';
import PromoPanel from '../components/promo_panel';
@@ -35,7 +35,7 @@ class GroupPage extends ImmutablePureComponent {
const top = group ? : null;
return (
-
{children}
-
+
)
}
}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/pages/home_page.js b/app/javascript/gabsocial/pages/home_page.js
index 44e2e757..3bee39e6 100644
--- a/app/javascript/gabsocial/pages/home_page.js
+++ b/app/javascript/gabsocial/pages/home_page.js
@@ -3,7 +3,7 @@ import GroupSidebarPanel from '../features/groups/sidebar_panel';
import LinkFooter from '../components/link_footer';
import PromoPanel from '../components/promo_panel';
import UserPanel from '../components/user_panel';
-import ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
import TimelineComposeBlock from '../components/timeline_compose_block';
export default class HomePage extends PureComponent {
@@ -11,26 +11,20 @@ export default class HomePage extends PureComponent {
const {children} = this.props;
return (
-
-
- ),
- LEFT: (
-
-
- )
+ ),
}}
>
{children}
-
+
)
}
}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/pages/profile_page.js b/app/javascript/gabsocial/pages/profile_page.js
index b5072ba7..06b9ef2a 100644
--- a/app/javascript/gabsocial/pages/profile_page.js
+++ b/app/javascript/gabsocial/pages/profile_page.js
@@ -5,7 +5,7 @@ import HeaderContainer from '../features/account_timeline/containers/header_cont
import ProfileInfoPanel from '../features/account_timeline/components/profile_info_panel/profile_info_panel';
import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
import LinkFooter from '../components/link_footer';
-import ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const accounts = state.getIn(['accounts']);
@@ -48,7 +48,7 @@ class ProfilePage extends ImmutablePureComponent {
const { accountId, account, accountUsername } = this.props;
return (
- ,
RIGHT: (
@@ -62,7 +62,7 @@ class ProfilePage extends ImmutablePureComponent {
}}
>
{this.props.children}
-
+
)
}
}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/pages/search_page.js b/app/javascript/gabsocial/pages/search_page.js
index 21117c0c..dba88ec2 100644
--- a/app/javascript/gabsocial/pages/search_page.js
+++ b/app/javascript/gabsocial/pages/search_page.js
@@ -2,7 +2,7 @@ import { Fragment } from 'react';
import Header from '../features/search/components/header';
import LinkFooter from '../components/link_footer';
import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
-import ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
export default class SearchPage extends PureComponent {
@@ -12,7 +12,7 @@ export default class SearchPage extends PureComponent {
render() {
return (
- ,
RIGHT: (
@@ -25,7 +25,7 @@ export default class SearchPage extends PureComponent {
}}
>
{this.props.children}
-
+
)
}
diff --git a/app/javascript/styles/gabsocial/reset.scss b/app/javascript/styles/gabsocial/reset.scss
index 2906b3ac..fa7c414f 100644
--- a/app/javascript/styles/gabsocial/reset.scss
+++ b/app/javascript/styles/gabsocial/reset.scss
@@ -22,6 +22,7 @@ time, mark, audio, video {
font-size: 100%;
font: inherit;
vertical-align: baseline;
+ box-sizing: border-box;
}
/* HTML5 display-role reset for older browsers */
diff --git a/app/javascript/styles/global.css b/app/javascript/styles/global.css
new file mode 100644
index 00000000..381ed736
--- /dev/null
+++ b/app/javascript/styles/global.css
@@ -0,0 +1,184 @@
+html,body{
+ height: 100%;
+}
+
+body{
+ -ms-overflow-style:scrollbar;
+ overflow-y:scroll;
+ overscroll-behavior-y:none;
+}
+
+html {
+ -ms-text-size-adjust: 100%;
+ -webkit-text-size-adjust: 100%;
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+body {
+ margin: 0;
+}
+
+.default {
+ align-items: stretch;
+ border: 0 solid black;
+ box-sizing: border-box;
+ display: flex;
+ flex-basis: auto;
+ flex-direction: column;
+ flex-shrink: 0;
+ margin-bottom: 0px;
+ margin-left: 0px;
+ margin-right: 0px;
+ margin-top: 0px;
+ min-height: 0px;
+ min-width: 0px;
+ padding-bottom: 0px;
+ padding-left: 0px;
+ padding-right: 0px;
+ padding-top: 0px;
+ position: relative;
+ z-index: 0;
+}
+
+.text {
+ font: 14px system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", sans-serif;
+}
+
+.color-black {
+ color: rgba(0, 0, 0, 1.00);
+}
+
+.inline {
+ display: inline;
+}
+
+.wrap {
+ white-space: pre-wrap;
+ word-wrap: break-word;
+}
+
+.inherit {
+ color: inherit;
+ font: inherit;
+ white-space: inherit;
+}
+
+.r-13awgt0 {
+ -ms-flex-negative: 1;
+ -ms-flex-positive: 1;
+ -ms-flex-preferred-size: 0%;
+ -webkit-box-flex: 1;
+ -webkit-flex-basis: 0%;
+ -webkit-flex-grow: 1;
+ -webkit-flex-shrink: 1;
+ flex-basis: 0%;
+ flex-grow: 1;
+ flex-shrink: 1;
+}
+
+.r-4qtqp9 {
+ display: inline-block;
+}
+
+.r-ywje51 {
+ margin-bottom: auto;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: auto;
+}
+
+.r-hvic4v {
+ display: none;
+}
+
+.r-1adg3ll {
+ display: block;
+}
+
+
+.r-12vffkv>* {
+ pointer-events: auto;
+}
+
+.r-12vffkv {
+ pointer-events: none !important;
+}
+
+.r-14lw9ot {
+ background-color: rgba(255, 255, 255, 1.00);
+}
+
+.r-1p0dtai {
+ bottom: 0px;
+}
+
+.r-1d2f490 {
+ left: 0px;
+}
+
+.r-1xcajam {
+ position: fixed;
+}
+
+.r-zchlnj {
+ right: 0px;
+}
+
+.r-ipm5af {
+ top: 0px;
+}
+
+.r-yyyyoo {
+ fill: currentcolor;
+}
+
+.r-1xvli5t {
+ height: 1.25em;
+}
+
+.r-dnmrzs {
+ max-width: 100%;
+}
+
+.r-bnwqim {
+ position: relative;
+}
+
+.r-1plcrui {
+ vertical-align: text-bottom;
+}
+
+.r-lrvibr {
+ -moz-user-select: none;
+ -ms-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+}
+
+.color-brand {
+ color: rgba(29, 161, 242, 1.00);
+}
+
+.height-72-px {
+ height: 72px;
+}
+
+.position-relative {
+ position: absolute;
+}
+
+.width-72-px {
+ width: 72px;
+}
+
+.top-60-pc {
+ top: 60%;
+}
+
+.line-height-2 {
+ line-height: 2em;
+}
+
+.text-align-center {
+ text-align: center;
+}
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 991c4a12..6e59c661 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -40,7 +40,4 @@
= yield :header_tags
%body{ class: body_classes }
- = content_for?(:content) ? yield(:content) : yield
-
- %div{ style: 'display: none'}
- = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+ = content_for?(:content) ? yield(:content) : yield
\ No newline at end of file
diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js
index 10f5f91e..5eea451f 100644
--- a/config/webpack/rules/css.js
+++ b/config/webpack/rules/css.js
@@ -18,7 +18,7 @@ module.exports = {
options: {
sourceMap: true,
importLoaders: 2,
- // modules: true,
+ modules: true,
// localIdentName: '[name]',
},
},
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 30839529..39194208 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -9,7 +9,7 @@ const extname = require('path-complete-extname');
const { env, settings, themes, output } = require('./configuration');
const rules = require('./rules');
const localePackPaths = [
- '/Users/m3/Documents/dev/gab-social-2/tmp/packs/locale_en.js',
+ '/Users/m3/Documents/dev/gab-social/tmp/packs/locale_en.js',
];
//require('./generateLocalePacks');
@@ -77,6 +77,7 @@ module.exports = {
PureComponent: ['react', 'PureComponent'],
connect: ['react-redux', 'connect'],
PropTypes: 'prop-types',
+ styles: '/Users/m3/Documents/dev/gab-social/app/javascript/styles/global.css',
}),
new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
new webpack.NormalModuleReplacementPlugin(