2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-12 21:10:47 +08:00

UX: Type system rebuild (#5492)

This commit is contained in:
Kris 2018-01-12 17:27:38 -05:00 committed by GitHub
parent 298ee26908
commit 674013129a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 931 additions and 859 deletions

View file

@ -24,7 +24,7 @@
}

.topic-list-main-link {
font-size: 1.143em;
font-size: $font-up-1;
a.title {
padding: 15px 0;
word-break: break-word;
@ -76,7 +76,7 @@
background-color: $secondary;
color: $danger-low;
padding: 0px 8px;
font-size: 0.929em;
font-size: $font-down-1;
}
}

@ -86,7 +86,7 @@

th,
td {
line-height: 1.25;
line-height: $line-height-large;
text-align: left;
vertical-align: middle;

@ -94,13 +94,13 @@
th {
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: 1em;
font-size: $font-0;
button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}

}
td {
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: 1em;
font-size: $font-0;
}

.main-link {
@ -112,11 +112,11 @@
}

.topic-excerpt {
font-size: 0.929em;
margin-top: 8px;
font-size: $font-down-1;
margin-top: 5px;
color: dark-light-choose($primary-medium, $secondary-medium);
word-wrap: break-word;
line-height: 1.4;
line-height: $line-height-large;
padding-right: 20px;
}
.topic-statuses:empty {
@ -174,7 +174,7 @@
}
td.stats {
.unit {
font-size: .857em;
font-size: $font-down-1;
}
}

@ -182,8 +182,8 @@
td {
padding: 2px;
vertical-align: bottom;
line-height: 24px;
&.value { text-align: right; font-size: 1.429em; }
line-height: $line-height-large;
&.value { text-align: right; font-size: $font-up-3; }
&.unit { text-align: left; }
}
}
@ -217,7 +217,7 @@
padding: 0;
border: 0;
color: $danger-medium;
font-size: 1em;
font-size: $font-0;
cursor: default;
}
}
@ -225,7 +225,7 @@
.topic-list {
.alert {
margin-bottom: 0;
font-size: 1em;
font-size: $font-0;
}
.spinner {
margin-top: 40px;
@ -262,12 +262,12 @@ ol.category-breadcrumb {
z-index: 100;

a.badge-category, a.badge-category-parent {
line-height: 19px;
line-height: $line-height-large;
overflow:hidden;
margin-bottom: 0;
}
a.badge-category, .dropdown-header {
font-size: 0.857em;
font-size: $font-down-1;
font-weight: bold;
float: none;
text-transform: none;
@ -296,7 +296,7 @@ ol.category-breadcrumb {
float: left;
margin: 5px 0 10px;
.top-date-string {
font-size: 0.857em;
font-size: $font-down-1;
}
}

@ -310,15 +310,16 @@ ol.category-breadcrumb {
outline: 0;
background: transparent;
border: 0;
font-size: 1.429em;
font-size: $font-up-3;
padding: 5px 10px 0 10px;
line-height: $line-height-large;
}

#period-popup {

@include unselectable;

font-size: 1.143em;
font-size: $font-up-1;
border: 1px solid $primary-low;
padding: 5px;
background: $secondary;
@ -342,7 +343,7 @@ ol.category-breadcrumb {
}
.top-date-string {
font-weight: normal;
font-size: 0.857em;
font-size: $font-down-1;
}
&:hover {
background-color: $highlight-medium;

View file

@ -21,7 +21,7 @@ section.about {
td, th {
padding: 10px 5px 5px 5px;
border-bottom: 1px solid lighten($primary, 70%);
line-height: 1.0em;
line-height: $line-height-small;
}

td.title {

View file

@ -10,8 +10,8 @@

.account-created {
.ac-message {
font-size: 1.143em;
line-height: 24px;
font-size: $font-up-1;
line-height: $line-height-large;
}

.activation-controls {

View file

@ -7,9 +7,9 @@
position: relative;
top: -2px;
right: -21px;
line-height: 18px;
line-height: $line-height-small;
float: right;
font-size: 1.429em;
font-size: $font-up-3;
font-weight: bold;
color: $primary;
opacity: 0.2;

View file

@ -75,7 +75,7 @@
.description {
padding: 0 1em 1em 1em;
text-align: center;
font-size: 1em;
font-size: $font-0;
color: dark-light-choose($primary-medium, $secondary-high);
.overflow {
max-height: 6em;
@ -85,10 +85,10 @@
}

h3 {
font-size: 1.286em;
font-size: $font-up-2;
margin-bottom: 0.5em;
margin-top: 0.25em;
line-height: 1.1em;
line-height: $line-height-medium;
text-align: center;
color: $primary;
}
@ -102,7 +102,7 @@
}

h3 {
font-size: 1.286em;
font-size: $font-up-2;
text-align: center;
}


View file

@ -300,7 +300,7 @@
color: $primary;
}
span.name {
font-size: .857em;
font-size: $font-down-1;
vertical-align: middle;
}
&.selected {
@ -326,8 +326,8 @@ div.ac-wrap.disabled {

div.ac-wrap div.item a.remove, .remove-link {
margin-left: 4px;
font-size: .857em;
line-height: 10px;
font-size: $font-down-1;
line-height: $line-height-small;
padding: 1.5px 1.5px 1.5px 2.5px;
border-radius: 12px;
width: 10px;
@ -354,7 +354,7 @@ div.ac-wrap {
span {
height: 24px;
display: inline-block;
line-height: 20px;
line-height: $line-height-large;
}
}


View file

@ -29,7 +29,7 @@
border-bottom: 1px solid $primary-low;

.number, .time-read {
font-size: 1.429em;
font-size: $font-up-3;
color: $primary-medium;
}
}

View file

@ -47,11 +47,11 @@ body {
}

big {
font-size: 2.286em;
font-size: $font-up-5;
}

small {
font-size: .786em;
font-size: $font-down-2;
}

//setting a static limit on big and small prevents nesting abuse
@ -120,7 +120,7 @@ input {
&[type="radio"],
&[type="checkbox"] {
margin: 3px 0;
line-height: normal;
line-height: $line-height-medium;
cursor: pointer;
}
&[type="submit"],
@ -190,8 +190,8 @@ input {
height: 18px;
padding: 4px 10px;
margin-bottom: 9px;
font-size: 1em;
line-height: 1.25;
font-size: $font-0;
line-height: $line-height-medium;
color: $primary;
background-color: $secondary;
border: 1px solid $primary-medium;
@ -363,7 +363,7 @@ select {
right: 70px;
top: 60px;
width: 230px;
line-height: 30px;
line-height: $line-height-medium;
}

.ring {
@ -423,7 +423,7 @@ select {
.content-list {
h3 {
color: $primary-medium;
font-size: 1.143em;
font-size: $font-up-1;
padding-left: 5px;
margin-bottom: 10px;
}
@ -474,8 +474,8 @@ select {

.control-label {
font-weight: bold;
font-size: 1.286em;
line-height: 2;
font-size: $font-up-2;
line-height: $line-height-large;
}

.controls {
@ -517,7 +517,7 @@ select {

#loading-message {
position: absolute;
font-size: 2.286em;
font-size: $font-up-5;
text-align: center;
top: 120px;
left: 500px;

View file

@ -49,7 +49,7 @@

h3 {
font-weight: normal;
font-size: 1.143em;
font-size: $font-up-1;
}
}
}

View file

@ -142,7 +142,7 @@ img.emoji {

.emoji-picker .diversity-picker .d-icon {
color: #fff;
font-size: 1em;
font-size: $font-0;
text-shadow: 0.5px 1.5px 0 rgba(0,0,0,0.3);
}

@ -202,7 +202,7 @@ img.emoji {

.emoji-picker .filter .d-icon-search {
color: dark-light-choose($header_primary-medium, $header_primary);
font-size: 1.143em;
font-size: $font-up-1;
margin-left: 5px;
margin-right: 5px;
}

View file

@ -4,15 +4,13 @@

.face {
font-size: 4.286em;
height: 60px;
}
.reason {
font-size: 1.857em;
height: 24px;
font-size: $font-up-4;
}
.url {
font-style: italic;
font-size: .857em;
font-size: $font-down-1;
}
.desc {
margin-top: 16px;

View file

@ -12,8 +12,8 @@
ol,
table {
margin: 0 0 20px;
font-size: 1.143em;
line-height: 22px;
font-size: $font-up-1;
line-height: $line-height-large;
}

li {

View file

@ -15,7 +15,7 @@
.time,
.delete-info {
color: lighten($primary, 40%);
font-size: 0.857em;
font-size: $font-down-1;
}

.group-member-info {
@ -29,7 +29,7 @@
width: 100%;
justify-content: space-between;
.group-post-title {
font-size: 1.143em;
font-size: $font-up-1;
}
}

@ -47,13 +47,13 @@
width: 100%;

.group-info-name {
font-size: 1.429em;
font-size: $font-up-3;
font-weight: bold;
color: $primary;
}

.group-info-full-name {
font-size: 1.286em;
font-size: $font-up-2;
color: dark-light-choose($primary-high, $secondary-low);
}


View file

@ -22,7 +22,7 @@
}

td.groups-user-count {
font-size: 1.286em;
font-size: $font-up-2
}
}

@ -38,7 +38,7 @@
}

.groups-info-title {
font-size: 0.857em;
font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-medium);
}


View file

@ -125,8 +125,8 @@
.d-icon {
width: 32px;
height: 32px;
font-size: 1.714em;
line-height: 32px;
font-size: $font-up-4;
line-height: $line-height-large;
display: inline-block;
}
.notifications {
@ -145,12 +145,12 @@
position: absolute;
z-index: 1;
left: 0;
top: -9px;
top: -4px;
min-width: 6px;
}
.unread-notifications {
left: auto;
right: 0;
right: -3px;
background-color: dark-light-choose($tertiary-medium, $tertiary);
}
.unread-private-messages, .ring {

View file

@ -43,7 +43,7 @@
margin: 6px;
padding-right: 20px;
color: blend-primary-secondary(50%);
font-size: 1em;
font-size: $font-0;
}

.expand {

View file

@ -1,6 +1,6 @@
.caps-lock-warning {
color: $danger;
font-size: 0.857em;
font-size: $font-down-1;
font-weight: bold;
}

@ -28,7 +28,7 @@ $input-width: 220px;
}

.disclaimer {
font-size: 0.857em;
font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-medium);
clear: both;
}
@ -58,9 +58,9 @@ $input-width: 220px;
.instructions {
color: dark-light-choose($primary-medium, $secondary-medium);
margin: 0;
font-size: 0.857em;
font-size: $font-down-1;
font-weight: normal;
line-height: 18px;
line-height: $line-height-medium;
}
}
clear: both;
@ -100,9 +100,9 @@ $input-width: 220px;
.instructions {
color: dark-light-choose($primary-medium, $secondary-medium);
margin: 0;
font-size: 0.857em;
font-size: $font-down-1;
font-weight: normal;
line-height: 18px;
line-height: $line-height-medium;
}
}
}

View file

@ -272,8 +272,7 @@ button {
.mfp-close {
width: 44px;
height: 44px;
line-height: 44px;

line-height: $line-height-large;
position: absolute;
right: 0;
top: 0;
@ -286,7 +285,7 @@ button {
padding: 0 0 18px 10px;
color: $controls-color;
font-style: normal;
font-size: 2em;
font-size: $font-up-5;
font-family: Arial, Baskerville, monospace;

&:hover,
@ -324,8 +323,8 @@ button {
top: 0;
right: 0;
color: $controls-text-color;
font-size: 0.857em;
line-height: 18px;
font-size: $font-down-1;
line-height: $line-height-medium;
}

// Navigation arrows
@ -489,8 +488,8 @@ button {
small {
color: $caption-subtitle-color;
display: block;
font-size: 0.857em;
line-height: 14px;
font-size: $font-down-1;
line-height: $line-height-medium;
}
figure {
margin: 0;
@ -506,7 +505,7 @@ button {
}
.mfp-title {
text-align: left;
line-height: 18px;
line-height: $line-height-medium;
color: $caption-title-color;
word-wrap: break-word;
padding-right: 36px; // leave some space for counter at right side
@ -583,7 +582,7 @@ button {
right: 0;
width: 35px;
height: 35px;
line-height: 35px;
line-height: $line-height-large;
background: rgba(0, 0, 0, 0.6);
position: fixed;
text-align: center;

View file

@ -65,7 +65,7 @@
}

.new {
font-size: 0.857em;
font-size: $font-down-1;
margin-left: 0.5em;
color: dark-light-choose($primary-medium, $secondary-medium);
}
@ -90,7 +90,7 @@
b.topics-count {
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: .786em;
font-size: $font-down-2;
}

span.badge-category {
@ -123,7 +123,6 @@
box-sizing: border-box;
width: calc(100% - 6px);
height: 32px;
padding: 5px;
}

.search-context {
@ -156,7 +155,7 @@

.search-link {
.badge-category-parent {
line-height: 0.8em;
line-height: $line-height-small;
}
.topic-title {
margin-right: 6px;
@ -174,8 +173,8 @@
}

li:not(.category):not(.heading) {
font-size: 1em;
line-height: 16px;
font-size: $font-0;
line-height: $line-height-medium;

.fa {
font-size: inherit;

View file

@ -130,7 +130,7 @@
padding: 10px 30px 10px 15px;
background-color: $secondary;
li > a {
font-size: 1em;
font-size: $font-0;
}
border-bottom: 1px solid $primary-low;

@ -153,7 +153,7 @@
}
p {
color: darken($primary, 40%);
font-size: 1em;
font-size: $font-0;
}
.archetype-option {
margin-bottom: 20px;
@ -180,9 +180,9 @@
color: rgb(255,255,255);
position: absolute;
top: 40%;
font-size: 2.571em;
font-size: $font-up-6;
text-align: center;
line-height: 38px;
line-height: $line-height-medium;
margin-left: auto;
margin-right: auto;
left: 0;
@ -225,7 +225,7 @@

// password reset modal
.modal-body.forgot-password-modal p {
font-size: 1em;
font-size: $font-0;
}
}

@ -239,15 +239,15 @@
}
.btn {
text-align: left;
font-size: 1.286em;
line-height: 20px;
font-size: $font-up-2;
line-height: $line-height-medium;
width: auto;
margin-bottom: 10px;
display: block;
margin-left: 0 !important; // override needed
font-weight: bold;
.topic-title {
font-size: 1em;
font-size: $font-0;
font-weight: normal;
}
&.btn-reply-here {
@ -268,8 +268,8 @@
.btn {
font-weight: normal;
text-align: left;
font-size: 1em;
line-height: 20px;
font-size: $font-0;
line-height: $line-height-large;
margin-bottom: 10px;
display: inline-block;
margin-left: 0;

View file

@ -1,8 +1,8 @@
// Page not found styles

h1.page-not-found {
font-size: 2.286em;
line-height: 1.25;
font-size: $font-up-5;
line-height: $line-height-medium;
}

.page-not-found {

View file

@ -15,7 +15,7 @@ a.loading-onebox {

margin-top: 15px;
padding: 12px;
font-size: 1em;
font-size: $font-0;
> .source {
margin-bottom: 12px;
margin-right: 10px;
@ -30,7 +30,7 @@ a.loading-onebox {
padding-right: 10px;
}
position: absolute;
font-size: 1em;
font-size: $font-0;
img.favicon {
margin-right: 3px;
}
@ -92,7 +92,7 @@ aside.onebox {
border: 5px solid $primary-low;
margin-bottom: 1em;
padding: 12px 25px 12px 12px;
font-size: 1em;
font-size: $font-0;

header {
margin-bottom: 8px;
@ -118,7 +118,7 @@ aside.onebox {
clear: both;

h3, h4 {
font-size: 1.143em;
font-size: $font-up-1;
margin: 0 0 10px 0;
}

@ -270,8 +270,8 @@ pre.onebox code ol.lines li:before {
color:#AFAFAF;
text-align:right;
padding-right:5px;
font-size:.857em;
line-height: 1.9em;
font-size: $font-down-1;
line-height: $line-height-large;
content: counter(li-counter);
counter-increment: li-counter;
}
@ -279,7 +279,7 @@ pre.onebox code ol.lines li:before {

pre.onebox code ol{
margin-left:0px;
line-height:1.5em;
line-height: $line-height-large;
}
pre.onebox code {
background-color: dark-light-choose(#fff, #000);
@ -331,7 +331,7 @@ pre.onebox code {
.onebox-body .build_status
{
padding: 2px;
font-size:.857em;
font-size: $font-down-1;
}

.onebox-body .status_tag.open {
@ -377,13 +377,13 @@ aside.onebox.twitterstatus .onebox-body {
.outer-box {
position: absolute;
z-index: 935;
height: 30px;
overflow: hidden;
font-size: .857em;
font-size: $font-down-1;
color: #fff;
background-color: rgba(0, 0, 0, 0.6);
text-overflow: ellipsis;
max-width: 100%;
padding: 5px 0;

.inner-box {
padding-left: 10px;
@ -395,8 +395,8 @@ aside.onebox.twitterstatus .onebox-body {

.album-title {
width: 100%;
font-size: 1.143em;
line-height: 30px;
font-size: $font-up-1;
line-height: $line-height-large;
color: #ccc;
text-decoration: none;
}

View file

@ -4,10 +4,10 @@
input[type=text] {
width: 320px;
height: 30px;
font-size: 1.429em;
font-size: $font-up-3;
}
input[type=submit] {
font-size: 1.429em;
font-size: $font-up-3;
padding: 10px;
}
}

View file

@ -11,7 +11,7 @@

.like-count {
color: dark-light-choose($primary-medium, $secondary-medium);
.fa { color: $love; font-size: .857em; }
.fa { color: $love; font-size: $font-down-1; }
}

.badge-wrapper span.badge-category {
@ -36,20 +36,20 @@
}
.search-link {
.topic-statuses, .topic-title {
font-size: 1.286em;
line-height: 25px;
font-size: $font-up-2;
line-height: $line-height-large;
}

.topic-statuses {
float: none;
display: inline-block;
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: 1.0em;
font-size: $font-0;
}
}
.blurb {
font-size: 1.0em;
line-height: 20px;
font-size: $font-0;
line-height: $line-height-large;
word-wrap: break-word;
max-width: 640px;
color: dark-light-choose($primary-medium, $secondary-medium);
@ -63,7 +63,7 @@
}

.discourse-tag {
font-size: 0.857em;
font-size: $font-down-1;
}
}

@ -80,7 +80,7 @@
}
a {
margin-right: 15px;
font-size: .857em;
font-size: $font-down-1;
padding: 2px 5px;
}
}
@ -148,7 +148,7 @@
.result-count {
float: left;
span {
line-height: 28px;
line-height: $line-height-large;
height: 28px;
display: inline-block;
}

View file

@ -22,7 +22,7 @@
margin: 14px 0;
}
h3 {
font-size: 1em;
font-size: $font-0;
}
.copy-text {
display: inline-block;
@ -31,7 +31,7 @@
color: $success;
opacity: 1;
transition: opacity 0.25s;
font-size: 1em;
font-size: $font-0;
&:not(.success) {
opacity: 0;
}
@ -40,12 +40,13 @@
margin-left: 2px;
margin-right: 8px;
float: left;
font-size: 1.857em;
font-size: $font-up-4;
}
.reply-as-new-topic {
float: left;
line-height: 22px;
line-height: $line-height-large;
margin-left: 8px;
margin-top: .5em;
.fa {
margin-right: 5px;
}
@ -53,7 +54,7 @@
.link {
margin-right: 2px;
float: right;
font-size: 1.429em;
font-size: $font-up-3;
a {
color: dark-light-choose($primary-medium, $secondary-medium);
}
@ -71,7 +72,7 @@
}

input[type=text] {
font-size: 1.143em;
font-size: $font-up-1;
margin-bottom: 10px;
}
}

View file

@ -19,11 +19,11 @@
float: left;

.discourse-tag {
font-size: 1em;
font-size: $font-0;
}

.tag-count {
font-size: 0.857em;
font-size: $font-down-1;
}
}

@ -34,13 +34,13 @@

.bullet + .topic-header-extra {
display: block;
line-height: 15px;
font-size: .857em;
.list-tags { font-size: 1em; }
line-height: $line-height-medium;
font-size: $font-down-1;
.list-tags { font-size: $font-0; }
}

.bar + .topic-header-extra {
line-height: 1.25;
line-height: $line-height-medium;
}

.box + .topic-header-extra {
@ -53,9 +53,9 @@
margin-top: 5px;

.topic-header-extra {
display: inline;
display: inline-block;
vertical-align: baseline;
margin: 0;
margin: .1em 0 0 0;
}

.badge-wrapper {
@ -86,7 +86,7 @@
$tag-color: $primary-medium;

.discourse-tag-count {
font-size: 0.857em;
font-size: $font-down-1;
color: $tag-color;
}

@ -153,10 +153,9 @@ $tag-color: $primary-medium;

.topic-list-item .discourse-tags {
display: block;
font-size: 0.786em;
font-size: $font-down-2;
font-weight: normal;
clear: both;
margin-top: 5px;

.discourse-tag.box {
position:relative;
@ -170,7 +169,7 @@ $tag-color: $primary-medium;

.mobile-view .topic-list-item .discourse-tags {
display: inline-block;
font-size: 0.857em;
font-size: $font-down-1;
margin-top: 0;
.discourse-tag.box {
position:relative;
@ -185,7 +184,7 @@ $tag-color: $primary-medium;
font-family: FontAwesome;
color: $primary-low-mid;
margin-right: 5px;
font-size: 0.786em;
font-size: $font-down-2;
position:relative;
top: -0.1em;
}
@ -195,7 +194,7 @@ header .discourse-tag {color: $tag-color }
.list-tags {
margin-right: 3px;
display: inline;
font-size: 0.857em;
font-size: $font-down-1;
}

.tag-chooser {
@ -260,7 +259,7 @@ header .discourse-tag {color: $tag-color }
margin-bottom: 20px;
}
label {
font-size: 1em;
font-size: $font-0;
display: inline-block;
margin-right: 10px;
}

View file

@ -22,7 +22,7 @@
}

span {
font-size: 0.929em;
font-size: $font-0;
margin-right: 8px;
display: inline-block;
max-width: 280px;
@ -34,7 +34,7 @@
}
}
.fa {
font-size: .786em;
font-size: $font-down-1;
margin-left: 3px;
color: dark-light-choose($primary-medium, $secondary-medium);
}
@ -46,9 +46,34 @@
// global styles for the cooked HTML content in posts (and preview)
.cooked, .d-editor-preview {
word-wrap: break-word;
line-height: $line-height-large;
h1, h2, h3, h4, h5, h6 {
margin: 30px 0 10px;
line-height: 1.25;
line-height: $line-height-medium;
}

h1 {
font-size: $font-up-4;
}
h2 {
font-size: $font-up-3;
}
h3 {
font-size: $font-up-2;
}
h4 {
font-size: $font-up-1;
}
h5 {
font-size: $font-0;
}
h6 {
font-size: $font-down-1;
}
a { word-wrap: break-word; }
@ -166,6 +191,33 @@ aside.quote {
position: relative;
}

.topic-map {

.avatars {
> div {
float: left;
position: relative;
margin: 3px 0;
}
.post-count {
position: absolute;
right: 0;
border-radius: 100px;
padding: 3px 5px;
text-align: center;
font-weight: normal;
font-size: $font-down-2;
line-height: $line-height-small;
}
}

.avatar {
float: left;
margin-right: 4px;
}

}

.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster {
.avatar-flair {
display: flex;
@ -204,7 +256,7 @@ aside.quote {
right: -4px;
}
.fa {
font-size: 1.714em;
font-size: $font-up-4;
}
}
.topic-map .poster .avatar-flair {
@ -222,13 +274,26 @@ aside.quote {
right: 0;
}
.fa {
font-size: 1em;
font-size: $font-0;
}
}
.topic-avatar .poster-avatar-extra {
display: none;
}

.map {
&:first-of-type {
display: flex;
.buttons {
margin-left: auto;
order: 15;
.btn {
height: 100%;
}
}
}
}

.topic-body {
// this is necessary for ANYTHING that extends past the right edge of
// the post body, such as an image in a deeply nested list, image in
@ -249,9 +314,10 @@ aside.quote {

.post-info {
&.via-email, &.whisper {
line-height: $line-height-medium;
margin-right: 5px;
.d-icon {
font-size: 1em;
font-size: $font-0;
}
}

@ -287,8 +353,8 @@ kbd
box-shadow: 0 1px 0 rgba(0,0,0, .8);
color: $primary;
display: inline-block;
font-size: 0.857em;
line-height: 1.4;
font-size: $font-down-1;
line-height: $line-height-large;
margin: 0 .1em;
padding: .1em .6em;

@ -314,7 +380,7 @@ blockquote > *:last-child {
cursor: pointer;
text-transform: uppercase;
font-weight: bold;
font-size: 0.9em;
font-size: $font-down-1;
}

.who-liked {
@ -347,11 +413,11 @@ blockquote > *:last-child {
max-width: 755px;
border-top: 1px solid $primary-low;
.topic-avatar {
padding: 5px 0 3px;
padding: .67em 0;
border-top: none;
float: left;
i {
font-size: 2.500em;
font-size: 2em;
width: 45px;
text-align: center;
color: dark-light-choose($primary-low-mid, $secondary-high);
@ -367,20 +433,20 @@ blockquote > *:last-child {
}

.small-action-desc {
padding: 0.25em 0 0.5em 4.3em;
margin-top: 6px;
padding: 1em 1em 1.25em 1em;
text-transform: uppercase;
font-weight: bold;
font-size: 0.857em;
font-size: $font-down-1;
color: dark-light-choose($primary-low-mid, $secondary-high);

.custom-message {
text-transform: none;
margin: 15px 0px 5px;
font-weight: normal;
font-size: 1.143em;
font-size: $font-up-1;
p {
margin: 5px 0;
line-height: $line-height-large;
}
}

@ -399,6 +465,7 @@ blockquote > *:last-child {
background: transparent;
border: 0;
float: right;
margin-top: -2px;
}

clear: both;
@ -449,8 +516,8 @@ a.mention, a.mention-group {
> i.fa {
color: dark-light-choose($primary-medium, $secondary-medium);
margin-right: 6px;
font-size: $base-font-size;
line-height: $base-line-height;
font-size: $font-0;
line-height: $line-height-large;
}

> span.url {
@ -464,9 +531,9 @@ a.mention, a.mention-group {
> span.help {
display: inline-block;
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: 0.857em;
font-size: $font-down-1;
font-style: italic;
line-height: $base-line-height;
line-height: $line-height-large;
margin-bottom: 1px;
}

@ -479,7 +546,7 @@ a.mention, a.mention-group {
.broken-image, .large-image {
color: dark-light-choose($primary-low-mid, $secondary-high);
border: 1px solid $primary-low;
font-size: 2.286em;
font-size: $font-up-5;
padding: 16px;
}


View file

@ -120,9 +120,6 @@
.extra-info-wrapper {
.badge-wrapper {
float: left;
&.bullet {
margin-top: 5px;
}
}

}
@ -147,7 +144,7 @@
#suggested-topics h3 .badge-wrapper.bullet span.badge-category {
// Override vertical-align: text-top from `badges.css.scss`
vertical-align: baseline;
line-height: 1.2;
line-height: $line-height-medium;
}

#suggested-topics h3 .badge-wrapper.bullet,
@ -166,7 +163,7 @@
.notifications-button {
display: inline-block;
float: none;
line-height: 2em;
line-height: $line-height-large;
.dropdown-toggle {
float: none;
}
@ -210,7 +207,7 @@
}
i {
float: left;
font-size: 0.857em;
font-size: $font-down-2;
margin: 0.3em 0.5em 0 0;
}
}

View file

@ -3,7 +3,7 @@
padding: 3px 8px;
color: $primary;
border: 1px solid $primary-low;
line-height: 19px;
line-height: $line-height-large;
display: inline-block;
background-color: $secondary;
margin: 0 0 3px;
@ -68,7 +68,7 @@

.show-badge .badge-user-info {
.earned {
font-size: 1.286em;
font-size: $font-up-2;
margin-bottom: 1em;
}
}
@ -79,7 +79,7 @@
.load-more {
padding-top: 30px;
display: block;
font-size: 1.286em;
font-size: $font-up-2;
}
}

@ -94,11 +94,11 @@
}
.date {
display: inline-block;
font-size: 1.143em;
font-size: $font-up-1;
margin-left: 10px;
}
.post-link {
font-size: 1.286em;
font-size: $font-up-2;
width: 500px;
margin: 0;
padding: 0;
@ -138,7 +138,7 @@
top: 5px;
font-weight: bold;
color: $primary-medium;
font-size: 1.286em;
font-size: $font-up-2;
}

.badge-contents {

View file

@ -60,13 +60,13 @@
}

h1 {
font-size: 2.286em;
font-size: $font-up-5;
font-weight: normal;
i {font-size: .8em;}
}

h2 {
font-size: 1.286em;
font-size: $font-up-2;
font-weight: normal;
margin-top: 10px;
max-width: 100%;
@ -77,7 +77,7 @@

h3 {
font-weight: normal;
font-size: 1em;
font-size: $font-0;
margin: 5px 0;

.d-icon:not(:first-of-type) {
@ -163,11 +163,11 @@
}

h1 {
font-size: 1.429em;
font-size: $font-up-3;
}

h2 {
font-size: 1.143em;
font-size: $font-up-1;
margin-top: 4px;
}

@ -212,7 +212,7 @@
width: 30px;
text-align: center;
vertical-align: middle;
line-height: 30px;
line-height: $line-height-large;
}

.helpful-flags {
@ -255,8 +255,8 @@
color: dark-light-choose($primary-medium, $secondary-medium);
margin-top: 5px;
margin-bottom: 10px;
font-size: .857em;
line-height: 1.4em;
font-size: $font-down-1;
line-height: $line-height-large;
}
}
}
@ -267,7 +267,7 @@
text-align: top;
color: $danger;
font-weight: bold;
font-size: 1.286em;
font-size: $font-up-2;
}
}

@ -306,7 +306,7 @@

h2 {
a {
font-size: 1em;
font-size: $font-0;
color: scale-color($tertiary, $lightness: -10%);
cursor: pointer;
}
@ -402,7 +402,7 @@

.value {
font-weight: bold;
font-size: 1.286em;
font-size: $font-up-2;
}

.label {
@ -449,7 +449,7 @@

.links-section {
.domain {
font-size: 0.786em;
font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-high);
}
}
@ -479,8 +479,8 @@
.instructions {
color: dark-light-choose($primary-medium, $secondary-medium);
margin-bottom: 10px;
font-size: .857em;
line-height: 1.4em;
font-size: $font-down-1;
line-height: $line-height-large;

a[href] {
color: $tertiary;

View file

@ -20,14 +20,14 @@ div.tagsinput span.tag {
margin-right: 5px;
margin-bottom:5px;
font-family: helvetica;
font-size: .929em;
font-size: $font-down-1;
}

div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: .786em; }
div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: $font-down-2; }
div.tagsinput input {
width:80px;
font-family: helvetica;
font-size: 0.929em;
font-size: $font-down-1;
border:1px solid transparent;
padding:2px 5px;
background: transparent;