Merge branch 'feature/mobile-responsive' into 'master'

Feature/mobile responsive

This oughta fix #4 .

See merge request !1
This commit is contained in:
Manuel Friedli 2015-03-29 00:24:14 +01:00
commit 56e11eedcb
2 changed files with 35 additions and 5 deletions

View file

@ -1,5 +1,39 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300,600&subset=latin,latin-ext); @import url(http://fonts.googleapis.com/css?family=Open+Sans:300,600&subset=latin,latin-ext);
@media (max-width: 980px) {
body {
margin: 0;
padding: 0;
}
h1 {
font-size: 120%;
margin: 0;
}
div.wrapper {
border-radius: 0;
margin-left: 0;
margin-right: 0;
}
textarea.input {
border-radius: 0;
}
}
@media (min-width: 981px) {
div.wrapper {
border-radius: 0.5em;
margin-left: auto;
margin-right: auto;
width: 50%;
}
textarea.input {
border-radius: 0.5em;
}
}
body { body {
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
font-weight: 300; font-weight: 300;
@ -17,19 +51,14 @@ strong {
div.wrapper { div.wrapper {
background-color: #fc0; background-color: #fc0;
border-color: #da0; border-color: #da0;
border-radius: 0.5em;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
box-shadow: 0 0 1px 1px #ea0 inset; box-shadow: 0 0 1px 1px #ea0 inset;
margin-bottom: 0.5em; margin-bottom: 0.5em;
margin-left: auto;
margin-right: auto;
padding: 0.5em; padding: 0.5em;
width: 50%;
} }
textarea.input { textarea.input {
border-radius: 0.5em;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
display: block; display: block;

View file

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />
<title>Decode? Encode? DENcode!</title> <title>Decode? Encode? DENcode!</title>
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script> <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="utf8.js"></script> <script type="text/javascript" src="utf8.js"></script>