Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
6c543204
Commit
6c543204
authored
9 years ago
by
Allen Gilliland
Browse files
Options
Downloads
Plain Diff
Merge pull request #1538 from metabase/pulse_button_fix
fix subscribe buttons in safari.
parents
f8a5b964
6f7c759b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/src/pulse/components/PulseListChannel.jsx
+9
-9
9 additions, 9 deletions
frontend/src/pulse/components/PulseListChannel.jsx
frontend/src/pulse/pulse.module.js
+1
-1
1 addition, 1 deletion
frontend/src/pulse/pulse.module.js
with
10 additions
and
10 deletions
frontend/src/pulse/components/PulseListChannel.jsx
+
9
−
9
View file @
6c543204
...
...
@@ -59,7 +59,7 @@ export default class PulseListChannel extends Component {
}
return
(
<
div
className
=
"h4 text-grey-4 flex align-center"
>
<
div
className
=
"h4 text-grey-4
py2
flex align-center"
>
{
channelIcon
&&
<
Icon
className
=
"mr1"
name
=
{
channelIcon
}
width
=
{
24
}
height
=
{
24
}
/>
}
<
span
>
{
channelVerb
+
"
"
}
...
...
@@ -85,15 +85,15 @@ export default class PulseListChannel extends Component {
{
subscribable
&&
<
div
className
=
"flex-align-right"
>
{
subscribed
?
<
button
className
=
"
rounded
bg-green text-white text-bold
flex align-center
"
>
<
span
className
=
"pl2"
>
You get this
{
channel
.
channel_type
}
</
span
>
<
Icon
className
=
"p2 text-grey-1 text-white-hover cursor-pointer"
name
=
"close"
width
=
{
12
}
height
=
{
12
}
onClick
=
{
this
.
unsubscribe
}
/>
</
button
>
<
div
className
=
"
inline-block rounded clearfix
bg-green text-white text-bold"
>
<
div
className
=
"
float-left py2
pl2"
>
You get this
{
channel
.
channel_type
}
</
div
>
<
Icon
className
=
"
float-right
p2 text-grey-1 text-white-hover cursor-pointer"
name
=
"close"
width
=
{
12
}
height
=
{
12
}
onClick
=
{
this
.
unsubscribe
}
/>
</
div
>
:
<
button
className
=
"rounded bordered bg-white text-default text-bold
flex align-center
cursor-pointer"
onClick
=
{
this
.
subscribe
}
>
<
Icon
className
=
"p2"
name
=
"add"
width
=
{
12
}
height
=
{
12
}
/>
<
span
className
=
"p
r2
"
>
Get this
{
channel
.
channel_type
}
</
span
>
</
button
>
<
div
className
=
"
inline-block clearfix
rounded bordered bg-white text-default text-bold cursor-pointer"
onClick
=
{
this
.
subscribe
}
>
<
Icon
className
=
"p2
float-left
"
name
=
"add"
width
=
{
12
}
height
=
{
12
}
/>
<
div
className
=
"p
y1 pr2 float-right
"
>
Get this
{
channel
.
channel_type
}
</
div
>
</
div
>
}
</
div
>
}
...
...
This diff is collapsed.
Click to expand it.
frontend/src/pulse/pulse.module.js
+
1
−
1
View file @
6c543204
...
...
@@ -21,7 +21,7 @@ var Pulse = angular.module('metabase.pulse', []);
Pulse
.
config
([
'
$routeProvider
'
,
function
(
$routeProvider
)
{
$routeProvider
.
when
(
'
/pulse
'
,
{
template
:
'
<div mb-redux-component
class="flex flex-column flex-full"
/>
'
,
template
:
'
<div mb-redux-component />
'
,
controller
:
[
'
$scope
'
,
'
$location
'
,
'
$route
'
,
'
$routeParams
'
,
'
AppState
'
,
function
(
$scope
,
$location
,
$route
,
$routeParams
,
AppState
)
{
$scope
.
Component
=
PulseListApp
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment