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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
a6e91b16
Commit
a6e91b16
authored
8 years ago
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styling of award emoji block for snippets after upstream design changes.
parent
86e7ae82
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
app/assets/stylesheets/pages/snippets.scss
app/assets/stylesheets/pages/snippets.scss
+7
-0
app/views/projects/snippets/_actions.html.haml
app/views/projects/snippets/_actions.html.haml
+1
-1
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+11
-10
No files found.
app/assets/stylesheets/pages/snippets.scss
View file @
a6e91b16
...
...
@@ -12,11 +12,18 @@
.snippet-file-content
{
border-radius
:
3px
;
margin-bottom
:
$gl-padding
;
.btn-clipboard
{
@extend
.btn
;
}
}
.project-snippets
.awards
{
border-bottom
:
1px
solid
$table-border-color
;
padding-bottom
:
$gl-padding
;
}
.snippet-title
{
font-size
:
24px
;
font-weight
:
600
;
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/snippets/_actions.html.haml
View file @
a6e91b16
...
...
@@ -3,7 +3,7 @@
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-grouped btn-create new-snippet-link'
,
title:
"New Snippet"
do
New Snippet
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
=
link_to
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-
warning
"
,
title:
'Delete Snippet'
do
=
link_to
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-
danger
"
,
title:
'Delete Snippet'
do
Delete
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
=
link_to
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-grouped snippable-edit"
do
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/snippets/show.html.haml
View file @
a6e91b16
...
...
@@ -2,7 +2,8 @@
=
render
'shared/snippets/header'
%article
.file-holder.snippet-file-content
.project-snippets
%article
.file-holder.snippet-file-content
.file-title
=
blob_icon
0
,
@snippet
.
file_name
=
@snippet
.
file_name
...
...
@@ -11,6 +12,6 @@
=
link_to
'Raw'
,
raw_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
render
'shared/snippets/blob'
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
%div
#notes
=
render
"projects/notes/notes_with_form"
%div
#notes
=
render
"projects/notes/notes_with_form"
This diff is collapsed.
Click to expand it.
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