Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Dependency List
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
833
Issues
833
List
Boards
Labels
Service Desk
Milestones
Merge Requests
44
Merge Requests
44
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Compare Revisions
3ccd8be8b17bfb0cfe4e7fc31e84f6ae12cd51ff...d7940cb06bec82955f1c94ba4b64f95f0793c39a
Source
d7940cb06bec82955f1c94ba4b64f95f0793c39a
Select Git revision
...
Target
3ccd8be8b17bfb0cfe4e7fc31e84f6ae12cd51ff
Select Git revision
Compare
Commits (2)
(feat): line up the boost button with the new wire button
· 64940974
Mark Harding
authored
2 hours ago
64940974
(chore): rename wire to donate
· d7940cb0
Mark Harding
authored
2 hours ago
d7940cb0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
32 deletions
+43
-32
buttons.scss
src/app/modules/legacy/components/buttons/buttons.scss
+11
-11
activity.component.scss
.../legacy/components/cards/activity/activity.component.scss
+5
-4
activity.html
...pp/modules/legacy/components/cards/activity/activity.html
+11
-11
button.component.scss
src/app/modules/wire/button/button.component.scss
+12
-3
button.component.ts
src/app/modules/wire/button/button.component.ts
+3
-2
channel.component.html
src/app/modules/wire/channel/channel.component.html
+1
-1
No files found.
src/app/modules/legacy/components/buttons/buttons.scss
View file @
d7940cb0
...
...
@@ -69,25 +69,25 @@ minds-button-remind {
.minds-boost-button
{
font-size
:
12px
;
font-weight
:
400
;
height
:
auto
;
min-height
:
0
;
line-height
:
18px
;
text-transform
:
capitaliz
e
;
text-transform
:
uppercas
e
;
align-self
:
center
;
padding
:
3px
0
;
min-width
:
6
2px
;
min-width
:
7
2px
;
width
:
auto
;
margin
:
-3px
0
;
display
:
block
;
@include
m-theme
(){
background-color
:
themed
(
$m-blue
)
!
important
;
}
&
:hover
{
@include
m-theme
(){
background-color
:
rgba
(
themed
(
$m-blue-dark
)
,
0
.9
)
!
important
;
}
flex
:
0
!
important
;
span
{
min-width
:
72px
;
text-align
:
center
;
vertical-align
:
middle
;
}
}
.selected
{
...
...
@@ -136,4 +136,4 @@ minds-button-remind > a {
color
:
themed
(
$m-blue-grey-800
);
}
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
src/app/modules/legacy/components/cards/activity/activity.component.scss
View file @
d7940cb0
.tabs
.m-wire-button
{
transform
:
scale
(
0
.8
)
translateY
(
-4px
);
// transform: scale(0.8) translateY(-4px);
margin
:
-3px
0
;
}
.m-pin-button
{
overflow
:
visible
;
...
...
@@ -88,9 +89,9 @@ minds-activity {
padding-left
:
8px
;
margin
:
auto
;
padding
:
3px
0
3
px
8px
;
padding
:
2px
0
2
px
8px
;
font-size
:
14px
;
line-height
:
9
px
;
line-height
:
8
px
;
border-radius
:
3px
;
vertical-align
:
middle
;
//text-align: center;
...
...
@@ -120,7 +121,7 @@ minds-activity {
}
.m-activity--metrics-metric
{
font-size
:
10
px
;
font-size
:
9
px
;
display
:
inline-block
;
vertical-align
:
middle
;
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/legacy/components/cards/activity/activity.html
View file @
d7940cb0
...
...
@@ -210,21 +210,21 @@
<div
class=
"tabs"
*
ngIf=
"!hideTabs && !isPending(activity)"
>
<minds-button-thumbs-up
[
object
]="
activity
"
></minds-button-thumbs-up>
<minds-button-thumbs-down
[
object
]="
activity
"
></minds-button-thumbs-down>
<m-wire-button
*
ngIf=
"session.getLoggedInUser().guid != (activity.remind_object ? activity.remind_object.owner_guid : activity.owner_guid)"
[
object
]="
activity
.
remind_object
?
activity
.
remind_object
:
activity
"
(
done
)="
wireSubmitted
($
event
)"
></m-wire-button>
<m-wire-button
*
ngIf=
"session.getLoggedInUser().guid != activity.owner_guid"
[
object
]="
activity
"
(
done
)="
wireSubmitted
($
event
)"
></m-wire-button>
<button
class=
"m-btn m-btn--action m-btn--slim minds-boost-button"
*
ngIf =
"session.getLoggedInUser().guid == activity.owner_guid"
id=
"boost-actions"
(
click
)="
showBoost
()"
>
<span
i18n=
"verb|@@M__ACTION__BOOST"
>
Boost
</span>
</button>
<minds-button-comment
[
object
]="
activity
"
(
click
)="
openComments
()"
></minds-button-comment>
<minds-button-remind
[
object
]="
activity
"
></minds-button-remind>
<a
class=
"mdl-button mdl-color-text--white mdl-button--colored minds-boost-button"
*
ngIf =
"session.getLoggedInUser().guid == activity.owner_guid"
id=
"boost-actions"
(
click
)="
showBoost
()"
>
<ng-container
i18n=
"verb|@@M__ACTION__BOOST"
>
Boost
</ng-container>
</a>
</div>
<div
class=
"impressions-tag m-activity--metrics
"
[
class
.
m-activity--metrics-wire
]="!
session
.
getLoggedInUser
()
||
session
.
getLoggedInUser
().
guid
!=
activity
.
owner_guid
"
*
ngIf=
"!activity.hide_impressions && !hideTabs"
>
<div
class=
"impressions-tag m-activity--metrics
m-activity--metrics-wire
"
*
ngIf=
"!activity.hide_impressions && !hideTabs"
>
<div
class=
"m-activity--metrics-inner m-border"
>
<div
class=
"m-activity--metrics-metric"
(
click
)="
showWire
()"
>
<i
class=
"ion-icon ion-flash"
></i>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/wire/button/button.component.scss
View file @
d7940cb0
.m-wire-button
{
appearance
:
none
;
/*
appearance: none;
background: transparent;
border: 0;
border-radius: 0;
padding
:
0
;
*/
padding
:
3px
;
height
:
auto
;
line-height
:
18px
;
cursor
:
pointer
;
@include
m-theme
(){
color
:
themed
(
$m-blue
);
...
...
@@ -16,7 +19,13 @@
}
>
.ion-icon
{
transform
:
scale
(
1
.6
);
// transform: scale(1.6);
font-size
:
18px
;
}
span
{
margin-left
:
$minds-margin
;
vertical-align
:
middle
;
}
&
:focus
{
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/wire/button/button.component.ts
View file @
d7940cb0
...
...
@@ -8,8 +8,9 @@ import { Session } from '../../../services/session';
@
Component
({
selector
:
'
m-wire-button
'
,
template
:
`
<button class="m-wire-button" (click)="wire()">
<i class="ion-icon ion-flash"></i>
<button class="m-btn m-btn--action m-btn--slim m-wire-button" (click)="wire()">
<i class="ion-icon ion-flash"></i>
<span>Donate</span>
</button>
`
})
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/wire/channel/channel.component.html
View file @
d7940cb0
...
...
@@ -7,7 +7,7 @@
<i
class=
"ion-icon ion-flash"
></i>
<span
class=
"m-wire-channel--cta-label"
>
<span
i18n=
"@@WIRE__CHANNEL__WIRE_ME_ACTION"
>
Wire m
e
</span>
<span
i18n=
"@@WIRE__CHANNEL__WIRE_ME_ACTION"
>
Donat
e
</span>
</span>
</button>
</div>
...
...
This diff is collapsed.
Click to expand it.