Merge remote-tracking branch 'upstream/dev' into keyboard_shortcuts_overlay

1 files changed, 19 insertions, 16 deletions

diff --git a/css/theme/sky.css b/css/theme/sky.css
index 1a44760..febfdfe 100644
--- a/css/theme/sky.css
+++ b/css/theme/sky.css
@@ -1,11 +1,11 @@
-@import url(https://fonts.googleapis.com/css?family=Quicksand:400,700,400italic,700italic);
-@import url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
 /**
  * Sky theme for reveal.js.
  *
  * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
  */
-.reveal a:not(.image) {
+@import url(https://fonts.googleapis.com/css?family=Quicksand:400,700,400italic,700italic);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
+.reveal a {
   line-height: 1.3em; }
 
 /*********************************************
@@ -45,7 +45,7 @@ body {
   margin: 0 0 20px 0;
   color: #333333;
   font-family: "Quicksand", sans-serif;
-  line-height: 0.9em;
+  line-height: 1em;
   letter-spacing: -0.08em;
   text-transform: uppercase;
   text-shadow: none; }
@@ -54,18 +54,23 @@ body {
   text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); }
 
 /*********************************************
+ * OTHER
+ *********************************************/
+.reveal p {
+  margin-bottom: 10px;
+  line-height: 1.3; }
+
+/*********************************************
  * LINKS
  *********************************************/
-.reveal a:not(.image) {
+.reveal a {
   color: #3b759e;
   text-decoration: none;
   -webkit-transition: color .15s ease;
   -moz-transition: color .15s ease;
-  -ms-transition: color .15s ease;
-  -o-transition: color .15s ease;
   transition: color .15s ease; }
 
-.reveal a:not(.image):hover {
+.reveal a:hover {
   color: #74a7cb;
   text-shadow: none;
   border: none; }
@@ -81,12 +86,12 @@ body {
   margin: 15px 0px;
   background: rgba(255, 255, 255, 0.12);
   border: 4px solid #333333;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
-  -webkit-transition: all .2s linear;
-  -moz-transition: all .2s linear;
-  -ms-transition: all .2s linear;
-  -o-transition: all .2s linear;
-  transition: all .2s linear; }
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.15); }
+
+.reveal a img {
+  -webkit-transition: all .15s linear;
+  -moz-transition: all .15s linear;
+  transition: all .15s linear; }
 
 .reveal a:hover img {
   background: rgba(255, 255, 255, 0.2);
@@ -134,8 +139,6 @@ body {
   background: #3b759e;
   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
-  -ms-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
-  -o-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
   transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); }
 
 /*********************************************