Make the UI usable and polish up some stuff
This commit is contained in:
parent
21bc92a461
commit
b81b0cf730
8 changed files with 67 additions and 6 deletions
|
@ -1,11 +1,15 @@
|
||||||
$(document).ready ->
|
$(document).ready ->
|
||||||
$("#feed_list > li > a").on("ajax:success", (event, data) ->
|
$("#feed_list > li > a").on("ajax:success", (event, data) ->
|
||||||
$("#feed_content").html(data)
|
$("#feed_content").html(data)
|
||||||
|
false
|
||||||
|
|
||||||
)
|
)
|
||||||
$("#feed_content").on("ajax:success", ".item > a", (event, data) ->
|
$("#feed_content").on("ajax:success", ".item > a", (event, data) ->
|
||||||
item = $(this).parent()
|
item = $(this).parent()
|
||||||
$("article", item).html(data)
|
$("article", item).html(data)
|
||||||
|
.addClass("expanded")
|
||||||
|
.append($('<br class="clearing">'))
|
||||||
$("a", item).live()
|
$("a", item).live()
|
||||||
|
false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -9,5 +9,6 @@
|
||||||
* compiled file, but it's generally better to create a new file per style scope.
|
* compiled file, but it's generally better to create a new file per style scope.
|
||||||
*
|
*
|
||||||
*= require_self
|
*= require_self
|
||||||
|
*= require config
|
||||||
*= require_tree .
|
*= require_tree .
|
||||||
*/
|
*/
|
||||||
|
|
7
app/assets/stylesheets/config.css.scss
Normal file
7
app/assets/stylesheets/config.css.scss
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
|
||||||
|
// http://www.colourlovers.com/palette/126030/Cruel_Water_at_Night
|
||||||
|
$main_color1: #030C22;
|
||||||
|
$main_color2: #20293F;
|
||||||
|
$main_color3: #404749;
|
||||||
|
$main_color4: #A9B0B3;
|
||||||
|
|
|
@ -1,3 +1,24 @@
|
||||||
// Place all the styles related to the items controller here.
|
@import "config";
|
||||||
// They will automatically be included in application.css.
|
|
||||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
li.item {
|
||||||
|
overflow: auto;
|
||||||
|
|
||||||
|
em.date_published, em.author {
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
em.author {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
article {
|
||||||
|
// TODO: Some more default stuff for incomming HTML
|
||||||
|
p {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
article.expanded {
|
||||||
|
padding: 10px 5px 10px 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
27
app/assets/stylesheets/layout.css.scss
Normal file
27
app/assets/stylesheets/layout.css.scss
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
@import "config";
|
||||||
|
|
||||||
|
aside {
|
||||||
|
width: 250px;
|
||||||
|
float: left;
|
||||||
|
|
||||||
|
ul {
|
||||||
|
list-style-type: none;
|
||||||
|
padding: 0 5px;
|
||||||
|
//background-color: $main_color4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
section#feed_content {
|
||||||
|
float: left;
|
||||||
|
max-width: 750px;
|
||||||
|
|
||||||
|
ul {
|
||||||
|
list-style-type: none;
|
||||||
|
padding: 0 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.clearing {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
|
|
|
@ -7,5 +7,6 @@
|
||||||
<%= render :partial => "navigation" %>
|
<%= render :partial => "navigation" %>
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<div id="feed_content">
|
<section id="feed_content">
|
||||||
</div>
|
</section>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<% @items.each do |item| %>
|
<% @items.each do |item| %>
|
||||||
<li class="item">
|
<li class="item">
|
||||||
<%= link_to raw(item.title), item_path(item), :remote => true %>
|
<%= link_to raw(item.title), item_path(item), :remote => true %>
|
||||||
<span class="data_published"><%= time_ago_in_words(item.published_at) %></span> <span class="author">by <%= item.author %></span>
|
<em class="date_published"><%= time_ago_in_words(item.published_at) %></em> <em class="author">by <%= item.author %></em>
|
||||||
<article></article>
|
<article></article>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Reference in a new issue