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
2da27205
Commit
2da27205
authored
Mar 13, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve css for file actions
parent
3aded9d5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
36 deletions
+43
-36
app/assets/stylesheets/base/gl_bootstrap.scss
app/assets/stylesheets/base/gl_bootstrap.scss
+1
-4
app/assets/stylesheets/generic/files.scss
app/assets/stylesheets/generic/files.scss
+9
-15
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+19
-0
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+4
-3
app/views/projects/blob/_blob.html.haml
app/views/projects/blob/_blob.html.haml
+6
-4
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+2
-2
app/views/search/results/_snippet_blob.html.haml
app/views/search/results/_snippet_blob.html.haml
+0
-6
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/base/gl_bootstrap.scss
View file @
2da27205
...
@@ -152,12 +152,9 @@
...
@@ -152,12 +152,9 @@
*/
*/
.panel
{
.panel
{
.panel-heading
{
.panel-heading
{
font-size
:
14px
;
line-height
:
18px
;
.panel-head-actions
{
.panel-head-actions
{
position
:
relative
;
position
:
relative
;
top
:
-
6
px
;
top
:
-
5
px
;
float
:
right
;
float
:
right
;
}
}
}
}
...
...
app/assets/stylesheets/generic/files.scss
View file @
2da27205
...
@@ -18,27 +18,21 @@
...
@@ -18,27 +18,21 @@
text-align
:
left
;
text-align
:
left
;
padding
:
10px
15px
;
padding
:
10px
15px
;
.
op
tions
{
.
file-ac
tions
{
float
:
right
;
float
:
right
;
margin-top
:
-3px
;
position
:
relative
;
top
:
-5px
;
.btn
{
padding
:
0px
10px
;
font-size
:
13px
;
line-height
:
28px
;
}
}
}
.left-options
{
.left-options
{
margin-top
:
-3px
;
margin-top
:
-3px
;
}
}
.file_name
{
font-weight
:
bold
;
padding-left
:
3px
;
font-size
:
14px
;
small
{
color
:
#888
;
font-size
:
13px
;
font-weight
:
normal
;
padding-left
:
10px
;
}
}
}
}
.file-content
{
.file-content
{
background
:
#fff
;
background
:
#fff
;
...
...
app/views/help/ui.html.haml
View file @
2da27205
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
=
link_to
'Alerts'
,
'#alerts'
=
link_to
'Alerts'
,
'#alerts'
%li
%li
=
link_to
'Forms'
,
'#forms'
=
link_to
'Forms'
,
'#forms'
%li
=
link_to
'Files'
,
'#file'
%li
%li
=
link_to
'Markdown'
,
'#markdown'
=
link_to
'Markdown'
,
'#markdown'
...
@@ -193,6 +195,23 @@
...
@@ -193,6 +195,23 @@
Remember me
Remember me
%button
.btn.btn-default
{
:type
=>
"submit"
}
Sign in
%button
.btn.btn-default
{
:type
=>
"submit"
}
Sign in
%h2
#file
File
%h3
%code
.file-holder
-
blob
=
Snippet
.
new
(
content:
"Wow
\n
Such
\n
File"
)
.example
.file-holder
.file-title
Awesome file
.file-actions
.btn-group
%a
.btn
Edit
%a
.btn
Remove
.file-contenta.code
=
render
'shared/file_highlight'
,
blob:
blob
%h2
#markdown
Markdown
%h2
#markdown
Markdown
%h3
%h3
%code
.md or .wiki and others
%code
.md or .wiki and others
...
...
app/views/projects/blame/show.html.haml
View file @
2da27205
...
@@ -4,10 +4,11 @@
...
@@ -4,10 +4,11 @@
.file-holder
.file-holder
.file-title
.file-title
%i
.fa.fa-file
%i
.fa.fa-file
%s
pan
.file_name
%s
trong
=
@path
=
@path
%small
=
number_to_human_size
@blob
.
size
%small
=
number_to_human_size
@blob
.
size
%span
.options
=
render
"projects/blob/actions"
.file-actions
=
render
"projects/blob/actions"
.file-content.blame.highlight
.file-content.blame.highlight
%table
%table
-
@blame
.
each
do
|
commit
,
lines
,
since
|
-
@blame
.
each
do
|
commit
,
lines
,
since
|
...
...
app/views/projects/blob/_blob.html.haml
View file @
2da27205
...
@@ -21,12 +21,14 @@
...
@@ -21,12 +21,14 @@
%div
#tree-content-holder
.tree-content-holder
%div
#tree-content-holder
.tree-content-holder
%article
.file-holder
%article
.file-holder
.file-title
.clearfix
.file-title
%i
.fa.fa-file
%i
.fa.fa-file
%s
pan
.file_name
%s
trong
=
blob
.
name
=
blob
.
name
%small
=
number_to_human_size
blob
.
size
%small
%span
.options.hidden-xs
=
render
"actions"
=
number_to_human_size
(
blob
.
size
)
.file-actions.hidden-xs
=
render
"actions"
-
if
blob
.
text?
-
if
blob
.
text?
=
render
"text"
,
blob:
blob
=
render
"text"
,
blob:
blob
-
elsif
blob
.
image?
-
elsif
blob
.
image?
...
...
app/views/projects/snippets/show.html.haml
View file @
2da27205
...
@@ -23,9 +23,9 @@
...
@@ -23,9 +23,9 @@
.file-holder
.file-holder
.file-title
.file-title
%i
.fa.fa-file
%i
.fa.fa-file
%s
pan
.file_name
%s
trong
=
@snippet
.
file_name
=
@snippet
.
file_name
.
op
tions
.
file-ac
tions
.btn-group
.btn-group
-
if
can?
(
current_user
,
:modify_project_snippet
,
@snippet
)
-
if
can?
(
current_user
,
:modify_project_snippet
,
@snippet
)
=
link_to
"edit"
,
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
=
link_to
"edit"
,
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
...
...
app/views/search/results/_snippet_blob.html.haml
View file @
2da27205
...
@@ -13,12 +13,6 @@
...
@@ -13,12 +13,6 @@
.file-title
.file-title
%i
.fa.fa-file
%i
.fa.fa-file
%strong
=
snippet_blob
[
:snippet_object
].
file_name
%strong
=
snippet_blob
[
:snippet_object
].
file_name
%span
.options
.btn-group.tree-btn-group.pull-right
-
if
snippet_blob
[
:snippet_object
].
author
==
current_user
=
link_to
"Edit"
,
edit_snippet_path
(
snippet_blob
[
:snippet_object
]),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
=
link_to
"Delete"
,
snippet_path
(
snippet_blob
[
:snippet_object
]),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-tiny"
,
title:
'Delete Snippet'
=
link_to
"Raw"
,
raw_snippet_path
(
snippet_blob
[
:snippet_object
]),
class:
"btn btn-tiny"
,
target:
"_blank"
-
if
gitlab_markdown?
(
snippet_blob
[
:snippet_object
].
file_name
)
-
if
gitlab_markdown?
(
snippet_blob
[
:snippet_object
].
file_name
)
.file-content.wiki
.file-content.wiki
-
snippet_blob
[
:snippet_chunks
].
each
do
|
snippet
|
-
snippet_blob
[
:snippet_chunks
].
each
do
|
snippet
|
...
...
app/views/snippets/show.html.haml
View file @
2da27205
...
@@ -31,9 +31,9 @@
...
@@ -31,9 +31,9 @@
.file-holder
.file-holder
.file-title
.file-title
%i
.fa.fa-file
%i
.fa.fa-file
%s
pan
.file_name
%s
trong
=
@snippet
.
file_name
=
@snippet
.
file_name
.
op
tions
.
file-ac
tions
.btn-group
.btn-group
-
if
can?
(
current_user
,
:modify_personal_snippet
,
@snippet
)
-
if
can?
(
current_user
,
:modify_personal_snippet
,
@snippet
)
=
link_to
"edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
=
link_to
"edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
...
...
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