From 4a2fdd8e2e1d4c1f52ed42413b4bcaeeeb170034 Mon Sep 17 00:00:00 2001 From: Teemu Patja Date: Sun, 29 Oct 2017 10:02:06 +0200 Subject: [PATCH] Layout improvements --- src/cljs/commiteth/activity.cljs | 12 ++++++------ src/cljs/commiteth/bounties.cljs | 2 +- src/cljs/commiteth/core.cljs | 6 +++--- src/less/style.less | 16 ++++++++++------ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/cljs/commiteth/activity.cljs b/src/cljs/commiteth/activity.cljs index 5b08004..bf708d0 100644 --- a/src/cljs/commiteth/activity.cljs +++ b/src/cljs/commiteth/activity.cljs @@ -50,12 +50,12 @@ (defn activity-list [activity-items] - [:div.ui.container - (if (empty? activity-items) - [:div.ui.text "No data"] - (into [:div.ui.items] - (for [item activity-items] - ^{:key item} [activity-item item])))] ) + [:div.ui.container.activity-container + (if (empty? activity-items) + [:div.ui.text "No data"] + (into [:div.ui.items] + (for [item activity-items] + ^{:key item} [activity-item item])))] ) (defn activity-page [] (let [activity-items (rf/subscribe [:activity-feed]) diff --git a/src/cljs/commiteth/bounties.cljs b/src/cljs/commiteth/bounties.cljs index 8c5664a..8eb4abf 100644 --- a/src/cljs/commiteth/bounties.cljs +++ b/src/cljs/commiteth/bounties.cljs @@ -34,7 +34,7 @@ [:div.time (moment-timestamp updated)]]]])) (defn bounties-list [open-bounties] - [:div.ui.container + [:div.ui.container.activity-container (if (empty? open-bounties) [:div.ui.text "No data"] (into [:div.ui.items] diff --git a/src/cljs/commiteth/core.cljs b/src/cljs/commiteth/core.cljs index 2dc9ffc..549e0ff 100644 --- a/src/cljs/commiteth/core.cljs +++ b/src/cljs/commiteth/core.cljs @@ -80,7 +80,7 @@ [:manage-payouts "Manage Payouts"] (when (:status-team-member? @user) [:usage-metrics "Usage metrics"])]))] - (into [:div.ui.attached.tabular.menu.tiny.commiteth-tabs] + (into [:div.ui.attached.tabular.menu.tiny] (for [[page caption] tabs] (let [props {:class (str "ui item" (when (= @current-page page) " active")) @@ -102,9 +102,9 @@ [:div.ui.twelve.wide.column.left.aligned [:div.logo-header "Status"] [:div.logo-subheader "Open Bounty"]]]] - [:div.eight.wide.column + [:div.eight.wide.column.middle.aligned [tabs]] - [:div.four.wide.column + [:div.four.wide.column.middle.aligned [user-component @user]] (when @flash-message [flash-message-pane])]]))) diff --git a/src/less/style.less b/src/less/style.less index 072c555..182eca9 100644 --- a/src/less/style.less +++ b/src/less/style.less @@ -46,11 +46,9 @@ background-color: #57a7ed!important; border-radius: 0em; padding-top: 1.5em; + padding-bottom: 2.5em; } -.commiteth-tabs { - padding-top: 1.8em; -} .status-logo { width: 42px; @@ -91,7 +89,7 @@ .top-hunters { background-color: #fff; - transform: translate(0, -30px); + transform: translate(0, -45px); border-radius: 10px; padding: 10px; .leader-ordinal { @@ -198,7 +196,6 @@ color: #fff; background-color: fade(#fff, 10%); cursor: default; - height: 80%; } } @@ -213,7 +210,7 @@ .enable-github-account { border-radius: 10px; background-color: #fff; - transform: translateY(-30px); + transform: translateY(-45px); padding-top: 80px; padding-bottom: 80px; .center.aligned.segment { border: 0; } @@ -370,6 +367,13 @@ color: #474951!important; } } + +.activity-container { + transform: translate(0, -45px); + border-radius: 10px; + +} + .footer-row { padding: 1em 0 0; .balance-badge {