Browse Source

restyle browse

pull/1/head
wes 8 years ago
parent
commit
d531cd64e8
  1. 24
      src/scripts/browse.tag
  2. 6
      src/styles/riotblog.scss

24
src/scripts/browse.tag

@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div class="columns"> <div class="columns">
<div class="column hide-xs hide-sm hide-md col-3"> <div class="column hide-xs hide-sm hide-md col-2">
<categoryfilter <categoryfilter
name="Categories" name="Categories"
category={opts.state.category_filter} category={opts.state.category_filter}
@ -44,12 +44,12 @@
> >
</categoryfilter> </categoryfilter>
</div> </div>
<div class="column col-sm-12 col-9"> <div class="column col-sm-12 col-10">
<loading if={loading}></loading> <loading if={loading}></loading>
<div <div
if={!loading} if={!loading}
style={cardStyle} style={cardStyle}
class="card" class="card post-card"
each={result in opts.state.results} each={result in opts.state.results}
> >
<div class="card-header"> <div class="card-header">
@ -128,6 +128,7 @@ self.filterCategories = (category) => {
}); });
self.opts.state.pagenum = 0; self.opts.state.pagenum = 0;
self.opts.state.category_filter = category; self.opts.state.category_filter = category;
self.opts.state.category_tag = category;
window.cached(`/blog/getbrowse/${category}/${self.pagesize}/${self.startkey ? self.startkey : ""}`) window.cached(`/blog/getbrowse/${category}/${self.pagesize}/${self.startkey ? self.startkey : ""}`)
.then((resp) => { return resp.json() }) .then((resp) => { return resp.json() })
@ -214,20 +215,19 @@ self.getprev = (ev) => {
} }
self.on("mount", () => { self.on("mount", () => {
/* If they clicked on the "browse" button */ if (!self.opts.state.category_filter &&
if (!self.opts.state.category_filter && !self.opts.state.category_tag) { !self.opts.state.category_tag &&
self.opts.state.results.length == 0) {
self.getInitial(); self.getInitial();
} }
/* Check for preloaded results */
else if ((self.opts.state.results.length > 0) && !self.opts.state.category_tag) {
return;
}
/* If we're coming from clicking a tag button */
else if (self.opts.state.category_tag) { else if (self.opts.state.category_tag) {
self.filterCategories(self.opts.state.category_tag)(); self.filterCategories(self.opts.state.category_tag)();
} }
/* If we're coming from the back button */ else if ((self.opts.state.results.length > 0) &&
else if (self.opts.state.category_filter) { !self.opts.state.category_tag) {
return;
}
else {
self.filterCategories(self.opts.state.category_filter)(); self.filterCategories(self.opts.state.category_filter)();
} }
}); });

6
src/styles/riotblog.scss

@ -98,7 +98,7 @@ $navbarHeight: 100px;
} }
.categorybar { .categorybar {
max-width: 250px; max-width: 350px;
float: right; float: right;
} }
@ -307,6 +307,10 @@ p, h6, h4 {
} }
} }
.post-card {
max-width: 80%;
}
.content { .content {
margin: auto; margin: auto;
max-width: 80%; max-width: 80%;

Loading…
Cancel
Save