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
44349697
Commit
44349697
authored
Nov 29, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ee-40459-svg-icon-fix' into 'master'
svg icon fix See merge request gitlab-org/gitlab-ee!3565
parents
c7c8eb86
ea0d2ab2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
69 additions
and
49 deletions
+69
-49
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+31
-2
app/assets/stylesheets/framework/icons.scss
app/assets/stylesheets/framework/icons.scss
+35
-7
app/assets/stylesheets/framework/tw_bootstrap.scss
app/assets/stylesheets/framework/tw_bootstrap.scss
+0
-27
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-6
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-4
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+2
-2
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/common.scss
View file @
44349697
...
@@ -2,14 +2,43 @@
...
@@ -2,14 +2,43 @@
.cgray
{
color
:
$common-gray
;
}
.cgray
{
color
:
$common-gray
;
}
.clgray
{
color
:
$common-gray-light
;
}
.clgray
{
color
:
$common-gray-light
;
}
.cred
{
color
:
$common-red
;
}
.cred
{
color
:
$common-red
;
}
svg
.cred
{
fill
:
$common-red
;
}
.cgreen
{
color
:
$common-green
;
}
.cgreen
{
color
:
$common-green
;
}
svg
.cgreen
{
fill
:
$common-green
;
}
.cdark
{
color
:
$common-gray-dark
;
}
.cdark
{
color
:
$common-gray-dark
;
}
.text-plain
,
.text-plain
:hover
{
color
:
$gl-text-color
;
}
.text-secondary
{
.text-secondary
{
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
}
}
.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
;
}
.underlined-link
{
text-decoration
:
underline
;
}
.underlined-link
{
text-decoration
:
underline
;
}
.hint
{
font-style
:
italic
;
color
:
$hint-color
;
}
.hint
{
font-style
:
italic
;
color
:
$hint-color
;
}
.light
{
color
:
$common-gray
;
}
.light
{
color
:
$common-gray
;
}
...
...
app/assets/stylesheets/framework/icons.scss
View file @
44349697
.ci-status-icon-success
,
.ci-status-icon-success
,
.ci-status-icon-passed
{
.ci-status-icon-passed
{
color
:
$green-500
;
&
,
&
:hover
,
&
:focus
{
color
:
$green-500
;
}
}
}
.ci-status-icon-failed
{
.ci-status-icon-failed
{
color
:
$gl-danger
;
&
,
&
:hover
,
&
:focus
{
color
:
$gl-danger
;
}
}
}
.ci-status-icon-pending
,
.ci-status-icon-pending
,
.ci-status-icon-failed_with_warnings
,
.ci-status-icon-failed_with_warnings
,
.ci-status-icon-success_with_warnings
{
.ci-status-icon-success_with_warnings
{
color
:
$orange-500
;
&
,
&
:hover
,
&
:focus
{
color
:
$orange-500
;
}
}
}
.ci-status-icon-running
{
.ci-status-icon-running
{
color
:
$blue-400
;
&
,
&
:hover
,
&
:focus
{
color
:
$blue-400
;
}
}
}
.ci-status-icon-canceled
,
.ci-status-icon-canceled
,
.ci-status-icon-disabled
,
.ci-status-icon-disabled
,
.ci-status-icon-not-found
{
.ci-status-icon-not-found
{
color
:
$gl-text-color
;
&
,
&
:hover
,
&
:focus
{
color
:
$gl-text-color
;
}
}
}
.ci-status-icon-created
,
.ci-status-icon-created
,
.ci-status-icon-skipped
{
.ci-status-icon-skipped
{
color
:
$gray-darkest
;
&
,
&
:hover
,
&
:focus
{
color
:
$gray-darkest
;
}
}
}
.ci-status-icon-manual
{
.ci-status-icon-manual
{
color
:
$gl-text-color
;
&
,
&
:hover
,
&
:focus
{
color
:
$gl-text-color
;
}
}
}
.icon-link
{
.icon-link
{
...
...
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @
44349697
...
@@ -195,33 +195,6 @@ summary {
...
@@ -195,33 +195,6 @@ summary {
}
}
}
}
// 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
;
}
// Prevent datetimes on tooltips to break into two lines
// Prevent datetimes on tooltips to break into two lines
.local-timeago
{
.local-timeago
{
white-space
:
nowrap
;
white-space
:
nowrap
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
44349697
...
@@ -777,12 +777,6 @@ ul.notes {
...
@@ -777,12 +777,6 @@ ul.notes {
}
}
}
}
svg
{
fill
:
currentColor
;
height
:
16px
;
width
:
16px
;
}
.loading
{
.loading
{
margin
:
0
;
margin
:
0
;
height
:
auto
;
height
:
auto
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
44349697
...
@@ -893,10 +893,6 @@ pre.light-well {
...
@@ -893,10 +893,6 @@ pre.light-well {
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
}
}
a
{
color
:
$gl-text-color
;
}
.avatar-container
,
.avatar-container
,
.controls
{
.controls
{
flex
:
0
0
auto
;
flex
:
0
0
auto
;
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
44349697
...
@@ -67,8 +67,8 @@
...
@@ -67,8 +67,8 @@
-
if
@commit
.
last_pipeline
-
if
@commit
.
last_pipeline
-
last_pipeline
=
@commit
.
last_pipeline
-
last_pipeline
=
@commit
.
last_pipeline
.well-segment.pipeline-info
.well-segment.pipeline-info
.status-icon-container
{
class:
"ci-status-icon-#{last_pipeline.status}"
}
.status-icon-container
=
link_to
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
do
=
link_to
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
,
class:
"ci-status-icon-
#{
last_pipeline
.
status
}
"
do
=
ci_icon_for_status
(
last_pipeline
.
status
)
=
ci_icon_for_status
(
last_pipeline
.
status
)
#{
_
(
'Pipeline'
)
}
#{
_
(
'Pipeline'
)
}
=
link_to
"#
#{
last_pipeline
.
id
}
"
,
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
=
link_to
"#
#{
last_pipeline
.
id
}
"
,
project_pipeline_path
(
@project
,
last_pipeline
.
id
)
...
...
app/views/shared/projects/_project.html.haml
View file @
44349697
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
.project-details
.project-details
%h3
.prepend-top-0.append-bottom-0
%h3
.prepend-top-0.append-bottom-0
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
=
link_to
project_path
(
project
),
class:
'text-plain'
do
%span
.project-full-name
%span
.project-full-name
%span
.namespace-name
%span
.namespace-name
-
if
project
.
namespace
&&
!
skip_namespace
-
if
project
.
namespace
&&
!
skip_namespace
...
...
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