Merge pull request #2280 from awesomerobot/master

initial move of common desktop/mobile styles to common/base
This commit is contained in:
Jeff Atwood 2014-04-19 12:00:17 -07:00
commit cd86343598
32 changed files with 43 additions and 809 deletions

View File

@ -0,0 +1,39 @@
.body-page {
// Consistent vertical spacing
blockquote,
h1,
h2,
h3,
hr,
p,
pre,
ul,
ol,
li,
table {
margin: 0 0 20px;
font-size: 16px;
line-height: 22px;
}
li {
margin-bottom: 8px;
}
ul,
ol {
margin-left: 40px;
}
.container {
@extend .clearfix;
width: 960px;
margin: 0 auto;
padding: 20px 10px;
margin-top: -60px;
}
}

View File

@ -140,4 +140,3 @@ aside.onebox {
height: 90px; height: 90px;
width: 90px; width: 90px;
} }

View File

@ -1,57 +0,0 @@
// --------------------------------------------------
// FAQs
// --------------------------------------------------
// Base
// --------------------------------------------------
.body-page {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 16px;
line-height: 22px;
// Consistent vertical spacing
blockquote,
h1,
h2,
h3,
hr,
p,
pre,
ul,
ol,
li,
table {
margin: 0 0 20px;
font-size: 16px;
line-height: 22px;
}
li {
margin-bottom: 8px;
}
ul,
ol {
margin-left: 40px;
}
}
.body-page {
.container {
@extend .clearfix;
width: 960px;
margin: 0 auto;
padding: 20px 10px;
margin-top: -60px;
}
}
.nav-pills {
margin-left:0px !important;
font: 13px/18px "Helvetica Neue",Helvetica,Arial,sans-serif;
}

View File

@ -536,6 +536,10 @@ iframe {
line-height: 1.3; line-height: 1.3;
} }
.new-user a {
color: $secondary_text_color;
}
a.user-group { a.user-group {
color: lighten($primary_text_color, 50%); color: lighten($primary_text_color, 50%);
width: 100%; width: 100%;
@ -654,10 +658,6 @@ iframe {
font-size: 36px; font-size: 36px;
} }
.new-user a {
color: $secondary_text_color;
}
.staff a { .staff a {
margin: -2px 0 0 0; margin: -2px 0 0 0;
background-color: $highlight_background_color; background-color: $highlight_background_color;

View File

@ -1,10 +0,0 @@
// Styles used before the user is logged into discourse. For example, activating their
// account or changing their email.
#simple-container {
@include border-radius-all(10px);
background-color: $primary_background_color;
padding: 20px;
width: 550px;
margin: 0 auto;
}

View File

@ -1,22 +0,0 @@
// Support for BBCode styles like colors and font sizes
span {
&.bbcode-b {
font-weight: bold;
}
&.bbcode-i {
font-style: italic;
}
&.bbcode-u {
text-decoration: underline;
}
&.bbcode-s {
text-decoration: line-through;
}
// Font sizes
@for $i from 4 through 40 {
&.bbcode-size-#{$i} {
font-size: #{$i}px;
}
}
}

View File

@ -1,92 +0,0 @@
// github.com style (c) Vasily Polovnyov <vast@whiteants.net>
pre {
code {
display: block;
padding: 5px 10px;
color: #333333;
background: #f1f1ff;
font-size: 14px;
font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
max-height: 500px;
}
.comment, .template_comment, .diff .header, .javadoc {
color: #999988;
font-style: italic;
}
.keyword, .css .keyword, .winutils, .javascript .title, .nginx .title, .subst, .request, .status {
color: #333333;
font-weight: bold;
}
.number, .hexcolor, .ruby .constant {
color: #009999;
}
.string, .tag .value, .phpdoc, .tex .formula {
color: #dd1144;
}
.title, .id {
color: #990000;
font-weight: bold;
}
.javascript .title, .lisp .title, .clojure .title, .subst {
font-weight: normal;
}
.class .title, .haskell .type, .vhdl .literal, .tex .command {
color: #445588;
font-weight: bold;
}
.tag {
color: navy;
font-weight: normal;
.title {
color: navy;
font-weight: normal;
}
}
.rules .property, .django .keyword {
color: navy;
font-weight: normal;
}
.attribute, .variable, .lisp .body {
color: teal;
}
.regexp {
color: #009926;
}
.class {
color: #445588;
font-weight: bold;
}
.symbol, .ruby .string, .lisp .keyword, .tex .special, .input_number {
color: #990073;
}
.built_in, .lisp .title, .clojure .built_in {
color: #0086b3;
}
.preprocessor, .pi, .doctype, .shebang, .cdata {
color: #999999;
font-weight: bold;
}
.deletion {
background: #ffdddd;
}
.addition {
background: #ddffdd;
}
.diff .change {
background: #0086b3;
}
.chunk {
color: #aaaaaa;
}
.tex .formula {
opacity: 0.5;
}
}
p > code, li > code {
margin: 0 2px;
padding: 2px 5px;
background-color: #f1f1ff;
border-radius: 3px;
}

View File

@ -1,31 +0,0 @@
// styles for the category badge color picker
.category-color-editor {
input {
width: 70px;
}
.color-title {
display: inline-block;
width: 130px;
}
.colors-container {
display: inline-block;
vertical-align: middle;
padding-top: 4px;
padding-left: 15px;
max-width: 300px;
.colorpicker {
border: 1px solid $primary_border_color;
margin-right: 2px;
width: 16px;
height: 16px;
font-size: 4px;
&.used-color {
background: image-url("chosen-sprite.png") -19px 13px;
}
}
}
}

View File

@ -1,17 +0,0 @@
.category-combobox {
.badge-category {
display: inline-block;
}
.topic-count {
font-size: 11px;
color: #666;
display: inline-block;
}
.highlighted .topic-count {
color: white;
}
.category-desc {
margin: 6px 0 0 3px;
font-size: 12px;
}
}

View File

@ -6,50 +6,10 @@
// -------------------------------------------------- // --------------------------------------------------
.body-page { .body-page {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 16px; font-size: 16px;
line-height: 22px; line-height: 22px;
margin: 20px 15px; margin: 20px 15px;
// Consistent vertical spacing
blockquote,
h1,
h2,
h3,
hr,
p,
pre,
ul,
ol,
li,
table {
margin: 0 0 20px;
font-size: 16px;
line-height: 22px;
}
li {
margin-bottom: 8px;
}
ul,
ol {
margin-left: 40px;
}
}
.body-page {
.container {
@extend .clearfix;
width: 960px;
margin: 0 auto;
padding: 20px 10px;
margin-top: -60px;
}
} }
.nav-pills { .nav-pills {

View File

@ -1,118 +0,0 @@
// styles that apply to the popup that appears when you show the edit history of a post
.modal.history-modal {
.modal-inner-container {
min-width: 960px;
min-height: 500px;
}
#revision-controls {
float: left;
.btn[disabled]:hover {
color: $primary_text_color;
}
}
#display-modes {
text-align: right;
.btn-primary {
float: none;
}
}
#revision-details {
background-color: lighten($secondary_background_color, 76%);
padding: 5px;
margin-top: 10px;
}
#revisions {
word-wrap: break-word;
}
img {
max-width: 670px;
height: auto;
}
.inline-diff {
width: 670px;
}
.markdown {
font-family: monospace;
font-size: 12px;
width: 100%;
border-collapse: collapse;
border-spacing: 0;
td {
width: 50%;
vertical-align: top;
max-width: 440px;
word-wrap: break-word;
white-space: pre-wrap;
}
}
.span8, .markdown {
img {
max-width: 400px;
}
}
ins, .diff-ins {
code, img {
border: 2px solid $success_border_color;
}
img {
opacity: .75;
filter: alpha(opacity=75);
}
a {
color: $success_text_color;
text-decoration: none;
}
}
img.diff-ins, code.diff-ins {
border: 2px solid $success_text_color;
}
img.diff-ins {
opacity: .75;
filter: alpha(opacity=75);
}
.diff-ins {
background: $success_background_color;
}
ins {
color: $success_text_color;
background: $success_background_color;
}
del, .diff-del {
code, img {
border: 2px solid $warning_border_color;
}
img {
opacity: .5;
filter: alpha(opacity=50);
}
a {
color: $warning_text_color;
text-decoration: none;
}
}
img.diff-del, code.diff-del {
border: 2px solid $warning_border_color;
}
img.diff-del {
opacity: .5;
filter: alpha(opacity=50);
}
.diff-del {
background: $warning_background_color;
}
del {
color: $warning_text_color;
background: $warning_background_color;
}
span.date {
font-weight: bold;
}
span.edit-reason {
background-color: $highlight_background_color;
padding: 3px 5px 5px 5px;
}
.modal-header {
height: 42px;
}
}

View File

@ -1,59 +0,0 @@
.lightbox {
position: relative;
display: inline-block;
&:hover .meta {
background: rgba(0, 0, 0, .5);
opacity: 1;
@include transition(opacity .5s);
}
}
.lightbox-wrapper {
display: inline-block;
}
.meta {
position: absolute;
bottom: 0;
width: 100%;
color: $tertiary_text_color;
background: $secondary_background_color;
opacity: 0;
@include transition(opacity .2s);
span {
float: left;
}
.filename {
margin: 5px;
&:before {
font-family: "FontAwesome";
content: "\F03E";
margin-right: 5px;
}
}
.informations {
margin: 6px;
padding-right: 20px;
color: $secondary_text_color;
font-size: 14px;
}
.expand {
position: absolute;
bottom: 4px;
right: 7px;
&:before {
font-family: "FontAwesome";
content: "\F065";
}
}
}
// this should be removed once all the posts have been rebaked with the new lightboxes overlays
.lightbox > span {
display: none;
}

View File

@ -1,23 +0,0 @@
@media only screen
and (min-device-width : 320px)
and (max-device-width : 540px) {
#reply-control {
.toggle-preview { display:none; }
#reply-title { width: 250px; }
.wmd-controls {
#wmd-input {
width: 100%;
border-top: 0;
}
.preview-wrapper {
display: none;
}
.textarea-wrapper {
width: 100%;
}
.wmd-button-bar {
display: none;
}
}
}
}

View File

@ -1,79 +0,0 @@
a.loading-onebox {
background: {
image: image-url("spinner_96.gif");
position: 0;
size: 20px;
height: 25px;
repeat: no-repeat;
};
padding-left: 25px;
}
.onebox-result {
font-size: 14px;
> .source {
margin-bottom: 10px;
margin-right: 10px;
padding: 10px 0;
display: block;
color: $primary_text_color;
position: relative;
border-bottom: 1px solid $primary_border_color;
.info {
a {
color: $primary_text_color;
text-decoration: none;
}
background-color: $primary_background_color;
position: absolute;
font-size: 14px;
img.favicon {
margin-right: 3px;
}
}
}
.onebox-result-body {
padding-top: 5px;
font-family: Georgia, Times, "Times New Roman", serif;
img {
max-width: 100px;
max-height: 80%;
float: left;
margin-right: 10px;
}
h3, h4 {
margin: 0 !important;
}
img.thumbnail {
max-width: 25%;
height: auto;
}
code {
max-height: 400px;
}
.metrics {
clear: both;
padding-bottom: 25px;
.metric {
display: inline-block;
padding-left: 33px;
float: left;
}
}
}
}
// RottenTomatoes Onebox
.onebox-result {
.onebox-result-body {
img.verdict {
float: none;
margin-right: 7px;
}
img.popcorn {
float: none;
margin-left: 20px;
margin-right: 5px;
}
}
}

View File

@ -1,147 +0,0 @@
// styles that apply to the PageDown editor
// http://code.google.com/p/pagedown/
.wmd-panel {
margin-left: 25%;
margin-right: 25%;
width: 50%;
min-width: 500px;
}
.wmd-button-bar {
width: 100%;
}
.wmd-button-row {
margin-left: 5px;
margin-right: 5px;
margin-bottom: 5px;
margin-top: 10px;
padding: 0;
height: 20px;
}
.wmd-spacer {
width: 1px;
height: 20px;
margin-right: 8px;
margin-left: 5px;
background-color: silver;
display: inline-block;
float: left;
}
.wmd-button {
width: 20px;
height: 20px;
padding-left: 2px;
padding-right: 3px;
margin-right: 5px;
background-repeat: no-repeat;
background-position: 0 0;
border: 0;
width: 20px;
height: 20px;
position: relative;
border: 0;
float: left;
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
display: inline;
width: auto;
height: auto;
line-height: normal;
vertical-align: baseline;
background-image: none !important;
background-position: 0 0;
background-repeat: repeat;
background-color: white;
padding: 4px;
}
.wmd-button:hover {
background-color: #99c0fa;
}
#wmd-bold-button:before {
content: "\f032";
}
#wmd-italic-button:before {
content: "\f033";
}
#wmd-link-button:before {
content: "\f0c1";
}
#wmd-quote-button:before {
content: "\f10e";
}
#wmd-code-button:before {
content: "\f121";
}
#wmd-image-button:before {
content: "\f093";
}
#wmd-olist-button:before {
content: "\f0cb";
}
#wmd-ulist-button:before {
content: "\f0ca";
}
#wmd-heading-button:before {
content: "\f031";
}
#wmd-hr-button:before {
content: "\f068";
}
#wmd-undo-button:before {
content: "\f0e2";
}
#wmd-redo-button:before {
content: "\f01e";
}
#wmd-quote-post:before {
content: "\f0e5";
}
.wmd-prompt-background {
background-color: black;
}
.wmd-prompt-dialog {
border: 1px solid #999999;
background-color: whitesmoke;
}
.wmd-prompt-dialog > div {
font-size: 0.8em;
font-family: arial, helvetica, sans-serif;
}
.wmd-prompt-dialog > form > input[type="text"] {
border: 1px solid #999999;
color: black;
}
.wmd-prompt-dialog > form > input[type="button"] {
border: 1px solid #888888;
font-family: trebuchet MS, helvetica, sans-serif;
font-size: 0.8em;
font-weight: bold;
}

View File

@ -1,13 +0,0 @@
#request-access {
width: 325px;
margin: 0 auto;
input[type=text] {
width: 320px;
height: 30px;
font-size: 22px;
}
input[type=submit] {
font-size: 22px;
padding: 10px;
}
}

View File

@ -1,36 +0,0 @@
// styles that apply to the "share" popup when sharing a link to a post or topic
#share-link {
position: absolute;
left: 20px;
z-index: 990;
@include border-radius-all(3px);
@include box-shadow(1px 1px 5px rgba($primary_shadow_color, .6));
background-color: lighten($primary_background_color, 60%);
padding: 3px 7px 6px 7px;
width: 300px;
display: none;
&.visible {
display: block;
}
input[type=text] {
width: 96%;
}
h3 {
font-size: 13px;
}
.social-link {
margin-left: 2px;
margin-right: 8px;
float: left;
font-size: 22px;
}
.link {
margin-right: 2px;
float: right;
font-size: 20px;
a {
color: $primary_text_color;
}
}
}

View File

@ -1,29 +0,0 @@
// Styles for the topic admin menu
#show-topic-admin {
position: fixed;
top: 70px;
right: 10px;
z-index: 1000;
}
.topic-admin-menu {
background-color: $primary_background_color;
width: 205px;
padding: 10px;
border: 1px solid $primary_border_color;
position: fixed;
top: 70px;
right: 10px;
z-index: 1000;
ul {
list-style: none;
margin: 10px 0 0 0;
}
button {
width: 200px;
margin-bottom: 5px;
}
}

View File

@ -1,31 +0,0 @@
div.tagsinput {
border:1px solid #CCC;
background: #FFF;
padding:5px 5px 0;
width:584px;
height:100px;
overflow-y: auto;
border-radius: 4px;
}
div.tagsinput span.tag {
border: 1px solid #a5d24a;
border-radius: 2px;
display: block;
float: left;
padding: 1px 5px;
text-decoration:none;
background: #cde69c;
color: #638421;
margin-right: 5px;
margin-bottom:5px;
font-family: helvetica;
font-size:13px;
}
div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; }
div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent;
padding:2px 5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; }
div.tagsinput div { display:block; float: left; }
.tags_clear { clear: both; width: 100%; height: 0; }
.not_valid {background: #FBD8DB !important; color: #90111A !important;}