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
Jérome Perrin
gitlab-ce
Commits
12784559
Commit
12784559
authored
Aug 03, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change logo animation to CSS
parent
c288916d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
136 additions
and
79 deletions
+136
-79
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/logo.js
app/assets/javascripts/logo.js
+2
-40
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-0
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-31
app/assets/stylesheets/framework/logo.scss
app/assets/stylesheets/framework/logo.scss
+118
-0
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+5
-0
app/views/shared/_logo.svg
app/views/shared/_logo.svg
+8
-8
No files found.
CHANGELOG
View file @
12784559
...
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.12.0 (unreleased)
- Add two-factor recovery endpoint to internal API !5510
- Add font color contrast to external label in admin area (ClemMakesApps)
- Change logo animation to CSS (ClemMakesApps)
- Change merge_error column from string to text type
- Reduce contributions calendar data payload (ClemMakesApps)
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
...
...
app/assets/javascripts/logo.js
View file @
12784559
(
function
()
{
var
clearHighlights
,
currentTimer
,
defaultClass
,
delay
,
firstPiece
,
pieceIndex
,
pieces
,
start
,
stop
,
work
;
Turbolinks
.
enableProgressBar
();
defaultClass
=
'
tanuki-shape
'
;
pieces
=
[
'
path#tanuki-right-cheek
'
,
'
path#tanuki-right-eye, path#tanuki-right-ear
'
,
'
path#tanuki-nose
'
,
'
path#tanuki-left-eye, path#tanuki-left-ear
'
,
'
path#tanuki-left-cheek
'
];
pieceIndex
=
0
;
firstPiece
=
pieces
[
0
];
currentTimer
=
null
;
delay
=
150
;
clearHighlights
=
function
()
{
return
$
(
"
.
"
+
defaultClass
+
"
.highlight
"
).
attr
(
'
class
'
,
defaultClass
);
};
start
=
function
()
{
clearHighlights
();
pieceIndex
=
0
;
if
(
pieces
[
0
]
!==
firstPiece
)
{
pieces
.
reverse
();
}
if
(
currentTimer
)
{
clearInterval
(
currentTimer
);
}
return
currentTimer
=
setInterval
(
work
,
delay
);
$
(
'
.tanuki-logo
'
).
addClass
(
'
animate
'
);
};
stop
=
function
()
{
clearInterval
(
currentTimer
);
return
clearHighlights
();
};
work
=
function
()
{
clearHighlights
();
$
(
pieces
[
pieceIndex
]).
attr
(
'
class
'
,
defaultClass
+
"
highlight
"
);
if
(
pieceIndex
===
pieces
.
length
-
1
)
{
pieceIndex
=
0
;
return
pieces
.
reverse
();
}
else
{
return
pieceIndex
++
;
}
$
(
'
.tanuki-logo
'
).
removeClass
(
'
animate
'
);
};
$
(
document
).
on
(
'
page:fetch
'
,
start
);
...
...
app/assets/stylesheets/framework.scss
View file @
12784559
...
...
@@ -24,6 +24,7 @@
@import
"framework/issue_box.scss"
;
@import
"framework/jquery.scss"
;
@import
"framework/lists.scss"
;
@import
"framework/logo.scss"
;
@import
"framework/markdown_area.scss"
;
@import
"framework/mobile.scss"
;
@import
"framework/modal.scss"
;
...
...
app/assets/stylesheets/framework/header.scss
View file @
12784559
...
...
@@ -2,16 +2,6 @@
* Application Header
*
*/
@mixin
tanuki-logo-colors
(
$path-color
)
{
fill
:
$path-color
;
transition
:
all
0
.8s
;
&
:hover
,
&
.highlight
{
fill
:
lighten
(
$path-color
,
25%
);
transition
:
all
0
.1s
;
}
}
header
{
transition
:
padding
$sidebar-transition-duration
;
...
...
@@ -25,7 +15,7 @@ header {
margin
:
8px
0
;
text-align
:
center
;
#
tanuki-logo
,
img
{
.
tanuki-logo
,
img
{
height
:
36px
;
}
}
...
...
@@ -205,26 +195,6 @@ header {
}
}
#tanuki-logo
{
#tanuki-left-ear
,
#tanuki-right-ear
,
#tanuki-nose
{
@include
tanuki-logo-colors
(
$tanuki-red
);
}
#tanuki-left-eye
,
#tanuki-right-eye
{
@include
tanuki-logo-colors
(
$tanuki-orange
);
}
#tanuki-left-cheek
,
#tanuki-right-cheek
{
@include
tanuki-logo-colors
(
$tanuki-yellow
);
}
}
@media
(
max-width
:
$screen-xs-max
)
{
header
.container-fluid
{
font-size
:
18px
;
...
...
app/assets/stylesheets/framework/logo.scss
0 → 100644
View file @
12784559
@mixin
unique-keyframes
{
$animation-name
:
unique-id
();
@include
webkit-prefix
(
animation-name
,
$animation-name
);
@-webkit-keyframes
#{
$animation-name
}
{
@content
;
}
@keyframes
#{
$animation-name
}
{
@content
;
}
}
@mixin
tanuki-logo-colors
(
$path-color
)
{
fill
:
$path-color
;
transition
:
all
0
.8s
;
&
:hover
{
fill
:
lighten
(
$path-color
,
25%
);
transition
:
all
0
.1s
;
}
}
@mixin
tanuki-second-highlight-animations
(
$tanuki-color
)
{
@include
unique-keyframes
{
10
%
,
80
%
{
fill
:
#{
$tanuki-color
}
}
20
%
,
90
%
{
fill
:
lighten
(
$tanuki-color
,
25%
);
}
}
}
@mixin
tanuki-forth-highlight-animations
(
$tanuki-color
)
{
@include
unique-keyframes
{
30
%
,
60
%
{
fill
:
#{
$tanuki-color
}
;
}
40
%
,
70
%
{
fill
:
lighten
(
$tanuki-color
,
25%
);
}
}
}
.tanuki-logo
{
.tanuki-left-ear
,
.tanuki-right-ear
,
.tanuki-nose
{
@include
tanuki-logo-colors
(
$tanuki-red
);
}
.tanuki-left-eye
,
.tanuki-right-eye
{
@include
tanuki-logo-colors
(
$tanuki-orange
);
}
.tanuki-left-cheek
,
.tanuki-right-cheek
{
@include
tanuki-logo-colors
(
$tanuki-yellow
);
}
&
.animate
{
.tanuki-shape
{
@include
webkit-prefix
(
animation-duration
,
1
.5s
);
@include
webkit-prefix
(
animation-iteration-count
,
infinite
);
}
.tanuki-left-cheek
{
@include
unique-keyframes
{
0
%
,
10
%
,
100
%
{
fill
:
lighten
(
$tanuki-yellow
,
25%
);
}
90
%
{
fill
:
$tanuki-yellow
;
}
}
}
.tanuki-left-eye
{
@include
tanuki-second-highlight-animations
(
$tanuki-orange
);
}
.tanuki-left-ear
{
@include
tanuki-second-highlight-animations
(
$tanuki-red
);
}
.tanuki-nose
{
@include
unique-keyframes
{
20
%
,
70
%
{
fill
:
$tanuki-red
;
}
30
%
,
80
%
{
fill
:
lighten
(
$tanuki-red
,
25%
);
}
}
}
.tanuki-right-eye
{
@include
tanuki-forth-highlight-animations
(
$tanuki-orange
);
}
.tanuki-right-ear
{
@include
tanuki-forth-highlight-animations
(
$tanuki-red
);
}
.tanuki-right-cheek
{
@include
unique-keyframes
{
40
%
{
fill
:
$tanuki-yellow
;
}
60
%
{
fill
:
lighten
(
$tanuki-yellow
,
25%
);
}
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/framework/mixins.scss
View file @
12784559
...
...
@@ -129,3 +129,8 @@
color
:
rgba
(
255
,
255
,
255
,
0
.3
);
background
:
rgba
(
255
,
255
,
255
,
0
.1
);
}
@mixin
webkit-prefix
(
$property
,
$value
)
{
#{
'-webkit-'
+
$property
}
:
$
value
;
#{
$property
}
:
$
value
;
}
app/views/shared/_logo.svg
View file @
12784559
<svg
width=
"36"
height=
"36"
id
=
"tanuki-logo"
>
<path
id=
"tanuki-right-ear"
class=
"tanuki-shape
"
fill=
"#e24329"
d=
"M2 14l9.38 9v-9l-4-12.28c-.205-.632-1.176-.632-1.38 0z"
/>
<path
id=
"tanuki-left-ear"
class=
"tanuki-shape
"
fill=
"#e24329"
d=
"M34 14l-9.38 9v-9l4-12.28c.205-.632 1.176-.632 1.38 0z"
/>
<path
id=
"tanuki-nose"
class=
"tanuki-shap
e"
fill=
"#e24329"
d=
"M18,34.38 3,14 33,14 Z"
/>
<path
id=
"tanuki-right-eye"
class=
"tanuki-shap
e"
fill=
"#fc6d26"
d=
"M18,34.38 11.38,14 2,14 6,25Z"
/>
<path
id=
"tanuki-left-eye"
class=
"tanuki-shap
e"
fill=
"#fc6d26"
d=
"M18,34.38 24.62,14 34,14 30,25Z"
/>
<path
id=
"tanuki-right-cheek"
class=
"tanuki-shape
"
fill=
"#fca326"
d=
"M2 14L.1 20.16c-.18.565 0 1.2.5 1.56l17.42 12.66z"
/>
<path
id=
"tanuki-left-cheek"
class=
"tanuki-shape
"
fill=
"#fca326"
d=
"M34 14l1.9 6.16c.18.565 0 1.2-.5 1.56L18 34.38z"
/>
<svg
width=
"36"
height=
"36"
class
=
"tanuki-logo"
>
<path
class=
"tanuki-shape tanuki-left-ear
"
fill=
"#e24329"
d=
"M2 14l9.38 9v-9l-4-12.28c-.205-.632-1.176-.632-1.38 0z"
/>
<path
class=
"tanuki-shape tanuki-right-ear
"
fill=
"#e24329"
d=
"M34 14l-9.38 9v-9l4-12.28c.205-.632 1.176-.632 1.38 0z"
/>
<path
class=
"tanuki-shape tanuki-nos
e"
fill=
"#e24329"
d=
"M18,34.38 3,14 33,14 Z"
/>
<path
class=
"tanuki-shape tanuki-left-ey
e"
fill=
"#fc6d26"
d=
"M18,34.38 11.38,14 2,14 6,25Z"
/>
<path
class=
"tanuki-shape tanuki-right-ey
e"
fill=
"#fc6d26"
d=
"M18,34.38 24.62,14 34,14 30,25Z"
/>
<path
class=
"tanuki-shape tanuki-left-cheek
"
fill=
"#fca326"
d=
"M2 14L.1 20.16c-.18.565 0 1.2.5 1.56l17.42 12.66z"
/>
<path
class=
"tanuki-shape tanuki-right-cheek
"
fill=
"#fca326"
d=
"M34 14l1.9 6.16c.18.565 0 1.2-.5 1.56L18 34.38z"
/>
</svg>
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