diff --git a/resources/public/img/favicon.ico b/resources/public/img/favicon.ico
index 7c5a278..fbd9805 100644
Binary files a/resources/public/img/favicon.ico and b/resources/public/img/favicon.ico differ
diff --git a/resources/templates/home.html b/resources/templates/home.html
index d70cd40..5e93895 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -3,7 +3,7 @@
- Commit ETH
+ Status Open Bounty
diff --git a/src/cljs/commiteth/core.cljs b/src/cljs/commiteth/core.cljs
index eb5bdb3..5e3e7bf 100644
--- a/src/cljs/commiteth/core.cljs
+++ b/src/cljs/commiteth/core.cljs
@@ -26,16 +26,19 @@
(let [flash-message (rf/subscribe [:flash-message])]
(fn []
(when-let [[type message] @flash-message]
- [:div.flash-message {:class (name type)}
- [:i.close.icon {:on-click #(rf/dispatch [:clear-flash-message])}]
- [:p message]]))))
+ (do
+ (println "flash-message-pane" type message)
+ [:div.ui.active.modal
+ [:div.flash-message {:class (name type)}
+ [:i.close.icon {:on-click #(rf/dispatch [:clear-flash-message])}]
+ [:p message]]])))))
(def user-dropdown-open? (r/atom false))
(defn user-dropdown [user items]
(let [menu (if @user-dropdown-open?
- [:div.ui.menu.transition.visible]
- [:div.ui.menu])
+ [:div.ui.menu.transition.visible {:tab-index 0}]
+ [:div.ui.menu.transition.hidden])
avatar-url (:avatar_url user)]
[:div.ui.left.item.dropdown
{:on-click #(swap! user-dropdown-open? not)}
@@ -70,8 +73,8 @@
(let [user (rf/subscribe [:user])
current-page (rf/subscribe [:page])]
(fn []
- (let [tabs (apply conj [[:activity "Activity"]
- [:bounties "Open bounties"]]
+ (let [tabs (apply conj [[:bounties "Bounties"]
+ [:activity "Activity"]]
(when @user
[[:repos "Repositories"]
[:manage-payouts "Manage Payouts"]
@@ -91,22 +94,21 @@
(fn []
[:div.vertical.segment.commiteth-header
[:div.ui.grid.container
- [:div.twelve.wide.column
- [:div.ui.image.lef.aligned
- [svg/app-logo]]]
[:div.four.wide.column
- (if @flash-message
- [flash-message-pane]
- [user-component @user])]
- (when-not @user
- [:div.ui.text.content
- [:div.ui.divider.hidden]
- [:h2.ui.header (if (config/on-testnet?)
- "Commit ETH (Testnet)"
- "Commit ETH")]
- [:h2.ui.subheader "Earn ETH by committing to open source projects"]
- [:div.ui.divider.hidden]])
- [tabs]]])))
+ [:div.ui.grid
+ [:div.ui.four.wide.column
+ [:div.ui.circular.image.status-logo
+ [svg/status-logo]]]
+ [:div.ui.twelve.wide.column.left.aligned
+ [:div.logo-header "Status"]
+ [:div.logo-subheader "Open Bounty"]]]]
+ [:div.eight.wide.column
+ [tabs]]
+ [:div.four.wide.column
+ [user-component @user]]
+ (when @flash-message
+ [flash-message-pane])]])))
+
(def pages
{:activity #'activity-page
@@ -147,7 +149,6 @@
[:div.ui.container
[:h3 "Top hunters"]
[top-hunters]]]]
- [:div.ui.divider]
[:div.commiteth-footer "Built by " [:a {:href "https://status.im"} "Status"]
(when-not (= "unknown" version)
[:div.version-footer "version " [:a {:href (str "https://github.com/status-im/commiteth/commit/" version)} version]])]]]]))
diff --git a/src/cljs/commiteth/repos.cljs b/src/cljs/commiteth/repos.cljs
index 106f037..fe1e6d0 100644
--- a/src/cljs/commiteth/repos.cljs
+++ b/src/cljs/commiteth/repos.cljs
@@ -9,15 +9,15 @@
button (if enabled
[:div.ui.button.small.repo-added-button (add-busy-styles {})
[:i.icon.check]
- "Added"]
+ "ADDED"]
[:div.ui.button.small
(add-busy-styles {:on-click on-click})
- "Add"])]
+ "ADD"])]
[:div.ui.two.column.container
button
(when enabled
- [:a.ui.item.remove-link {:on-click on-click} "Remove"])]))
+ [:a.ui.item.remove-link {:on-click on-click} "REMOVE"])]))
(defn repo-card [repo]
diff --git a/src/cljs/commiteth/svg.cljs b/src/cljs/commiteth/svg.cljs
index 5ed2afb..7def5d4 100644
--- a/src/cljs/commiteth/svg.cljs
+++ b/src/cljs/commiteth/svg.cljs
@@ -53,3 +53,14 @@
{:fill-rule "evenodd"
:fill "#a8aab1"
:d "M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"}]])
+
+
+(defn status-logo []
+ [:svg
+ {:width "50"
+ :height "50"
+ :viewBox "0 0 50 50"}
+ [:path
+ {:fill "#fff"
+ :fill-rule "evenodd"
+ :d "M17 0h16c5.542 0 7.308 0 9.808.833 2.917 1.042 5.317 3.438 6.359 6.355C50 9.688 50 11.457 50 17v16c0 5.542 0 7.313-.833 9.813a10.5 10.5 0 0 1-6.355 6.354C40.313 50 38.543 50 33 50H17c-5.542 0-7.313 0-9.813-.833a10.505 10.505 0 0 1-6.354-6.355C0 40.313 0 38.543 0 33V17c0-5.542 0-7.313.833-9.813A10.5 10.5 0 0 1 7.188.833C9.688 0 11.457 0 17 0zm3.672 23.59c3.5 0 5.156.665 8.656.665 4.74 0 7.99-1.908 7.99-5.86 0-3.95-2.707-5.859-6.658-5.859A12.65 12.65 0 0 0 18.083 23.81a14.416 14.416 0 0 1 2.59-.22zm0 2.3c-4.74 0-7.99 1.909-7.99 5.86 0 3.951 2.707 5.86 6.658 5.86a12.65 12.65 0 0 0 12.577-11.273c-.855.15-1.721.224-2.59.22-3.499 0-5.155-.666-8.655-.666z"}]])
diff --git a/src/less/style.less b/src/less/style.less
index 952d0a3..c717e2d 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -13,8 +13,8 @@
.ui.button {
- color: #2f3f44;
- background-color: #b0f1ee;
+ color: #fff;
+ background-color: #57a7ed;
white-space: nowrap;
padding: 0.9em 1.2em 0.9em;
&:hover {
@@ -30,12 +30,12 @@
}
}
.ui.small.button {
- font-size: 15px!important;
+ font-size: 13px!important;
}
.commiteth-header {
- background-color: #2f3f44!important;
+ background-color: #57a7ed!important;
border-radius: 0em;
padding-top: 1.5em;
}
@@ -44,6 +44,31 @@
padding-top: 1.8em;
}
+.status-logo {
+ width: 42px;
+ height: 42px;
+ object-fit: contain;
+ box-shadow: 0 2px 4px 0 rgba(22, 51, 81, 0.14);
+}
+
+.logo-header {
+ color: #fff;
+ font-family: PostGrotesk;
+ font-size: 21px;
+ font-weight: 500;
+ text-align: left;
+}
+
+.logo-subheader {
+ color: #fff;
+ opacity: 0.4;
+ font-family: PostGrotesk;
+ font-size: 15px;
+ line-height: 1.0;
+ text-align: left;
+}
+
+
.top-hunters {
.header {
color: #474951!important;
@@ -77,9 +102,6 @@
font-weight: normal;
}
-.ui.card a {
- color: #848e91;
-}
.user-component {
margin-top: 0px!important;
@@ -92,13 +114,16 @@
}
}
-.ui.dropdown .item {
- color: #fff!important;
- opacity: 0.98;
+.ui.dropdown {
+ .item {
+ color: #fff!important;
+ }
}
-.ui.menu .ui.dropdown .menu>.item:hover, .ui.menu .ui.dropdown .menu>.selected.item {
- background-color: #fff!important;
+.ui.menu .ui.dropdown {
+ .menu> {
+ background-color: #1e3751;
+ }
}
.ui.input.address-input {
@@ -111,42 +136,45 @@
color: #e7e7e7;
background-color: yellow!important;
}
+
.ui.menu.transition.visible {
font-family: 'postgrotesk';
font-size: 1em;
border-radius: 8px;
border: none;
padding: .5em;
+ overflow: visible!important;
.item>a {
- &:hover {
- color:#1bb5c1;
- }
- color: #474951;
+ // &:hover {
+ // color:#1bb5c1;
+ // }
+ color: #fff;
}
}
.logout-link {
- color: #e96868!important;
+ color: #fff!important;
}
.ui.attached.tabular {
- background-color: #2f3f44;
+ background-color: #57a7ed;
border-bottom: none;
+ height: 80%;
.ui.item {
- padding: 1em;
+ padding: 0.6em;
color: #fff;
- opacity: 0.98;
cursor: pointer;
font-family: 'postgrotesk';
- font-size: 16px;
+ font-size: 15px;
font-weight: normal;
}
.ui.item.active {
- border-radius: .8rem .8rem 0 0!important;
- color: #b0f1ee;
+ border-radius: 8px!important;
+ border-width: 0;
+ color: #fff;
background-color: fade(#fff, 10%);
- border-width: 0em;
cursor: default;
+ height: 80%;
}
}
@@ -159,16 +187,17 @@
}
.repo-label {
- color: #1bb5c1;
+ color: #42505c;
font-family: 'postgrotesk-medium';
- font-size: 16px;
+ font-size: 18px;
+ a { color: #42505c; }
}
.repo-description {
- color: #474951;
+ color: #8d99a4;
font-size: 15px;
font-weight: normal;
- line-height: 24px;
+ line-height: 22px;
margin-top: 16px;
margin-bottom: 16px;
}
@@ -182,6 +211,7 @@
a {
padding: 1em;
font-size: 15px;
+ color: #42505c;
}
.remove-link:hover {
color: #e96868;
@@ -189,8 +219,8 @@
}
.ui.button.repo-added-button {
- color: white;
- background-color: #61deb0;
+ color: #42505c;
+ background-color: #eaecee;
cursor: default;
}
@@ -200,6 +230,7 @@
}
.activity-item {
+ background-color: #fff!important;
.left-column {
margin: 0;
padding-left: 12px;
@@ -252,9 +283,6 @@
h3 {
color: #474951;
}
- a:not(.ui) {
- color: #1bb5c1;
- }
.label {
background-color: #61deb0;
color: #fff;
@@ -331,7 +359,7 @@
}
.commiteth-footer {
- color: #a8aab1;
+ background-color: #4a5c69;
line-height: 1.8em;
a {
&:hover {
@@ -339,6 +367,7 @@
}
color: #a8aab1!important;
}
+ &.group-title { color: #fff; opacity: 0.6; }
}
@@ -352,6 +381,11 @@
}
}
+
.ui {
font-family: 'postgrotesk'!important;
}
+
+body {
+ background-color: #eaecee;
+}