codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1591 from awesomerobot/master

Browse source 
fixing pre/sub/sup/code/kbd formatting, post selection buttons
This commit is contained in:
Régis Hanol 2013-10-30 06:20:59 -07:00
commit 9a2e3245b8
4 changed files with 64 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/desktop/compose.scss
View file

@ -309,9 +309,7 @@
border: 1px dashed $gray;
overflow: auto;
visibility: visible;
p {
margin-top: 0;
}
&.hidden {
width: 0;
visibility: hidden;

2
app/assets/stylesheets/desktop/discourse.scss
View file

@ -668,10 +668,8 @@ body {
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 18px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3;
border: 1px solid #fbeed5;
border-radius: 4px;
color: #c09853;
}
.alert .close {

36
app/assets/stylesheets/desktop/topic-post.scss
View file

@ -882,10 +882,42 @@ clear: both;
}
#selected-posts {
margin-left: 330px;
width: 12%;
.btn {
border: none;
color: $white;
font-weight: normal;
color: #fff;
background: $btn-primary-background-color;
&[href] {
color: $white;
}
&:hover
{
color: #fff;
background: darken($btn-primary-background-color, 12%);
}
&:active {
@include linear-gradient(darken($btn-primary-background-color, 18%), darken($btn-primary-background-color, 12%));
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
color: #fff;
}
&[disabled] {
text-shadow: 0 1px 0 rgba($black, 0.2);
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-dark);
@include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2)));
}
}
p {
font-size: 13px;
}
@ -975,3 +1007,7 @@ a.attachment:before {
font-family: "FontAwesome";
content: "\f019";
}

27
app/assets/stylesheets/desktop/topic.scss
View file

@ -193,3 +193,30 @@ i {background: #e4f2f8;
}
/* Code, KBD, Sub/sup formatting */
code,kbd,pre,samp{
font-family:monospace, serif;font-size:1em
}
pre { white-space:pre-wrap= }
q{ quotes:"\201C" "\201D" "\2018" "\2019" }
small{ font-size:80% }
sub,sup{
font-size:75%;
line-height:0;
position:relative;
vertical-align:baseline
}
sup{top:-0.5em}
sub{bottom:-0.25em}
figure{margin:0}
fieldset{
border:1px solid #c0c0c0;
margin:0 2px;
padding:0.35em 0.625em 0.75em
}
legend{
border:0;
padding:0
}