From 86957359ecf54c205aee1c09e151172c327e987a Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 31 Oct 2018 19:03:19 +0100
Subject: Various fixes
---
server/src/Design/Global.hs | 14 ++++++++++----
server/src/Design/Helper.hs | 13 +------------
server/src/Design/View/SignIn.hs | 6 ------
3 files changed, 11 insertions(+), 22 deletions(-)
(limited to 'server/src/Design')
diff --git a/server/src/Design/Global.hs b/server/src/Design/Global.hs
index de8dd61..ba4ccb7 100644
--- a/server/src/Design/Global.hs
+++ b/server/src/Design/Global.hs
@@ -73,14 +73,20 @@ global = do
svg ? height (pct 100)
button ? do
- ".content" ? display flex
- svg # ".loader" ? display none
+ position relative
+
+ ".content" ? do
+ display flex
+
+ svg # ".loader" ? do
+ opacity 0
+ position absolute
".waiting" & do
".content" ? do
- display none
+ opacity 0
svg # ".loader" ? do
- display block
+ opacity 1
rotateKeyframes
rotateAnimation
diff --git a/server/src/Design/Helper.hs b/server/src/Design/Helper.hs
index 6980c71..e586d56 100644
--- a/server/src/Design/Helper.hs
+++ b/server/src/Design/Helper.hs
@@ -1,16 +1,14 @@
module Design.Helper
( clearFix
, button
- , input
, centeredWithMargin
, verticalCentering
) where
import Prelude hiding (span)
-import Clay hiding (button, input)
+import Clay hiding (button)
-import Design.Color as Color
import Design.Constants
clearFix :: Css
@@ -37,15 +35,6 @@ button backgroundCol textCol h focusOp = do
hover & backgroundColor (focusOp backgroundCol)
focus & backgroundColor (focusOp backgroundCol)
-input :: Double -> Css
-input h = do
- height (px h)
- padding (px 10) (px 10) (px 10) (px 10)
- borderRadius radius radius radius radius
- border solid (px 1) Color.dustyGray
- focus & borderColor Color.silver
- verticalAlign middle
-
centeredWithMargin :: Css
centeredWithMargin = do
width (pct blockPercentWidth)
diff --git a/server/src/Design/View/SignIn.hs b/server/src/Design/View/SignIn.hs
index 7f5f503..2138676 100644
--- a/server/src/Design/View/SignIn.hs
+++ b/server/src/Design/View/SignIn.hs
@@ -17,12 +17,6 @@ design = do
marginLeft auto
marginRight auto
- input ? do
- Helper.input inputHeight
- display block
- width (pct 100)
- marginBottom (px 10)
-
button # ".validate" ? do
Helper.button Color.gothic Color.white (px inputHeight) Constants.focusLighten
display flex
--
cgit v1.2.3