From 995476b52a8154aafd2be2022928f786d6f65b12 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 11 Nov 2011 18:23:49 -0500 Subject: [PATCH] improved styling of wiki excerpt --- app/assets/stylesheets/common/dtext.css.scss | 3 +++ app/assets/stylesheets/specific/posts.css.scss | 15 +++++++++++++-- app/views/wiki_pages/_excerpt.html.erb | 4 ++-- config/routes.rb | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/dtext.css.scss b/app/assets/stylesheets/common/dtext.css.scss index 2697d5c55..9a64a1d77 100644 --- a/app/assets/stylesheets/common/dtext.css.scss +++ b/app/assets/stylesheets/common/dtext.css.scss @@ -1,6 +1,9 @@ @import "000_vars.css.scss"; div.prose { + max-width: 40em; + line-height: 1.4em; + h1, h2, h3 { line-height: 1em; } diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 2eb85daa6..6cf7bae9d 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -105,12 +105,23 @@ div#c-posts { div#wiki-page-excerpt { position: relative; width: 40em; + background: #EEE; + padding: 0.5em; + margin-bottom: 1em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + border-radius: 0.5em; + border: 1px solid #CCC; + + p:last-child { + margin-bottom: 0; + } div#hide-or-show-wiki-page-excerpt { font-size: 1em; position: absolute; - top: 0; - right: 0; + top: 9px; + right: 9px; span { cursor: pointer; diff --git a/app/views/wiki_pages/_excerpt.html.erb b/app/views/wiki_pages/_excerpt.html.erb index 1938acb23..86660e602 100644 --- a/app/views/wiki_pages/_excerpt.html.erb +++ b/app/views/wiki_pages/_excerpt.html.erb @@ -7,8 +7,8 @@

Wiki

- (hide) - (show) + +
diff --git a/config/routes.rb b/config/routes.rb index b5f198464..7381dc48e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -203,7 +203,7 @@ Danbooru::Application.routes.draw do match "/post/index" => redirect {|params, req| "/posts?tags=#{params[:tags]}&page=#{req.params[:page]}"} match "/post" => redirect {|params, req| "/posts?tags=#{req.params[:tags]}&page=#{req.params[:page]}"} match "/post/upload" => redirect("/uploads/new") - match "/post/moderate" => redirect("/moderator/post/queues") + match "/post/moderate" => redirect("/moderator/post/queue") match "/post/atom" => redirect("/posts.atom") match "/post/atom.feed" => redirect("/posts.atom") match "/post/popular_by_day" => redirect("/explore/posts/popular")