status-im/open-bounty
2
0
Fork 0
mirror of https://github.com/status-im/open-bounty.git synced 2025-01-11 18:14:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #256 from pablodip/sort-and-filter-fixes-3

Browse Source 
Sort and filter fixes 3
This commit is contained in:
P 2018-02-08 16:30:50 +01:00 committed by GitHub
commit abaf5b3b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cljs/commiteth/bounties.cljs
View File

@ -8,7 +8,8 @@
[commiteth.handlers :as handlers] [commiteth.handlers :as handlers]
[commiteth.db :as db] [commiteth.db :as db]
[commiteth.ui-model :as ui-model] [commiteth.ui-model :as ui-model]
[commiteth.subscriptions :as subs])) [commiteth.subscriptions :as subs]
[commiteth.util :as util]))
(defn bounty-item [bounty] (defn bounty-item [bounty]
@ -207,8 +208,11 @@
[:div [:div
(let [left (inc (* (dec page-number) items-per-page)) (let [left (inc (* (dec page-number) items-per-page))
right (dec (+ left item-count))] right (dec (+ left item-count))]
[:div.item-counts-label [:div.item-counts-label-and-sorting-container
[:span (str "Showing " left "-" right " of " total-count)]]) [:div.item-counts-label
[:span (str "Showing " left "-" right " of " total-count)]]
(when-not (util/os-windows?)
[bounties-sort-view])])
(display-data-page bounty-page-data bounty-item container-element)])) (display-data-page bounty-page-data bounty-item container-element)]))
(defn bounties-page [] (defn bounties-page []
@ -223,8 +227,7 @@
[:div.ui.container.open-bounties-container [:div.ui.container.open-bounties-container
{:ref #(reset! container-element %1)} {:ref #(reset! container-element %1)}
[:div.open-bounties-header "Bounties"] [:div.open-bounties-header "Bounties"]
[:div.open-bounties-filter-and-sort (when-not (util/os-windows?)
[bounty-filters-view] [:div.open-bounties-filter-and-sort
[bounties-sort-view]] [bounty-filters-view]])
[bounties-list @bounty-page-data container-element]])) [bounties-list @bounty-page-data container-element]]))))
))

4
src/cljs/commiteth/core.cljs
View File

@ -208,12 +208,12 @@
[:div.ui.vertical.segment [:div.ui.vertical.segment
[:div.ui.container [:div.ui.container
[:div.ui.grid.stackable [:div.ui.grid.stackable
[:div {:class (str (if (show-top-hunters?) "ten" "sixteen") [:div {:class (str (if (show-top-hunters?) "eleven" "sixteen")
" wide computer sixteen wide tablet column")} " wide computer sixteen wide tablet column")}
[:div.ui.container [:div.ui.container
[(pages @current-page)]]] [(pages @current-page)]]]
(when (show-top-hunters?) (when (show-top-hunters?)
[:div.six.wide.column.computer.only [:div.five.wide.column.computer.only
[:div.ui.container.top-hunters [:div.ui.container.top-hunters
[:h3.top-hunters-header "Top 5 hunters"] [:h3.top-hunters-header "Top 5 hunters"]
[:div.top-hunters-subheader "All time"] [:div.top-hunters-subheader "All time"]

5
src/cljs/commiteth/util.cljs Normal file
View File

@ -0,0 +1,5 @@
(ns commiteth.util
(:require [clojure.string :as string]))
(defn os-windows? []
(string/includes? (-> js/navigator .-platform) "Win"))

17
src/less/style.less
View File

@ -414,6 +414,11 @@
color: #42505c; color: #42505c;
} }
.item-counts-label-and-sorting-container {
display: flex;
justify-content: space-between;
}
.open-bounties-filter-and-sort { .open-bounties-filter-and-sort {
margin-top: 24px; margin-top: 24px;
display: flex; display: flex;
@ -442,6 +447,7 @@
margin-right: 10px; margin-right: 10px;
position: relative; position: relative;
display: flex; display: flex;
z-index: 1000;
.text { .text {
margin: 8px 12px; margin: 8px 12px;
@ -669,7 +675,7 @@
font-weight: 500; font-weight: 500;
line-height: 1.0; line-height: 1.0;
color: #8d99a4; color: #8d99a4;
padding: 8px 12px; padding: 16px 12px 0;
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -711,6 +717,10 @@
} }
} }
.open-bounty-item:first-child {
border-top: #eaecee 1px solid !important;
}
.open-bounty-item { .open-bounty-item {
background-color: #fff; background-color: #fff;
display: flex; display: flex;
@ -1267,12 +1277,11 @@ body {
} }
.item-counts-label { .item-counts-label {
margin: auto; //margin: auto;
font-family: "PostGrotesk-Book"; font-family: "PostGrotesk-Book";
font-size: 15px; font-size: 15px;
color: #8d99a4; color: #8d99a4;
padding-top: 8px; padding-top: 20px;
padding-bottom: 8px;
} }