-
+ { /** Default */}
+
-
- {
- !!account &&
-
- }
-
-
- {title}
-
-
-
+
+
-
-
+
+
-
-
- { /** actions */}
-
-
-
-
@@ -112,9 +104,69 @@ class NavigationBar extends ImmutablePureComponent {
}
-
+
-
+
+
+
+ { /** Mobile */}
+
+
+ {
+ !!account && !showBackBtn &&
+
+ }
+ {
+ showBackBtn &&
+
+ }
+
+
+
+
+ {title}
+
+
+
+
+ {
+ !!actions &&
+
+ {
+ actions.map((action, i) => (
+
+ }
+
+
+
diff --git a/app/javascript/gabsocial/components/sidebar.js b/app/javascript/gabsocial/components/sidebar.js
index c3f8ae2a..bbba2a77 100644
--- a/app/javascript/gabsocial/components/sidebar.js
+++ b/app/javascript/gabsocial/components/sidebar.js
@@ -13,7 +13,6 @@ import SidebarSectionTitle from './sidebar_section_title'
import SidebarSectionItem from './sidebar_section_item'
import Heading from './heading'
import Pills from './pills'
-import Divider from './divider'
const messages = defineMessages({
followers: { id: 'account.followers', defaultMessage: 'Followers' },
diff --git a/app/javascript/gabsocial/components/sidebar_section_item.js b/app/javascript/gabsocial/components/sidebar_section_item.js
index 6b90a579..471febcd 100644
--- a/app/javascript/gabsocial/components/sidebar_section_item.js
+++ b/app/javascript/gabsocial/components/sidebar_section_item.js
@@ -1,11 +1,10 @@
import {
CX,
- BREAKPOINT_SMALL
} from '../constants'
import Button from './button'
import Icon from './icon'
import Image from './image'
-import Responsive from '../features/ui/util/responsive_component'
+import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
export default class SidebarSectionItem extends PureComponent {
@@ -76,19 +75,6 @@ export default class SidebarSectionItem extends PureComponent {
bgPrimary: shouldShowActive,
})
- const textClasses = CX({
- default: 1,
- fontWeightNormal: 1,
- fs15PX: 1,
- text: 1,
- textOverflowEllipsis: 1,
- colorPrimary: 1,
- })
-
- const iconClasses = CX({
- fillPrimary: 1,
- })
-
const countClasses = CX({
default: 1,
text: 1,
@@ -118,7 +104,7 @@ export default class SidebarSectionItem extends PureComponent {
{
icon &&
-
+
}
{
@@ -132,11 +118,14 @@ export default class SidebarSectionItem extends PureComponent {
/>
}
-
-
- {title}
-
-
+
+
+ {title}
+
+
{
count > 0 &&
diff --git a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
index bdbdcf0b..b8c56fc2 100644
--- a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
+++ b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
@@ -76,6 +76,7 @@ const mapStateToProps = (state, { replyToId }) => {
const mapDispatchToProps = (dispatch, { reduxReplyToId, replyToId }) => ({
onChange(text, markdown, newReplyToId) {
+ // : todo :
console.log("text:", text, newReplyToId, replyToId, reduxReplyToId)
dispatch(changeCompose(text, markdown, newReplyToId))
},
diff --git a/app/javascript/gabsocial/layouts/layout.js b/app/javascript/gabsocial/layouts/layout.js
index a6aa36ce..df0bc669 100644
--- a/app/javascript/gabsocial/layouts/layout.js
+++ b/app/javascript/gabsocial/layouts/layout.js
@@ -6,6 +6,7 @@ import FooterBar from '../components/footer_bar'
import FloatingActionButton from '../components/floating_action_button'
import Responsive from '../features/ui/util/responsive_component'
import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
+import Pills from '../components/pills'
export default class Layout extends PureComponent {
@@ -41,6 +42,7 @@ export default class Layout extends PureComponent {
actions={actions}
tabs={tabs}
title={title}
+ showBackBtn={showBackBtn}
/>
@@ -58,7 +60,8 @@ export default class Layout extends PureComponent {
@@ -71,6 +74,16 @@ export default class Layout extends PureComponent {
{
!noRightSidebar &&
+
+ {
+ !!tabs &&
+
+
+
+ }
+
{children}
diff --git a/app/javascript/styles/global.css b/app/javascript/styles/global.css
index d5f7bf82..518d8d60 100644
--- a/app/javascript/styles/global.css
+++ b/app/javascript/styles/global.css
@@ -464,6 +464,7 @@ body {
.width250PX { width: 240px; }
.width240PX { width: 240px; }
.width160PX { width: 160px; }
+.width84PX { width: 84px; }
.width72PX { width: 72px; }
.width50PX { width: 50px; }
.width20PX { width: 20px; }
@@ -536,19 +537,19 @@ body {
@media (min-width: 992px) and (max-width: 1080px) {
.width1015PX {
- width: 850px;
+ width: 780px;
}
.width645PX {
- width: 525px;
+ width: 470px;
}
.width340PX {
- width: 300px;
+ width: 285px;
}
.width240PX {
- width: 100px;
+ width: 170px;
}
.width1255PX {
@@ -813,7 +814,7 @@ body {
}
.highlightedComment {
- background-color: rgba(224, 234, 66, .3);
+ background-color: rgba(224, 234, 66, .25);
}
.searchInput::placeholder {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 9c3a57dd..405af443 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,8 @@
%html{ lang: I18n.locale }
%head
%meta{ charset: 'utf-8' }/
- %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1', 'viewport-fit': 'cover' }/
+
+ %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no', 'viewport-fit': 'cover' }/
- if cdn_host?
%link{ rel: 'dns-prefetch', href: cdn_host }/