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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
12ba855f
Commit
12ba855f
authored
Mar 12, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-import-page' into 'master'
Style improvements to import page See merge request !1685
parents
cdb64a81
dd78cd1c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
56 additions
and
9 deletions
+56
-9
app/assets/javascripts/importer_status.js.coffee
app/assets/javascripts/importer_status.js.coffee
+5
-5
app/assets/stylesheets/base/gl_bootstrap.scss
app/assets/stylesheets/base/gl_bootstrap.scss
+47
-0
app/views/import/bitbucket/status.html.haml
app/views/import/bitbucket/status.html.haml
+1
-1
app/views/import/github/status.html.haml
app/views/import/github/status.html.haml
+1
-1
app/views/import/gitlab/status.html.haml
app/views/import/gitlab/status.html.haml
+1
-1
app/views/import/gitorious/status.html.haml
app/views/import/gitorious/status.html.haml
+1
-1
No files found.
app/assets/javascripts/importer_status.js.coffee
View file @
12ba855f
...
...
@@ -26,7 +26,7 @@ class @ImporterStatus
if
job
.
import_status
==
'finished'
job_item
.
removeClass
(
"active"
).
addClass
(
"success"
)
status_field
.
html
(
'<span
class="cgreen"
><i class="fa fa-check"></i> done</span>'
)
status_field
.
html
(
'<span><i class="fa fa-check"></i> done</span>'
)
else
if
job
.
import_status
==
'started'
status_field
.
html
(
"<i class='fa fa-spinner fa-spin'></i> started"
)
else
...
...
app/assets/stylesheets/base/gl_bootstrap.scss
View file @
12ba855f
...
...
@@ -197,3 +197,50 @@
text-decoration
:
underline
;
}
}
// Typography =================================================================
.text-primary
,
.text-primary
:hover
{
color
:
$brand-primary
;
}
.text-success
,
.text-success
:hover
{
color
:
$brand-success
;
}
.text-danger
,
.text-danger
:hover
{
color
:
$brand-danger
;
}
.text-warning
,
.text-warning
:hover
{
color
:
$brand-warning
;
}
.text-info
,
.text-info
:hover
{
color
:
$brand-info
;
}
// Tables =====================================================================
table
.table
{
.dropdown-menu
a
{
text-decoration
:
none
;
}
.success
,
.warning
,
.danger
,
.info
{
color
:
#fff
;
a
:not
(
.btn
)
{
text-decoration
:
underline
;
color
:
#fff
;
}
}
}
app/views/import/bitbucket/status.html.haml
View file @
12ba855f
...
...
@@ -23,7 +23,7 @@
%strong
=
link_to
project
.
path_with_namespace
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
%td
.job-status
-
if
project
.
import_status
==
'finished'
%span
.cgreen
%span
%i
.fa.fa-check
done
-
elsif
project
.
import_status
==
'started'
...
...
app/views/import/github/status.html.haml
View file @
12ba855f
...
...
@@ -23,7 +23,7 @@
%strong
=
link_to
project
.
path_with_namespace
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
%td
.job-status
-
if
project
.
import_status
==
'finished'
%span
.cgreen
%span
%i
.fa.fa-check
done
-
elsif
project
.
import_status
==
'started'
...
...
app/views/import/gitlab/status.html.haml
View file @
12ba855f
...
...
@@ -23,7 +23,7 @@
%strong
=
link_to
project
.
path_with_namespace
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
%td
.job-status
-
if
project
.
import_status
==
'finished'
%span
.cgreen
%span
%i
.fa.fa-check
done
-
elsif
project
.
import_status
==
'started'
...
...
app/views/import/gitorious/status.html.haml
View file @
12ba855f
...
...
@@ -23,7 +23,7 @@
%strong
=
link_to
project
.
path_with_namespace
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
%td
.job-status
-
if
project
.
import_status
==
'finished'
%span
.cgreen
%span
%i
.fa.fa-check
done
-
elsif
project
.
import_status
==
'started'
...
...
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