Merge branch 'simplify-design'

This commit is contained in:
Arvid Andersson
2015-02-19 21:43:29 +01:00
3 changed files with 26 additions and 57 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

+19 -15
View File
@@ -7,9 +7,10 @@
<meta property="og:image" content="http://www.emoji-cheat-sheet.com/graphics/emojis/thumbsup.png" />
<meta property="og:type" content="website" />
<meta property="og:url" content="http://www.emoji-cheat-sheet.com/" />
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="shortcut icon" href="favicon.ico"/>
<link href="//fonts.googleapis.com/css?family=Yanone+Kaffeesatz" rel="stylesheet">
<link href="style.css?6" rel="stylesheet">
<link href="style.css?7" rel="stylesheet">
<script>
// http://mths.be/aab
var _gaq = [['_setAccount', 'UA-20637790-4'], ['_trackPageview']];
@@ -26,6 +27,7 @@
<h1>Emoji cheat sheet</h1>
<input class="search" placeholder="Instant Search">
</div>
<p id="description">
<a href="http://en.wikipedia.org/wiki/Emoji">Emoji</a> emoticons listed on this page are supported on
<a href="http://campfirenow.com/">Campfire</a>,
@@ -77,10 +79,24 @@
<a href="https://www.teamwork.com/chat">TeamworkChat</a>
and <a href="https://www.bugtrack.in">Damn Bugs</a>.<br>
</p>
<p>
However some of the emoji codes are not super easy to remember, <em>so here is a little cheat sheet</em>.<br>
&#x2708; <b>Got flash enabled? Click the emoji code and it will be copied to your clipboard.</b>
</p>
<div id="share">
<div>
<iframe src="https://ghbtns.com/github-btn.html?user=arvida&amp;repo=emoji-cheat-sheet.com&amp;type=fork&amp;count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
</div>
<div>
<iframe src="https://ghbtns.com/github-btn.html?user=arvida&amp;repo=emoji-cheat-sheet.com&amp;type=star&amp;count=true" frameborder="0" scrolling="0" width="106px" height="20px"></iframe>
</div>
<div><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.emoji-cheat-sheet.com/" data-count="horizontal">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script></div>
<div><iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.emoji-cheat-sheet.com&amp;send=false&amp;layout=button_count&amp;width=100&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=lucida+grande&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" height="20" width="100"></iframe></div>
<div><div class="g-plusone" data-size="medium" data-href="http://www.emoji-cheat-sheet.com/"></div></div>
</div>
<h2>People</h2>
<ul class="people emojis" id="emoji-people">
<li><div><img src="graphics/emojis/bowtie.png"> :<span class="name">bowtie</span>:</div></li>
@@ -1024,11 +1040,6 @@
<li><div data-sound="flawless">/play flawless</div></li>
<li><div data-sound="butts">/play butts</div></li>
</ul>
<div id="share">
<div><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.emoji-cheat-sheet.com/" data-count="vertical">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script></div>
<div><iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.emoji-cheat-sheet.com&amp;send=false&amp;layout=box_count&amp;width=50&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=lucida+grande&amp;height=90" scrolling="no" frameborder="0" allowTransparency="true"></iframe></div>
<div><div class="g-plusone" data-size="tall" data-href="http://www.emoji-cheat-sheet.com/"></div></div>
</div>
<div id="flash-test"></div>
<div id="footer">
<p>
@@ -1039,21 +1050,14 @@
<a href="https://github.com/arvida/emoji-cheat-sheet.com">GitHub</a>.
</p>
<p>
&#x2764; View all the super awesome people that have contributed to this page on <a href="https://github.com/arvida/emoji-cheat-sheet.com/graphs/contributors">the GitHub contributors page</a>.
</p>
<p>
&#x2714; Emoji-cheat-sheet.com is not affiliated with 37signals, LLC. or GitHub Inc. in any way.
</p>
<p>
&#x2764; View all the super awesome people that have contributed to this page on <a href="https://github.com/arvida/emoji-cheat-sheet.com/graphs/contributors">the GitHub contributors page</a>.<br>
&#x2714; Emoji-cheat-sheet.com is not affiliated with 37signals, LLC. or GitHub Inc. in any way.<br>
&#x267A; Built using bits from
<a href="http://www.steamdev.com/zclip">zClip</a>,
<a href="http://subtlepatterns.com/">SubtlePatterns</a>,
<a href="http://www.givainc.com/labs/jnotify_jquery_plugin.htm">jnotify</a>, and
<a href="http://listjs.com/">list.js</a>.
</p>
<a href="https://github.com/arvida/emoji-cheat-sheet.com">
<img src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" id="github" alt="Fork me on GitHub">
</a>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="script.js?5"></script>
+7 -42
View File
@@ -3,7 +3,7 @@ html {
font-family: "Helvetica Neue", helvetica, arial, sans-serif;
font-size: 14px;
line-height: 1.5;
background: url(graphics/stucco.png); }
background: #fefefe; }
h1 {
margin: 0;
@@ -12,9 +12,7 @@ h1 {
text-transform: uppercase;
font-weight: normal; }
a {
color: inherit;
font-weight: bold; }
a { color: inherit; }
a:hover { color: #999; }
ul {
@@ -36,7 +34,6 @@ ul {
margin: 0 auto;
padding: 0 30px; }
#header {
max-width: 80%;
overflow: hidden;
zoom: 1;
position: relative;
@@ -45,10 +42,8 @@ ul {
#description {
border-top: 1px solid #fff;
font-weight: 300;
max-width: 80%;
padding: 13px 0;
margin: 0 0 1.5em 0;
font-size: 16px; }
margin: 12px 0 0 0; }
#description a { font-weight: bold; }
#footer {
padding: 8px 20px;
background: rgba(200,200,200,.2);
@@ -72,36 +67,12 @@ ul {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px rgba(82, 168, 236, 0.3); }
.search:-moz-placeholder { color: #a1a1a1; }
#share {
position: absolute;
top: 166px;
right: 0;
padding: 4px;
background: rgba(200,200,200,.2);
border: 2px dotted #ddd;
border-right: 0;
border-radius: 8px 0 0 8px; }
#share:hover > div { opacity: 1; }
#share > div {
height: 64px;
margin: 4px;
text-align: center;
opacity: .45; }
#share iframe { width: 50px; }
#share > div { display: inline; }
@media screen and (max-width: 640px) {
.search {
position: relative;
top: 0; }
#share {
position: static;
display: table;
width: 180px;
margin: 0 auto 2em auto;
background: none;
border: none;
opacity: 1; }
#share > div { float: left; }
}
#flash-test {
@@ -111,12 +82,6 @@ ul {
width: 1px;
height: 1px; }
#github {
position: absolute;
top: 0;
right: 0;
border: 0; }
.jnotify-container {
position: fixed;
top: 1em;
@@ -140,8 +105,8 @@ ul {
font: inherit; }
#campfire-sounds > li > a {
text-decoration: none;
text-decoration: none;
font-size: 12px; }
#campfire-sounds > li > div {
display: inline-block; }
display: inline-block; }