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
Tatuya Kamada
gitlab-ce
Commits
c2254499
Commit
c2254499
authored
May 19, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 8-8-stable
parents
4a1acdd6
5566c9e7
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
74 additions
and
12 deletions
+74
-12
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+0
-1
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-0
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+72
-0
vendor/assets/stylesheets/animate.css
vendor/assets/stylesheets/animate.css
+0
-11
No files found.
CHANGELOG
View file @
c2254499
...
@@ -89,6 +89,7 @@ v 8.7.3
...
@@ -89,6 +89,7 @@ v 8.7.3
- Merge request widget displays TeamCity build state and code coverage correctly again.
- Merge request widget displays TeamCity build state and code coverage correctly again.
- Fix the line code when importing PR review comments from GitHub. !4010
- Fix the line code when importing PR review comments from GitHub. !4010
- Wikis are now initialized on legacy projects when checking repositories
- Wikis are now initialized on legacy projects when checking repositories
- Remove animate.css in favor of a smaller subset of animations. !3937 (Connor Shea)
v 8.7.2
v 8.7.2
- The "New Branch" button is now loaded asynchronously
- The "New Branch" button is now loaded asynchronously
...
...
app/assets/stylesheets/application.scss
View file @
c2254499
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
*= require dropzone/basic
*= require dropzone/basic
*= require cal-heatmap
*= require cal-heatmap
*= require cropper.css
*= require cropper.css
*= require animate
*/
*/
/*
/*
...
...
app/assets/stylesheets/framework.scss
View file @
c2254499
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
@import
'framework/tw_bootstrap'
;
@import
'framework/tw_bootstrap'
;
@import
"framework/layout"
;
@import
"framework/layout"
;
@import
"framework/animations.scss"
;
@import
"framework/avatar.scss"
;
@import
"framework/avatar.scss"
;
@import
"framework/blocks.scss"
;
@import
"framework/blocks.scss"
;
@import
"framework/buttons.scss"
;
@import
"framework/buttons.scss"
;
...
...
app/assets/stylesheets/framework/animations.scss
0 → 100644
View file @
c2254499
// This file is based off animate.css 3.5.1, available here:
// https://github.com/daneden/animate.css/blob/3.5.1/animate.css
//
// animate.css - http://daneden.me/animate
// Version - 3.5.1
// Licensed under the MIT license - http://opensource.org/licenses/MIT
//
// Copyright (c) 2016 Daniel Eden
.animated
{
-webkit-animation-duration
:
1s
;
animation-duration
:
1s
;
-webkit-animation-fill-mode
:
both
;
animation-fill-mode
:
both
;
}
.animated.infinite
{
-webkit-animation-iteration-count
:
infinite
;
animation-iteration-count
:
infinite
;
}
.animated.hinge
{
-webkit-animation-duration
:
2s
;
animation-duration
:
2s
;
}
.animated.flipOutX
,
.animated.flipOutY
,
.animated.bounceIn
,
.animated.bounceOut
{
-webkit-animation-duration
:
.75s
;
animation-duration
:
.75s
;
}
@-webkit-keyframes
pulse
{
from
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
transform
:
scale3d
(
1
,
1
,
1
);
}
50
%
{
-webkit-transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
}
to
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
transform
:
scale3d
(
1
,
1
,
1
);
}
}
@keyframes
pulse
{
from
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
transform
:
scale3d
(
1
,
1
,
1
);
}
50
%
{
-webkit-transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
}
to
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
transform
:
scale3d
(
1
,
1
,
1
);
}
}
.pulse
{
-webkit-animation-name
:
pulse
;
animation-name
:
pulse
;
}
vendor/assets/stylesheets/animate.css
deleted
100644 → 0
View file @
4a1acdd6
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