Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gab-social
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
gab
social
gab-social
Commits
8088b995
Commit
8088b995
authored
Oct 21, 2019
by
mgabdev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added trends.gab.com to header, tabs bar, sidebar, promo panel
parent
8a9e7352
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
4 deletions
+27
-4
app/javascript/gabsocial/components/sidebar_menu.js
app/javascript/gabsocial/components/sidebar_menu.js
+5
-0
app/javascript/gabsocial/features/ui/components/promo_panel.js
...avascript/gabsocial/features/ui/components/promo_panel.js
+7
-0
app/javascript/gabsocial/features/ui/components/tabs_bar.js
app/javascript/gabsocial/features/ui/components/tabs_bar.js
+8
-4
app/javascript/images/sprite-main-navigation-links.png
app/javascript/images/sprite-main-navigation-links.png
+0
-0
app/javascript/styles/gabsocial/components/tabs-bar.scss
app/javascript/styles/gabsocial/components/tabs-bar.scss
+6
-0
app/views/layouts/public.html.haml
app/views/layouts/public.html.haml
+1
-0
No files found.
app/javascript/gabsocial/components/sidebar_menu.js
View file @
8088b995
...
...
@@ -32,6 +32,7 @@ const messages = defineMessages({
more
:
{
id
:
'
sidebar.more
'
,
defaultMessage
:
'
More
'
},
partners
:
{
id
:
'
promo.partners
'
,
defaultMessage
:
'
Affiliate Partners
'
},
pro
:
{
id
:
'
promo.gab_pro
'
,
defaultMessage
:
'
Upgrade to GabPRO
'
},
trends
:
{
id
:
'
promo.trends
'
,
defaultMessage
:
'
Trends
'
},
})
const
mapStateToProps
=
state
=>
{
...
...
@@ -150,6 +151,10 @@ class SidebarMenu extends ImmutablePureComponent {
<
span
className
=
'
sidebar-menu-item__title
'
>
{
intl
.
formatMessage
(
messages
.
pro
)}
<
/span
>
<
/a
>
}
<
a
className
=
'
sidebar-menu-item
'
href
=
'
https://trends.gab.com
'
>
<
Icon
id
=
'
signal
'
fixedWidth
/>
<
span
className
=
'
sidebar-menu-item__title
'
>
{
intl
.
formatMessage
(
messages
.
trends
)}
<
/span
>
<
/a
>
<
a
className
=
'
sidebar-menu-item
'
href
=
'
https://news.gab.com
'
>
<
Icon
id
=
'
align-left
'
fixedWidth
/>
<
span
className
=
'
sidebar-menu-item__title
'
>
{
intl
.
formatMessage
(
messages
.
news
)}
<
/span
>
...
...
app/javascript/gabsocial/features/ui/components/promo_panel.js
View file @
8088b995
...
...
@@ -41,6 +41,13 @@ class PromoPanel extends React.PureComponent {
<
/a
>
<
/div
>
<
div
className
=
'
promo-panel-item
'
>
<
a
className
=
'
promo-panel-item__btn
'
href
=
'
https://trends.gab.com
'
>
<
Icon
id
=
'
signal
'
className
=
'
promo-panel-item__icon
'
fixedWidth
/>
<
FormattedMessage
id
=
'
promo.trends
'
defaultMessage
=
'
Trends
'
/>
<
/a
>
<
/div
>
<
div
className
=
'
promo-panel-item
'
>
<
a
className
=
'
promo-panel-item__btn
'
href
=
'
https://news.gab.com/support-gab
'
>
<
Icon
id
=
'
users
'
className
=
'
promo-panel-item__icon
'
fixedWidth
/>
...
...
app/javascript/gabsocial/features/ui/components/tabs_bar.js
View file @
8088b995
...
...
@@ -30,10 +30,10 @@ export const privateLinks = [
<
i
className
=
'
tabs-bar__link__icon groups
'
/>
<
FormattedMessage
id
=
'
tabs_bar.groups
'
defaultMessage
=
'
Groups
'
/>
<
/NavLink>
,
<
NavLink
key
=
'
pr5
'
className
=
'
tabs-bar__link tabs-bar__link--search
'
to
=
'
/search
'
data
-
preview
-
title
-
id
=
'
tabs_bar.search
'
>
<
i
className
=
'
tabs-bar__link__icon t
abs-bar__link__icon--search
'
/>
<
FormattedMessage
id
=
'
tabs_bar.
search
'
defaultMessage
=
'
Search
'
/>
<
/
NavLink
>
,
<
a
key
=
'
pl4
'
className
=
'
tabs-bar__link tabs-bar__link--trends
'
href
=
'
https://trends.gab.com
'
data
-
preview
-
title
-
id
=
'
tabs_bar.trends
'
>
<
i
className
=
'
tabs-bar__link__icon t
rends
'
/>
<
FormattedMessage
id
=
'
tabs_bar.
trends
'
defaultMessage
=
'
Trends
'
/>
<
/
a
>
,
];
export
const
publicLinks
=
[
...
...
@@ -48,6 +48,10 @@ export const publicLinks = [
<
i
className
=
'
tabs-bar__link__icon tabs-bar__link__icon--search
'
/>
<
FormattedMessage
id
=
'
tabs_bar.search
'
defaultMessage
=
'
Search
'
/>
<
/NavLink>
,
<
a
key
=
'
pl3
'
className
=
'
tabs-bar__link tabs-bar__link--trends
'
href
=
'
https://trends.gab.com
'
data
-
preview
-
title
-
id
=
'
tabs_bar.trends
'
>
<
i
className
=
'
tabs-bar__link__icon trends
'
/>
<
FormattedMessage
id
=
'
tabs_bar.trends
'
defaultMessage
=
'
Trends
'
/>
<
/a>
,
];
@
withRouter
...
...
app/javascript/images/sprite-main-navigation-links.png
View replaced file @
8a9e7352
View file @
8088b995
7.6 KB
|
W:
|
H:
7.96 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/javascript/styles/gabsocial/components/tabs-bar.scss
View file @
8088b995
...
...
@@ -275,6 +275,12 @@
&
.apps
{
background-position
:
-825px
18px
;
}
&
.trends
{
background-position
:
-850px
18px
;
@media
screen
and
(
max-width
:
895px
)
{
background-position
:
-1208px
8px
;
}
}
&
.tabs-bar__link__icon--search
{
background-position
:
-697px
18px
;
@media
screen
and
(
max-width
:
895px
)
{
...
...
app/views/layouts/public.html.haml
View file @
8088b995
...
...
@@ -13,6 +13,7 @@
=
link_to
t
(
'home'
),
root_url
,
class:
'nav-link optional'
=
link_to
t
(
'about.about_this'
),
about_path
,
class:
'nav-link'
=
link_to
'Apps'
,
'https://apps.gab.com'
,
class:
'nav-link'
=
link_to
'Trends'
,
'https://trends.gab.com'
,
class:
'nav-link'
.nav-center
.nav-right
-
if
user_signed_in?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment