diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js index 2356eac74..5013657f4 100644 --- a/app/assets/javascripts/related_tag.js +++ b/app/assets/javascripts/related_tag.js @@ -97,7 +97,7 @@ return $div; } - Danbooru.RelatedTag.toggle = function(e) { + Danbooru.RelatedTag.toggle_tag = function(e) { var $field = $("#upload_tag_string,#post_tag_string"); var tags = $field.val().match(/\S+/g) || []; var tag = $(e.target).html().replace(/ /g, "_"); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2729593c8..f8bf18ff9 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,1312 +1,37 @@ /* - *= require_self *= require "smoothness/jquery-ui-1.8.5.custom.css" - *= require_tree . + *= require_self */ -$link_color: #006FFA; -$link_hover_color: #9093FF; -$h1_size: 2em; -$h2_size: 1.5em; -$h3_size: 1.16667em; -$h1_padding: 1.25em 0; -$h2_padding: 1.45833em 0; -$h3_padding: 1.51785em 0; - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} - -/*** BEGIN CUSTOM STYLES ***/ -body { - font-family: Verdana, Helvetica, sans-serif; - padding: 0; - margin: 0; - font-size: 87.5%; - line-height: 1.25em; -} - -article, section { - display: block; -} - -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; -} - -abbr[title=required] { - display: none; -} - -blockquote { - margin: 0 0 1em 0; - padding: 1em; - 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 { - font-family: Tahoma; - font-weight: bold; - line-height: 1.25em; -} - -h1 { - font-size: $h1_size; -} - -h2 { - font-size: $h2_size; -} - -h3 { - font-size: $h3_size; -} - -.spoiler { - color: black; - background: black; - cursor: text; - display: block; -} - -.spoiler a { - color: black; -} - -.spoiler:hover { - color: white; -} - -div.prose { - h1, h2, h3 { - line-height: 1em; - } - - h1 { - padding: $h1_padding; - } - - h2 { - padding: $h2_padding; - } - - h3 { - padding: $h3_padding; - } - - ul { - margin-left: 1em; - margin-bottom: 1em; - - ul { - margin-bottom: 0; - } - } - - li { - list-style-type: disc; - } -} - -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; -} - -input[type=text], input[type=password], input[type=url], textarea, button { -/* border: 1px solid #AAA;*/ - font-size: 1em; -/* -moz-border-radius: 4px;*/ -/* -webkit-border-radius: 4px;*/ -} - -input[type=submit] { - padding: 1px 4px; -/* border: 1px solid #AAA;*/ -/* background-color: #EEE;*/ -/* -moz-border-radius: 4px;*/ -/* -webkit-border-radius: 4px;*/ - font-size: 1em; - cursor: pointer; -} - -input:focus, textarea:focus { -/* background-color: #FFD;*/ -} - -input[type=submit]:hover { -/* background-color: #F6F6F6;*/ -} - -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.25em; - list-style-type: none; - display: inline; - } -} - -header#top { - h1 { - margin: 5px 30px 0 30px; - } - - menu { - margin-top: -2px; - background: #F7F7FF; - padding: 6px 20px; - - li a { - padding: 6px 10px; - } - } - - menu.main { - margin-top: 0px; - background: white; - - li.current a { - background: #F7F7FF; - font-weight: bold; - } - } -} - -p { - margin-bottom: 1em; -} - -section { - display: block; -} - -span.error { - display: block; - font-weight: bold; - color: red; -} - -span.link { - color: $link_color; - cursor: pointer; -} - -span.wait { - color: #CCC; -} - -span.ui-icon { - float: left; - margin-top: 0.2em; - margin-right: 0.25em; -} - -strong { - font-weight: bold; -} - -table tfoot { - margin-top: 2em; -} - -table.striped { - p { - margin: 0; - } - - td, th { - padding: 2px 4px; - } - - tbody { - tr:hover { - background-color: #FFE; - } - } - - thead { - th { - font-weight: bold; - text-align: left; - } - } - - tr.even { - background-color: #EEE; - } -} - -div.error-messages { - margin: 1em 0; - padding: 1em; - - span.ui-icon { - float: left; - margin-right: 0.5em; - } - - h1 { - font-size: 1em; - color: #A00; - } -} - -div#search { - margin-bottom: 1em; -} - -div#notice { - margin: 1em 0; - padding: 1em; - - span.ui-icon { - float: left; - margin-right: 0.5em; - } -} - -div#page { - margin: 0 30px; - - aside#sidebar { - width: 20%; - float: left; - - h1 { - font-size: $h3_size; - } - - ul { - list-style-type: none; - } - - input[type=text] { - width: 10em; - } - } - - aside#sidebar > section { - margin-bottom: 1em; - } - - section#content { - width: 75%; - float: left; - margin-left: 2em; - overflow: visible; - } -} - -div.clearfix { - clear: both; -} - - -/*** Post previews ***/ -div.post-previews { - overflow: visible; -} - - -/*** Paginator ***/ -div.paginator { - display: block; - padding: 2em 0 1em 0; - font-size: 1em; - text-align: center; - font-weight: bold; - clear: both; - - a { - margin: 0 3px; - padding: 2px 6px; - font-weight: normal; - border: 1px solid #EAEAEA; - } - - a.arrow { - border: none; - } - - a.arrow:hover { - background: white; - color: #9093FF; - } - - a.current { - border: 1px solid #AAA; - } - - a:hover { - background: rgb(60, 60, 220); - color: white; - } - - span { - margin: 0 3px; - padding: 2px 6px; - } -} - - -/*** Dialog Boxes ***/ -div.ui-dialog { - ul { - margin-left: 1em; - margin-bottom: 1em; - } -} - - -/*** Simple Form ***/ -form.simple_form { - margin: 0 0 1em 0; - - div.input.boolean { - label { - display: inline; - } - } - - div.input { - margin-bottom: 1em; - - input[type=text], input[type=file], input[type=password], input[type=email] { - width: 20em; - } - - textarea { - width: 30em; - } - - label { - display: block; - cursor: pointer; - font-weight: bold; - } - - span.hint { - color: #666; - font-style: italic; - display: block; - } - - fieldset { - border: none; - display: inline; - margin: 0; - padding: 0; - - label { - font-weight: normal; - width: auto; - margin-right: 2em; - display: inline; - } - } - } -} - - -/*** DText Preview ***/ - -div.dtext { - width: 30em; - - ul { - margin-left: 1em; - } -} - - -/*** Pool Elements ***/ - -div#c-pool-elements { - div#a-new { - font-size: 0.8em; - - form { - margin-bottom: 1em; - } - - li { - margin-left: 1em; - cursor: pointer; - } - - h1 { - font-size: $h3_size; - } - } -} - - - -/*** Pools ***/ - -div#c-pools { - h1 { - font-size: $h2_size; - } - - p { - width: 30em; - } - - textarea { - height: 10em; - } -} - - -/*** Pool Orders ***/ - -div#c-pool-orders { - h1 { - font-size: $h2_size; - } - - div#a-edit { - ul.ui-sortable { - list-style-type: none; - - li { - padding: 0.5em; - } - - li.ui-state-default { - margin-bottom: 20px; - width: 180px; - background: none; - } - - li.ui-state-placeholder { - margin-bottom: 20px; - width: 180px; - height: 150px; - background: none; - } - } - } -} - -/*** Comments ***/ - -div.comments-for-post { - div.list-of-comments { - article.comment { - margin-bottom: 2em; - - div.author { - width: 20%; - float: left; - - h1 { - display: block; - font-size: $h2_size; - } - } - - div.content { - margin-left: 2em; - width: 30em; - float: left; - } - } - - article.comment.below-threshold { - opacity: 0.3; - } - - article.comment.below-threshold:hover { - opacity: 1.0; - } - } - - div.comment-preview { - margin-bottom: 2em; - } -} - -div.dtext-preview { - border: 2px dashed #AAA; - padding: 1em; - margin: 1em 0; - width: 30em; -} - -div#c-comments { - div#a-index { - div.header { - span.info { - margin-right: 1.5em; - } - - strong, time { - margin-right: 0.3em; - } - - time { - font-weight: bold; - } - - div.list-of-tags { - a { - margin-right: 0.5em; - } - } - - div.notices { - margin: 1em 0; - } - } - - div.preview { - float: left; - width: 180px; - } - - div.post { - margin-bottom: 4em; - - div.comments-for-post { - float: left; - width: 55em; - } - } - } -} - - -/*** Favorites ***/ -div#c-favorites { - section#content > h1 { - display: none; - } -} - - -/*** Posts ***/ - -article.post-preview { - height: 150px; - width: 150px; - margin-right: 30px; - margin-bottom: 30px; - display: inline-block; - float: left; - text-align: center; - vertical-align: middle; -} - -article.post-preview.blacklisted-active { - display: none; -} - -div#c-posts { - div.notice { - font-size: 0.8em; - padding: 1em; - margin-bottom: 1em; - - ul { - margin-left: 1em; - } - } - - aside#sidebar > section#pool-sidebar { - span.ui-icon { - color: #666; - } - } - - aside#sidebar > section > ul li { - list-style-type: none; - } - - aside#sidebar > section > ul ul li { - margin-left: 1em; - } - - aside#sidebar > section#blacklist-box ul { - margin-left: 1em; - - li { - list-style-type: disc; - } - - a { - color: $link_color; - cursor: pointer; - } - - span { - color: #AAA; - } - } - - h1 { - font-size: $h3_size; - } - - div#wiki-page-excerpt { - position: relative; - width: 40em; - - div#hide-or-show-wiki-page-excerpt { - font-size: 1em; - position: absolute; - top: 0; - right: 0; - - span { - cursor: pointer; - color: #AAA; - } - - span:hover { - color: #333; - } - } - } - - div#a-show { - menu#post-sections { - font-size: $h3_size; - font-weight: bold; - line-height: 1.25em; - - li a { - color: $link_color; - } - } - - section#notes article { - margin-bottom: 1em; - } - } -} - -div#c-explore-posts { -} - - -/*** Post Histories ***/ -div.post_histories { - div.index { - div.post { - margin-bottom: 2em; - - div.preview { - width: 20%; - float: left; - } - - div.history { - width: 70%; - float: left; - - table { - width: 100%; - } - - ins { - color: green; - text-decoration: none; - } - - del { - color: red; - text-decoration: line-through; - } - } - } - } -} - - -/*** Post Unapprovals ***/ -div#unapprove-dialog { - p { - margin-bottom: 1em; - } -} - - -/*** Sessions ***/ -div#sessions { - div#new { - section { - width: 30em; - float: left; - } - - h1 { - font-size: $h2_size; - } - } -} - - -/*** Artists ***/ -div#c-artists { - span.new-artist { - font-weight: bold; - color: #A00; - } - - div#a-show { - max-width: 60em; - - p.legend { - margin-bottom: 2em; - font-size: 0.8em; - font-style: italic; - } - } - - div#a-edit, div#a-new { - textarea { - height: 5em; - } - } -} - - -/*** Users ***/ -div#c-users { - div#a-new { - max-width: 60em; - - p { - margin-bottom: 1em; - } - - li { - margin-left: 1em; - list-style-type: disc; - } - - div#account-comparison { - h1 { - font-size: $h2_size; - } - - li { - font-size: 0.8em; - line-height: 1.5em; - } - - section { - width: 18em; - float: left; - padding: 1em; - } - } - - footer.nav-links { - font-size: 1.4545em; - font-weight: bold; - text-align: center; - display: block; - } - - div#p2 ul { - margin-bottom: 2em; - } - } -} - -/*** Uploads ***/ -div#c-uploads { - div#a-new { - div#upload-guide-notice { - margin-bottom: 2em; - } - - fieldset.ratings { - label { - display: inline; - } - } - - div#source-info { - margin: 1em 0; - padding: 1em; - border: 1px solid gray; - - p { - margin: 0; - } - - ul { - a { - margin-right: 1em; - } - } - } - } -} - - - -/*** Forum ***/ -div.list-of-forum-posts { - article { - margin-bottom: 3em; - - div.author { - width: 20%; - float: left; - } - - div.content { - margin-left: 2em; - width: 30em; - float: left; - - menu { - margin-top: 0.5em; - } - } - } -} - -div#c-forum-topics { - div.single-forum-post { - width: 60em; - } - - div#a-show { - } - - span.info { - color: #AAA; - } - - tr.new-topic { - font-weight: bold; - } - - div#form-content { - float: left; - width: 450px; - padding-right: 1em; - } - - div#form-aside { - float: left; - width: 400px; - - div#preview > p { - margin-top: 0.5em; - padding-top: 0.5em; - border-top: 1px solid #AAA; - } - } - - a.last-page { - color: #666; - } - - span.locked-topic { - color: #666; - } -} - - - -/*** Wiki Pages ***/ -div#c-wiki-pages { - span.version { - color: #AAA; - } - - div#form-content { - float: left; - width: 30em; - padding-right: 1em; - } - - div#form-aside { - float: left; - width: 20em; - - div#preview > p { - margin-top: 0.5em; - padding-top: 0.5em; - border-top: 1px solid #AAA; - } - } - - div#a-edit, div#a-new { - div#preview { - } - } -} - - - -/*** Post Moderation ***/ -div#c-moderator-post-dashboards { - article { - margin-bottom: 4em; - overflow: hidden; - } - - aside { - float: left; - width: 520px; - } - - section { - float: left; - width: 300px; - } -} - - - -/*** Note Container ***/ -div#note-container { - position: absolute; - z-index: 500; - - div.note-body { - position: absolute; - border: 1px solid black; - background: white; - min-width: 5em; - min-height: 1em; - cursor: pointer; - padding: 4px; - z-index: 1000; - overflow: auto; - - p.tn { - font-size: 0.8em; - color: gray; - } - } - - div.note-box { - position: absolute; - border: 1px solid white; - min-width: 20px; - min-height: 20px; - width: 100px; - height: 100px; - cursor: move; - background: transparent; - - div.note-box-inner-border { - border: 1px solid black; - background: white; - } - - div.note-box-inner-border.unsaved { - border: 1px solid red; - } - } -} - -div.note-edit-dialog { - font-size: 0.8em; -} - - -/*** Site Map ***/ -div#c-static { - div#a-site-map { - width: 80em; - - h1 { - display: none; - } - - section { - width: 20em; - float: left; - - h1 { - display: block; - font-size: $h3_size; - } - - ul { - margin-bottom: 1.5em; - } - } - } -} - - - -/*** moderator dashboard ***/ -div#moderator-dashboard { - div#comment-activity { - width: 45%; - float: left; - } - - div#post-activity { - width: 45%; - float: left; - margin-left: 2em; - } - - div#ip-addr-search { - margin-bottom: 2em; - } - - div#activity-search { - margin-bottom: 2em; - } - - table { - margin-bottom: 2em; - } - - caption { - font-weight: bold; - font-size: 1.5em; - } -} - - -/*** page footer ***/ -footer#page-footer { - clear: both; - margin: 1em; - text-align: center; - padding-top: 1em; - border-top: 1px solid #EEE; -} - -/*** news ticker ***/ - -div#news-ticker { - padding: 5px; - background: #EEE; - border-bottom: 2px solid #666; - overflow: hidden; - font-size: 0.8em; - - ul { - float: left; - margin: 0; - padding: 0; - } - - li { - list-style-type: none; - float: left; - margin: 0 2em 0 0; - padding: 0; - } - - a#close-news-ticker-link { - float: right; - } -} - - -div#terms-of-service { - width: 40em; - - h1 { - font-size: $h2_size; - } - - p { - margin-bottom: 1em; - } - - ul { - margin-left: 1em; - margin-bottom: 1em; - } - - li { - list-style-type: disc; - } - - section { - margin-bottom: 2em; - } -} - - -/*** post mode menus ***/ -body#mode-view { - background-color: "#FFF"; -} - -body#mode-edit { - background-color: "#3A3"; -} - -body#mode-add-fav { - background-color: "#FFA"; -} - -body#mode-remove-fav { - background-color: "#FFA"; -} - -body#mode-rating-q { - background-color: "#AAA"; -} - -body#mode-rating-s { - background-color: "#6F6"; -} - -body#mode-rating-e { - background-color: "#F66"; -} - -body#mode-vote-down { - background-color: "#FAA"; -} - -body#mode-vote-up { - background-color: "#AFA"; -} - -body#mode-lock-rating { - background-color: "#AA3"; -} - -body#mode-lock-note { - background-color: "#3AA"; -} - -body#mode-approve { - background-color: "#26A"; -} - -body#mode-unapprove { - background-color: "#F66"; -} - -body#mode-add-to-pool { - background-color: "#26A"; -} - -body#mode-apply-tag-script { - background-color: "#A3A"; -} - -body#mode-edit-tag-script { - background-color: "#FFF"; -} +@import "common/000_vars.css.scss"; +@import "common/010_reset.css.scss"; +@import "common/020_base.css.scss"; +@import "common/030_links.css.scss"; +@import "common/dtext.css.scss"; +@import "common/inline.css.scss"; +@import "common/jquery_ui_custom.css.scss"; +@import "common/main_layout.css.scss"; +@import "common/news.css.scss"; +@import "common/notices.css.scss"; +@import "common/page_header.css.scss"; +@import "common/paginator.css.scss"; +@import "common/simple_form.css.scss"; +@import "common/spoiler.css.scss"; +@import "common/tables.css.scss"; + +@import "specific/artists.css.scss"; +@import "specific/comments.css.scss"; +@import "specific/favorites.css.scss"; +@import "specific/forum.css.scss"; +@import "specific/moderator_dashboard.css.scss"; +@import "specific/notes.css.scss"; +@import "specific/pools.css.scss"; +@import "specific/post_mode_menu.css.scss"; +@import "specific/posts.css.scss"; +@import "specific/related_tags.css.scss"; +@import "specific/sessions.css.scss"; +@import "specific/site_map.css.scss"; +@import "specific/terms_of_service.css.scss"; +@import "specific/uploads.css.scss"; +@import "specific/users.css.scss"; +@import "specific/wiki_pages.css.scss"; diff --git a/app/assets/stylesheets/common/000_vars.css.scss b/app/assets/stylesheets/common/000_vars.css.scss new file mode 100644 index 000000000..1e2a3173c --- /dev/null +++ b/app/assets/stylesheets/common/000_vars.css.scss @@ -0,0 +1,8 @@ +$link_color: #006FFA; +$link_hover_color: #9093FF; +$h1_size: 2em; +$h2_size: 1.5em; +$h3_size: 1.16667em; +$h1_padding: 1.25em 0; +$h2_padding: 1.45833em 0; +$h3_padding: 1.51785em 0; \ No newline at end of file diff --git a/app/assets/stylesheets/common/010_reset.css.scss b/app/assets/stylesheets/common/010_reset.css.scss new file mode 100644 index 000000000..9c4c3c567 --- /dev/null +++ b/app/assets/stylesheets/common/010_reset.css.scss @@ -0,0 +1,40 @@ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/app/assets/stylesheets/common/020_base.css.scss b/app/assets/stylesheets/common/020_base.css.scss new file mode 100644 index 000000000..63a56ef7e --- /dev/null +++ b/app/assets/stylesheets/common/020_base.css.scss @@ -0,0 +1,140 @@ +body { + font-family: Verdana, Helvetica, sans-serif; + 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; + 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 { + font-family: Tahoma; + font-weight: bold; + line-height: 1.25em; +} + +h1 { + font-size: $h1_size; +} + +h2 { + font-size: $h2_size; +} + +h3 { + 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; +} + +input[type=text], input[type=password], input[type=url], textarea, button { +/* border: 1px solid #AAA;*/ + font-size: 1em; +/* -moz-border-radius: 4px;*/ +/* -webkit-border-radius: 4px;*/ +} + +input[type=submit] { + padding: 1px 4px; +/* border: 1px solid #AAA;*/ +/* background-color: #EEE;*/ +/* -moz-border-radius: 4px;*/ +/* -webkit-border-radius: 4px;*/ + font-size: 1em; + cursor: pointer; +} + +input:focus, textarea:focus { +/* background-color: #FFD;*/ +} + +input[type=submit]:hover { +/* background-color: #F6F6F6;*/ +} + +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.25em; + list-style-type: none; + display: inline; + } +} + +p { + margin-bottom: 1em; +} + +section { + display: block; +} + +strong { + font-weight: bold; +} + +table tfoot { + margin-top: 2em; +} diff --git a/app/assets/stylesheets/common/030_links.css.scss b/app/assets/stylesheets/common/030_links.css.scss new file mode 100644 index 000000000..920cb94fc --- /dev/null +++ b/app/assets/stylesheets/common/030_links.css.scss @@ -0,0 +1,28 @@ +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; +} \ No newline at end of file diff --git a/app/assets/stylesheets/common/dtext.css.scss b/app/assets/stylesheets/common/dtext.css.scss new file mode 100644 index 000000000..553396763 --- /dev/null +++ b/app/assets/stylesheets/common/dtext.css.scss @@ -0,0 +1,45 @@ +div.prose { + h1, h2, h3 { + line-height: 1em; + } + + h1 { + padding: $h1_padding; + } + + h2 { + padding: $h2_padding; + } + + h3 { + padding: $h3_padding; + } + + ul { + margin-left: 1em; + margin-bottom: 1em; + + ul { + margin-bottom: 0; + } + } + + li { + list-style-type: disc; + } +} + +div.dtext { + width: 30em; + + ul { + margin-left: 1em; + } +} + +div.dtext-preview { + border: 2px dashed #AAA; + padding: 1em; + margin: 1em 0; + width: 30em; +} diff --git a/app/assets/stylesheets/common/inline.css.scss b/app/assets/stylesheets/common/inline.css.scss new file mode 100644 index 000000000..c0518eeac --- /dev/null +++ b/app/assets/stylesheets/common/inline.css.scss @@ -0,0 +1,14 @@ +span.error { + display: block; + font-weight: bold; + color: red; +} + +span.link { + color: $link_color; + cursor: pointer; +} + +span.wait { + color: #CCC; +} diff --git a/app/assets/stylesheets/common/jquery_ui_custom.css.scss b/app/assets/stylesheets/common/jquery_ui_custom.css.scss new file mode 100644 index 000000000..91f259f78 --- /dev/null +++ b/app/assets/stylesheets/common/jquery_ui_custom.css.scss @@ -0,0 +1,6 @@ +div.ui-dialog { + ul { + margin-left: 1em; + margin-bottom: 1em; + } +} diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss new file mode 100644 index 000000000..68524f4cb --- /dev/null +++ b/app/assets/stylesheets/common/main_layout.css.scss @@ -0,0 +1,47 @@ +div#search { + margin-bottom: 1em; +} + +div#page { + margin: 0 30px; + + aside#sidebar { + width: 20%; + float: left; + + h1 { + font-size: $h3_size; + } + + ul { + list-style-type: none; + } + + input[type=text] { + width: 10em; + } + } + + aside#sidebar > section { + margin-bottom: 1em; + } + + section#content { + width: 75%; + float: left; + margin-left: 2em; + overflow: visible; + } +} + +footer#page-footer { + clear: both; + margin: 1em; + text-align: center; + padding-top: 1em; + border-top: 1px solid #EEE; +} + +div.clearfix { + clear: both; +} diff --git a/app/assets/stylesheets/common/news.css.scss b/app/assets/stylesheets/common/news.css.scss new file mode 100644 index 000000000..16b623cdf --- /dev/null +++ b/app/assets/stylesheets/common/news.css.scss @@ -0,0 +1,24 @@ +div#news-ticker { + padding: 5px; + background: #EEE; + border-bottom: 2px solid #666; + overflow: hidden; + font-size: 0.8em; + + ul { + float: left; + margin: 0; + padding: 0; + } + + li { + list-style-type: none; + float: left; + margin: 0 2em 0 0; + padding: 0; + } + + a#close-news-ticker-link { + float: right; + } +} diff --git a/app/assets/stylesheets/common/notices.css.scss b/app/assets/stylesheets/common/notices.css.scss new file mode 100644 index 000000000..6f0e93ae0 --- /dev/null +++ b/app/assets/stylesheets/common/notices.css.scss @@ -0,0 +1,30 @@ +span.ui-icon { + float: left; + margin-top: 0.2em; + margin-right: 0.25em; +} + +div.error-messages { + margin: 1em 0; + padding: 1em; + + span.ui-icon { + float: left; + margin-right: 0.5em; + } + + h1 { + font-size: 1em; + color: #A00; + } +} + +div#notice { + margin: 1em 0; + padding: 1em; + + span.ui-icon { + float: left; + margin-right: 0.5em; + } +} diff --git a/app/assets/stylesheets/common/page_header.css.scss b/app/assets/stylesheets/common/page_header.css.scss new file mode 100644 index 000000000..5eef2eea7 --- /dev/null +++ b/app/assets/stylesheets/common/page_header.css.scss @@ -0,0 +1,25 @@ +header#top { + h1 { + margin: 5px 30px 0 30px; + } + + menu { + margin-top: -2px; + background: #F7F7FF; + padding: 6px 20px; + + li a { + padding: 6px 10px; + } + } + + menu.main { + margin-top: 0px; + background: white; + + li.current a { + background: #F7F7FF; + font-weight: bold; + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/common/paginator.css.scss b/app/assets/stylesheets/common/paginator.css.scss new file mode 100644 index 000000000..fbc90d9b7 --- /dev/null +++ b/app/assets/stylesheets/common/paginator.css.scss @@ -0,0 +1,38 @@ +div.paginator { + display: block; + padding: 2em 0 1em 0; + font-size: 1em; + text-align: center; + font-weight: bold; + clear: both; + + a { + margin: 0 3px; + padding: 2px 6px; + font-weight: normal; + border: 1px solid #EAEAEA; + } + + a.arrow { + border: none; + } + + a.arrow:hover { + background: white; + color: #9093FF; + } + + a.current { + border: 1px solid #AAA; + } + + a:hover { + background: rgb(60, 60, 220); + color: white; + } + + span { + margin: 0 3px; + padding: 2px 6px; + } +} diff --git a/app/assets/stylesheets/common/simple_form.css.scss b/app/assets/stylesheets/common/simple_form.css.scss new file mode 100644 index 000000000..b64483cc1 --- /dev/null +++ b/app/assets/stylesheets/common/simple_form.css.scss @@ -0,0 +1,48 @@ +form.simple_form { + margin: 0 0 1em 0; + + div.input.boolean { + label { + display: inline; + } + } + + div.input { + margin-bottom: 1em; + + input[type=text], input[type=file], input[type=password], input[type=email] { + width: 20em; + } + + textarea { + width: 30em; + } + + label { + display: block; + cursor: pointer; + font-weight: bold; + } + + span.hint { + color: #666; + font-style: italic; + display: block; + } + + fieldset { + border: none; + display: inline; + margin: 0; + padding: 0; + + label { + font-weight: normal; + width: auto; + margin-right: 2em; + display: inline; + } + } + } +} + diff --git a/app/assets/stylesheets/common/spoiler.css.scss b/app/assets/stylesheets/common/spoiler.css.scss new file mode 100644 index 000000000..7873968ad --- /dev/null +++ b/app/assets/stylesheets/common/spoiler.css.scss @@ -0,0 +1,14 @@ +.spoiler { + color: black; + background: black; + cursor: text; + display: block; +} + +.spoiler a { + color: black; +} + +.spoiler:hover { + color: white; +} \ No newline at end of file diff --git a/app/assets/stylesheets/common/tables.css.scss b/app/assets/stylesheets/common/tables.css.scss new file mode 100644 index 000000000..913c85bbd --- /dev/null +++ b/app/assets/stylesheets/common/tables.css.scss @@ -0,0 +1,26 @@ +table.striped { + p { + margin: 0; + } + + td, th { + padding: 2px 4px; + } + + tbody { + tr:hover { + background-color: #FFE; + } + } + + thead { + th { + font-weight: bold; + text-align: left; + } + } + + tr.even { + background-color: #EEE; + } +} diff --git a/app/assets/stylesheets/specific/artists.css.scss b/app/assets/stylesheets/specific/artists.css.scss new file mode 100644 index 000000000..b6ff3e559 --- /dev/null +++ b/app/assets/stylesheets/specific/artists.css.scss @@ -0,0 +1,22 @@ +div#c-artists { + span.new-artist { + font-weight: bold; + color: #A00; + } + + div#a-show { + max-width: 60em; + + p.legend { + margin-bottom: 2em; + font-size: 0.8em; + font-style: italic; + } + } + + div#a-edit, div#a-new { + textarea { + height: 5em; + } + } +} diff --git a/app/assets/stylesheets/specific/comments.css.scss b/app/assets/stylesheets/specific/comments.css.scss new file mode 100644 index 000000000..90842a5a4 --- /dev/null +++ b/app/assets/stylesheets/specific/comments.css.scss @@ -0,0 +1,77 @@ +div.comments-for-post { + div.list-of-comments { + article.comment { + margin-bottom: 2em; + + div.author { + width: 20%; + float: left; + + h1 { + display: block; + font-size: $h2_size; + } + } + + div.content { + margin-left: 2em; + width: 30em; + float: left; + } + } + + article.comment.below-threshold { + opacity: 0.3; + } + + article.comment.below-threshold:hover { + opacity: 1.0; + } + } + + div.comment-preview { + margin-bottom: 2em; + } +} + +div#c-comments { + div#a-index { + div.header { + span.info { + margin-right: 1.5em; + } + + strong, time { + margin-right: 0.3em; + } + + time { + font-weight: bold; + } + + div.list-of-tags { + a { + margin-right: 0.5em; + } + } + + div.notices { + margin: 1em 0; + } + } + + div.preview { + float: left; + width: 180px; + } + + div.post { + margin-bottom: 4em; + + div.comments-for-post { + float: left; + width: 55em; + } + } + } +} diff --git a/app/assets/stylesheets/specific/favorites.css.scss b/app/assets/stylesheets/specific/favorites.css.scss new file mode 100644 index 000000000..3d7a529e7 --- /dev/null +++ b/app/assets/stylesheets/specific/favorites.css.scss @@ -0,0 +1,5 @@ +div#c-favorites { + section#content > h1 { + display: none; + } +} diff --git a/app/assets/stylesheets/specific/forum.css.scss b/app/assets/stylesheets/specific/forum.css.scss new file mode 100644 index 000000000..928fb5662 --- /dev/null +++ b/app/assets/stylesheets/specific/forum.css.scss @@ -0,0 +1,62 @@ +div.list-of-forum-posts { + article { + margin-bottom: 3em; + + div.author { + width: 20%; + float: left; + } + + div.content { + margin-left: 2em; + width: 30em; + float: left; + + menu { + margin-top: 0.5em; + } + } + } +} + +div#c-forum-topics { + div.single-forum-post { + width: 60em; + } + + div#a-show { + } + + span.info { + color: #AAA; + } + + tr.new-topic { + font-weight: bold; + } + + div#form-content { + float: left; + width: 450px; + padding-right: 1em; + } + + div#form-aside { + float: left; + width: 400px; + + div#preview > p { + margin-top: 0.5em; + padding-top: 0.5em; + border-top: 1px solid #AAA; + } + } + + a.last-page { + color: #666; + } + + span.locked-topic { + color: #666; + } +} diff --git a/app/assets/stylesheets/specific/moderator_dashboard.css.scss b/app/assets/stylesheets/specific/moderator_dashboard.css.scss new file mode 100644 index 000000000..59e272935 --- /dev/null +++ b/app/assets/stylesheets/specific/moderator_dashboard.css.scss @@ -0,0 +1,29 @@ +div#moderator-dashboard { + div#comment-activity { + width: 45%; + float: left; + } + + div#post-activity { + width: 45%; + float: left; + margin-left: 2em; + } + + div#ip-addr-search { + margin-bottom: 2em; + } + + div#activity-search { + margin-bottom: 2em; + } + + table { + margin-bottom: 2em; + } + + caption { + font-weight: bold; + font-size: 1.5em; + } +} diff --git a/app/assets/stylesheets/specific/notes.css.scss b/app/assets/stylesheets/specific/notes.css.scss new file mode 100644 index 000000000..e345ca806 --- /dev/null +++ b/app/assets/stylesheets/specific/notes.css.scss @@ -0,0 +1,45 @@ +div#note-container { + position: absolute; + z-index: 500; + + div.note-body { + position: absolute; + border: 1px solid black; + background: white; + min-width: 5em; + min-height: 1em; + cursor: pointer; + padding: 4px; + z-index: 1000; + overflow: auto; + + p.tn { + font-size: 0.8em; + color: gray; + } + } + + div.note-box { + position: absolute; + border: 1px solid white; + min-width: 20px; + min-height: 20px; + width: 100px; + height: 100px; + cursor: move; + background: transparent; + + div.note-box-inner-border { + border: 1px solid black; + background: white; + } + + div.note-box-inner-border.unsaved { + border: 1px solid red; + } + } +} + +div.note-edit-dialog { + font-size: 0.8em; +} diff --git a/app/assets/stylesheets/specific/pools.css.scss b/app/assets/stylesheets/specific/pools.css.scss new file mode 100644 index 000000000..4492fad51 --- /dev/null +++ b/app/assets/stylesheets/specific/pools.css.scss @@ -0,0 +1,61 @@ +div#c-pool-elements { + div#a-new { + font-size: 0.8em; + + form { + margin-bottom: 1em; + } + + li { + margin-left: 1em; + cursor: pointer; + } + + h1 { + font-size: $h3_size; + } + } +} + +div#c-pools { + h1 { + font-size: $h2_size; + } + + p { + width: 30em; + } + + textarea { + height: 10em; + } +} + +div#c-pool-orders { + h1 { + font-size: $h2_size; + } + + div#a-edit { + ul.ui-sortable { + list-style-type: none; + + li { + padding: 0.5em; + } + + li.ui-state-default { + margin-bottom: 20px; + width: 180px; + background: none; + } + + li.ui-state-placeholder { + margin-bottom: 20px; + width: 180px; + height: 150px; + background: none; + } + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/specific/post_mode_menu.css.scss b/app/assets/stylesheets/specific/post_mode_menu.css.scss new file mode 100644 index 000000000..f10e09abb --- /dev/null +++ b/app/assets/stylesheets/specific/post_mode_menu.css.scss @@ -0,0 +1,63 @@ +body#mode-view { + background-color: "#FFF"; +} + +body#mode-edit { + background-color: "#3A3"; +} + +body#mode-add-fav { + background-color: "#FFA"; +} + +body#mode-remove-fav { + background-color: "#FFA"; +} + +body#mode-rating-q { + background-color: "#AAA"; +} + +body#mode-rating-s { + background-color: "#6F6"; +} + +body#mode-rating-e { + background-color: "#F66"; +} + +body#mode-vote-down { + background-color: "#FAA"; +} + +body#mode-vote-up { + background-color: "#AFA"; +} + +body#mode-lock-rating { + background-color: "#AA3"; +} + +body#mode-lock-note { + background-color: "#3AA"; +} + +body#mode-approve { + background-color: "#26A"; +} + +body#mode-unapprove { + background-color: "#F66"; +} + +body#mode-add-to-pool { + background-color: "#26A"; +} + +body#mode-apply-tag-script { + background-color: "#A3A"; +} + +body#mode-edit-tag-script { + background-color: "#FFF"; +} diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss new file mode 100644 index 000000000..0b4d0a06f --- /dev/null +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -0,0 +1,160 @@ +div.post-previews { + overflow: visible; +} + +article.post-preview { + height: 150px; + width: 150px; + margin-right: 30px; + margin-bottom: 30px; + display: inline-block; + float: left; + text-align: center; + vertical-align: middle; +} + +article.post-preview.blacklisted-active { + display: none; +} + +div#c-posts { + div.notice { + font-size: 0.8em; + padding: 1em; + margin-bottom: 1em; + + ul { + margin-left: 1em; + } + } + + aside#sidebar > section#pool-sidebar { + span.ui-icon { + color: #666; + } + } + + aside#sidebar > section > ul li { + list-style-type: none; + } + + aside#sidebar > section > ul ul li { + margin-left: 1em; + } + + aside#sidebar > section#blacklist-box ul { + margin-left: 1em; + + li { + list-style-type: disc; + } + + a { + color: $link_color; + cursor: pointer; + } + + span { + color: #AAA; + } + } + + h1 { + font-size: $h3_size; + } + + div#wiki-page-excerpt { + position: relative; + width: 40em; + + div#hide-or-show-wiki-page-excerpt { + font-size: 1em; + position: absolute; + top: 0; + right: 0; + + span { + cursor: pointer; + color: #AAA; + } + + span:hover { + color: #333; + } + } + } + + div#a-show { + menu#post-sections { + font-size: $h3_size; + font-weight: bold; + line-height: 1.25em; + + li a { + color: $link_color; + } + } + + section#notes article { + margin-bottom: 1em; + } + } +} + +div#c-explore-posts { +} + +div.post_histories { + div.index { + div.post { + margin-bottom: 2em; + + div.preview { + width: 20%; + float: left; + } + + div.history { + width: 70%; + float: left; + + table { + width: 100%; + } + + ins { + color: green; + text-decoration: none; + } + + del { + color: red; + text-decoration: line-through; + } + } + } + } +} + +div#unapprove-dialog { + p { + margin-bottom: 1em; + } +} + +div#c-moderator-post-dashboards { + article { + margin-bottom: 4em; + overflow: hidden; + } + + aside { + float: left; + width: 520px; + } + + section { + float: left; + width: 300px; + } +} diff --git a/app/assets/stylesheets/specific/related_tags.css.scss b/app/assets/stylesheets/specific/related_tags.css.scss new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/specific/sessions.css.scss b/app/assets/stylesheets/specific/sessions.css.scss new file mode 100644 index 000000000..051ec822e --- /dev/null +++ b/app/assets/stylesheets/specific/sessions.css.scss @@ -0,0 +1,12 @@ +div#sessions { + div#new { + section { + width: 30em; + float: left; + } + + h1 { + font-size: $h2_size; + } + } +} diff --git a/app/assets/stylesheets/specific/site_map.css.scss b/app/assets/stylesheets/specific/site_map.css.scss new file mode 100644 index 000000000..bd56943f1 --- /dev/null +++ b/app/assets/stylesheets/specific/site_map.css.scss @@ -0,0 +1,23 @@ +div#c-static { + div#a-site-map { + width: 80em; + + h1 { + display: none; + } + + section { + width: 20em; + float: left; + + h1 { + display: block; + font-size: $h3_size; + } + + ul { + margin-bottom: 1.5em; + } + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/specific/terms_of_service.css.scss b/app/assets/stylesheets/specific/terms_of_service.css.scss new file mode 100644 index 000000000..55b9c29f2 --- /dev/null +++ b/app/assets/stylesheets/specific/terms_of_service.css.scss @@ -0,0 +1,24 @@ +div#terms-of-service { + width: 40em; + + h1 { + font-size: $h2_size; + } + + p { + margin-bottom: 1em; + } + + ul { + margin-left: 1em; + margin-bottom: 1em; + } + + li { + list-style-type: disc; + } + + section { + margin-bottom: 2em; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/specific/uploads.css.scss b/app/assets/stylesheets/specific/uploads.css.scss new file mode 100644 index 000000000..f344deba8 --- /dev/null +++ b/app/assets/stylesheets/specific/uploads.css.scss @@ -0,0 +1,29 @@ +div#c-uploads { + div#a-new { + div#upload-guide-notice { + margin-bottom: 2em; + } + + fieldset.ratings { + label { + display: inline; + } + } + + div#source-info { + margin: 1em 0; + padding: 1em; + border: 1px solid gray; + + p { + margin: 0; + } + + ul { + a { + margin-right: 1em; + } + } + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/specific/users.css.scss b/app/assets/stylesheets/specific/users.css.scss new file mode 100644 index 000000000..47c51f261 --- /dev/null +++ b/app/assets/stylesheets/specific/users.css.scss @@ -0,0 +1,42 @@ +div#c-users { + div#a-new { + max-width: 60em; + + p { + margin-bottom: 1em; + } + + li { + margin-left: 1em; + list-style-type: disc; + } + + div#account-comparison { + h1 { + font-size: $h2_size; + } + + li { + font-size: 0.8em; + line-height: 1.5em; + } + + section { + width: 18em; + float: left; + padding: 1em; + } + } + + footer.nav-links { + font-size: 1.4545em; + font-weight: bold; + text-align: center; + display: block; + } + + div#p2 ul { + margin-bottom: 2em; + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss new file mode 100644 index 000000000..556342cc7 --- /dev/null +++ b/app/assets/stylesheets/specific/wiki_pages.css.scss @@ -0,0 +1,27 @@ +div#c-wiki-pages { + span.version { + color: #AAA; + } + + div#form-content { + float: left; + width: 30em; + padding-right: 1em; + } + + div#form-aside { + float: left; + width: 20em; + + div#preview > p { + margin-top: 0.5em; + padding-top: 0.5em; + border-top: 1px solid #AAA; + } + } + + div#a-edit, div#a-new { + div#preview { + } + } +} \ No newline at end of file