From 6b62e8309965e697c289a5754e0f7174dd4dab56 Mon Sep 17 00:00:00 2001 From: nek0 Date: Wed, 31 Aug 2016 21:37:20 +0200 Subject: [PATCH] more tinkering with new uiQ --- Handler/Home.hs | 2 +- Handler/NewAlbum.hs | 2 +- static/css/main.css | 24 +++---- templates/adminBase.hamlet | 44 ++++++------- templates/album.hamlet | 33 +++++----- templates/bulkUpload.hamlet | 9 ++- templates/dUpload.hamlet | 9 ++- templates/default-layout-wrapper.hamlet | 5 -- templates/default-layout.hamlet | 2 +- templates/home.hamlet | 25 ++++---- templates/login.hamlet | 38 ++++++----- templates/medium.hamlet | 43 ++++++------- templates/newAlbum.hamlet | 3 +- templates/page.hamlet | 8 +-- templates/profile.hamlet | 85 ++++++++++++------------- 15 files changed, 156 insertions(+), 176 deletions(-) diff --git a/Handler/Home.hs b/Handler/Home.hs index d04a860..d3779cb 100755 --- a/Handler/Home.hs +++ b/Handler/Home.hs @@ -27,7 +27,7 @@ import Yesod.AtomFeed getHomeR :: Handler Html getHomeR = do recentMedia <- runDB $ selectList [] [Desc MediumTime, LimitTo 15] - nextMediaQuery <- runDB $ selectList [] [Desc MediumTime, LimitTo 1, OffsetBy 30] + nextMediaQuery <- runDB $ selectList [] [Desc MediumTime, LimitTo 1, OffsetBy 15] let nextMedia = not $ L.null nextMediaQuery defaultLayout $ do rssLink RootFeedRssR "Root Feed" diff --git a/Handler/NewAlbum.hs b/Handler/NewAlbum.hs index abaec9f..b645c42 100755 --- a/Handler/NewAlbum.hs +++ b/Handler/NewAlbum.hs @@ -31,7 +31,7 @@ getNewAlbumR = do (albumWidget, enctype) <- generateFormPost $ renderBootstrap3 BootstrapBasicForm $ albumForm userId - formLayout $ do + defaultLayout $ do setTitle "Eidolon :: Create new Album" $(widgetFile "newAlbum") Nothing -> do diff --git a/static/css/main.css b/static/css/main.css index 1582679..3bf4133 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -12,11 +12,6 @@ body { color: rgba(255,255,255,0.7); } -#main { - margin-top: 80px; - width: 100%; -} - a { color: white; text-decoration: none; @@ -54,19 +49,14 @@ a:hover, .item a:hover, .medium a:hover, a:hover figcaption { margin: 40px 80px 40px; } -#reel { +.reel { list-style: none; display: block; - margin: 0 80px; + margin: 80px 80px 0; padding: 0; text-align: center; } -.middle { - position: relative; - top: 50px; -} - .item, .medium { color: rgba(0,0,0,0.7); display: inline-block; @@ -109,6 +99,10 @@ a:hover, .item a:hover, .medium a:hover, a:hover figcaption { width: 100%; } +.subheader > * { + padding: 20px; +} + .subheader a { flex: 1; display: inline; @@ -122,6 +116,8 @@ a:hover, .item a:hover, .medium a:hover, a:hover figcaption { .subheader p { font-size: 14pt; + display: block; + height: 150px; } .column { @@ -195,6 +191,10 @@ footer { float: right; } +.middle { + margin-top: 50px; +} + @media (max-width: 755px) { #main { margin-top: 120px; diff --git a/templates/adminBase.hamlet b/templates/adminBase.hamlet index ab9fbb1..c1c1cc7 100755 --- a/templates/adminBase.hamlet +++ b/templates/adminBase.hamlet @@ -1,32 +1,26 @@ $newline always -