diff --git a/breve.cabal b/breve.cabal
--- a/breve.cabal
+++ b/breve.cabal
@@ -1,5 +1,5 @@
name: breve
-version: 0.1.0.0
+version: 0.1.1.0
synopsis: a url shortener
description:
@@ -15,7 +15,8 @@
category: Web
build-type: Simple
extra-source-files: README.md, LICENSE
-data-files: layouts/*.css, layouts/*.html, views/*.html
+data-files: static/*.png, static/*.html, static/*.css,
+ views/*.html
cabal-version: >=1.10
source-repository head
diff --git a/layouts/main.css b/layouts/main.css
deleted file mode 100644
--- a/layouts/main.css
+++ /dev/null
@@ -1,89 +0,0 @@
-@import url(http://fonts.googleapis.com/css?family=Inconsolata:400,700);
-@import url(http://reset5.googlecode.com/hg/reset.min.css);
-
-html, body { overflow: hidden }
-body, input { font-size: 1.1em }
-
-body {
- background-color: rgb(24,27,32);
- color: rgb(155,144,129);
- font-family: Inconsolata;
-}
-
-#container {
- text-align:center;
- position: absolute;
- height: 100%;
- width: 100%;
-}
-
-#container:before {
- content: '';
- display: inline-block;
- height: 75%;
- min-height: 20em;
- vertical-align: middle;
-}
-
-#center {
- display: inline-block;
- text-align:left;
- margin-top: -2em;
-}
-
-footer {
- position: absolute;
- width: 100%;
- bottom: 0;
- left: 0;
- padding: 1em;
- font-size: .9em;
- color: rgb(89,84,80)
-}
-
-footer span {
- float: right;
- margin-right: 2em;
-}
-
-h1 {
- margin: 1em 0 0 1em;
- font-size: 1.8em;
- font-weight: 700;
- color: rgb(81,94,102);
-}
-
-h1 a { color: rgb(81,94,102) !important}
-
-h2 {
- font-size: 1.2em;
- margin: .5em 0 0 1.5em;
-}
-
-input[type="text"] {
- border: none;
- border-bottom: .15em dashed rgb(43,44,46);
- outline: none;
- background: transparent;
- color: rgb(119,96,73);
- padding: 0 2px;
-}
-
-input[type="submit"] {
- border: .12em solid rgb(43,44,46);
- padding: .2em .4em !important;
- background: transparent;
- color: rgb(119,87,80);
- cursor: pointer;
-}
-
-a:link, a:visited {
- color: rgb(119,96,73);
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
- transition: color .5s ease;
- color: rgb(119,87,80);
-}
diff --git a/layouts/main.html b/layouts/main.html
deleted file mode 100644
--- a/layouts/main.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- breve: url shortener
-
-
-
-
-
-
-
-
- a url shortener
-
-
-
-
diff --git a/src/Application.hs b/src/Application.hs
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -24,13 +24,16 @@
ServerSettings {..} <- newServerSettings
table <- load urlTable
- css <- getDataFileName "layouts/main.css"
- index <- getDataFileName "views/index.html"
- done <- getDataFileName "views/done.html"
+ static <- getDataFileName "static/"
+ index <- getDataFileName "views/index.html"
+ done <- getDataFileName "views/done.html"
runner $ controllerApp settings $ do
get "/" (render index ())
- get "/main.css" (serveStatic css)
+
+ get "/:file" $ do
+ file <- queryParam' "file"
+ serveStatic (static ++ file)
get "/:name" $ do
name <- queryParam' "name"
diff --git a/src/Breve/Common.hs b/src/Breve/Common.hs
--- a/src/Breve/Common.hs
+++ b/src/Breve/Common.hs
@@ -26,7 +26,7 @@
instance HasTemplates IO AppSettings where
defaultLayout = do
- main <- liftIO (getDataFileName "layouts/main.html")
+ main <- liftIO (getDataFileName "static/main.html")
Just <$> getTemplate main
diff --git a/static/icon-big.png b/static/icon-big.png
new file mode 100644
Binary files /dev/null and b/static/icon-big.png differ
diff --git a/static/icon-medium.png b/static/icon-medium.png
new file mode 100644
Binary files /dev/null and b/static/icon-medium.png differ
diff --git a/static/icon-small.png b/static/icon-small.png
new file mode 100644
Binary files /dev/null and b/static/icon-small.png differ
diff --git a/static/main.css b/static/main.css
new file mode 100644
--- /dev/null
+++ b/static/main.css
@@ -0,0 +1,69 @@
+@import url(http://fonts.googleapis.com/css?family=Inconsolata:400,700);
+@import url(https://cdn.rawgit.com/necolas/normalize.css/master/normalize.css);
+
+body {
+ background-color: #181b20;
+ color: #9b9081;
+ font-family: Inconsolata;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+
+#center { align-self: center }
+
+body,input { font-size: 1.1em; }
+
+footer {
+ font-size: .9em;
+ color: #595450;
+ padding: 1em;
+}
+
+footer span {
+ float: right;
+ margin-right: 2em;
+}
+
+h1 {
+ font-size: 1.8em;
+ font-weight: 700;
+ color: #515e66;
+ margin: 1em 0 0 1em;
+}
+
+h1 a { color: #515e66 !important }
+
+h2 {
+ font-size: 1.2em;
+ margin: .5em 0 0 1.5em;
+}
+
+input[type="text"] {
+ border: none;
+ border-bottom: .15em dashed #2b2c2e;
+ outline: none;
+ background: transparent;
+ color: #776049;
+ padding: 0 2px;
+}
+
+input[type="submit"] {
+ border: .12em solid #2b2c2e;
+ background: transparent;
+ color: #775750;
+ cursor: pointer;
+ padding: .2em .4em!important;
+}
+
+a:link, a:visited {
+ color: #776049;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+ transition: color .5s ease;
+ color: #775750;
+}
diff --git a/static/main.html b/static/main.html
new file mode 100644
--- /dev/null
+++ b/static/main.html
@@ -0,0 +1,26 @@
+
+
+
+ breve: url shortener
+
+
+
+
+
+
+
+
+
+
+
+
+ $yield$
+
+
+