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

removing duplicate topic-map desktop/mobile styles

This commit is contained in:
Kris 2018-02-12 15:16:27 -05:00
parent e700e3e882
commit 32116654ec
3 changed files with 40 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -199,7 +199,10 @@ aside.quote {
} }
.topic-map { .topic-map {
background: blend-primary-secondary(5%);
border: 1px solid $primary-low;
border-top: none; // would cause double top border
.avatars { .avatars {
> div { > div {
float: left; float: left;
@ -223,6 +226,41 @@ aside.quote {
margin-right: 4px; margin-right: 4px;
} }
section {
border-top: 1px solid $primary-low;
}
ul {
margin: 0;
list-style: none;
}
h3 {
margin-bottom: 4px;
color: dark-light-choose($primary-high, $secondary-low);
line-height: $line-height-large;
font-weight: normal;
font-size: $font-0;
}
h4 {
margin: 1px 0 2px 0;
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: $font-down-1;
line-height: $line-height-small;
}
span.domain {
font-size: $font-down-2;
color: dark-light-choose($primary-medium, $secondary-medium);
}
td {
vertical-align: top;
padding:1px;
}
} }
.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster { .topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster {

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

@ -307,39 +307,6 @@ nav.post-controls {
.topic-map { .topic-map {
margin: 20px 0; margin: 20px 0;
background: blend-primary-secondary(5%);
border: 1px solid $primary-low;
border-top: none; // would cause double top border
section {
border-top: 1px solid $primary-low;
}
h3 {
margin-bottom: 4px;
color: dark-light-choose($primary-high, $secondary-low);
line-height: $line-height-large;
font-weight: normal;
font-size: $font-0;
}
h4 {
margin: 1px 0 2px 0;
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: $font-down-1;
line-height: $line-height-small;
}
ul {
margin: 0;
list-style: none;
}
span.domain {
font-size: $font-down-2;
color: dark-light-choose($primary-medium, $secondary-medium);
}
.map { .map {
.secondary {text-align: center;} .secondary {text-align: center;}
@ -391,11 +358,6 @@ nav.post-controls {
} }
} }
td {
vertical-align: top;
padding:1px;
}
.buttons { .buttons {
float: right; float: right;
.btn { .btn {

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

@ -143,30 +143,10 @@ a.reply-to-tab {
} }
.topic-map { .topic-map {
margin: 10px 0; margin: 10px 0;
background: blend-primary-secondary(5%);
border: 1px solid $primary-low;
border-top: none; // would cause double top border
section {
border-top: 1px solid $primary-low;
}
h3 {
margin-bottom: 4px;
margin-top: 0;
color: dark-light-choose($primary-medium, $secondary-medium);
line-height: $line-height-large;
font-weight: normal;
font-size: $font-0;
}
h4 { h4 {
margin: 0 0 3px 0; margin: 0 0 3px 0;
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: $font-down-1;
line-height: $line-height-medium; line-height: $line-height-medium;
} }
@ -175,11 +155,6 @@ a.reply-to-tab {
margin-right: 10px; margin-right: 10px;
} }
ul {
margin: 0;
list-style: none;
}
.map-collapsed { .map-collapsed {
.secondary { .secondary {
display: none; display: none;
@ -195,7 +170,7 @@ a.reply-to-tab {
} }
} }
a, .number { a, .number {
line-height: $line-height-large; line-height: $line-height-medium;
} }
.number, i { .number, i {
color: dark-light-choose($primary-high, $secondary-low); color: dark-light-choose($primary-high, $secondary-low);
@ -226,21 +201,12 @@ a.reply-to-tab {
.user {float: left; margin: 0 10px 10px 0;} .user {float: left; margin: 0 10px 10px 0;}
} }
.domain {
color: dark-light-choose($primary-low-mid, $secondary-high);
}
.topic-links { .topic-links {
.badge-notification { .badge-notification {
margin: 1px 5px 2px 0; margin: 1px 5px 2px 0;
} }
} }
td {
vertical-align: top;
padding:1px;
}
.buttons { .buttons {
.btn { .btn {
border: 0; border: 0;