jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes for #3791

Browse Source
This commit is contained in:
Albert Yi
2018-07-31 16:31:18 -07:00
parent 6fa0ae2cf1
commit 6fde3c20cf
37 changed files with 67 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
app/javascript/src/styles/common/000_vars.scss
View File

@@ -1,92 +0,0 @@
@charset "UTF-8";
$menu_color: #F5F5FF;
$link_color: hsl(213, 100%, 50%);
$link_hover_color: lighten($link_color, 25%);
$link_dark_color: darken($link_color, 25%);
$highlight_color: lighten($link_color, 45%);
$h1_size: 2em;
$h2_size: 1.5em;
$h3_size: 1.16667em;
$h4_size: 1em;
$dtext_h1_size: 2em;
$dtext_h2_size: 1.8em;
$dtext_h3_size: 1.6em;
$dtext_h4_size: 1.4em;
$dtext_h5_size: 1.2em;
$dtext_h6_size: 1em;
$h1_padding: 0.8em 0 0.25em 0;
$h2_padding: 0.8em 0 0.25em 0;
$h3_padding: 0.8em 0 0.25em 0;
$h4_padding: 0.8em 0 0.25em 0;
$baseline: 1em;
$basefont: 100%;
$base_font_family: Verdana, Helvetica, sans-serif;
$preview_has_children_color: #0F0;
$preview_has_parent_color: #CC0;
$preview_deleted_color: #000;
$preview_pending_color: #00F;
$preview_flagged_color: #F00;
$preview_sample_warning_color: hsl(0, 100%, 90%); // light red
$preview_quality_warning_color: hsl(50, 100%, 90%); // light yellow
$note_highlight_color: $preview_pending_color;
$error_color: hsl(0, 100%, 95%); // light red
$success_color: hsl(120, 100%, 95%); // light green
@mixin border-radius($val) {
-moz-border-radius: $val;
-webkit-border-radius: $val;
-ms-border-radius: $val;
-o-border-radius: $val;
border-radius: $val;
}
@mixin box-shadow($val) {
-moz-box-shadow: $val;
-webkit-box-shadow: $val;
-ms-box-shadow: $val;
-o-box-shadow: $val;
box-shadow: $val;
}
@mixin text-shadow($val) {
-moz-text-shadow: $val;
-webkit-text-shadow: $val;
-ms-text-shadow: $val;
-o-text-shadow: $val;
text-shadow: $val;
}
@mixin inline-block {
display: -moz-inline-box;
-moz-box-orient: vertical;
display: inline-block;
vertical-align: baseline;
zoom: 1;
*display: inline;
*vertical-align: auto;
}
@mixin animated-icon {
content: "►";
position: absolute;
width: 20px;
height: 20px;
color: white;
background-color: rgba(0,0,0,0.5);
margin: 2px;
text-align: center;
}
@mixin sound-icon {
content: "♪";
position: absolute;
width: 20px;
height: 20px;
color: white;
background-color: rgba(0,0,0,0.5);
margin: 2px;
text-align: center;
}

171
app/javascript/src/styles/common/010_reset.scss
View File

@@ -1,171 +0,0 @@
// Source: https://github.com/FrogBot/sassy_bootstrap/blob/master/lib/_reset.sass
@import "000_vars.scss";
// Reset.sass
// Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an
// adapted version here that cuts out some of the reset HTML elements we will
// never need here (i.e., dfn, samp, etc).
// ERIC MEYER RESET
// ----------------
html, body {
margin: 0;
padding: 0;
}
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: 100%;
line-height: 1.25em;
font-family: inherit;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
ol, ul {
list-style: none;
}
q:before, q:after, blockquote:before, blockquote:after {
content: "";
}
// Normalize.css
// Pulling in select resets form the normalize.css project
// --------------------------------------------------
// Display in IE6-9 and FF3
// -------------------------
// Source: http://github.com/necolas/normalize.css
html {
overflow-y: scroll;
font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
// Focus states
a:focus {
outline: thin dotted;
}
// Hover & Active
a:hover,
a:active {
outline: 0;
}
// Display in IE6-9 and FF3
// -------------------------
// Source: http://github.com/necolas/normalize.css
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
nav,
section {
display: block;
}
// Prevents sub and sup affecting line-height in all browsers
// -------------------------
// Source: http://github.com/necolas/normalize.css
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
// Img border in a's and image quality
// -------------------------
// Source: http://github.com/necolas/normalize.css
img {
border: 0;
-ms-interpolation-mode: bicubic;
}
// Forms
// -------------------------
// Source: http://github.com/necolas/normalize.css
// Font size in all browsers, margin changes, misc consistency
button,
input,
select,
textarea {
font-size: 100%;
margin: 0;
vertical-align: middle;
}
button,
input {
line-height: normal;
// FF3/4 have !important on line-height in UA stylesheet
*overflow: visible;
// Inner spacing ie IE6/7
}
button::-moz-focus-inner,
input::-moz-focus-inner {
// Inner padding and border oddities in FF3/4
border: 0;
padding: 0;
}
button,
input[type="button"],
input[type="reset"],
input[type="submit"] {
cursor: pointer;
// Cursors on all buttons applied consistently
-webkit-appearance: button;
// Style clickable inputs in iOS
}
input[type="search"] {
// Appearance in Safari/Chrome
-webkit-appearance: textfield;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
// Inner-padding issues in Chrome OSX, Safari 5
}
textarea {
overflow: auto;
// Remove vertical scrollbar in IE6-9
vertical-align: top;
// Readability and alignment cross-browser
}

136
app/javascript/src/styles/common/020_base.scss
View File

@@ -1,136 +0,0 @@
@import "000_vars.scss";
body {
background-color: #FFF;
font-family: $base_font_family;
padding: 0;
margin: 0;
font-size: 87.5%;
line-height: 1.25em;
}
article, section {
display: block;
}
abbr[title=required] {
display: none;
}
blockquote {
margin: 0 0 1em 0;
padding: 1em 1em 0.2em;
border: 1px solid #666;
background: #EEE;
}
code {
font-family: monospace;
font-size: 1.2em;
}
dd {
margin-bottom: 1em;
}
dt {
font-weight: bold;
}
em {
font-style: italic;
}
h1, h2, h3, h4, h5, h6 {
font-family: Tahoma, Verdana, Helvetica, sans-serif;
font-weight: bold;
line-height: 1.5em;
}
h1 {
font-size: $h1_size;
}
h2 {
font-size: $h2_size;
}
h3, h4, h5, h6 {
font-weight: bold;
font-size: $h3_size;
}
fieldset {
margin-bottom: 1em;
}
header {
margin: 0 0 1em 0;
padding: 0;
display: block;
}
img {
border: none;
vertical-align: middle;
}
img.wait {
margin-left: 5px;
}
legend {
font-size: $h2_size;
font-weight: bold;
margin-bottom: 0.5em;
}
menu {
margin: 0;
padding: 0;
ul {
margin: 0;
padding: 0;
}
li {
margin: 0;
padding: 0 0.2em;
list-style-type: none;
display: inline;
}
}
p {
margin-bottom: 1em;
}
section {
display: block;
}
strong {
font-weight: bold;
}
table tfoot {
margin-top: 2em;
}
.hint {
color: #666;
font-style: italic;
max-width: 70%;
}
.tn {
font-size: 0.8em;
color: gray;
}
p.info {
color: #AAA;
font-style: italic;
font-size: 80%;
}

38
app/javascript/src/styles/common/030_links.scss
View File

@@ -1,38 +0,0 @@
@import "000_vars.scss";
a:link {
color: $link_color;
text-decoration: none;
}
a:visited {
color: $link_color;
text-decoration: none;
}
a:hover {
color: $link_hover_color;
text-decoration: none;
}
a:active {
color: $link_color;
text-decoration: none;
}
a.active {
font-weight: bold;
}
a.login {
font-weight: bold;
color: #e00;
}
a.forum-updated {
font-style: italic;
}
a.wiki-link {
margin-right: 0.3em;
}

10
app/javascript/src/styles/common/autocomplete.scss
View File

@@ -1,3 +1,5 @@
@import "../base/000_vars.scss";
.ui-autocomplete {
font-size: 0.9em;
@@ -9,8 +11,12 @@
border-right: 1px solid #C5C5C5;
}
.ui-menu-item a {
padding: 1px .2em;
.ui-menu-item-wrapper {
padding: 3px .5em 3px .4em;
a {
margin-right: 1em;
}
}
.autocomplete-arrow {

2
app/javascript/src/styles/common/dtext.scss
View File

@@ -1,4 +1,4 @@
@import "000_vars.scss";
@import "../base/000_vars.scss";
div.prose {
line-height: 1.4em;

2
app/javascript/src/styles/common/inline.scss
View File

@@ -1,4 +1,4 @@
@import "000_vars.scss";
@import "../base/000_vars.scss";
span.error {
display: block;

2
app/javascript/src/styles/common/jquery_ui_custom.scss
View File

@@ -1,4 +1,4 @@
@import "./000_vars.scss";
@import "../base/000_vars.scss";
.ui-widget {
font-family: $base_font_family;

2
app/javascript/src/styles/common/main_layout.scss
View File

@@ -1,4 +1,4 @@
@import "000_vars.scss";
@import "../base/000_vars.scss";
div#search {
margin-bottom: 1em;

2
app/javascript/src/styles/common/page_header.scss
View File

@@ -1,4 +1,4 @@
@import "000_vars.scss";
@import "../base/000_vars.scss";
#maintoggle {
display: none;

2
app/javascript/src/styles/common/paginator.scss
View File

@@ -1,4 +1,4 @@
@import "000_vars.scss";
@import "../base/000_vars.scss";
div.paginator {
display: block;

2
app/javascript/src/styles/common/tables.scss
View File

@@ -1,4 +1,4 @@
@import "000_vars.scss";
@import "../base/000_vars.scss";
table.striped {
p {

8
app/javascript/src/styles/common/tags.scss.erb
View File

@@ -1,13 +1,17 @@
@import "./000_vars.scss";
@import "../base/000_vars.scss";
<% TagCategory.css_mapping.each do |category,cssmap| %>
.category-<%= category %> a, a.tag-type-<%= category %>, .ui-state-active a.tag-type-<%= category %> {
.category-<%= category %> a, a.tag-type-<%= category %>, .ui-widget-content a.tag-type-<%= category %> {
color: <%= cssmap["color"] %>;
&:hover {
color: <%= cssmap["hover"] %>;
}
}
.ui-widget-content .ui-state-active a.tag-type-<%= category %> {
color: <%= cssmap["hover"] %>;
}
<% end %>
.category-banned a, a.tag-type-banned, .ui-state-active a.tag-type-banned {