Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c1d27f86
Commit
c1d27f86
authored
Mar 12, 2021
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix selectors with hyphens instead of underscores
Signed-off-by:
Takuya Noguchi
<
takninnovationresearch@gmail.com
>
parent
172b3826
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
19 deletions
+4
-19
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+2
-17
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+1
-1
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/events.scss
View file @
c1d27f86
...
...
@@ -50,7 +50,7 @@
.event-user-info
{
margin-bottom
:
$gl-padding-4
;
.author
_
name
{
.author
-
name
{
a
{
color
:
$gl-text-color
;
font-weight
:
$gl-font-weight-bold
;
...
...
@@ -118,26 +118,11 @@
}
}
.event_icon
{
position
:
relative
;
float
:
right
;
border
:
1px
solid
$gray-darker
;
padding
:
5px
;
border-radius
:
5px
;
background
:
$gray-light
;
margin-left
:
10px
;
top
:
-6px
;
img
{
width
:
20px
;
}
}
&
:last-child
{
border
:
0
;
}
.event
_
commits
{
.event
-
commits
{
li
{
&
.commit
{
background
:
transparent
;
...
...
app/helpers/events_helper.rb
View file @
c1d27f86
...
...
@@ -273,7 +273,7 @@ module EventsHelper
def
event_user_info
(
event
)
content_tag
(
:div
,
class:
"event-user-info"
)
do
concat
content_tag
(
:span
,
link_to_author
(
event
),
class:
"author
_
name"
)
concat
content_tag
(
:span
,
link_to_author
(
event
),
class:
"author
-
name"
)
concat
" "
.
html_safe
concat
content_tag
(
:span
,
event
.
author
.
to_reference
,
class:
"username"
)
end
...
...
app/views/events/event/_push.html.haml
View file @
c1d27f86
...
...
@@ -18,7 +18,7 @@
-
if
event
.
push_with_commits?
.event-body
%ul
.content-list.event
_
commits
%ul
.content-list.event
-
commits
=
render
"events/commit"
,
project:
project
,
event:
event
-
create_mr
=
event
.
new_ref?
&&
create_mr_button?
(
from:
project
.
default_branch
,
to:
event
.
ref_name
,
source_project:
project
,
target_project:
project
)
&&
event
.
authored_by?
(
current_user
)
...
...
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