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
Boxiang Sun
gitlab-ce
Commits
53784fb6
Commit
53784fb6
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
Updated Gitorious import icons See merge request !353
parents
2cedeb48
f6add983
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
2 deletions
+20
-2
app/assets/images/gitorious-logo-black.png
app/assets/images/gitorious-logo-black.png
+0
-0
app/assets/images/gitorious-logo-blue.png
app/assets/images/gitorious-logo-blue.png
+0
-0
app/assets/stylesheets/sections/import.scss
app/assets/stylesheets/sections/import.scss
+18
-0
app/views/import/gitorious/status.html.haml
app/views/import/gitorious/status.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+1
-1
No files found.
app/assets/images/gitorious-logo-black.png
0 → 100644
View file @
53784fb6
809 Bytes
This diff is collapsed.
Click to expand it.
app/assets/images/gitorious-logo-blue.png
0 → 100644
View file @
53784fb6
495 Bytes
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/import.scss
0 → 100644
View file @
53784fb6
i
.icon-gitorious
{
display
:
inline-block
;
background-position
:
0px
0px
;
background-size
:
contain
;
background-repeat
:
no-repeat
;
}
i
.icon-gitorious-small
{
background-image
:
image-url
(
'gitorious-logo-blue.png'
);
width
:
13px
;
height
:
13px
;
}
i
.icon-gitorious-big
{
background-image
:
image-url
(
'gitorious-logo-black.png'
);
width
:
18px
;
height
:
18px
;
}
This diff is collapsed.
Click to expand it.
app/views/import/gitorious/status.html.haml
View file @
53784fb6
%h3
.page-title
%i
.
fa.fa-gitorious
%i
.
icon-gitorious.icon-gitorious-big
Import repositories from Gitorious.org
%p
.light
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/new.html.haml
View file @
53784fb6
...
...
@@ -71,7 +71,7 @@
.col-sm-2
.col-sm-10
=
link_to
new_import_gitorious_path
do
%i
.
fa.fa-heart
%i
.
icon-gitorious.icon-gitorious-small
Import projects from Gitorious.org
%hr
.prepend-botton-10
...
...
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