diff options
Diffstat (limited to 'css/theme')
-rw-r--r-- | css/theme/beige.css | 32 | ||||
-rw-r--r-- | css/theme/blood.css | 39 | ||||
-rw-r--r-- | css/theme/default.css | 32 | ||||
-rw-r--r-- | css/theme/moon.css | 32 | ||||
-rw-r--r-- | css/theme/night.css | 33 | ||||
-rw-r--r-- | css/theme/serif.css | 31 | ||||
-rw-r--r-- | css/theme/simple.css | 33 | ||||
-rw-r--r-- | css/theme/sky.css | 35 | ||||
-rw-r--r-- | css/theme/solarized.css | 32 | ||||
-rw-r--r-- | css/theme/source/blood.scss | 8 | ||||
-rw-r--r-- | css/theme/source/serif.scss | 2 | ||||
-rw-r--r-- | css/theme/source/sky.scss | 2 | ||||
-rw-r--r-- | css/theme/template/settings.scss | 2 | ||||
-rw-r--r-- | css/theme/template/theme.scss | 30 |
14 files changed, 186 insertions, 157 deletions
diff --git a/css/theme/beige.css b/css/theme/beige.css index 089cb7b..55aaf22 100644 --- a/css/theme/beige.css +++ b/css/theme/beige.css @@ -1,16 +1,15 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Beige theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /********************************************* * GLOBAL STYLES *********************************************/ @@ -48,7 +47,7 @@ body { margin: 0 0 20px 0; color: #333333; font-family: "League Gothic", Impact, sans-serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: uppercase; text-shadow: none; } @@ -57,18 +56,23 @@ body { text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); } /********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + +/********************************************* * LINKS *********************************************/ -.reveal a:not(.image) { +.reveal a { color: #8b743d; 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: #c0a86e; text-shadow: none; border: none; } @@ -84,12 +88,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); @@ -137,8 +141,6 @@ body { background: #8b743d; -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); } /********************************************* diff --git a/css/theme/blood.css b/css/theme/blood.css index 0aefdd9..658cb3d 100644 --- a/css/theme/blood.css +++ b/css/theme/blood.css @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Ubuntu:300,700,300italic,700italic); /** * Blood theme for reveal.js * Author: Walther http://github.com/Walther @@ -10,6 +9,7 @@ * For other themes, change $codeBackground accordingly. * */ +@import url(https://fonts.googleapis.com/css?family=Ubuntu:300,700,300italic,700italic); /********************************************* * GLOBAL STYLES *********************************************/ @@ -47,7 +47,7 @@ body { margin: 0 0 20px 0; color: #eeeeee; font-family: Ubuntu, "sans-serif"; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: uppercase; text-shadow: 2px 2px 2px #222222; } @@ -56,18 +56,23 @@ body { text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); } /********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + +/********************************************* * LINKS *********************************************/ -.reveal a:not(.image) { +.reveal a { color: #aa2233; 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: #dd5566; text-shadow: none; border: none; } @@ -83,12 +88,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid #eeeeee; - 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); @@ -136,8 +141,6 @@ body { background: #aa2233; -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); } /********************************************* @@ -158,12 +161,12 @@ body { .reveal h6 { font-weight: 700; } -.reveal a:not(.image), -.reveal a:not(.image):hover { +.reveal a, +.reveal a:hover { text-shadow: 2px 2px 2px #000; } -.reveal small a:not(.image), -.reveal small a:not(.image):hover { +.reveal small a, +.reveal small a:hover { text-shadow: 1px 1px 1px #000; } .reveal p code { diff --git a/css/theme/default.css b/css/theme/default.css index a234861..7b197d4 100644 --- a/css/theme/default.css +++ b/css/theme/default.css @@ -1,16 +1,15 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Default theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /********************************************* * GLOBAL STYLES *********************************************/ @@ -48,7 +47,7 @@ body { margin: 0 0 20px 0; color: #eeeeee; font-family: "League Gothic", Impact, sans-serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: uppercase; text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } @@ -57,18 +56,23 @@ body { text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); } /********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + +/********************************************* * LINKS *********************************************/ -.reveal a:not(.image) { +.reveal a { color: #13daec; 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: #71e9f4; text-shadow: none; border: none; } @@ -84,12 +88,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid #eeeeee; - 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); @@ -137,8 +141,6 @@ body { background: #13daec; -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); } /********************************************* diff --git a/css/theme/moon.css b/css/theme/moon.css index 3c15b00..01d410c 100644 --- a/css/theme/moon.css +++ b/css/theme/moon.css @@ -1,15 +1,14 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized Dark theme for reveal.js. * Author: Achim Staebler */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /** * Solarized colors by Ethan Schoonover */ @@ -48,7 +47,7 @@ body { margin: 0 0 20px 0; color: #eee8d5; font-family: "League Gothic", Impact, sans-serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: uppercase; text-shadow: none; } @@ -57,18 +56,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: #268bd2; 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: #78b9e6; text-shadow: none; border: none; } @@ -84,12 +88,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid #93a1a1; - 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); @@ -137,8 +141,6 @@ body { background: #268bd2; -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); } /********************************************* diff --git a/css/theme/night.css b/css/theme/night.css index e8703a5..d94bec1 100644 --- a/css/theme/night.css +++ b/css/theme/night.css @@ -1,10 +1,10 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:700); -@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic); /** * Black theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Montserrat:700); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic); /********************************************* * GLOBAL STYLES *********************************************/ @@ -36,7 +36,7 @@ body { margin: 0 0 20px 0; color: #eeeeee; font-family: "Montserrat", Impact, sans-serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: -0.03em; text-transform: none; text-shadow: none; } @@ -45,18 +45,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: #e7ad52; 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: #f3d7ac; text-shadow: none; border: none; } @@ -72,12 +77,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid #eeeeee; - 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); @@ -125,8 +130,6 @@ body { background: #e7ad52; -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); } /********************************************* diff --git a/css/theme/serif.css b/css/theme/serif.css index d5f0ad8..a5ebcb1 100644 --- a/css/theme/serif.css +++ b/css/theme/serif.css @@ -4,7 +4,7 @@ * * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed. */ -.reveal a:not(.image) { +.reveal a { line-height: 1.3em; } /********************************************* @@ -38,7 +38,7 @@ body { margin: 0 0 20px 0; color: #383d3d; font-family: "Palatino Linotype", "Book Antiqua", Palatino, FreeSerif, serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: none; text-shadow: none; } @@ -47,18 +47,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: #51483d; 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: #8b7c69; text-shadow: none; border: none; } @@ -74,12 +79,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid black; - 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); @@ -127,8 +132,6 @@ body { background: #51483d; -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); } /********************************************* diff --git a/css/theme/simple.css b/css/theme/simple.css index 504606c..4334171 100644 --- a/css/theme/simple.css +++ b/css/theme/simple.css @@ -1,5 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=News+Cycle:400,700); -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * A simple theme for reveal.js presentations, similar * to the default theme. The accent color is darkblue. @@ -7,6 +5,8 @@ * This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed. * reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=News+Cycle:400,700); +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /********************************************* * GLOBAL STYLES *********************************************/ @@ -38,7 +38,7 @@ body { margin: 0 0 20px 0; color: black; font-family: "News Cycle", Impact, sans-serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: none; text-shadow: none; } @@ -47,18 +47,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: darkblue; 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: #0000f1; text-shadow: none; border: none; } @@ -74,12 +79,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid black; - 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); @@ -127,8 +132,6 @@ body { background: darkblue; -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); } /********************************************* 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); } /********************************************* diff --git a/css/theme/solarized.css b/css/theme/solarized.css index c8bff7c..8c414c8 100644 --- a/css/theme/solarized.css +++ b/css/theme/solarized.css @@ -1,15 +1,14 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized Light theme for reveal.js. * Author: Achim Staebler */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /** * Solarized colors by Ethan Schoonover */ @@ -48,7 +47,7 @@ body { margin: 0 0 20px 0; color: #586e75; font-family: "League Gothic", Impact, sans-serif; - line-height: 0.9em; + line-height: 1em; letter-spacing: 0.02em; text-transform: uppercase; text-shadow: none; } @@ -57,18 +56,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: #268bd2; 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: #78b9e6; text-shadow: none; border: none; } @@ -84,12 +88,12 @@ body { margin: 15px 0px; background: rgba(255, 255, 255, 0.12); border: 4px solid #657b83; - 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); @@ -137,8 +141,6 @@ body { background: #268bd2; -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); } /********************************************* diff --git a/css/theme/source/blood.scss b/css/theme/source/blood.scss index a9925a1..f2e3a09 100644 --- a/css/theme/source/blood.scss +++ b/css/theme/source/blood.scss @@ -70,13 +70,13 @@ $selectionColor: #fff; font-weight: 700; } -.reveal a:not(.image), -.reveal a:not(.image):hover { +.reveal a, +.reveal a:hover { text-shadow: 2px 2px 2px #000; } -.reveal small a:not(.image), -.reveal small a:not(.image):hover { +.reveal small a, +.reveal small a:hover { text-shadow: 1px 1px 1px #000; } diff --git a/css/theme/source/serif.scss b/css/theme/source/serif.scss index 404b8bf..ec3fcb3 100644 --- a/css/theme/source/serif.scss +++ b/css/theme/source/serif.scss @@ -25,7 +25,7 @@ $linkColor: #51483D; $linkColorHover: lighten( $linkColor, 20% ); $selectionBackgroundColor: #26351C; -.reveal a:not(.image) { +.reveal a { line-height: 1.3em; } diff --git a/css/theme/source/sky.scss b/css/theme/source/sky.scss index 72a3a90..3fee67c 100644 --- a/css/theme/source/sky.scss +++ b/css/theme/source/sky.scss @@ -30,7 +30,7 @@ $linkColorHover: lighten( $linkColor, 20% ); $selectionBackgroundColor: #134674; // Fix links so they are not cut off -.reveal a:not(.image) { +.reveal a { line-height: 1.3em; } diff --git a/css/theme/template/settings.scss b/css/theme/template/settings.scss index 739a609..1b4fe9b 100644 --- a/css/theme/template/settings.scss +++ b/css/theme/template/settings.scss @@ -13,7 +13,7 @@ $mainColor: #eee; $headingMargin: 0 0 20px 0; $headingFont: 'League Gothic', Impact, sans-serif; $headingColor: #eee; -$headingLineHeight: 0.9em; +$headingLineHeight: 1em; $headingLetterSpacing: 0.02em; $headingTextTransform: uppercase; $headingTextShadow: 0px 0px 6px rgba(0,0,0,0.2); diff --git a/css/theme/template/theme.scss b/css/theme/template/theme.scss index 1562b54..10b4689 100644 --- a/css/theme/template/theme.scss +++ b/css/theme/template/theme.scss @@ -50,20 +50,28 @@ body { /********************************************* + * OTHER + *********************************************/ + +.reveal p { + margin-bottom: 10px; + line-height: 1.3; +} + + +/********************************************* * LINKS *********************************************/ -.reveal a:not(.image) { +.reveal a { color: $linkColor; 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: $linkColorHover; text-shadow: none; @@ -86,14 +94,14 @@ body { border: 4px solid $mainColor; 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; } + .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); border-color: $linkColor; @@ -155,8 +163,6 @@ body { -webkit-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); -moz-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); - -ms-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); - -o-transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); transition: width 800ms cubic-bezier(0.260, 0.860, 0.440, 0.985); } |