Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2070 from nschonni/fix-mailformed-rule 

Fix unmatched braces of "nav.post-controls button"
This commit is contained in:
Régis Hanol 2014-03-07 10:37:25 +01:00
parent e9fe8f6063 c43e86d7c6
commit 7670598658
2 changed files with 170 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -106,7 +106,9 @@ section.post-menu-area, .post-actions {
nav.post-controls { nav.post-controls {
padding: 0; padding: 0;
button {color: lighten($primary_text_color, 50%); button {
color: lighten($primary_text_color, 50%);
}
margin-right: 2px; margin-right: 2px;
} }
@ -134,13 +136,14 @@ nav.post-controls {
padding: 8px 20px; padding: 8px 20px;
margin-left: 10px; margin-left: 10px;
&:hover { color: $tertiary_text_color; &:hover {
color: $tertiary_text_color;
background: $emphasis_text_color; background: $emphasis_text_color;
} }
&:active { &:active {
background: $emphasis_background_color; background: $emphasis_background_color;
@include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, .3)); @include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, .3));
} }
@ -158,53 +161,52 @@ nav.post-controls {
border: none; border: none;
margin-left: 3px; margin-left: 3px;
transition: all linear 0.15s; transition: all linear 0.15s;
&:hover { &:hover {
background: lighten($secondary_background_color, 76%); background: lighten($secondary_background_color, 76%);
color: $primary_text_color; color: $primary_text_color;
} }
&:active { &:active {
@include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, .4)); @include box-shadow(inset 0 1px 3px rgba($primary_shadow_color, .4));
} }
&.hidden { &.hidden {
display: none; display: none;
} }
&.like, &.edit, &.flag, &.delete, &.share, &.bookmark, &.create { &.like, &.edit, &.flag, &.delete, &.share, &.bookmark, &.create {
float: right; float: right;
} }
&.delete:hover { &.delete:hover {
background: $warning_text_color; background: $warning_text_color;
color: $tertiary_text_color; color: $tertiary_text_color;
} }
&.like:hover {color: $like_color; &.like:hover {color: $like_color;
background: $like_background_color; background: $like_background_color;
} }
&.bookmark {padding: 8px 11px; } &.bookmark {padding: 8px 11px; }
.read-icon { .read-icon {
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
content: "\f02e"; content: "\f02e";
} }
&.unseen { &.unseen {
&:before { &:before {
content: "\f097"; content: "\f097";
}
}
&.last-read {
color: $warning_text_color;
}
&.bookmarked {
&:before {
color: $link-color;
}
}
} }
} }
&.last-read {
color: $warning_text_color;
}
&.bookmarked {
&:before {
color: $link-color;
}
}
}
} }
.embedded-posts { .embedded-posts {
@ -212,15 +214,15 @@ nav.post-controls {
.quote .title {background: lighten($secondary_background_color, 60%);} .quote .title {background: lighten($secondary_background_color, 60%);}
blockquote {background: lighten($secondary_background_color, 60%);} blockquote {background: lighten($secondary_background_color, 60%);}
.onebox { .onebox {
background: lighten($secondary_background_color, 60%); background: lighten($secondary_background_color, 60%);
border-left: 5px solid lighten($secondary_background_color, 35%); border-left: 5px solid lighten($secondary_background_color, 35%);
.quote-controls, .quote-controls a {color: $link-color;} .quote-controls, .quote-controls a {color: $link-color;}
} }
&.bottom { margin-top: -11px;} &.bottom { margin-top: -11px;}
.topic-meta-data h5 {margin: 5px;} .topic-meta-data h5 {margin: 5px;}
.topic-meta-data-inside { .topic-meta-data-inside {
margin: -3px 0 0 0; margin: -3px 0 0 0;
color: $secondary_text_color; color: $secondary_text_color;
} }
.topic-meta-data {padding-top: 20px;} .topic-meta-data {padding-top: 20px;}
} }
@ -291,7 +293,7 @@ a.star {
font-weight: normal; font-weight: normal;
font-size: 11px; font-size: 11px;
line-height: 14px; line-height: 14px;
} }
} }
.avatar { .avatar {
@ -392,9 +394,9 @@ a.star {
margin-top: 10px; margin-top: 10px;
} }
.title { .title {
font-size: 14px; line-height: 8px; font-size: 14px; line-height: 8px;
} }
} }
span.post-count { span.post-count {
@ -444,17 +446,17 @@ iframe {
@include medium-width { @include medium-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 720px; max-width: 720px;
} }
} }
/**/ /**/
@include small-width { @include small-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 680px; max-width: 680px;
} }
} }
@ -532,7 +534,7 @@ iframe {
display: block; display: block;
} }
.dropdown-menu li { .dropdown-menu li {
margin: 5px 0; margin: 5px 0;
} }
@ -593,15 +595,15 @@ iframe {
width: 265px; width: 265px;
margin-left: -4px; margin-left: -4px;
h3 { h3 {
margin: 5px 0; margin: 5px 0;
} }
input[type=text] { input[type=text] {
font-size: 16px; font-size: 16px;
width: 92%; width: 92%;
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
#selected-posts { #selected-posts {
@ -645,8 +647,8 @@ iframe {
} }
.topic-meta-data { .topic-meta-data {
float: left; float: left;
position: relative; position: relative;
h3 { h3 {
font-size: 13px; font-size: 13px;
@ -675,9 +677,9 @@ blockquote { /* solo quotes */
margin: 14px 0; margin: 14px 0;
padding: 12px; padding: 12px;
a.mention {background: lighten($secondary_background_color, 60%);} a.mention {background: lighten($secondary_background_color, 60%);}
p:first-of-type {margin-top: 0;} p:first-of-type {margin-top: 0;}
p:last-of-type {margin-bottom: 0;} p:last-of-type {margin-bottom: 0;}
} }
.quote { /* quotes with attribution */ .quote { /* quotes with attribution */
@ -689,13 +691,13 @@ blockquote { /* solo quotes */
} }
.title { .title {
border-left: 5px solid $primary_border_color; border-left: 5px solid $primary_border_color;
background-color: lighten($secondary_background_color, 76%); background-color: lighten($secondary_background_color, 76%);
padding: 12px; padding: 12px;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
img {margin-top: -4px;} img {margin-top: -4px;}
} }
} }
@ -705,22 +707,22 @@ blockquote { /* solo quotes */
float: right; float: right;
color: $secondary_text_color; color: $secondary_text_color;
a { a {
margin: 0; margin: 0;
} }
.back:before, .back:before,
.quote-other-topic:before { .quote-other-topic:before {
display: inline-block; display: inline-block;
margin-left: 8px; margin-left: 8px;
color: $secondary_text_color; color: $secondary_text_color;
font-family: "FontAwesome"; font-family: "FontAwesome";
position: relative; position: relative;
z-index: 20; z-index: 20;
} }
.back:before { .back:before {
content: "\f062"; content: "\f062";
} }
.quote-other-topic:before { .quote-other-topic:before {
content: "\f061"; content: "\f061";
} }
} }
@ -730,8 +732,8 @@ blockquote { /* solo quotes */
float: left; float: left;
margin-top: 6px; margin-top: 6px;
ul {margin: 0;} ul {margin: 0;}
padding-left: 10px; padding-left: 10px;
i {font-size: 12px;} i {font-size: 12px;}
@ -769,8 +771,8 @@ blockquote { /* solo quotes */
.bottom-round.contents.regular { .bottom-round.contents.regular {
-webkit-transition: background-color .25s linear; -webkit-transition: background-color .25s linear;
transition: background-color .25s linear; transition: background-color .25s linear;
} }
@ -810,12 +812,12 @@ blockquote { /* solo quotes */
.topic-meta-data {padding-left: 13px;} .topic-meta-data {padding-left: 13px;}
@include medium-width { @include medium-width {
margin-left: 99px; margin-left: 99px;
} }
@include small-width { @include small-width {
margin-left: 95px; margin-left: 95px;
max-width: 720px; max-width: 720px;
} }
} }
&.top.span14 {padding-left: 0;} &.top.span14 {padding-left: 0;}
@ -824,23 +826,24 @@ blockquote { /* solo quotes */
.reply:first-of-type .row {border-top: none;} .reply:first-of-type .row {border-top: none;}
} }
.contents.regular { .contents.regular {
button.show-replies { button.show-replies {
background: lighten($secondary_background_color, 76%); background: lighten($secondary_background_color, 76%);
padding-bottom: 20px; padding-bottom: 20px;
&:hover {background: lighten($secondary_background_color, 76%); &:hover {background: lighten($secondary_background_color, 76%);
.badge-posts {color: $secondary_text_color;} .badge-posts {color: $secondary_text_color;}
} }
} }
&.bottom-round button.show-replies { &.bottom-round button.show-replies {
background: lighten($secondary_background_color, 76%); background: lighten($secondary_background_color, 76%);
margin-bottom: 0; margin-bottom: 0;
padding-bottom: 8px; padding-bottom: 8px;
&:hover {background: lighten($secondary_background_color, 76%); &:hover {
.badge-posts {color: $secondary_text_color;} background: lighten($secondary_background_color, 76%);
.badge-posts {color: $secondary_text_color;}
} }
} }
@ -876,7 +879,7 @@ button.show-replies {
box-shadow: 0 1px 5px rgba($primary_shadow_color, .4); box-shadow: 0 1px 5px rgba($primary_shadow_color, .4);
background-clip: padding-box; background-clip: padding-box;
span {font-size: 12px;} span {font-size: 12px;}
.title {font-weight: bold; display: block; font-size: 14px;} .title {font-weight: bold; display: block; font-size: 14px;}
} }
.dropdown-menu a { .dropdown-menu a {
display: block; display: block;
@ -895,7 +898,7 @@ button.show-replies {
} }
.open > .dropdown-menu { .open > .dropdown-menu {
display: block; display: block;
clear: both; clear: both;
} }
.fade { .fade {
opacity: 0; opacity: 0;
@ -953,8 +956,8 @@ clear: both;
color: $tertiary_text_color; color: $tertiary_text_color;
font-weight: normal; font-weight: normal;
color: $tertiary_text_color; color: $tertiary_text_color;
background: $btn-primary-background-color; background: $btn-primary-background-color;
&[href] { &[href] {
color: $tertiary_text_color; color: $tertiary_text_color;
@ -1024,24 +1027,24 @@ a.attachment:before {
} }
.private_message .gutter, .deleted-topic .gutter,.read_restricted .gutter { .private_message .gutter, .deleted-topic .gutter,.read_restricted .gutter {
position: relative; position: relative;
} }
.private_message .gutter:before, .deleted-topic .gutter:before, .read_restricted .gutter:before { .private_message .gutter:before, .deleted-topic .gutter:before, .read_restricted .gutter:before {
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 0;
left: 10px; left: 10px;
color: lighten($primary_text_color, 76%); color: lighten($primary_text_color, 76%);
font: 90px/1 FontAwesome; font: 90px/1 FontAwesome;
content: "\f05c"; content: "\f05c";
z-index: -5; z-index: -5;
} }
.read_restricted .gutter:before { .read_restricted .gutter:before {
content: "\f0c0"; content: "\f0c0";
} }
.private_message .gutter:before { .private_message .gutter:before {
content: "\f0e0"; content: "\f0e0";
} }

109
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -21,7 +21,7 @@ nav.post-controls {
padding: 0; padding: 0;
border-right: 1px solid $primary_border_color; border-right: 1px solid $primary_border_color;
margin-top: 10px; margin-top: 10px;
button {color: lighten($primary_text_color, 35%); button {color: lighten($primary_text_color, 35%);}
border-radius: 4px; border-radius: 4px;
margin-right: 2px; margin-right: 2px;
@ -48,8 +48,8 @@ button.create {
color: lighten($primary_text_color, 35%); color: lighten($primary_text_color, 35%);
padding-right: 7px; padding-right: 7px;
} }
.like { .like {
border-right: 1px solid $primary_border_color; border-right: 1px solid $primary_border_color;
} }
.create i { .create i {
@ -65,36 +65,36 @@ button {
background: transparent; background: transparent;
border: 1px solid $primary_border_color; border: 1px solid $primary_border_color;
float: left !important; float: left !important;
&:last-of-type { &:last-of-type {
border-right: 1px solid $primary_border_color border-right: 1px solid $primary_border_color
}
&.hidden {
display: none;
}
&.like, &.edit, &.flag, &.delete, &.share, &.bookmark, &.create {
float: right;
}
.read-icon {
&:before {
font-family: "FontAwesome";
content: "\f02e";
} }
&.hidden { &.unseen {
display: none; &:before {
} content: "\f097";
&.like, &.edit, &.flag, &.delete, &.share, &.bookmark, &.create {
float: right;
}
.read-icon {
&:before {
font-family: "FontAwesome";
content: "\f02e";
}
&.unseen {
&:before {
content: "\f097";
}
}
&.last-read {
color: $warning_text_color;
}
&.bookmarked {
&:before {
color: $bookmarkColor;
}
}
}
} }
} }
&.last-read {
color: $warning_text_color;
}
&.bookmarked {
&:before {
color: $bookmarkColor;
}
}
}
}
@ -182,7 +182,7 @@ a.star {
font-weight: normal; font-weight: normal;
font-size: 11px; font-size: 11px;
line-height: 14px; line-height: 14px;
} }
} }
.avatar { .avatar {
@ -262,15 +262,15 @@ a.star {
#suggested-topics { #suggested-topics {
clear: left; clear: left;
padding: 20px 10px 15px 10px; padding: 20px 10px 15px 10px;
th.views, td.views, td.activity, th.activity, th.likes, td.likes { th.views, td.views, td.activity, th.activity, th.likes, td.likes {
display: none; display: none;
} }
a.badge-category { a.badge-category {
font-size: 10px; font-size: 10px;
} }
.title { .title {
font-size: 14px; line-height: 8px; font-size: 14px; line-height: 8px;
} }
@ -344,7 +344,7 @@ iframe {
display: block; display: block;
} }
.dropdown-menu li { .dropdown-menu li {
margin: 5px 0; margin: 5px 0;
} }
@ -375,15 +375,15 @@ iframe {
width: 265px; width: 265px;
margin-left: -4px; margin-left: -4px;
h3 { h3 {
margin: 5px 0; margin: 5px 0;
} }
input[type=text] { input[type=text] {
font-size: 16px; font-size: 16px;
width: 92%; width: 92%;
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
#selected-posts { #selected-posts {
@ -456,23 +456,23 @@ blockquote {
float: right; float: right;
color: $primary_text_color; color: $primary_text_color;
a { a {
margin: 0; margin: 0;
} }
.back:before, .back:before,
.quote-other-topic:before { .quote-other-topic:before {
display: inline-block; display: inline-block;
margin-left: 8px; margin-left: 8px;
color: $primary_text_color; color: $primary_text_color;
font-family: "FontAwesome"; font-family: "FontAwesome";
position: relative; position: relative;
z-index: 20; z-index: 20;
} }
.back:before { .back:before {
content: "\f062"; content: "\f062";
} }
.quote-other-topic:before { .quote-other-topic:before {
content: "\f061"; content: "\f061";
} }
} }
@ -486,5 +486,6 @@ blockquote {
.gutter { display: none; } .gutter { display: none; }
.posts-wrapper { position: relative; .posts-wrapper {
position: relative;
} }