From ee418df7716786ecc078db69ed083a969961bc1d Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 18 Jan 2015 02:22:33 +0100 Subject: [PATCH] reduced cassius files --- Handler/Login.hs | 1 + static/css/style-global.css | 68 +++++++++++++++++++++++++++++--- templates/adminMediumSet.cassius | 10 ----- templates/default-layout.cassius | 23 ----------- templates/medium.cassius | 19 --------- templates/tagMedia.cassius | 10 ----- 6 files changed, 64 insertions(+), 67 deletions(-) delete mode 100644 templates/adminMediumSet.cassius delete mode 100644 templates/default-layout.cassius delete mode 100644 templates/tagMedia.cassius diff --git a/Handler/Login.hs b/Handler/Login.hs index 4ccab9f..00cdc30 100644 --- a/Handler/Login.hs +++ b/Handler/Login.hs @@ -67,6 +67,7 @@ postLoginR = do returnJsonError msg Right userId -> do setSession "userId" $ extractKey (fromJust userId) + setMessage "Succesfully logged in" welcomeLink <- ($ProfileR (fromJust userId)) <$> getUrlRender returnJson ["welcome" .= welcomeLink] diff --git a/static/css/style-global.css b/static/css/style-global.css index 43153e8..cb29e5f 100644 --- a/static/css/style-global.css +++ b/static/css/style-global.css @@ -33,11 +33,6 @@ -ms-transition: color 0.25s ease-in-out; transition: color 0.25s ease-in-out; } - - a:hover - { - color: #d64760; - } h1,h2,h3,h4,h5,h6 { @@ -96,6 +91,8 @@ .item { + background: #1a1f2c; + background: rgba(255,255,255,0.25); } .item.thumb @@ -160,6 +157,8 @@ { position: relative; z-index: 1; + /*custom*/ + overflow: auto; } /*********************************************************************************/ @@ -168,6 +167,8 @@ #main { + margin-top: 60px; + position: static; } /*********************************************************************************/ @@ -189,3 +190,60 @@ #header .inner { width: 100%; } + +/*custom*/ + + a:hover + { + color: black; + } + + .image img + { + position: relative !important; + max-width: 100%; + width: auto !important; + display: block; + margin-left: auto; + margin-right: auto; + } + + nav + { + padding: 1em 2em; + } + + nav li + { + display: inline-block; + } + + .comment + { + border: 5px solid rgb(255, 255, 255); + padding: 2em 3em; + background: #d64760 url('/static/css/images/overlay.png'); + } + + .center + { + text-align: center; + } + + .image + { + height: 100% !important; + } + + .reply + { + background: #47d65f url('/static/css/images/overlay.png'); + } + + #message + { + padding: 20px; + background: lightyellow url('/static/css/images/overlay.png'); + color: #d64760; + font-size: 1.5em; + } diff --git a/templates/adminMediumSet.cassius b/templates/adminMediumSet.cassius deleted file mode 100644 index c172218..0000000 --- a/templates/adminMediumSet.cassius +++ /dev/null @@ -1,10 +0,0 @@ -.right - float:right - width:50% - -.left - float:left - width:50% - -footer - clear:both diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius deleted file mode 100644 index 66d3472..0000000 --- a/templates/default-layout.cassius +++ /dev/null @@ -1,23 +0,0 @@ -/*templates/default-layout.cassius*/ - -#message - padding: 20px - background: lightyellow url('../css/images/overlay.png') - color: #d64760 - font-size: 1.5em - -.item - background: #1a1f2c; - background: rgba(255,255,255,0.25); - -nav li - display: inline-block - -.center - text-align: center - -nav - padding: 1em 2em !important - -a:hover - color: black !important diff --git a/templates/medium.cassius b/templates/medium.cassius index 8895107..68199ff 100644 --- a/templates/medium.cassius +++ b/templates/medium.cassius @@ -1,24 +1,5 @@ /*templates/medium.cassius*/ -img - position: relative !important - max-width: 100% !important - width: auto !important - display: block !important - margin-left: auto !important - margin-right: auto !important - -.comment - border: 5px solid rgb(255, 255, 255) - padding: 2em 3em - background: #d64760 url('/static/css/images/overlay.png') - -.reply - background: #47d65f url('/static/css/images/overlay.png') - -.image - width: 100% !important - #wrapper overflow: auto !important diff --git a/templates/tagMedia.cassius b/templates/tagMedia.cassius deleted file mode 100644 index c0ac854..0000000 --- a/templates/tagMedia.cassius +++ /dev/null @@ -1,10 +0,0 @@ -.thumbnail - border 1px solid #ddd - border-radius: 6px - box-shadow: 0 0 3px #c4c4c4 - -ul - list-style: none - -li - display: inline-block