style tweaks

This commit is contained in:
albert
2011-03-11 16:35:53 -05:00
parent ccb2def7d7
commit 851d1fa26d
8 changed files with 28 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
<div class="comment-preview dtext"> <div class="comment-preview dtext dtext-preview">
</div> </div>
<%= form_tag(comments_path) do %> <%= form_tag(comments_path) do %>

View File

@@ -5,7 +5,7 @@
<section id="content"> <section id="content">
<h1 id="wiki-page-title"><%= @wiki_page.pretty_title %> (Editing)</h1> <h1 id="wiki-page-title"><%= @wiki_page.pretty_title %> (Editing)</h1>
<div id="preview" class="wiki-page-body"> <div id="preview" class="dtext">
</div> </div>
<%= simple_form_for(@wiki_page) do |f| %> <%= simple_form_for(@wiki_page) do |f| %>

View File

@@ -5,7 +5,7 @@
<section id="content"> <section id="content">
<h1>New Wiki Page</h1> <h1>New Wiki Page</h1>
<div id="preview" class="wiki-page-body"> <div id="preview" class="dtext">
</div> </div>
<%= simple_form_for(@wiki_page) do |f| %> <%= simple_form_for(@wiki_page) do |f| %>

View File

@@ -5,7 +5,7 @@
<section id="content"> <section id="content">
<h1 id="wiki-page-title"><%= @wiki_page.pretty_title %></h1> <h1 id="wiki-page-title"><%= @wiki_page.pretty_title %></h1>
<div class="wiki-page-body"> <div id="wiki-page-body" class="dtext">
<%= format_text(@wiki_page.body) %> <%= format_text(@wiki_page.body) %>
</div> </div>

View File

@@ -1025,6 +1025,7 @@ $(document).ready(function() {
Danbooru.Comment = {}; Danbooru.Comment = {};
Danbooru.Comment.initialize_all = function() { Danbooru.Comment.initialize_all = function() {
$("#c-comments div.dtext-preview").hide();
this.initialize_response_link(); this.initialize_response_link();
this.initialize_preview_button(); this.initialize_preview_button();
} }

View File

@@ -2,6 +2,7 @@
Danbooru.Comment = {}; Danbooru.Comment = {};
Danbooru.Comment.initialize_all = function() { Danbooru.Comment.initialize_all = function() {
$("#c-comments div.dtext-preview").hide();
this.initialize_response_link(); this.initialize_response_link();
this.initialize_preview_button(); this.initialize_preview_button();
} }

View File

@@ -221,6 +221,8 @@ form.simple_form {
/*** DText Preview ***/ /*** DText Preview ***/
div.dtext p { div.dtext p {
margin-bottom: 1em; } margin-bottom: 1em; }
div.dtext ul {
margin-left: 1em; }
/*** Pools Posts ***/ /*** Pools Posts ***/
div#c-pools-posts div#a-new form { div#c-pools-posts div#a-new form {
@@ -267,9 +269,14 @@ div.comments-for-post div.list-of-comments article {
width: 40em; width: 40em;
float: left; } float: left; }
div.comments-for-post div.comment-preview { div.comments-for-post div.comment-preview {
width: 40em;
margin-bottom: 2em; } margin-bottom: 2em; }
div.dtext-preview {
border: 2px dashed #AAA;
padding: 1em;
margin: 1em;
width: 40em; }
div#c-comments div#a-index div.header span.info { div#c-comments div#a-index div.header span.info {
margin-right: 1.5em; } margin-right: 1.5em; }
div#c-comments div#a-index div.header strong, div#c-comments div#a-index div.header time { div#c-comments div#a-index div.header strong, div#c-comments div#a-index div.header time {
@@ -389,21 +396,12 @@ div#artists div#show {
font-style: italic; } font-style: italic; }
/*** Wiki Pages ***/ /*** Wiki Pages ***/
div#c-wiki-pages div.wiki-page-body ul {
margin-left: 1em; }
div#c-wiki-pages div.wiki-page-body p {
margin-bottom: 1em; }
div#c-wiki-pages div#a-edit textarea, div#c-wiki-pages div#a-new textarea { div#c-wiki-pages div#a-edit textarea, div#c-wiki-pages div#a-new textarea {
width: 500px; width: 500px;
height: 40em; } height: 40em; }
div#c-wiki-pages div#a-edit div#preview, div#c-wiki-pages div#a-new div#preview { div#c-wiki-pages div#a-edit div#preview h1:first-child, div#c-wiki-pages div#a-new div#preview h1:first-child {
border: 2px dashed #AAA; color: #333;
padding: 1em; margin-bottom: 0.5em; }
margin: 1em;
width: 40em; }
div#c-wiki-pages div#a-edit div#preview h1:first-child, div#c-wiki-pages div#a-new div#preview h1:first-child {
color: #333;
margin-bottom: 0.5em; }
/*** Users ***/ /*** Users ***/
div.users div.new { div.users div.new {

View File

@@ -319,6 +319,10 @@ div.dtext {
p { p {
margin-bottom: 1em; margin-bottom: 1em;
} }
ul {
margin-left: 1em;
}
} }
@@ -408,11 +412,17 @@ div.comments-for-post {
} }
div.comment-preview { div.comment-preview {
width: 40em;
margin-bottom: 2em; margin-bottom: 2em;
} }
} }
div.dtext-preview {
border: 2px dashed #AAA;
padding: 1em;
margin: 1em;
width: 40em;
}
div#c-comments { div#c-comments {
div#a-index { div#a-index {
div.header { div.header {
@@ -655,16 +665,6 @@ div#artists {
/*** Wiki Pages ***/ /*** Wiki Pages ***/
div#c-wiki-pages { div#c-wiki-pages {
div.wiki-page-body {
ul {
margin-left: 1em;
}
p {
margin-bottom: 1em;
}
}
div#a-edit, div#a-new { div#a-edit, div#a-new {
textarea { textarea {
width: 500px; width: 500px;
@@ -672,11 +672,6 @@ div#c-wiki-pages {
} }
div#preview { div#preview {
border: 2px dashed #AAA;
padding: 1em;
margin: 1em;
width: 40em;
h1:first-child { h1:first-child {
color: #333; color: #333;
margin-bottom: 0.5em; margin-bottom: 0.5em;