style fixes

This commit is contained in:
albert
2011-11-15 18:08:01 -05:00
parent cd48af8845
commit 710d584ec6
11 changed files with 72 additions and 55 deletions

View File

@@ -16,7 +16,7 @@ $(document).ready(function() {
e.stopPropagation(); e.stopPropagation();
}); });
$("#more-links").hide().offset({top: $("#site-map-link").offset().top + $("#site-map-link").height() + 10, left: $("#site-map-link").offset().left}); $("#more-links").hide().offset({top: $("#site-map-link").offset().top, left: $("#site-map-link").offset().left + 10});
$(document).click(function(e) { $(document).click(function(e) {
$("#more-links").hide(); $("#more-links").hide();

View File

@@ -27,12 +27,12 @@ $baseline: 1em;
box-shadow: $x $y $blur $color; box-shadow: $x $y $blur $color;
} }
@mixin text-shadow($x, $y, $blur, $color) { @mixin text-shadow($val) {
-moz-text-shadow: $x $y $blur $color; -moz-text-shadow: $val;
-webkit-text-shadow: $x $y $blur $color; -webkit-text-shadow: $val;
-ms-text-shadow: $x $y $blur $color; -ms-text-shadow: $val;
-o-text-shadow: $x $y $blur $color; -o-text-shadow: $val;
text-shadow: $x $y $blur $color; text-shadow: $val;
} }
@mixin transparency($value) { @mixin transparency($value) {

View File

@@ -1,38 +1,44 @@
@import "000_vars.css.scss";
div.paginator { div.paginator {
display: block; display: block;
padding: 2em 0 1em 0; padding: 2em 0 1em 0;
font-size: 1em; font-size: 1.2em;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
clear: both; clear: both;
a { li {
margin: 0 3px; font-weight: bold;
padding: 2px 6px;
font-weight: normal; a {
border: 1px solid #EAEAEA; margin: 0 0.25em;
} padding: 0.25em 0.75em;
border: 1px solid #EAEAEA;
@include border-radius(0.5em);
}
a.arrow { a.arrow {
border: none; border: none;
} }
a.arrow:hover { a.arrow:hover {
background: white; background: white;
color: #9093FF; color: $link_color;
} }
a.current { a.current {
border: 1px solid #AAA; border: 1px solid #AAA;
} }
a:hover { a:hover {
background: rgb(60, 60, 220); background: $link_color;
color: white; color: white;
} }
span { span {
margin: 0 3px; margin: 0 0.25em;
padding: 2px 6px; padding: 0.25em 0.75em
}
} }
} }

View File

@@ -0,0 +1,7 @@
$h1_size: 4em;
$h2_size: 3em;
$h3_size: 2em;
$h1_padding: 1.25em 0;
$h2_padding: 1.45833em 0;
$h3_padding: 1.51785em 0;
$baseline: 1em;

View File

@@ -0,0 +1,10 @@
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
margin: 0;
padding: 0;
border: 0;
/* font-weight: normal;*/
font-style: normal;
font-size: 130%;
line-height: 1.25em;
font-family: inherit;
}

View File

@@ -2,13 +2,10 @@
header#top { header#top {
h1 { h1 {
font-size: 2.5em;
margin: 5px 30px 0 30px; margin: 5px 30px 0 30px;
} }
menu { menu {
font-size: $h1_size;
li.nonessential { li.nonessential {
display: none; display: none;
} }

View File

@@ -1,7 +1,6 @@
@import "../common/000_vars.css.scss"; @import "../common/000_vars.css.scss";
div.paginator { div.paginator {
font-size: $h1_size;
font-weight: bold; font-weight: bold;
li { li {

View File

@@ -7,27 +7,26 @@ div#c-posts {
section#tag-box { section#tag-box {
ul { ul {
font-size: $h1_size;
font-weight: bold; font-weight: bold;
li { li {
margin: 0.5em 0; margin: 0.5em 0;
} }
} }
}
a.search-tag {
} a.search-tag {
}
a.search-inc-tag {
display: none; a.search-inc-tag {
} display: none;
}
a.search-exl-tag {
display: none; a.search-exl-tag {
} display: none;
}
span.post-count {
display: none; span.post-count {
} display: none;
} }
} }

View File

@@ -16,8 +16,7 @@
<% end %> <% end %>
<meta name="default-image-size" content="<%= CurrentUser.user.default_image_size %>"> <meta name="default-image-size" content="<%= CurrentUser.user.default_image_size %>">
<%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %> <%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %>
<%#= stylesheet_link_tag "application", :media => "screen" %> <%= stylesheet_link_tag "application", :media => "screen" %>
<%= stylesheet_link_tag "mobile", :media => "screen" %>
<%#= stylesheet_link_tag "mobile", :media => "only screen and (max-device-width:480px)" %> <%#= stylesheet_link_tag "mobile", :media => "only screen and (max-device-width:480px)" %>
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= Danbooru.config.custom_html_header_content %> <%= Danbooru.config.custom_html_header_content %>

View File

@@ -3,7 +3,7 @@
<%= render "sidebar" %> <%= render "sidebar" %>
<section id="content"> <section id="content">
<h1>Edit Wiki Page</h1> <h1>Edit Wiki</h1>
<%= render "form" %> <%= render "form" %>
</section> </section>
</div> </div>

View File

@@ -3,7 +3,7 @@
<%= render "sidebar" %> <%= render "sidebar" %>
<section id="content"> <section id="content">
<h1>Wiki Pages</h1> <h1>Wiki</h1>
<table class="striped" width="100%"> <table class="striped" width="100%">
<thead> <thead>