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 #2246 from awesomerobot/master 

de-bluing some non-links
This commit is contained in:
Jeff Atwood 2014-04-09 21:06:10 -07:00
parent b9d4edd91a ec96ca4c60
commit cfc1444177
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -1,3 +1,4 @@
.fa-thumb-tack.unpinned { .fa-thumb-tack.unpinned {
@include fa-icon-rotate(315deg, 1); @include fa-icon-rotate(315deg, 1);
color: $secondary_text_color;
} }

3
app/assets/stylesheets/desktop/discourse.scss
View File

@ -231,8 +231,7 @@ blockquote {
margin: 0; margin: 0;
i { i {
font-size: 15px; font-size: 15px;
color: darken($tertiary_text_color, 60%); }
}
} }
} }

5
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -60,6 +60,9 @@
border-spacing: 0; border-spacing: 0;
margin: 0 0 10px; margin: 0 0 10px;
border-top: 1px solid $primary-border-color; border-top: 1px solid $primary-border-color;
.fa-thumb-tack {color: $primary_text_color;}
.fa-thumb-tack.unpinned {color: $secondary_text_color;}
a.title {color: $primary_text_color;} a.title {color: $primary_text_color;}
a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);}
@ -166,6 +169,7 @@
.topic-status { .topic-status {
margin-right: 4px; margin-right: 4px;
padding: 0; padding: 0;
font-size: 15px;
&:last-of-type { &:last-of-type {
margin-right: 0; margin-right: 0;
} }
@ -459,7 +463,6 @@
margin: 20px 0 10px; margin: 20px 0 10px;
} }
.topic-statuses .topic-status i {font-size: 15px;}
.empty-topic-list { .empty-topic-list {
padding: 10px; padding: 10px;

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

@ -30,7 +30,9 @@
margin-left: 0; margin-left: 0;
} }
h1 .topic-statuses .topic-status i {margin-right: 5px;} h1 .topic-statuses .topic-status i {
font-size: 20px;
}
.logo-small { .logo-small {
margin-right: 8px; margin-right: 8px;
@ -295,6 +297,8 @@ a.star {
color: $secondary_text_color; color: $secondary_text_color;
} }
.avatars { .avatars {
> div { > div {
float: left; float: left;
@ -326,11 +330,10 @@ a.star {
} }
} }
a, .number { a, .number {
font-weight: bold;
line-height: 20px; line-height: 20px;
} }
.number { .number, i {
color: $link-color; color: $secondary_text_color;
} }
.avatar + a { .avatar + a {
float: left; float: left;
@ -461,7 +464,13 @@ iframe {
float: left; float: left;
width: 78%; width: 78%;
max-width: 800px; max-width: 800px;
.topic-statuses {margin-right: 5px;} .topic-statuses {
i { color: $primary_text_color;
}
.unpinned { color: $secondary_text_color;}
}
.topic-link {color: $primary_text_color;}
} }
@ -486,12 +495,14 @@ iframe {
} }
a.star { a.star {
margin-right: 8px; margin-right: 7px;
font-size: 20px; font-size: 20px;
margin-top: 6px; margin-top: 6px;
} }
.topic-statuses {margin-top: -2px;} .topic-statuses {
margin-top: -2px;
}
.badge-category { .badge-category {
vertical-align: top; vertical-align: top;

14
app/assets/stylesheets/desktop/topic.scss
View File

@ -37,7 +37,7 @@
margin-bottom: 20px; margin-bottom: 20px;
.star { .star {
font-size: 20px; font-size: 20px;
margin-top: 8px; margin-top: 6px;
margin-right: 6px; margin-right: 6px;
} }
#edit-title { width: 500px; } #edit-title { width: 500px; }
@ -56,12 +56,15 @@
margin: 0; margin: 0;
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a {color: $primary_text_color;}
a.badge-category { vertical-align: top; margin-top: 4px; } a.badge-category { vertical-align: top; margin-top: 4px; }
a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
} }
.topic-statuses { .topic-statuses {
margin-top: -2px; margin-top: -2px;
.fa-thumb-tack { margin-top: -1px; } .fa-thumb-tack { padding-left: 3px;
}
} }
.chzn-container { vertical-align: middle; } .chzn-container { vertical-align: middle; }
.private-message-glyph { display: none; } .private-message-glyph { display: none; }
@ -180,13 +183,6 @@ a:hover.reply-new {
} }
.topic-statuses .topic-status {
padding: 0;
i {
font-size:20px;
}
}
#suggested-topics .topic-statuses .topic-status { #suggested-topics .topic-statuses .topic-status {
padding: 0; padding: 0;
i { i {