Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit69f69e6

Browse files
committed
Merge branch 'hotfix/1.7.1' into develop
2 parentsd8456e0 +b6029f0 commit69f69e6

File tree

17 files changed

+618
-711
lines changed

17 files changed

+618
-711
lines changed

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GEM
3838
rb-fsevent (0.9.7)
3939
rb-inotify (0.9.7)
4040
ffi (>=0.5.0)
41-
rouge (1.10.1)
41+
rouge (1.11.1)
4242
safe_yaml (1.0.4)
4343
sass (3.4.22)
4444
sawyer (0.7.0)

‎_posts/2013-08-16-code-highlighting-post.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,10 @@ module Jekyll
111111
end
112112
end
113113
end
114-
~~~
114+
~~~
115+
116+
###GitHub Gist Embed
117+
118+
An example of a Gist embed below.
119+
120+
<scriptsrc="https://gist.github.com/mmistakes/43a355923921d22cd993.js"></script>

‎_sass/_animations.scss‎

Lines changed: 134 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
.animated{-webkit-animation-fill-mode:both;-moz-animation-fill-mode:both;-ms-animation-fill-mode:both;-o-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:1s;-moz-animation-duration:1s;-ms-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;}.animated.hinge{-webkit-animation-duration:2s;-moz-animation-duration:2s;-ms-animation-duration:2s;-o-animation-duration:2s;animation-duration:2s;}
1+
/* ==========================================================================
2+
Animations
3+
==========================================================================*/
24

5+
.animated{-webkit-animation-fill-mode:both;-moz-animation-fill-mode:both;-ms-animation-fill-mode:both;-o-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:1s;-moz-animation-duration:1s;-ms-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;}.animated.hinge{-webkit-animation-duration:2s;-moz-animation-duration:2s;-ms-animation-duration:2s;-o-animation-duration:2s;animation-duration:2s;}
36

4-
// Fade in
5-
// --------------------------------------------------
7+
/*
8+
Fade in
9+
==========================================================================*/
610

711
@-webkit-keyframes fadeIn {
812
0% {opacity:0;}
@@ -20,6 +24,7 @@
2024
0% {opacity:0;}
2125
100% {opacity:1;}
2226
}
27+
2328
.fadeIn {
2429
-webkit-animation-name: fadeIn;
2530
-moz-animation-name: fadeIn;
@@ -67,6 +72,7 @@
6772
transform:translateY(0);
6873
}
6974
}
75+
7076
.fadeInDown {
7177
-webkit-animation-name: fadeInDown;
7278
-moz-animation-name: fadeInDown;
@@ -114,16 +120,17 @@
114120
transform:translateY(0);
115121
}
116122
}
123+
117124
.fadeInDownBig {
118125
-webkit-animation-name: fadeInDownBig;
119126
-moz-animation-name: fadeInDownBig;
120127
-o-animation-name: fadeInDownBig;
121128
animation-name: fadeInDownBig;
122129
}
123130

124-
125-
// Bounce
126-
// --------------------------------------------------
131+
/*
132+
Bounce
133+
==========================================================================*/
127134

128135
@-webkit-keyframes bounceIn {
129136
0% {
@@ -189,12 +196,14 @@
189196
transform:scale(1);
190197
}
191198
}
199+
192200
.bounceIn {
193201
-webkit-animation-name: bounceIn;
194202
-moz-animation-name: bounceIn;
195203
-o-animation-name: bounceIn;
196204
animation-name: bounceIn;
197205
}
206+
198207
@-webkit-keyframes bounceInDown {
199208
0% {
200209
opacity:0;
@@ -282,9 +291,9 @@
282291
animation-name: bounceInDown;
283292
}
284293

285-
286-
// Drop
287-
// --------------------------------------------------
294+
/*
295+
Drop
296+
==========================================================================*/
288297

289298
@-webkit-keyframes drop {
290299
0% {
@@ -324,4 +333,120 @@
324333
-moz-animation-name:drop;
325334
-o-animation-name:drop;
326335
animation-name:drop;
336+
}
337+
338+
/*
339+
DL Menu In/Out
340+
==========================================================================*/
341+
342+
@-webkit-keyframes MenuAnimOut {
343+
100% {
344+
-webkit-transform:translateZ(300px);
345+
opacity:0;
346+
}
347+
}
348+
@-moz-keyframes MenuAnimOut {
349+
100% {
350+
-moz-transform:translateZ(300px);
351+
opacity:0;
352+
}
353+
}
354+
@keyframesMenuAnimOut {
355+
100% {
356+
transform:translateZ(300px);
357+
opacity:0;
358+
}
359+
}
360+
361+
@-webkit-keyframes MenuAnimIn {
362+
0% {
363+
-webkit-transform:translateZ(300px);
364+
opacity:0;
365+
}
366+
100% {
367+
-webkit-transform:translateZ(0px);
368+
opacity:1;
369+
}
370+
}
371+
@-moz-keyframes MenuAnimIn {
372+
0% {
373+
-moz-transform:translateZ(300px);
374+
opacity:0;
375+
}
376+
100% {
377+
-moz-transform:translateZ(0px);
378+
opacity:1;
379+
}
380+
}
381+
@keyframesMenuAnimIn {
382+
0% {
383+
transform:translateZ(300px);
384+
opacity:0;
385+
}
386+
100% {
387+
transform:translateZ(0px);
388+
opacity:1;
389+
}
390+
}
391+
392+
@-webkit-keyframes SubMenuAnimIn {
393+
0% {
394+
-webkit-transform:translateZ(-300px);
395+
opacity:0;
396+
}
397+
100% {
398+
-webkit-transform:translateZ(0px);
399+
opacity:1;
400+
}
401+
}
402+
@-moz-keyframes SubMenuAnimIn {
403+
0% {
404+
-moz-transform:translateZ(-300px);
405+
opacity:0;
406+
}
407+
100% {
408+
-moz-transform:translateZ(0px);
409+
opacity:1;
410+
}
411+
}
412+
@keyframesSubMenuAnimIn {
413+
0% {
414+
transform:translateZ(-300px);
415+
opacity:0;
416+
}
417+
100% {
418+
transform:translateZ(0px);
419+
opacity:1;
420+
}
421+
}
422+
423+
@-webkit-keyframes SubMenuAnimOut {
424+
0% {
425+
-webkit-transform:translateZ(0px);
426+
opacity:1;
427+
}
428+
100% {
429+
-webkit-transform:translateZ(-300px);
430+
opacity:0;
431+
}
432+
}
433+
@-moz-keyframes SubMenuAnimOut {
434+
0% {
435+
-moz-transform:translateZ(0px);
436+
opacity:1;
437+
}
438+
100% {
439+
-moz-transform:translateZ(-300px);
440+
opacity:0;
441+
}
442+
}
443+
@keyframesSubMenuAnimOut {
444+
0% {
445+
transform:translateZ(0px);
446+
opacity:1;
447+
}
448+
100% {
449+
transform:translateZ(-300px);
450+
opacity:0;
451+
}
327452
}

‎_sass/_coderay.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
/* ==========================================================================
2+
CodeRay Syntax Highlighting
3+
==========================================================================*/
4+
15
.CodeRay {
26
font-family:$code-font;
37
@includefont(12);
48
color:#d0d0d0;
59
margin-bottom:1.5em;
6-
@includerounded(3px);
10+
border-radius:3px;
711
}
812

913
.CodeRay.codepre {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp