IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: adds prettier (#5956)

Browse Source 
Run `prettier --write "app/assets/stylesheets/**/*.scss" "plugins/**/*.scss"` after making sure you installed it with `yarn`

It's recommended to configure your editor to run prettier on file save.
This commit is contained in:
Joffrey JAFFEUX
2018-06-08 11:49:31 +02:00
committed by GitHub
parent 8bd4c11f53
commit 174d392e5a
118 changed files with 2558 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.prettierignore Normal file
View File

@@ -0,0 +1,2 @@
app/assets/stylesheets/vendor/
plugins/**/assets/stylesheets/vendor/

371
app/assets/stylesheets/common/admin/admin_base.scss
View File

@@ -16,7 +16,9 @@ $mobile-breakpoint: 700px;
@media (max-width: $mobile-breakpoint) {
.admin-content {
box-sizing: border-box;
*, *:before, *:after {
*,
*:before,
*:after {
box-sizing: inherit;
}
@@ -38,8 +40,13 @@ $mobile-breakpoint: 700px;
width: 100%;
margin-top: 10px;
tr {text-align: left;}
td, th {padding: 8px;}
tr {
text-align: left;
}
td,
th {
padding: 8px;
}
th {
text-align: left;
@@ -59,9 +66,15 @@ $mobile-breakpoint: 700px;
}
}
}
tr:hover { background-color: darken($secondary, 2.5%); }
tr.selected { background-color: lighten($primary, 80%); }
.filters input { margin-bottom: 0; }
tr:hover {
background-color: darken($secondary, 2.5%);
}
tr.selected {
background-color: lighten($primary, 80%);
}
.filters input {
margin-bottom: 0;
}
}
.site-texts {
@@ -79,11 +92,10 @@ $mobile-breakpoint: 700px;
.extra-options {
float: right;
input[type=checkbox] {
input[type="checkbox"] {
margin-right: 0.5em;
}
}
}
.text-highlight {
font-weight: bold;
@@ -111,7 +123,6 @@ $mobile-breakpoint: 700px;
max-height: 100px;
color: $primary-medium;
}
}
.edit-site-text {
@@ -119,7 +130,8 @@ $mobile-breakpoint: 700px;
width: 80%;
}
.save-messages, .title {
.save-messages,
.title {
margin-bottom: 1em;
}
@@ -235,9 +247,15 @@ $mobile-breakpoint: 700px;
max-height: 200px;
overflow: auto;
width: 455px;
ul { margin: 0; }
li { list-style: none; }
tr td:first-of-type { width: 130px; }
ul {
margin: 0;
}
li {
list-style: none;
}
tr td:first-of-type {
width: 130px;
}
}
}
}
@@ -323,9 +341,8 @@ $mobile-breakpoint: 700px;
}
button {
margin-right: 5px;
}
input[type=text] {
input[type="text"] {
display: inline-block;
float: left;
}
@@ -334,7 +351,7 @@ $mobile-breakpoint: 700px;
padding-left: 10px;
}
.username {
input[type=text] {
input[type="text"] {
width: 240px;
}
}
@@ -391,7 +408,9 @@ $mobile-breakpoint: 700px;
height: 150px;
}
.groups, .badges, .web-hook-container {
.groups,
.badges,
.web-hook-container {
.form-horizontal {
& > div {
margin-bottom: 20px;
@@ -404,11 +423,15 @@ $mobile-breakpoint: 700px;
}
}
input, textarea, select, .select-box {
input,
textarea,
select,
.select-box {
width: 350px;
}
input[type="checkbox"], input[type="radio"] {
input[type="checkbox"],
input[type="radio"] {
width: 20px;
}
}
@@ -510,7 +533,8 @@ $mobile-breakpoint: 700px;
.setting-controls {
float: left;
}
.input-setting-string, .input-setting-textarea {
.input-setting-string,
.input-setting-textarea {
box-sizing: border-box;
height: 30px;
width: 100%;
@@ -537,7 +561,7 @@ $mobile-breakpoint: 700px;
position: relative;
line-height: $line-height-small;
cursor: default;
border: 1px dashed #AAA;
border: 1px dashed #aaa;
border-radius: 3px;
background-clip: padding-box;
-moz-user-select: none;
@@ -545,10 +569,10 @@ $mobile-breakpoint: 700px;
width: 3em;
height: 1em;
}
}
.desc, .validation-error {
.desc,
.validation-error {
padding-top: 3px;
font-size: $font-down-1;
line-height: $line-height-large;
@@ -575,7 +599,9 @@ $mobile-breakpoint: 700px;
}
.setting.overridden.string {
input[type=text], input[type=password], textarea {
input[type="text"],
input[type="password"],
textarea {
background-color: $highlight-medium;
}
}
@@ -636,7 +662,8 @@ section.details {
background-color: $danger-low;
}
border-top: 1px solid $primary-low;
&:before, &:after {
&:before,
&:after {
display: table;
content: "";
}
@@ -784,7 +811,9 @@ section.details {
}
.badge-query-preview {
.grant-count, .sample, .error-header {
.grant-count,
.sample,
.error-header {
margin-left: 10px;
}
@@ -803,7 +832,12 @@ section.details {
}
.count-warning {
background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-60%
);
margin: 0 0 7px 0;
padding: 10px 20px;
@@ -826,7 +860,8 @@ section.details {
margin-right: 10px;
}
}
.next, .previous {
.next,
.previous {
color: #333 !important;
&.disabled {
color: #aaa !important;
@@ -866,7 +901,7 @@ section.details {
.section-title {
flex: 1 1 100%;
border-bottom: 1px solid $primary-low;
margin-bottom: .5em;
margin-bottom: 0.5em;
}
}
@@ -928,12 +963,11 @@ section.details {
max-width: unset;
}
.face {
margin: 0 .75em 0 0;
margin: 0 0.75em 0 0;
font-size: $font-up-3;
}
}
&.critical .version-notes .normal-note {
display: none;
}
@@ -1036,13 +1070,15 @@ table.api-keys {
display: none;
}
&.high-trending-up, &.trending-up {
&.high-trending-up,
&.trending-up {
i.up {
color: $success;
display: inline;
}
}
&.high-trending-down, &.trending-down {
&.high-trending-down,
&.trending-down {
i.down {
color: $danger;
display: inline;
@@ -1057,10 +1093,12 @@ table.api-keys {
}
tr.reverse-colors {
td.value.high-trending-down i.down, td.value.trending-down i.down {
td.value.high-trending-down i.down,
td.value.trending-down i.down {
color: $success;
}
td.value.high-trending-up i.up, td.value.trending-up i.up {
td.value.high-trending-up i.up,
td.value.trending-up i.up {
color: $danger;
}
}
@@ -1075,7 +1113,7 @@ table.api-keys {
.fa {
font-size: $font-up-5;
color: $danger
color: $danger;
}
}
@media screen and (max-width: 650px) {
@@ -1090,7 +1128,6 @@ table.api-keys {
display: flex;
}
.problem-messages {
display: flex;
@@ -1146,8 +1183,12 @@ table.api-keys {
.referred-topic-title {
width: 355px;
@include medium-width { width: 305px; }
@include small-width { width: 265px; }
@include medium-width {
width: 305px;
}
@include small-width {
width: 265px;
}
}
}
@@ -1161,7 +1202,7 @@ table.api-keys {
min-height: 500px;
float: left;
width: 54.0540%;
width: 54.054%;
margin-left: 1.8018%;
p.description {
@@ -1194,7 +1235,6 @@ table.api-keys {
top: 0;
bottom: 0;
}
}
.hook-event {
@@ -1223,7 +1263,7 @@ table.api-keys {
}
.row.groups {
input[type='text'] {
input[type="text"] {
width: 500px;
}
input#group-users {
@@ -1245,11 +1285,18 @@ table.api-keys {
}
}
.screened-emails, .screened-urls, .screened-ip-addresses {
.email, .url, .domain {
.screened-emails,
.screened-urls,
.screened-ip-addresses {
.email,
.url,
.domain {
width: 300px;
}
.action, .match_count, .last_match_at, .created_at {
.action,
.match_count,
.last_match_at,
.created_at {
text-align: center;
width: 9.9099%;
}
@@ -1262,7 +1309,8 @@ table.api-keys {
}
}
.screened-emails, .screened-urls {
.screened-emails,
.screened-urls {
.ip_address {
width: 9.9099%;
text-align: center;
@@ -1289,7 +1337,7 @@ table.api-keys {
width: 100%;
min-width: 990px;
.action {
width: 10.810%;
width: 10.81%;
}
.staff_user {
width: 9.009%;
@@ -1329,8 +1377,6 @@ table.api-keys {
&:hover {
color: $primary;
background-color: $primary-low;
}
.label {
font-weight: bold;
@@ -1352,8 +1398,13 @@ table.api-keys {
position: absolute;
}
.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks, .search-logs-list, .web-hook-events {
.staff-actions,
.screened-emails,
.screened-urls,
.screened-ip-addresses,
.permalinks,
.search-logs-list,
.web-hook-events {
border-bottom: dotted 1px dark-light-choose($primary-low-mid, $secondary);
.heading-container {
@@ -1391,7 +1442,6 @@ table.api-keys {
}
.log-details-modal {
pre {
white-space: pre-wrap;
max-height: 250px;
@@ -1422,7 +1472,7 @@ table.api-keys {
// Backups
// --------------------------------------------------
$rollback: #3D9970;
$rollback: #3d9970;
$rollback-dark: darken($rollback, 10%) !default;
$rollback-darker: darken($rollback, 20%) !default;
@@ -1445,7 +1495,6 @@ $rollback-darker: darken($rollback, 20%) !default;
overflow: auto;
}
button.ru {
position: relative;
min-width: 110px;
@@ -1476,12 +1525,13 @@ button.ru {
}
}
@media all
and (min-width : 320px)
and (max-width : 500px) {
.full-width { margin: 0; }
.site-settings-nav { width: 100%; }
@media all and (min-width: 320px) and (max-width: 500px) {
.full-width {
margin: 0;
}
.site-settings-nav {
width: 100%;
}
.site-settings-detail {
width: 100%;
padding: 0;
@@ -1518,15 +1568,25 @@ and (max-width : 500px) {
}
}
.dashboard-left, .dashboard-right { width: 100%; }
.dashboard-stats { margin: 0; }
.badges {
.current-badge {margin: 70px 0 0 0;}
.current-badge-actions {padding: 0;}
.dashboard-left,
.dashboard-right {
width: 100%;
}
.dashboard-stats {
margin: 0;
}
.customize .content-list, .customize .current-style {
.badges {
.current-badge {
margin: 70px 0 0 0;
}
.current-badge-actions {
padding: 0;
}
}
.customize .content-list,
.customize .current-style {
width: 100%;
}
}
@@ -1549,12 +1609,16 @@ and (max-width : 500px) {
}
tr.not-activated {
td, td a, td a:visited {
td,
td a,
td a:visited {
color: #bbb;
}
}
.details.not-activated {
.username .value, .email .value a, .email .value a:visited {
.username .value,
.email .value a,
.email .value a:visited {
color: #bbb;
}
}
@@ -1575,14 +1639,15 @@ tr.not-activated {
float: left;
}
.form-element, .form-element-desc {
.form-element,
.form-element-desc {
float: left;
min-height: 30px;
padding: 0.25em 0;
&.input-area {
width: 75%;
input[type=text] {
input[type="text"] {
width: 50%;
}
}
@@ -1642,7 +1707,7 @@ table#user-badges {
height: 30px;
}
input[type=text] {
input[type="text"] {
width: 90%;
}
}
@@ -1650,14 +1715,20 @@ table#user-badges {
// Permalinks
.permalinks {
.url, .topic, .category, .external_url, .post {
.url,
.topic,
.category,
.external_url,
.post {
text-overflow: ellipsis;
white-space: nowrap;
}
.url {
width: 200px;
}
.topic, .post, .external_url {
.topic,
.post,
.external_url {
width: 180px;
}
.category {
@@ -1673,7 +1744,6 @@ table#user-badges {
margin-bottom: 10px;
}
// embedding
.embeddable-hosts {
@@ -1690,7 +1760,7 @@ table#user-badges {
margin-bottom: 2em;
.embed-setting {
input[type=text] {
input[type="text"] {
width: 50%;
}
margin: 0.75em 0;
@@ -1943,8 +2013,6 @@ table#user-badges {
left: -100%;
}
.cboxcontainer {
display: inline-block;
padding: 8px;
@@ -1969,46 +2037,119 @@ table#user-badges {
margin-right: 20px;
}
.admin-reports, .dashboard-next {
.admin-reports,
.dashboard-next {
&.admin-contents {
margin: 0;
}
}
.cbox0 { background: blend-primary-secondary(0%); }
.cbox10 { background: blend-primary-secondary(10%); }
.cbox20 { background: blend-primary-secondary(20%); }
.cbox30 { background: blend-primary-secondary(30%); }
.cbox40 { background: blend-primary-secondary(40%); }
.cbox50 { background: blend-primary-secondary(50%); }
.cbox60 { background: blend-primary-secondary(60%); }
.cbox70 { background: blend-primary-secondary(70%); }
.cbox80 { background: blend-primary-secondary(80%); }
.cbox90 { background: blend-primary-secondary(90%); }
.cbox100 { background: blend-primary-secondary(100%); }
.cbox5 { background: blend-primary-secondary(5%); }
.cbox7 { background: blend-primary-secondary(7%); }
.cbox15 { background: blend-primary-secondary(15%); }
.cbox17 { background: blend-primary-secondary(17%); }
.cbox25 { background: blend-primary-secondary(25%); }
.cbox95 { background: blend-primary-secondary(95%); }
.cbox85 { background: blend-primary-secondary(85%); }
.cbox75 { background: blend-primary-secondary(75%); }
.cbox0 {
background: blend-primary-secondary(0%);
}
.cbox10 {
background: blend-primary-secondary(10%);
}
.cbox20 {
background: blend-primary-secondary(20%);
}
.cbox30 {
background: blend-primary-secondary(30%);
}
.cbox40 {
background: blend-primary-secondary(40%);
}
.cbox50 {
background: blend-primary-secondary(50%);
}
.cbox60 {
background: blend-primary-secondary(60%);
}
.cbox70 {
background: blend-primary-secondary(70%);
}
.cbox80 {
background: blend-primary-secondary(80%);
}
.cbox90 {
background: blend-primary-secondary(90%);
}
.cbox100 {
background: blend-primary-secondary(100%);
}
.cbox5 {
background: blend-primary-secondary(5%);
}
.cbox7 {
background: blend-primary-secondary(7%);
}
.cbox15 {
background: blend-primary-secondary(15%);
}
.cbox17 {
background: blend-primary-secondary(17%);
}
.cbox25 {
background: blend-primary-secondary(25%);
}
.cbox95 {
background: blend-primary-secondary(95%);
}
.cbox85 {
background: blend-primary-secondary(85%);
}
.cbox75 {
background: blend-primary-secondary(75%);
}
.dbox0 { background: dark-light-diff($primary, $secondary, 0%, -0%); }
.dbox10 { background: dark-light-diff($primary, $secondary, 10%, -10%); }
.dbox20 { background: dark-light-diff($primary, $secondary, 20%, -20%); }
.dbox30 { background: dark-light-diff($primary, $secondary, 30%, -30%); }
.dbox40 { background: dark-light-diff($primary, $secondary, 40%, -40%); }
.dbox50 { background: blend-primary-secondary(50%); }
.dbox60 { background: dark-light-diff($primary, $secondary, 60%, -60%); }
.dbox70 { background: dark-light-diff($primary, $secondary, 70%, -70%); }
.dbox80 { background: dark-light-diff($primary, $secondary, 80%, -80%); }
.dbox90 { background: $primary-low; }
.dbox100 { background: dark-light-diff($primary, $secondary, 100%, -100%); }
.dbox5 { background: dark-light-diff($primary, $secondary, 5%, -5%); }
.dbox15 { background: dark-light-diff($primary, $secondary, 15%, -15%); }
.dbox25 { background: dark-light-diff($primary, $secondary, 25%, -25%); }
.dbox95 { background: dark-light-diff($primary, $secondary, 95%, -95%); }
.dbox85 { background: dark-light-diff($primary, $secondary, 85%, -85%); }
.dbox75 { background: dark-light-diff($primary, $secondary, 75%, -75%); }
.dbox0 {
background: dark-light-diff($primary, $secondary, 0%, -0%);
}
.dbox10 {
background: dark-light-diff($primary, $secondary, 10%, -10%);
}
.dbox20 {
background: dark-light-diff($primary, $secondary, 20%, -20%);
}
.dbox30 {
background: dark-light-diff($primary, $secondary, 30%, -30%);
}
.dbox40 {
background: dark-light-diff($primary, $secondary, 40%, -40%);
}
.dbox50 {
background: blend-primary-secondary(50%);
}
.dbox60 {
background: dark-light-diff($primary, $secondary, 60%, -60%);
}
.dbox70 {
background: dark-light-diff($primary, $secondary, 70%, -70%);
}
.dbox80 {
background: dark-light-diff($primary, $secondary, 80%, -80%);
}
.dbox90 {
background: $primary-low;
}
.dbox100 {
background: dark-light-diff($primary, $secondary, 100%, -100%);
}
.dbox5 {
background: dark-light-diff($primary, $secondary, 5%, -5%);
}
.dbox15 {
background: dark-light-diff($primary, $secondary, 15%, -15%);
}
.dbox25 {
background: dark-light-diff($primary, $secondary, 25%, -25%);
}
.dbox95 {
background: dark-light-diff($primary, $secondary, 95%, -95%);
}
.dbox85 {
background: dark-light-diff($primary, $secondary, 85%, -85%);
}
.dbox75 {
background: dark-light-diff($primary, $secondary, 75%, -75%);
}

8
app/assets/stylesheets/common/admin/admin_reports.scss
View File

@@ -1,8 +1,8 @@
.admin-reports {
h3 {
border-bottom: 1px solid $primary-low;
margin-bottom: .5em;
padding-bottom: .5em;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
}
.report-container {
@@ -29,7 +29,9 @@
width: 195px;
}
.combo-box, .date-picker-wrapper, .btn {
.combo-box,
.date-picker-wrapper,
.btn {
width: 100%;
margin-bottom: 1em;
}

38
app/assets/stylesheets/common/admin/customize.scss
View File

@@ -19,7 +19,8 @@
}
.edit-main-nav {
.nav-pills:after, .nav-pills:before {
.nav-pills:after,
.nav-pills:before {
display: inline;
content: "";
}
@@ -65,7 +66,7 @@
width: 25%;
h3 {
margin-top: 0;
margin-bottom: .5rem;
margin-bottom: 0.5rem;
}
}
}
@@ -93,7 +94,8 @@
.nav.nav-pills.fields {
margin-left: 10px;
}
.content-list, .current-style {
.content-list,
.current-style {
float: left;
}
.content-list ul {
@@ -187,18 +189,33 @@
}
.color-scheme {
.controls {
span, button, a {
span,
button,
a {
margin-right: 10px;
}
}
}
.colors {
thead th { border: none; }
td.hex { width: 160px; }
td.actions { width: 200px; }
.hex-input { width: 80px; margin-bottom: 0; }
.hex { text-align: center; }
.description { color: dark-light-choose($primary-medium, $secondary-medium); }
thead th {
border: none;
}
td.hex {
width: 160px;
}
td.actions {
width: 200px;
}
.hex-input {
width: 80px;
margin-bottom: 0;
}
.hex {
text-align: center;
}
.description {
color: dark-light-choose($primary-medium, $secondary-medium);
}
.invalid .hex input {
background-color: white;
@@ -258,4 +275,3 @@
}
}
}

73
app/assets/stylesheets/common/admin/dashboard_next.scss
View File

@@ -12,10 +12,10 @@
}
.section-column {
min-width: calc(50% - .5em);
min-width: calc(50% - 0.5em);
max-width: 100%;
&:last-child, {
&:last-child {
margin-left: 1em;
}
@@ -47,7 +47,7 @@
.section {
.section-title {
h2 {
margin: 0 .5em 0 0;
margin: 0 0.5em 0 0;
}
display: flex;
@@ -57,8 +57,8 @@
align-items: center;
justify-content: space-between;
border-bottom: 1px solid $primary-low;
margin-bottom: .5em;
padding-bottom: .5em;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
}
.section-body {
@@ -101,7 +101,8 @@
display: flex;
border: 1px solid $primary-low;
.durability, .last-dashboard-update {
.durability,
.last-dashboard-update {
flex: 1 1 50%;
box-sizing: border-box;
margin: 1em 0;
@@ -113,7 +114,8 @@
flex-wrap: wrap;
justify-content: space-between;
.backups, .uploads {
.backups,
.uploads {
flex: 1 1 100%;
}
@@ -128,7 +130,8 @@
@media screen and (max-width: 400px) {
flex-wrap: wrap;
.durability, .last-dashboard-update {
.durability,
.last-dashboard-update {
flex: 1 1 100%;
text-align: left;
}
@@ -154,7 +157,8 @@
}
}
.top-referred-topics, .trending-search {
.top-referred-topics,
.trending-search {
th:first-of-type {
text-align: left;
}
@@ -168,7 +172,8 @@
.community-health {
.period-chooser .period-chooser-header {
.selected-name, .d-icon {
.selected-name,
.d-icon {
font-size: $font-up-1;
}
@@ -183,19 +188,21 @@
.status {
display: flex;
justify-content: space-between;
margin-bottom: .5em;
padding: 0 .45em 0 0;
margin-bottom: 0.5em;
padding: 0 0.45em 0 0;
.title {
font-size: $font-up-1;
font-weight: 700;
margin: 0;
a { color: $primary; }
a {
color: $primary;
}
.info {
cursor: pointer;
margin-left: .25em;
margin-left: 0.25em;
color: $primary-low-mid;
&:hover {
@@ -207,11 +214,13 @@
.trend {
align-items: center;
&.trending-down, &.high-trending-down {
&.trending-down,
&.high-trending-down {
color: $danger;
}
&.trending-up, &.high-trending-up {
&.trending-up,
&.high-trending-up {
color: $success;
}
@@ -265,7 +274,8 @@
h3 {
margin: 1em 0;
a, a:visited {
a,
a:visited {
color: $primary;
}
}
@@ -353,11 +363,17 @@
}
}
&.high-trending-up, &.trending-up {
i { color: $success; }
&.high-trending-up,
&.trending-up {
i {
color: $success;
}
}
&.high-trending-down,
&.trending-down {
i {
color: $danger;
}
&.high-trending-down, &.trending-down {
i { color: $danger; }
}
}
}
@@ -370,8 +386,9 @@
flex-wrap: wrap;
justify-content: space-between;
margin-left: -5%;
margin: 2em 0 .75em -5%; // Negative margin allows for a margin when in 2-columns,
.dashboard-inline-table { // and "hides" margin when the item spans 100% width
margin: 2em 0 0.75em -5%; // Negative margin allows for a margin when in 2-columns,
.dashboard-inline-table {
// and "hides" margin when the item spans 100% width
flex: 1 0 auto;
max-width: 95%;
}
@@ -404,7 +421,8 @@
color: $primary-high;
}
}
&.user-basic , &.user-member {
&.user-basic,
&.user-member {
border-color: $bronze;
.label {
border-color: $bronze;
@@ -461,7 +479,9 @@
text-align: center;
}
@media screen and (max-width: 400px) {
.d-icon { display: none; }
.d-icon {
display: none;
}
td.title {
padding: 8px 0 8px 4px;
}
@@ -469,10 +489,9 @@
}
}
.rtl .dashboard-next {
.section-column {
&:last-child, {
&:last-child {
margin-right: 1em;
margin-left: 0;
}

6
app/assets/stylesheets/common/admin/flagging.scss
View File

@@ -1,11 +1,13 @@
.flagged-post.hidden-post {
.flagged-post-excerpt, .flagged-post-avatar {
.flagged-post-excerpt,
.flagged-post-avatar {
opacity: 0.5;
}
}
.flagged-post.deleted {
.flagged-post-excerpt, .flagged-post-avatar {
.flagged-post-excerpt,
.flagged-post-avatar {
background-color: $danger-low;
}
}

3
app/assets/stylesheets/common/admin/moderation_history.scss
View File

@@ -6,7 +6,8 @@
td.date {
padding-right: 1em;
}
td, th {
td,
th {
padding-bottom: 0.5em;
vertical-align: top;
}

7
app/assets/stylesheets/common/admin/suspend.scss
View File

@@ -1,5 +1,4 @@
.suspend-user-modal {
.until-controls {
margin-bottom: 1em;
}
@@ -8,11 +7,13 @@
width: 100%;
}
.suspend-reason-label, .suspend-message-label {
.suspend-reason-label,
.suspend-message-label {
margin-bottom: 0.5em;
}
.textarea, input[type=text] {
.textarea,
input[type="text"] {
box-sizing: border-box;
height: 2.5em;
}

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

@@ -26,11 +26,14 @@
.select-kit-collection {
font-size: $font-down-1;
max-height: 40vh;
.texts, .icons {
.texts,
.icons {
font-size: $font-up-1;
}
}
&.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
&.categories-admin-dropdown,
&.category-notifications-button,
&.tag-notifications-button {
float: right;
}
}
@@ -39,7 +42,9 @@
.topic-list-item.visited,
.latest-topic-list-item.visited,
.category-topic-link.visited {
a.title:not(.badge-notification) { color: $primary-medium; }
a.title:not(.badge-notification) {
color: $primary-medium;
}
}
.topic-list-main-link {
@@ -103,14 +108,14 @@
line-height: $line-height-large;
text-align: left;
vertical-align: middle;
}
th {
color: dark-light-choose($primary-medium, $secondary-medium);
font-weight: normal;
font-size: $font-0;
button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
button .d-icon {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
td {
color: dark-light-choose($primary-medium, $secondary-medium);
@@ -172,15 +177,22 @@
padding: 15px 5px;
}
}
}
.heatmap-high, .heatmap-high a {color: #fe7a15 !important;}
.heatmap-med, .heatmap-med a {color: #cf7721 !important;}
.heatmap-low, .heatmap-low a {color: #9b764f !important;}
.heatmap-high,
.heatmap-high a {
color: #fe7a15 !important;
}
.heatmap-med,
.heatmap-med a {
color: #cf7721 !important;
}
.heatmap-low,
.heatmap-low a {
color: #9b764f !important;
}
.topic-list.categories {
.category .badge-notification {
background-color: transparent;
color: $primary-medium;
@@ -207,11 +219,15 @@
padding: 2px;
vertical-align: bottom;
line-height: $line-height-large;
&.value { text-align: right; font-size: $font-up-3; }
&.unit { text-align: left; }
&.value {
text-align: right;
font-size: $font-up-3;
}
&.unit {
text-align: left;
}
}
}
}
.loading .topic-list {

4
app/assets/stylesheets/common/base/about.scss
View File

@@ -12,13 +12,13 @@ section.about {
text-align: left;
}
td, th {
td,
th {
padding: 10px;
}
td.title {
width: 33%;
}
}
}

2
app/assets/stylesheets/common/base/alert.scss
View File

@@ -34,7 +34,7 @@
color: $primary;
}
&.alert-error {
background-color: rgba($danger-low, .5);
background-color: rgba($danger-low, 0.5);
color: $primary;
}
&.alert-info {

16
app/assets/stylesheets/common/base/category-list.scss
View File

@@ -14,7 +14,8 @@
}
}
.category-boxes, .category-boxes-with-topics {
.category-boxes,
.category-boxes-with-topics {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
@@ -153,12 +154,17 @@
}
}
li:before {
content: '\f0f6';
font-family: 'FontAwesome';
content: "\f0f6";
font-family: "FontAwesome";
float: left;
margin-left: -1.5em;
}
li.topic-pinned:before { content: '\f08d'; }
li.topic-closed:before, li.topic-archived:before { content: '\f023'; }
li.topic-pinned:before {
content: "\f08d";
}
li.topic-closed:before,
li.topic-archived:before {
content: "\f023";
}
}
}

7
app/assets/stylesheets/common/base/code_highlighting.scss
View File

@@ -56,7 +56,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
.haskell .hljs-type,
.vhdl .hljs-literal,
.tex .hljs-command {
color: dark-light-choose(#458, #9AE);
color: dark-light-choose(#458, #9ae);
font-weight: bold;
}
@@ -110,14 +110,15 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
color: #aaa;
}
/*
--------------------------------------------------------------------------------
| SHOULD NOT BE REMOVED |
--------------------------------------------------------------------------------
*/
p > code, li > code, pre > code {
p > code,
li > code,
pre > code {
color: dark-light-choose(#333, #f8f8f8);
background: dark-light-choose(#f8f8f8, #333);
}

3
app/assets/stylesheets/common/base/colorpicker.scss
View File

@@ -22,8 +22,7 @@
margin-right: 2px;
width: 16px;
height: 16px;
font-size: 0.286em
;
font-size: 0.286em;
&.used-color {
background: image-url("chosen-sprite.png") -19px 13px;
}

16
app/assets/stylesheets/common/base/compose.scss
View File

@@ -17,7 +17,8 @@
min-width: 0;
}
z-index: z("composer", "content");
transition: height 250ms ease, background 250ms ease, transform 250ms ease, max-width 250ms ease;
transition: height 250ms ease, background 250ms ease, transform 250ms ease,
max-width 250ms ease;
background-color: $secondary;
box-shadow: shadow("composer");
@@ -78,7 +79,8 @@
.draft-text {
display: block;
}
.grippie, .saving-text {
.grippie,
.saving-text {
display: none;
}
}
@@ -116,7 +118,9 @@
text-overflow: ellipsis;
}
.topic-link, .user-link, .post-link {
.topic-link,
.user-link,
.post-link {
margin-right: 5px;
}
@@ -305,7 +309,8 @@
}
}
#draft-status, #file-uploading {
#draft-status,
#file-uploading {
color: $primary-high;
}
}
@@ -368,7 +373,8 @@ div.ac-wrap.disabled {
}
}
div.ac-wrap div.item a.remove, .remove-link {
div.ac-wrap div.item a.remove,
.remove-link {
margin-left: 4px;
font-size: $font-down-1;
line-height: $line-height-small;

2
app/assets/stylesheets/common/base/crawler_layout.scss
View File

@@ -8,7 +8,7 @@ body.crawler {
padding: 10px;
box-shadow: shadow("header");
}
div.topic-list div[itemprop='itemListElement'] {
div.topic-list div[itemprop="itemListElement"] {
padding: 10px 0;
border-bottom: 1px solid #e9e9e9;
.page-links a {

17
app/assets/stylesheets/common/base/directory.scss
View File

@@ -23,15 +23,17 @@
width: 100%;
margin-bottom: 1em;
td, th {
td,
th {
padding: 0.5em;
text-align: left;
border-bottom: 1px solid $primary-low;
@media screen and (max-width: $small-width) {
padding: .5em .25em;
padding: 0.5em 0.25em;
}
.number, .time-read {
.number,
.time-read {
font-size: $font-up-3;
color: $primary-medium;
@media screen and (max-width: $small-width) {
@@ -51,7 +53,8 @@
color: $love;
margin-right: 0.5em;
}
.d-icon-chevron-down, .d-icon-chevron-up {
.d-icon-chevron-down,
.d-icon-chevron-up {
margin-left: 0.5em;
}
@@ -62,7 +65,11 @@
}
.me {
background-color: dark-light-choose($highlight-low, $highlight-medium);
.username a, .name, .title, .number, .time-read {
.username a,
.name,
.title,
.number,
.time-read {
color: $primary-medium;
}
}

13
app/assets/stylesheets/common/base/discourse.scss
View File

@@ -66,7 +66,7 @@ h4,
h5,
h6 {
margin-top: 0;
margin-bottom: .5rem;
margin-bottom: 0.5rem;
}
button {
@@ -131,7 +131,10 @@ input {
}
&.invalid {
background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%));
background-color: dark-light-choose(
$danger-low,
scale-color($danger, $lightness: -60%)
);
}
.radio &[type="radio"],
@@ -340,7 +343,11 @@ select {
height: 80px;
top: -18px;
right: -18px;
background-image: radial-gradient(40px at 50% 50% , transparent 95%, $primary 100%);
background-image: radial-gradient(
40px at 50% 50%,
transparent 95%,
$primary 100%
);
opacity: 0.85;
}

3
app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
View File

@@ -7,7 +7,8 @@
width: 50%;
}
input.date-picker, input[type="time"] {
input.date-picker,
input[type="time"] {
width: 150px;
text-align: left;
}

32
app/assets/stylesheets/common/base/emoji.scss
View File

@@ -38,7 +38,8 @@ img.emoji {
}
}
.emoji-picker .category-icon.current, .emoji-picker .category-icon:hover {
.emoji-picker .category-icon.current,
.emoji-picker .category-icon:hover {
-webkit-filter: grayscale(0%);
filter: grayscale(0%);
}
@@ -123,12 +124,24 @@ img.emoji {
justify-content: center;
cursor: pointer;
}
.emoji-picker .diversity-picker .diversity-scale.default { background: #ffcc4d; }
.emoji-picker .diversity-picker .diversity-scale.light { background: #f7dece; }
.emoji-picker .diversity-picker .diversity-scale.medium-light { background: #f3d2a2; }
.emoji-picker .diversity-picker .diversity-scale.medium { background: #d5ab88; }
.emoji-picker .diversity-picker .diversity-scale.medium-dark { background: #af7e57; }
.emoji-picker .diversity-picker .diversity-scale.dark { background: #7c533e; }
.emoji-picker .diversity-picker .diversity-scale.default {
background: #ffcc4d;
}
.emoji-picker .diversity-picker .diversity-scale.light {
background: #f7dece;
}
.emoji-picker .diversity-picker .diversity-scale.medium-light {
background: #f3d2a2;
}
.emoji-picker .diversity-picker .diversity-scale.medium {
background: #d5ab88;
}
.emoji-picker .diversity-picker .diversity-scale.medium-dark {
background: #af7e57;
}
.emoji-picker .diversity-picker .diversity-scale.dark {
background: #7c533e;
}
.emoji-picker .diversity-picker .diversity-scale.selected i {
display: block;
@@ -161,7 +174,8 @@ img.emoji {
margin: 2px;
}
.emoji-picker .section-group button.emoji:hover, .emoji-picker .results button.emoji:hover {
.emoji-picker .section-group button.emoji:hover,
.emoji-picker .results button.emoji:hover {
display: inline-block;
vertical-align: top;
border-radius: 2px;
@@ -179,7 +193,7 @@ img.emoji {
top: 0;
width: 100%;
height: 100%;
opacity: .8;
opacity: 0.8;
background-color: black;
}

2
app/assets/stylesheets/common/base/faqs.scss
View File

@@ -8,7 +8,6 @@
margin-top: 20px;
}
li {
margin-bottom: 8px;
}
@@ -21,5 +20,4 @@
ol:not(.nav-pills) {
margin-left: 40px;
}
}

3
app/assets/stylesheets/common/base/group.scss
View File

@@ -26,7 +26,6 @@
margin: 0 0 5px 0;
vertical-align: middle;
}
}
.group-info {
@@ -175,7 +174,7 @@ table.group-members {
vertical-align: middle;
}
input[type='checkbox'] {
input[type="checkbox"] {
vertical-align: middle;
}
}

1
app/assets/stylesheets/common/base/groups.scss
View File

@@ -39,7 +39,6 @@
}
tr {
td {
padding: 0.8em;
color: $primary-medium;

39
app/assets/stylesheets/common/base/header.scss
View File

@@ -17,7 +17,8 @@
.title {
float: left;
a, a:visited {
a,
a:visited {
color: $header_primary;
}
}
@@ -37,27 +38,34 @@
align-items: center;
}
.hamburger-panel, .user-menu, .search-menu {
.hamburger-panel,
.user-menu,
.search-menu {
width: 0; // Flexbox fix for Safari
}
.header-buttons {
margin-top: .2em;
margin-top: 0.2em;
}
.login-button, button.sign-up-button {
.login-button,
button.sign-up-button {
padding: 6px 10px;
.fa { margin-right: 3px; }
.fa {
margin-right: 3px;
}
}
button.login-button {
margin-left: 7px;
}
}
.header-dropdown-toggle, .drop-down, .panel-body {
.flagged-posts, .queued-posts {
.header-dropdown-toggle,
.drop-down,
.panel-body {
.flagged-posts,
.queued-posts {
background: $danger;
min-width: 6px;
}
@@ -78,20 +86,24 @@
justify-content: center;
width: 2.2857em;
height: 2.2857em;
padding: .2143em;
color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
padding: 0.2143em;
color: dark-light-choose(
scale-color($header_primary, $lightness: 50%),
$header_primary
);
text-decoration: none;
cursor: pointer;
border-top: 1px solid transparent;
border-left: 1px solid transparent;
border-right: 1px solid transparent;
transition: all linear .15s;
transition: all linear 0.15s;
outline: none;
img.avatar {
width: 2.2857em;
height: 2.2857em;
}
&:hover, &:focus {
&:hover,
&:focus {
color: $primary;
background-color: $primary-low;
border-top: 1px solid transparent;
@@ -160,7 +172,8 @@
right: -3px;
background-color: dark-light-choose($tertiary-medium, $tertiary);
}
.unread-private-messages, .ring {
.unread-private-messages,
.ring {
left: auto;
right: 25px;
}

38
app/assets/stylesheets/common/base/history.scss
View File

@@ -33,12 +33,14 @@
#revisions .row:first-of-type {
margin-top: 10px;
}
ins, .diff-ins {
code, img {
ins,
.diff-ins {
code,
img {
border: 2px solid $success;
}
img {
opacity: .75;
opacity: 0.75;
filter: alpha(opacity=75);
}
a {
@@ -46,11 +48,12 @@
text-decoration: none;
}
}
img.diff-ins, code.diff-ins {
img.diff-ins,
code.diff-ins {
border: 2px solid $success;
}
img.diff-ins {
opacity: .75;
opacity: 0.75;
filter: alpha(opacity=75);
}
.diff-ins {
@@ -61,12 +64,14 @@
color: $success;
background: $success-low;
}
del, .diff-del {
code, img {
del,
.diff-del {
code,
img {
border: 2px solid $danger;
}
img {
opacity: .5;
opacity: 0.5;
filter: alpha(opacity=50);
}
a {
@@ -74,11 +79,12 @@
text-decoration: none;
}
}
img.diff-del, code.diff-del {
img.diff-del,
code.diff-del {
border: 2px solid $danger;
}
img.diff-del {
opacity: .5;
opacity: 0.5;
filter: alpha(opacity=50);
}
.diff-del {
@@ -99,16 +105,18 @@
color: #f00;
}
.hidden-revision-either {
opacity: .5;
opacity: 0.5;
}
.hidden-revision-previous .row {
div:nth-of-type(1), td:nth-of-type(1) {
opacity: .5;
div:nth-of-type(1),
td:nth-of-type(1) {
opacity: 0.5;
}
}
.hidden-revision-current .row {
div:nth-of-type(2), td:nth-of-type(2) {
opacity: .5;
div:nth-of-type(2),
td:nth-of-type(2) {
opacity: 0.5;
}
}
}

9
app/assets/stylesheets/common/base/lightbox.scss
View File

@@ -4,13 +4,16 @@
&:hover .meta {
opacity: 1;
transition: opacity .5s;
transition: opacity 0.5s;
}
}
.lightbox-wrapper {
display: inline-block;
&, * { outline: 0; }
&,
* {
outline: 0;
}
}
.meta {
@@ -20,7 +23,7 @@
color: dark-light-choose($secondary, $primary);
background: dark-light-choose($primary, lighten($secondary, 10%));
opacity: 0;
transition: opacity .2s;
transition: opacity 0.2s;
span {
float: left;

17
app/assets/stylesheets/common/base/login.scss
View File

@@ -31,7 +31,8 @@
$label-width: 92px;
$input-width: 220px;
.login-modal, .create-account {
.login-modal,
.create-account {
tr {
border: none;
}
@@ -41,7 +42,8 @@ $input-width: 220px;
}
}
td {
label, input {
label,
input {
margin-bottom: 0;
width: 100%;
}
@@ -66,7 +68,7 @@ $input-width: 220px;
.disclaimer {
color: dark-light-choose($primary-medium, $secondary-medium);
margin-top: .5em;
margin-top: 0.5em;
}
.user-field.confirm {
@@ -78,7 +80,7 @@ $input-width: 220px;
width: $label-width;
float: left;
}
input[type=text] {
input[type="text"] {
width: $input-width;
margin-bottom: 0;
}
@@ -134,7 +136,8 @@ $input-width: 220px;
label:not(.checkbox-label) {
font-weight: bold;
}
.controls, .input {
.controls,
.input {
margin-bottom: 10px;
}
.instructions {
@@ -165,8 +168,8 @@ $input-width: 220px;
// alternate login / create new account buttons should be de-emphasized
button#login-link, button#new-account-link
{
button#login-link,
button#new-account-link {
background: transparent;
color: dark-light-choose($primary-high, $secondary-low);
}

62
app/assets/stylesheets/common/base/magnific-popup.scss
View File

@@ -23,8 +23,6 @@
//
////////////////////////
////////////////////////
// 1. Default Settings
////////////////////////
@@ -38,10 +36,10 @@ $popup-padding-left-mobile: 6px !default; // Same as above, but is applied
$z-index-base: 1040 !default; // Base z-index of popup
$include-arrows: true !default; // include styles for nav arrows
$controls-opacity: 0.65 !default;
$controls-color: #FFF !default;
$controls-color: #fff !default;
$inner-close-icon-color: #333 !default;
$controls-text-color: #CCC !default; // Color of preloader and "1 of X" indicator
$controls-text-color-hover: #FFF !default;
$controls-text-color: #ccc !default; // Color of preloader and "1 of X" indicator
$controls-text-color-hover: #fff !default;
$IE7support: true !default; // Very basic IE7 support
// Iframe-type options
@@ -59,14 +57,12 @@ $image-padding-bottom: 40px !default;
$include-mobile-layout-for-image: true !default; // Removes paddings from top and bottom
// Image caption options
$caption-title-color: #F3F3F3 !default;
$caption-subtitle-color: #BDBDBD !default;
$caption-title-color: #f3f3f3 !default;
$caption-subtitle-color: #bdbdbd !default;
// A11y
$use-visuallyhidden: false !default; // Hide content from browsers, but make it available for screen readers
////////////////////////
// 2. General styles
////////////////////////
@@ -117,7 +113,7 @@ $use-visuallyhidden: false !default; // Hide content from browsers,
// Vertical centerer helper
.mfp-container {
&:before {
content: '';
content: "";
display: inline-block;
height: 100%;
vertical-align: middle;
@@ -155,7 +151,8 @@ $use-visuallyhidden: false !default; // Hide content from browsers,
cursor: progress;
}
.mfp-zoom-out-cur {
&, .mfp-image-holder .mfp-close {
&,
.mfp-image-holder .mfp-close {
cursor: -moz-zoom-out;
cursor: -webkit-zoom-out;
cursor: zoom-out;
@@ -208,7 +205,6 @@ $use-visuallyhidden: false !default; // Hide content from browsers,
}
}
////////////////////////
// 3. Appearance
////////////////////////
@@ -263,11 +259,10 @@ button {
}
&::-moz-focus-inner {
padding: 0;
border: 0
border: 0;
}
}
// Close icon
.mfp-close {
width: 44px;
@@ -356,7 +351,7 @@ button {
&:after,
.mfp-b,
.mfp-a {
content: '';
content: "";
display: block;
width: 0;
height: 0;
@@ -370,7 +365,6 @@ button {
&:after,
.mfp-a {
border-top-width: 13px;
border-bottom-width: 13px;
top: 8px;
@@ -381,7 +375,6 @@ button {
border-top-width: 21px;
border-bottom-width: 21px;
}
}
.mfp-arrow-left {
@@ -389,7 +382,7 @@ button {
&:after,
.mfp-a {
border-right: 17px solid #FFF;
border-right: 17px solid #fff;
margin-left: 31px;
}
&:before,
@@ -403,8 +396,8 @@ button {
right: 0;
&:after,
.mfp-a {
border-left: 17px solid #FFF;
margin-left: 39px
border-left: 17px solid #fff;
margin-left: 39px;
}
&:before,
.mfp-b {
@@ -413,8 +406,6 @@ button {
}
}
// Iframe content type
@if $include-iframe-type {
.mfp-iframe-holder {
@@ -447,11 +438,8 @@ button {
}
}
// Image content type
@if $include-image-type {
/* Main image in popup */
img {
&.mfp-img {
@@ -472,7 +460,7 @@ button {
.mfp-figure {
line-height: 0;
&:after {
content: '';
content: "";
position: absolute;
left: 0;
top: $image-padding-top;
@@ -532,9 +520,9 @@ button {
}
}
@if $include-mobile-layout-for-image {
@media all and (max-width: 800px) and (orientation:landscape), screen and (max-height: 300px) {
@media all and (max-width: 800px) and (orientation: landscape),
screen and (max-height: 300px) {
/**
* Remove all paddings around the image on small screen
*/
@@ -593,8 +581,6 @@ button {
}
}
// Scale navigation arrows and reduce padding from sides
@media all and (max-width: 900px) {
.mfp-arrow {
@@ -614,8 +600,6 @@ button {
}
}
// IE7 support
// Styles that make popup look nicier in old IE
@if $IE7support {
@@ -644,20 +628,19 @@ button {
}
}
.mfp-zoom-in {
/* start state */
.mfp-content {
opacity: 0;
transition: all .2s;
-webkit-transform: scale(.8);
-ms-transform: scale(.8);
transform: scale(.8);
transition: all 0.2s;
-webkit-transform: scale(0.8);
-ms-transform: scale(0.8);
transform: scale(0.8);
}
&.mfp-bg {
opacity: 0;
transition: all .3s ease-out;
transition: all 0.3s ease-out;
}
/* animate in */
@@ -673,9 +656,8 @@ button {
/* animate out */
&.mfp-removing {
.mfp-content {
@include transform(scale(.8));
@include transform(scale(0.8));
opacity: 0;
}
&.mfp-bg {

48
app/assets/stylesheets/common/base/menu-panel.scss
View File

@@ -55,11 +55,13 @@
}
.menu-panel {
ul.menu-links li, ul li.heading {
ul.menu-links li,
ul li.heading {
a {
padding: 0.25em 0.5em;
display: block;
&:hover, &:focus {
&:hover,
&:focus {
background-color: $highlight-medium;
outline: none;
}
@@ -90,7 +92,8 @@
.badge-wrapper {
overflow: hidden;
text-overflow: ellipsis;
&.bar, &.bullet {
&.bar,
&.bullet {
color: $primary;
}
&.box {
@@ -120,11 +123,9 @@
overflow: hidden;
text-overflow: ellipsis;
}
}
.search-menu {
.search-input {
position: relative;
}
@@ -140,7 +141,7 @@
}
}
input[type='text'] {
input[type="text"] {
margin: 0.5em 3px;
box-sizing: border-box;
width: calc(100% - 6px);
@@ -149,7 +150,9 @@
.search-context {
padding: 0 5px;
label { margin-bottom: 0; }
label {
margin-bottom: 0;
}
}
.searching {
@@ -172,7 +175,9 @@
.filter {
padding: 0;
&:hover {background: transparent;}
&:hover {
background: transparent;
}
}
.search-link {
@@ -207,7 +212,7 @@
display: block;
padding: 5px;
}
transition: all linear .15s;
transition: all linear 0.15s;
.user-results {
color: dark-light-choose($primary-high, $secondary-low);
@@ -218,12 +223,13 @@
background-color: $highlight-medium;
}
button {margin-left: 5px;}
button {
margin-left: 5px;
}
}
}
.user-menu {
.notifications {
width: 100%;
display: table;
@@ -234,8 +240,12 @@
margin: 0.5em 0;
}
.fa { color: dark-light-choose($primary-medium, $secondary-medium); }
.icon { color: dark-light-choose($primary-high, $secondary-low); }
.fa {
color: dark-light-choose($primary-medium, $secondary-medium);
}
.icon {
color: dark-light-choose($primary-high, $secondary-low);
}
li {
background-color: $tertiary-low;
@@ -249,7 +259,8 @@
color: $primary;
}
&:hover, &:focus {
&:hover,
&:focus {
background-color: $highlight-medium;
outline: none;
}
@@ -308,7 +319,8 @@
@include unselectable;
}
.logout-link, .dismiss-link {
.logout-link,
.dismiss-link {
display: inline-block;
}
.dismiss-link {
@@ -339,7 +351,8 @@ div.menu-links-header {
}
}
}
a:hover, a:focus {
a:hover,
a:focus {
background-color: $highlight-medium;
outline: none;
}
@@ -366,7 +379,8 @@ div.menu-links-header {
li:last-child {
text-align: right;
}
.fa, a {
.fa,
a {
color: dark-light-choose($primary-medium, $secondary-medium);
}

43
app/assets/stylesheets/common/base/modal.scss
View File

@@ -8,7 +8,6 @@
.tooltip {
z-index: z("modal", "tooltip");
}
}
.bootbox.modal {
@@ -63,21 +62,29 @@
.modal-backdrop,
.modal-backdrop.fade.in {
animation: fade .3s;
opacity: .9;
animation: fade 0.3s;
opacity: 0.9;
filter: alpha(opacity=90);
}
// fade in
@keyframes fade {
from { opacity: 0 }
to { opacity: .9 }
from {
opacity: 0;
}
to {
opacity: 0.9;
}
}
// slide in
@keyframes slidein {
from { transform: translateY(-20%); }
to { transform: translateY(0); }
from {
transform: translateY(-20%);
}
to {
transform: translateY(0);
}
}
.modal-outer-container {
@@ -113,10 +120,9 @@
.create-account.in .modal-inner-container,
.login-modal.in .modal-inner-container {
animation: slidein .3s;
animation: slidein 0.3s;
}
.inline-modal {
.modal-inner-container {
border: 1px solid $secondary-medium;
@@ -177,7 +183,6 @@
font-size: $font-0;
}
border-bottom: 1px solid $primary-low;
}
&.hidden {
@@ -364,8 +369,10 @@
}
.edit-category-modal {
.future-date-input, .num-featured-topics-fields, .position-fields {
input[type=text] {
.future-date-input,
.num-featured-topics-fields,
.position-fields {
input[type="text"] {
width: 50px;
}
}
@@ -406,7 +413,7 @@
}
section.minimum-required-tags {
input[type=number] {
input[type="number"] {
width: 50px;
}
}
@@ -417,7 +424,8 @@
transition: none;
background-color: transparent;
margin-right: 5px;
&:hover, &.active {
&:hover,
&.active {
color: $primary;
}
&.active {
@@ -434,7 +442,8 @@
height: 300px;
max-width: 700px;
width: 90vw; // forcing textarea wider
textarea, .incoming-email-html-part {
textarea,
.incoming-email-html-part {
height: 95%;
border: none;
border-top: 1px solid $primary-low;
@@ -462,7 +471,6 @@
.change-timestamp,
.poll-ui-builder {
.date-picker {
width: 9em;
}
@@ -475,7 +483,7 @@
}
}
input[type=time] {
input[type="time"] {
width: 6em;
text-align: center;
}
@@ -528,7 +536,6 @@
}
}
.modal-tab {
position: absolute;
width: 95%;

4
app/assets/stylesheets/common/base/not-found.scss
View File

@@ -19,7 +19,8 @@ h1.page-not-found {
}
}
.popular-topics, .recent-topics {
.popular-topics,
.recent-topics {
box-sizing: border-box;
width: 50%;
max-width: 400px;
@@ -47,4 +48,3 @@ h1.page-not-found {
flex-basis: 100%;
}
}

70
app/assets/stylesheets/common/base/onebox.scss
View File

@@ -5,11 +5,10 @@ a.loading-onebox {
size: 20px;
height: 25px;
repeat: no-repeat;
};
}
padding-left: 25px;
}
.onebox-result {
@include post-aside;
@@ -37,7 +36,6 @@ a.loading-onebox {
}
}
.onebox-result-body {
padding-top: 5px;
img {
@@ -47,7 +45,8 @@ a.loading-onebox {
float: left;
margin-right: 10px;
}
h3, h4 {
h3,
h4 {
margin: 0;
}
code {
@@ -102,23 +101,23 @@ aside.onebox {
}
}
@include onebox-favicon('stackexchange', 'stackexchange');
@include onebox-favicon('twitterstatus', 'twitter');
@include onebox-favicon('wikipedia', 'wikipedia');
@include onebox-favicon('githubblob', 'github');
@include onebox-favicon('githubcommit', 'github');
@include onebox-favicon('githubpullrequest', 'github');
@include onebox-favicon('githubissue', 'github');
@include onebox-favicon('githubgist', 'github');
@include onebox-favicon('amazon', 'amazon');
@include onebox-favicon('instagram', 'instagram');
@include onebox-favicon('googledocs', 'google_branding/logo_drive_48px');
@include onebox-favicon("stackexchange", "stackexchange");
@include onebox-favicon("twitterstatus", "twitter");
@include onebox-favicon("wikipedia", "wikipedia");
@include onebox-favicon("githubblob", "github");
@include onebox-favicon("githubcommit", "github");
@include onebox-favicon("githubpullrequest", "github");
@include onebox-favicon("githubissue", "github");
@include onebox-favicon("githubgist", "github");
@include onebox-favicon("amazon", "amazon");
@include onebox-favicon("instagram", "instagram");
@include onebox-favicon("googledocs", "google_branding/logo_drive_48px");
.onebox-body {
clear: both;
h3, h4 {
h3,
h4 {
font-size: $font-up-1;
margin: 0 0 10px 0;
}
@@ -160,7 +159,6 @@ aside.onebox {
// this allows us to load all onebox images without jiggle
// see: http://cssmojo.com/aspect-ratio-using-custom-properties-and-calc/
@supports (--custom: property) {
.aspect-image {
max-height: 170px;
--magic-ratio: calc(var(--aspect-ratio) + 0.15);
@@ -256,7 +254,8 @@ aside.onebox {
@mixin gdocs-logo($type) {
&.g-#{$type}-logo {
background: image-url("favicons/google_branding/logo_#{$type}_48px.png") no-repeat;
background: image-url("favicons/google_branding/logo_#{$type}_48px.png")
no-repeat;
}
}
@@ -264,12 +263,12 @@ aside.onebox {
width: 60px;
height: 50px;
float: left;
@include gdocs-logo('docs');
@include gdocs-logo('forms');
@include gdocs-logo('sheets');
@include gdocs-logo('slides');
@include gdocs-logo('calendar');
@include gdocs-logo('drive');
@include gdocs-logo("docs");
@include gdocs-logo("forms");
@include gdocs-logo("sheets");
@include gdocs-logo("slides");
@include gdocs-logo("calendar");
@include gdocs-logo("drive");
}
// Google Calendar Placeholder
@@ -282,7 +281,8 @@ aside.onebox {
width: 128px;
height: 128px;
&.g-calendar-logo {
background: image-url("favicons/google_branding/logo_calendar_128px.png") no-repeat;
background: image-url("favicons/google_branding/logo_calendar_128px.png")
no-repeat;
}
}
}
@@ -306,7 +306,7 @@ pre.onebox code ol.lines li:before {
display: inline-block;
width: 35px;
left: -40px;
color:#AFAFAF;
color: #afafaf;
text-align: right;
padding-right: 5px;
font-size: $font-down-1;
@@ -315,7 +315,6 @@ pre.onebox code ol.lines li:before {
counter-increment: li-counter;
}
pre.onebox code ol {
margin-left: 0;
line-height: $line-height-large;
@@ -336,13 +335,13 @@ pre.onebox code ol.lines li {
list-style-type: none;
padding-left: 5px;
margin-left: 0;
border-left: 1px solid #CFCFCF;
border-left: 1px solid #cfcfcf;
min-height: 1.5em; //show empty li lines
white-space: pre;
}
pre.onebox code li.selected {
background-color: dark-light-choose(#F8EEC7, #541);
background-color: dark-light-choose(#f8eec7, #541);
}
pre.onebox code {
@@ -351,7 +350,7 @@ pre.onebox code {
//Onebox - Github - Pull request
.onebox-body .github-commit-status {
background: #F5F5F5;
background: #f5f5f5;
border-radius: 5px;
margin: 0 0 5px 100px;
padding: 10px;
@@ -367,8 +366,7 @@ pre.onebox code {
text-transform: capitalize;
}
.onebox-body .build_status
{
.onebox-body .build_status {
padding: 2px;
font-size: $font-down-1;
}
@@ -400,7 +398,8 @@ aside.onebox.twitterstatus .onebox-body {
width: 48px;
height: 48px;
}
p, .tweet {
p,
.tweet {
white-space: pre-wrap;
padding-top: 3px;
margin-left: 70px;
@@ -483,7 +482,8 @@ aside.onebox.stackexchange .onebox-body {
// whitelistedgeneric twitter labels
.onebox.whitelistedgeneric {
.label1, .label2 {
.label1,
.label2 {
color: dark-light-choose($primary-medium, $secondary-medium);
}
.label1 {

4
app/assets/stylesheets/common/base/request_access.scss
View File

@@ -1,12 +1,12 @@
#request-access {
width: 325px;
margin: 0 auto;
input[type=text] {
input[type="text"] {
width: 320px;
height: 30px;
font-size: $font-up-3;
}
input[type=submit] {
input[type="submit"] {
font-size: $font-up-3;
padding: 10px;
}

49
app/assets/stylesheets/common/base/search.scss
View File

@@ -11,7 +11,7 @@
.search-query {
flex: 1;
margin: 0 .5em 0 0;
margin: 0 0.5em 0 0;
}
.search-cta {
@@ -22,7 +22,9 @@
.search-advanced {
width: 70%;
@include small-width { width: 65%; }
@include small-width {
width: 65%;
}
.search-actions,
.search-notice,
@@ -36,7 +38,7 @@
display: flex;
flex-wrap: wrap;
border-bottom: 3px solid $primary-low;
padding-bottom: .5em;
padding-bottom: 0.5em;
margin-bottom: 1em;
flex-direction: row;
align-items: center;
@@ -50,7 +52,7 @@
// spans can be in different orders depending of locale
span + span {
margin-left: .25em;
margin-left: 0.25em;
}
}
@@ -60,7 +62,7 @@
align-items: center;
.desc {
margin-right: .5em;
margin-right: 0.5em;
}
.combo-box {
@@ -75,11 +77,11 @@
align-items: center;
.bulk-select {
margin-left: .5em;
margin-left: 0.5em;
}
.fps-select a {
margin-left: .5em;
margin-left: 0.5em;
font-size: $font-down-1;
&:hover {
@@ -90,7 +92,7 @@
.search-notice {
.fps-invalid {
padding: .5em;
padding: 0.5em;
background-color: $danger-low;
border: 1px solid $danger-medium;
color: $danger;
@@ -100,7 +102,9 @@
.search-advanced-sidebar {
width: 30%;
@include small-width { width: 35%; }
@include small-width {
width: 35%;
}
margin-left: 1em;
display: flex;
flex-direction: column;
@@ -115,13 +119,14 @@
box-sizing: border-box;
width: 100%;
min-width: 100%;
input, .item {
input,
.item {
padding-left: 4px; // temporarily normalizing input padding for this section
}
}
.date-picker-wrapper {
margin-top: .5em;
margin-top: 0.5em;
}
.date-picker {
@@ -133,8 +138,10 @@
.search-advanced-title {
background: $primary-low;
padding: .358em 1em;
@include small-width { padding: .358em .5em; }
padding: 0.358em 1em;
@include small-width {
padding: 0.358em 0.5em;
}
font-weight: 700;
text-align: left;
font-weight: bold;
@@ -158,8 +165,11 @@
margin-top: 5px;
}
@include small-width {
padding: .75em .5em;
.ac-wrap, .choices, .select-kit.multi-select { // overriding inline width from JS
padding: 0.75em 0.5em;
.ac-wrap,
.choices,
.select-kit.multi-select {
// overriding inline width from JS
width: 100% !important;
}
.select-kit {
@@ -170,7 +180,6 @@
}
}
.fps-invalid {
margin-bottom: 1em;
}
@@ -184,7 +193,10 @@
.like-count {
color: dark-light-choose($primary-medium, $secondary-medium);
.fa { color: $love; font-size: $font-down-1; }
.fa {
color: $love;
font-size: $font-down-1;
}
}
.badge-wrapper span.badge-category {
@@ -208,7 +220,8 @@
color: $tertiary-high;
}
.search-link {
.topic-statuses, .topic-title {
.topic-statuses,
.topic-title {
font-size: $font-up-2;
line-height: $line-height-large;
}

8
app/assets/stylesheets/common/base/share_link.scss
View File

@@ -12,7 +12,7 @@
&.visible {
display: block;
}
input[type=text] {
input[type="text"] {
width: 96%;
}
.share-for-touch .overflow-ellipsis {
@@ -46,7 +46,7 @@
float: left;
line-height: $line-height-large;
margin-left: 8px;
margin-top: .5em;
margin-top: 0.5em;
.fa {
margin-right: 5px;
}
@@ -71,7 +71,7 @@
color: dark-light-choose($primary-medium, $secondary-medium);
}
input[type=text] {
input[type="text"] {
font-size: $font-up-1;
margin-bottom: 10px;
}
@@ -81,6 +81,6 @@
display: none;
}
.discourse-touch #share-link input[type=text] {
.discourse-touch #share-link input[type="text"] {
display: none;
}

31
app/assets/stylesheets/common/base/tagging.scss
View File

@@ -1,4 +1,3 @@
.topic-title-outlet.choose-tags {
margin-left: 25px;
margin-top: 3px;
@@ -31,8 +30,8 @@
}
.topic-header-extra .discourse-tag {
-webkit-animation: fadein .7s;
animation: fadein .7s;
-webkit-animation: fadein 0.7s;
animation: fadein 0.7s;
}
.bullet + .topic-header-extra {
@@ -59,7 +58,8 @@
&.bullet .badge-category {
}
&.box, &.bullet {
&.box,
&.bullet {
}
&.box + .topic-header-extra,
@@ -91,7 +91,8 @@ $tag-color: $primary-medium;
margin: 0;
color: $tag-color;
&:visited, &:hover {
&:visited,
&:hover {
color: $tag-color;
}
@@ -109,13 +110,16 @@ $tag-color: $primary-medium;
}
}
&.simple, &.simple:visited, &.simple:hover {
&.simple,
&.simple:visited,
&.simple:hover {
margin-right: 0;
color: $primary-high;
}
}
.discourse-tags, .list-tags {
.discourse-tags,
.list-tags {
.discourse-tag.simple:not(:last-child):after {
content: ", ";
margin-left: 1px;
@@ -127,7 +131,9 @@ $tag-color: $primary-medium;
display: inline-block;
font-size: $font-down-1;
}
.topic-featured-link { margin-left: 8px; }
.topic-featured-link {
margin-left: 8px;
}
}
.fps-result .add-full-page-tags {
@@ -156,7 +162,7 @@ $tag-color: $primary-medium;
font-size: $font-down-1;
margin-top: 0;
.discourse-tag {
margin-right: .2em;
margin-right: 0.2em;
}
.discourse-tag.box {
position: relative;
@@ -164,9 +170,8 @@ $tag-color: $primary-medium;
}
}
.discourse-tag.bullet {
margin-right: .25em;
margin-right: 0.25em;
&:before {
content: "\f04d";
font-family: FontAwesome;
@@ -177,7 +182,9 @@ $tag-color: $primary-medium;
}
}
header .discourse-tag {color: $tag-color }
header .discourse-tag {
color: $tag-color;
}
.list-tags {
display: inline-block;

6
app/assets/stylesheets/common/base/tooltip.scss
View File

@@ -22,7 +22,8 @@ $discourse-tooltip-border: $primary-medium;
background: $discourse-tooltip-background;
}
.tooltip-pointer:before, .tooltip-pointer:after {
.tooltip-pointer:before,
.tooltip-pointer:after {
position: absolute;
pointer-events: none;
border: solid transparent;
@@ -32,8 +33,7 @@ $discourse-tooltip-border: $primary-medium;
width: 0;
}
.tooltip-pointer:after
{
.tooltip-pointer:after {
border-bottom-color: $discourse-tooltip-background;
border-width: 8px;
left: 50%;

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

@@ -38,16 +38,24 @@
margin-left: 3px;
color: dark-light-choose($primary-medium, $secondary-medium);
}
.new_user a, .user-title, .user-title a {
.new_user a,
.user-title,
.user-title a {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
// global styles for the cooked HTML content in posts (and preview)
.cooked, .d-editor-preview {
.cooked,
.d-editor-preview {
word-wrap: break-word;
line-height: $line-height-large;
h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
margin: 30px 0 10px;
line-height: $line-height-medium;
}
@@ -76,19 +84,44 @@
font-size: $font-down-2;
}
a { word-wrap: break-word; }
ins { background-color: dark-light-choose($success-low, scale-color($success, $lightness: -60%)); }
del { background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%)); }
a {
word-wrap: break-word;
}
ins {
background-color: dark-light-choose(
$success-low,
scale-color($success, $lightness: -60%)
);
}
del {
background-color: dark-light-choose(
$danger-low,
scale-color($danger, $lightness: -60%)
);
}
// Prevents users from breaking posts with tag nesting
big { font-size: 1.5rem; }
small { font-size: 0.75rem; }
small small { font-size: .75em; }
big big { font-size: 1em; }
sub sub sub {bottom: 0;}
sup sup sup {top: 0;}
big {
font-size: 1.5rem;
}
small {
font-size: 0.75rem;
}
small small {
font-size: 0.75em;
}
big big {
font-size: 1em;
}
sub sub sub {
bottom: 0;
}
sup sup sup {
top: 0;
}
}
.cooked, .d-editor-preview {
.cooked,
.d-editor-preview {
video {
max-width: 100%;
}
@@ -122,7 +155,9 @@ aside.quote {
margin-top: 1em;
margin-bottom: 1em;
.badge-wrapper { margin-left: 5px; }
.badge-wrapper {
margin-left: 5px;
}
.title {
@include post-aside;
@@ -131,8 +166,12 @@ aside.quote {
// IE will screw up the blockquote underneath if bottom padding is 0px
padding: 12px 12px 1px 12px;
// blockquote is underneath this and has top margin
.avatar { margin-right: 7px; }
img { margin-top: -4px; }
.avatar {
margin-right: 7px;
}
img {
margin-top: -4px;
}
@include unselectable;
}
@@ -142,7 +181,8 @@ aside.quote {
}
}
.quote-controls, .quote-controls .d-icon {
.quote-controls,
.quote-controls .d-icon {
color: dark-light-choose($primary-low-mid, $secondary-high);
}
@@ -153,7 +193,8 @@ aside.quote {
}
.post-action {
.undo-action, .act-action{
.undo-action,
.act-action {
margin-left: 5px;
}
}
@@ -195,7 +236,8 @@ aside.quote {
}
}
.topic-avatar, .user-card-avatar {
.topic-avatar,
.user-card-avatar {
position: relative;
}
@@ -270,10 +312,13 @@ aside.quote {
margin: 1px 5px 2px 0;
}
}
}
.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster, .user-profile-avatar {
.topic-avatar,
.avatar-flair-preview,
.user-card-avatar,
.topic-map .poster,
.user-profile-avatar {
.avatar-flair {
display: flex;
align-items: center;
@@ -285,7 +330,9 @@ aside.quote {
right: -6px;
}
}
.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair, .collapsed-info .user-profile-avatar .avatar-flair {
.topic-avatar .avatar-flair,
.avatar-flair-preview .avatar-flair,
.collapsed-info .user-profile-avatar .avatar-flair {
background-size: 20px 20px;
width: 20px;
height: 20px;
@@ -298,7 +345,8 @@ aside.quote {
right: -8px;
}
}
.user-card-avatar .avatar-flair, .user-profile-avatar .avatar-flair {
.user-card-avatar .avatar-flair,
.user-profile-avatar .avatar-flair {
background-size: 40px 40px;
width: 40px;
height: 40px;
@@ -368,11 +416,13 @@ aside.quote {
}
.post-info {
&.via-email, &.whisper {
&.via-email,
&.whisper {
line-height: $line-height-medium;
}
&.via-email, &.whisper, &.post-locked {
&.via-email,
&.whisper,
&.post-locked {
margin-right: 5px;
.d-icon {
font-size: $font-0;
@@ -403,8 +453,7 @@ pre {
}
}
kbd
{
kbd {
background-color: $secondary;
border: 1px solid $primary-low;
border-radius: 3px;
@@ -417,14 +466,16 @@ kbd
display: inline-block;
font-size: $font-down-1;
line-height: $line-height-large;
margin: 0 .1em;
padding: .1em .6em;
margin: 0 0.1em;
padding: 0.1em 0.6em;
// don't allow more than 3 nested elements to prevent FF from crashing
// cf. http://what.thedailywtf.com/t/nested-elements/7927
// 3 levels are needed to prevent highlighted words being hidden
// cf. https://meta.discourse.org/t/word-disappears-when-searched-and-in-details-summary-kbd-b/25741
* * * { display: none; }
* * * {
display: none;
}
}
// we assume blockquotes have their own margins, so all blockquotes
@@ -453,8 +504,8 @@ blockquote > *:last-child {
}
}
.cooked table, .d-editor-preview table {
.cooked table,
.d-editor-preview table {
thead {
border-bottom: 2px solid lighten($primary, 80%);
th {
@@ -463,7 +514,8 @@ blockquote > *:last-child {
}
}
td,th {
td,
th {
padding: 3px 3px 3px 10px;
}
}
@@ -475,7 +527,7 @@ blockquote > *:last-child {
border-top: 1px solid $primary-low;
.topic-avatar {
align-self: flex-start;
padding: .7em 0;
padding: 0.7em 0;
border-top: none;
margin-right: 11px;
i {
@@ -487,7 +539,12 @@ blockquote > *:last-child {
}
.small-action.deleted {
background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-60%
);
}
.small-action-desc.timegap {
@@ -527,7 +584,6 @@ blockquote > *:last-child {
margin: 0;
line-height: $line-height-medium;
flex: 1 1;
}
}
@@ -554,7 +610,8 @@ blockquote > *:last-child {
}
}
a.mention, a.mention-group {
a.mention,
a.mention-group {
padding: 2px 4px;
color: dark-light-choose($primary-high, $secondary-low);
background: $primary-low;
@@ -577,12 +634,13 @@ a.mention, a.mention-group {
.large-image-placeholder {
> a {
&.link {
margin-right: 10px;
}
> * { overflow: hidden; }
> * {
overflow: hidden;
}
> i.fa {
color: dark-light-choose($primary-medium, $secondary-medium);
@@ -614,7 +672,8 @@ a.mention, a.mention-group {
}
}
.broken-image, .large-image {
.broken-image,
.large-image {
color: dark-light-choose($primary-low-mid, $secondary-high);
border: 1px solid $primary-low;
font-size: $font-up-5;
@@ -623,13 +682,16 @@ a.mention, a.mention-group {
/* below standard tablet portrait ----------- */
@media all
and (max-width : 767px) {
@media all and (max-width: 767px) {
.reply-to-tab {
span {display: none;}
span {
display: none;
}
}
.names {
span {display: block;}
span {
display: block;
}
}
.user-title {
float: left;

31
app/assets/stylesheets/common/base/topic.scss
View File

@@ -1,9 +1,19 @@
@keyframes button-jump-up {
0% { bottom: 0;}
50% { bottom: 45px;}
65% { bottom: 40px;}
77% { bottom: 43px;}
100% { bottom: 40px;}
0% {
bottom: 0;
}
50% {
bottom: 45px;
}
65% {
bottom: 40px;
}
77% {
bottom: 43px;
}
100% {
bottom: 40px;
}
}
.progress-back-container {
@@ -92,7 +102,9 @@ a.badge-category {
margin-top: 5px;
}
a.edit-topic i { font-size: 0.8em; }
a.edit-topic i {
font-size: 0.8em;
}
.edit-topic-title {
display: flex;
@@ -105,13 +117,13 @@ a.badge-category {
.private-message-glyph {
margin: 5px 5px 0 0;
}
.category-chooser, .mini-tag-chooser {
.category-chooser,
.mini-tag-chooser {
flex: 1 1 49%;
margin: 0 0 9px 0;
@media all and (max-width: 500px) {
flex: 1 1 100%;
}
}
.mini-tag-chooser {
margin-left: 2%;
@@ -141,7 +153,6 @@ a.badge-category {
}
}
.topic-title-outlet {
clear: both;
}
@@ -243,7 +254,7 @@ a.badge-category {
i {
background: $secondary;
border-radius: 20px;
transition: all linear .15s;
transition: all linear 0.15s;
}
&:hover {
color: $tertiary;

11
app/assets/stylesheets/common/base/user-badges.scss
View File

@@ -50,11 +50,14 @@
.badges-listing {
display: block;
.info, .grant-count {
.info,
.grant-count {
text-align: left;
}
.row > div.info { display: none; }
.row > div.info {
display: none;
}
.row {
display: block;
@@ -124,7 +127,7 @@
background-color: $primary-very-low;
border: 1px solid $primary-low;
margin-bottom: 2vh;
transition: box-shadow .25s;
transition: box-shadow 0.25s;
.check-display {
position: absolute;
@@ -257,7 +260,7 @@
margin: 20px 0;
color: dark-light-choose($primary-medium, $secondary-medium);
h3 {
margin-bottom: 1.0em;
margin-bottom: 1em;
}
}

27
app/assets/stylesheets/common/base/user.scss
View File

@@ -48,7 +48,8 @@
}
}
dt, dd {
dt,
dd {
display: inline-flex;
align-items: center;
}
@@ -62,10 +63,10 @@
&.groups {
span:after {
content: ','
content: ",";
}
span:last-of-type:after {
content:''
content: "";
}
}
}
@@ -78,7 +79,7 @@
}
.details {
background: rgba($secondary, .8);
background: rgba($secondary, 0.8);
blockquote {
background-color: $secondary-low;
@@ -88,7 +89,9 @@
h1 {
font-size: $font-up-5;
font-weight: normal;
i {font-size: .8em;}
i {
font-size: 0.8em;
}
}
h2 {
@@ -180,7 +183,7 @@
.details {
margin-top: 0;
background: rgba($secondary, .8);
background: rgba($secondary, 0.8);
.bio {
display: none;
@@ -227,7 +230,8 @@
color: $secondary;
display: flex;
padding: 10px;
> div, > div a {
> div,
> div a {
display: flex;
align-items: baseline;
flex: 0 1 auto;
@@ -263,15 +267,15 @@
}
.flagged-posts {
background-color: #E49735;
background-color: #e49735;
}
.warnings-received {
background-color: #EC441B;
background-color: #ec441b;
}
.deleted-posts {
background-color: #EC441B;
background-color: #ec441b;
}
.suspensions {
@@ -427,7 +431,8 @@
padding: 10px 14px;
margin: 0 5px 10px 0;
&.linked-stat { // This makes the entire "box" (the li) clickable instead of a narrow area.
&.linked-stat {
// This makes the entire "box" (the li) clickable instead of a narrow area.
padding: 0;
a {
padding: 10px 14px;

27
app/assets/stylesheets/common/base/username_tagsinput.scss
View File

@@ -1,6 +1,6 @@
div.tagsinput {
border:1px solid #CCC;
background: #FFF;
border: 1px solid #ccc;
background: #fff;
padding: 5px 5px 0;
width: 584px;
height: 100px;
@@ -23,7 +23,12 @@ div.tagsinput span.tag {
font-size: $font-down-1;
}
div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: $font-down-2; }
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;
@@ -35,6 +40,16 @@ div.tagsinput input {
outline: 0;
margin: 0 5px 5px 0;
}
div.tagsinput div { display:block; float: left; }
.tags_clear { clear: both; width: 100%; height: 0; }
.not_valid {background: #FBD8DB !important; color: #90111A !important;}
div.tagsinput div {
display: block;
float: left;
}
.tags_clear {
clear: both;
width: 100%;
height: 0;
}
.not_valid {
background: #fbd8db !important;
color: #90111a !important;
}

21
app/assets/stylesheets/common/components/badges.scss
View File

@@ -47,13 +47,15 @@
color: $header-primary;
}
}
.badge-category-parent-bg, .badge-category-bg {
.badge-category-parent-bg,
.badge-category-bg {
width: 9px;
height: 9px;
margin-right: 5px;
display: inline-block;
}
.badge-category-parent-bg { // Subcategories
.badge-category-parent-bg {
// Subcategories
width: 5px;
margin-right: 0;
+ .badge-category-bg {
@@ -71,7 +73,8 @@
span {
overflow: hidden;
text-overflow: ellipsis;
&.badge-category-bg, &.badge-category-parent-bg {
&.badge-category-bg,
&.badge-category-parent-bg {
position: absolute;
top: 0;
right: 0;
@@ -79,7 +82,8 @@
left: 0;
}
&.badge-category-parent-bg { // Subcategories
&.badge-category-parent-bg {
// Subcategories
width: calc(100% - 5px);
& + .badge-category-bg {
left: 5px;
@@ -115,7 +119,9 @@
}
}
.badge-category-parent-bg, .badge-category-bg { // Subcategories
.badge-category-parent-bg,
.badge-category-bg {
// Subcategories
display: inline-block;
padding: 0 1px;
@@ -131,10 +137,8 @@
color: $primary;
margin-right: 5px;
}
}
// Category badge dropdown
// --------------------------------------------------
@@ -171,7 +175,8 @@
// New posts
&.new-posts, &.unread-posts {
&.new-posts,
&.unread-posts {
background-color: dark-light-choose($tertiary-medium, $tertiary);
color: dark-light-choose($secondary, $secondary);
font-weight: dark-light-choose(normal, bold);

39
app/assets/stylesheets/common/components/buttons.scss
View File

@@ -14,12 +14,14 @@
line-height: $line-height-medium;
text-align: center;
cursor: pointer;
transition: all .25s;
transition: all 0.25s;
&:active, &.btn-active {
&:active,
&.btn-active {
text-shadow: none;
}
&[disabled], &.disabled {
&[disabled],
&.disabled {
cursor: default;
opacity: 0.4;
}
@@ -49,13 +51,17 @@
&[href] {
color: $primary;
}
&:hover, &.btn-hover {
&:hover,
&.btn-hover {
background: $primary-medium;
color: $secondary;
}
&[disabled], &.disabled {
&[disabled],
&.disabled {
background: $primary-low;
&:hover { color: dark-light-choose($primary-low-mid, $secondary-high); }
&:hover {
color: dark-light-choose($primary-low-mid, $secondary-high);
}
cursor: not-allowed;
}
@@ -80,15 +86,18 @@
&[href] {
color: $secondary;
}
&:hover, &.btn-hover {
&:hover,
&.btn-hover {
color: #fff;
background: dark-light-choose($tertiary, $tertiary);
}
&:active, &.btn-active {
&:active,
&.btn-active {
@include linear-gradient($tertiary, $tertiary);
color: $secondary;
}
&[disabled], &.disabled {
&[disabled],
&.disabled {
background: $tertiary;
}
}
@@ -103,13 +112,16 @@
&[href] {
color: $secondary;
}
&:hover, &.btn-hover {
&:hover,
&.btn-hover {
background: scale-color($danger, $lightness: -20%);
}
&:active, &.btn-active {
&:active,
&.btn-active {
@include linear-gradient(scale-color($danger, $lightness: -20%), $danger);
}
&[disabled], &.disabled {
&[disabled],
&.disabled {
background: $danger;
}
}
@@ -130,7 +142,8 @@
font-family: FontAwesome;
font-size: $font-0;
}
&.google, &.google_oauth2 {
&.google,
&.google_oauth2 {
background: $google;
&:before {
content: $fa-var-google;

3
app/assets/stylesheets/common/components/date-picker.scss
View File

@@ -1,5 +1,6 @@
.pika-table {
th, td {
th,
td {
padding: 0 !important;
border-top: none !important;
border-bottom: none !important;

3
app/assets/stylesheets/common/components/hashtag.scss
View File

@@ -2,7 +2,8 @@ a.hashtag {
color: dark-light-choose($primary, $primary-low-mid);
font-weight: bold;
&:visited, &:hover {
&:visited,
&:hover {
color: dark-light-choose($primary, $primary-low-mid);
}

9
app/assets/stylesheets/common/components/keyboard_shortcuts.scss
View File

@@ -1,8 +1,11 @@
.topic-list-item td:first-child, .topic-post {
.topic-list-item td:first-child,
.topic-post {
border-left: 1px solid transparent;
}
.topic-list tr.selected td:first-child, .topic-list-item.selected td:first-child, .topic-post.selected {
.topic-list tr.selected td:first-child,
.topic-list-item.selected td:first-child,
.topic-post.selected {
box-shadow: -3px 0 0 $danger;
}
@@ -27,7 +30,7 @@
margin-left: 0;
li {
margin: 5px 0
margin: 5px 0;
}
b {

6
app/assets/stylesheets/common/components/navs.scss
View File

@@ -31,11 +31,11 @@
color: $primary;
font-size: $font-up-1;
line-height: $line-height-medium;
transition: background .15s;
transition: background 0.15s;
.d-icon {
margin-right: 5px;
opacity: .65;
opacity: 0.65;
}
&:hover {
@@ -110,7 +110,7 @@
font-size: $font-down-1;
width: 1.25em;
text-align: center;
margin-right: .5em;
margin-right: 0.5em;
line-height: $line-height-large;
}
}

4
app/assets/stylesheets/common/components/user-info.scss
View File

@@ -53,7 +53,8 @@
&.medium {
min-height: 60px;
.username, .name {
.username,
.name {
display: block;
}
@@ -76,4 +77,3 @@
}
}
}

22
app/assets/stylesheets/common/components/user-stream-item.scss
View File

@@ -1,6 +1,5 @@
// Common styles for "user-stream-item" component
.user-stream {
// DEPRECATED:
// The ".item" class should be removed because it's too generic.
// Once ".item" has been removed, ".user-stream-item" can replace
@@ -17,7 +16,12 @@
&.deleted {
opacity: 0.8;
background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -10%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-10%
);
}
&.hidden {
@@ -43,7 +47,8 @@
font-size: $font-0;
}
.expand-item, .collapse-item {
.expand-item,
.collapse-item {
float: right;
margin-right: 0.5em;
line-height: $line-height-small;
@@ -71,7 +76,10 @@
}
.edit-reason {
background-color: dark-light-choose($highlight-medium, scale-color($highlight, $lightness: -50%));
background-color: dark-light-choose(
$highlight-medium,
scale-color($highlight, $lightness: -50%)
);
padding: 3px 5px 5px 5px;
}
@@ -100,7 +108,8 @@
}
// common/base/header.scss
.fa, .icon {
.fa,
.icon {
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: $font-up-4;
}
@@ -122,7 +131,7 @@
}
}
.user-stream .child-actions, // DEPRECATED: '.user-stream .child-actions' selector
.user-stream .child-actions, /* DEPRECATED: '.user-stream .child-actions' selector*/
.user-stream-item-actions {
margin-top: 8px;
@@ -137,4 +146,3 @@
color: $primary;
}
}

16
app/assets/stylesheets/common/foundation/base.scss
View File

@@ -54,12 +54,14 @@ dd {
padding: 0;
}
.cooked ul, .cooked ol, .cooked dd {
.cooked ul,
.cooked ol,
.cooked dd {
clear: both;
}
.cooked ul, .d-editor-preview ul {
.cooked ul,
.d-editor-preview ul {
margin: 0;
padding-left: 40px;
}
@@ -93,12 +95,14 @@ pre code {
}
// TODO figure out a clean place to put stuff like this
.row:before, .row:after {
.row:before,
.row:after {
display: table;
content: "";
}
.row:after {clear: both;}
.row:after {
clear: both;
}
#offscreen-content {
display: none;

3
app/assets/stylesheets/common/foundation/helpers.scss
View File

@@ -77,10 +77,9 @@
cursor: pointer;
}
// Buttons
// ---------------------------------------------------
.disable-no-hover:hover {
background: dark-light-choose($primary-low, $secondary-medium);;
background: dark-light-choose($primary-low, $secondary-medium);
color: $primary;
}

1
app/assets/stylesheets/common/foundation/math.scss
View File

@@ -33,7 +33,6 @@ $SQRT2: 1.4142135623730951;
@return $ret;
}
// Returns a two-element list containing the normalized fraction and exponent of number.
// @param {Number} $x
// @return {List} fraction, exponent

36
app/assets/stylesheets/common/foundation/mixins.scss
View File

@@ -5,7 +5,6 @@
// Media queries
// --------------------------------------------------
@mixin small-width {
@media all and (max-width: 850px) {
@content;
@@ -24,11 +23,31 @@
}
}
@mixin mobile-portrait { @media all and (max-width : 320px) { @content; } }
@mixin not-mobile-portrait { @media all and (min-width : 321px) { @content; } }
@mixin mobile-landscape { @media all and (min-width : 321px) and (max-width : 959px) { @content; } }
@mixin not-tablet-landscape { @media all and (max-width : 959px) { @content; } }
@mixin tablet-landscape { @media all and (min-width : 960px) { @content; } }
@mixin mobile-portrait {
@media all and (max-width: 320px) {
@content;
}
}
@mixin not-mobile-portrait {
@media all and (min-width: 321px) {
@content;
}
}
@mixin mobile-landscape {
@media all and (min-width: 321px) and (max-width: 959px) {
@content;
}
}
@mixin not-tablet-landscape {
@media all and (max-width: 959px) {
@content;
}
}
@mixin tablet-landscape {
@media all and (min-width: 960px) {
@content;
}
}
// CSS3 properties
// --------------------------------------------------
@@ -98,7 +117,6 @@
@include user-select(none);
}
// Stuff we repeat
@mixin post-aside {
border-left: 5px solid $primary-low;
@@ -111,8 +129,8 @@
transform: $transforms;
}
@mixin appearance-none() { // resets default browser styles
@mixin appearance-none() {
// resets default browser styles
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;

39
app/assets/stylesheets/common/foundation/variables.scss
View File

@@ -17,7 +17,7 @@ $input-padding: 4px 10px;
$google: #5b76f7 !default;
$instagram: #125688 !default;
$facebook: #3b5998 !default;
$cas: #70BA61 !default;
$cas: #70ba61 !default;
$twitter: #00bced !default;
$yahoo: #810293 !default;
$github: #6d6d6d !default;
@@ -43,12 +43,12 @@ $font-up-3: 1.5157em;
$font-up-2: 1.3195em;
$font-up-1: 1.1487em; // 2^(1/5)
$font-0: 1em;
$font-down-1: .8706em; // 2^(-1/5)
$font-down-2: .7579em; // Smallest size we use based on the 1em base
$font-down-3: .6599em;
$font-down-4: .5745em;
$font-down-5: .5em;
$font-down-6: .4355em;
$font-down-1: 0.8706em; // 2^(-1/5)
$font-down-2: 0.7579em; // Smallest size we use based on the 1em base
$font-down-3: 0.6599em;
$font-down-4: 0.5745em;
$font-down-5: 0.5em;
$font-down-6: 0.4355em;
// Common line-heights
$line-height-small: 1;
@@ -73,7 +73,7 @@ $z-layers: (
"popover": 1500,
"dropdown": 1400,
"content": 1300,
"overlay": 1200,
"overlay": 1200
),
"mobile-composer": 1100,
"header": 1000,
@@ -82,7 +82,7 @@ $z-layers: (
"dropdown": 700,
"tooltip": 600,
"popover": 500,
"content": 400,
"content": 400
),
"dropdown": 300,
"usercard": 200,
@@ -114,7 +114,6 @@ $z-layers: (
@return map-deep-get($z-layers, $layers...);
}
// Box-shadow
// --------------------------------------------------
@@ -125,7 +124,10 @@ $box-shadow: (
"card": 0 4px 14px rgba(0, 0, 0, 0.15),
"dropdown": 0 2px 3px 0 rgba(0, 0, 0, 0.2),
"header": 0 2px 4px -1px rgba(0, 0, 0, 0.25),
"kbd": (0 2px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px dark-light-choose(#fff, #000) inset),
"kbd": (
0 2px 0 rgba(0, 0, 0, 0.2),
0 0 0 1px dark-light-choose(#fff, #000) inset
),
"focus": 0 0 6px 0 $tertiary,
"focus-danger": 0 0 6px 0 $danger
);
@@ -139,7 +141,9 @@ $box-shadow: (
// w3c definition of color brightness https://www.w3.org/TR/AERT#color-contrast
@function dc-color-brightness($color) {
@return ((red($color) * .299) + (green($color) * .587) + (blue($color) * .114));
@return (
(red($color) * 0.299) + (green($color) * 0.587) + (blue($color) * 0.114)
);
}
// Uses an approximation of sRGB blending, GAMMA=2 instead of GAMMA=2.2
@@ -166,8 +170,15 @@ $box-shadow: (
@return srgb-scale($primary, $secondary, $percent);
}
@function dark-light-diff($adjusted-color, $comparison-color, $lightness, $darkness) {
@if dc-color-brightness($adjusted-color) < dc-color-brightness($comparison-color) {
@function dark-light-diff(
$adjusted-color,
$comparison-color,
$lightness,
$darkness
) {
@if dc-color-brightness($adjusted-color) <
dc-color-brightness($comparison-color)
{
@return scale-color($adjusted-color, $lightness: $lightness);
} @else {
@return scale-color($adjusted-color, $lightness: $darkness);

5
app/assets/stylesheets/common/input_tip.scss
View File

@@ -11,7 +11,8 @@
color: white;
box-shadow: shadow("dropdown");
}
&.hide, &.good {
&.hide,
&.good {
display: none;
}
.close {
@@ -23,6 +24,6 @@
cursor: pointer;
}
.close:hover {
opacity: 1.0;
opacity: 1;
}
}

47
app/assets/stylesheets/common/printer-friendly.scss
View File

@@ -40,16 +40,40 @@
}
/* bottom border to help separate posts */
div.row {
border-top: 1px solid #AAA;
border-top: 1px solid #aaa;
}
.cooked pre code {
max-height: none;
}
#main-outlet {
padding: 0 !important;
}
html,
body {
min-width: 0;
height: auto;
}
.lightbox-wrapper img {
max-width: 500px !important;
height: auto !important;
}
.topic-body {
width: auto;
margin: 0;
padding: 0;
float: none;
}
.topic-post article.boxed .select-posts {
width: auto;
left: auto;
right: 0;
}
.gap {
width: auto;
}
.gutter {
padding: 0;
}
.cooked pre code { max-height: none; }
#main-outlet { padding: 0 !important; }
html,body { min-width: 0; height: auto; }
.lightbox-wrapper img { max-width: 500px !important; height: auto !important; }
.topic-body { width: auto; margin: 0; padding: 0; float: none; }
.topic-post article.boxed .select-posts { width: auto; left: auto; right: 0; }
.gap { width: auto; }
.gutter { padding: 0; }
/* restyle div#topic-title */
#topic-title {
margin: 0;
@@ -62,8 +86,9 @@
font-weight: normal;
font-size: normal;
}
a, a:visited {
color: #DDD;
a,
a:visited {
color: #ddd;
font-weight: bold;
}
/* hide OP Solved plugin stuff */

1
app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
View File

@@ -1,6 +1,5 @@
.select-kit {
&.dropdown-select-box {
&.admin-agree-flag-dropdown {
.select-kit-body {
width: 485px;

5
app/assets/stylesheets/common/select-kit/category-drop.scss
View File

@@ -1,7 +1,6 @@
.select-kit {
&.combo-box {
&.category-drop {
.badge-wrapper {
font-size: $font-0;
font-weight: normal;
@@ -33,7 +32,6 @@
.badge-wrapper {
margin-right: 0;
}
}
.select-kit-body {
@@ -65,7 +63,8 @@
}
}
&.is-expanded .select-kit-wrapper, .select-kit-wrapper {
&.is-expanded .select-kit-wrapper,
.select-kit-wrapper {
display: none;
}
}

3
app/assets/stylesheets/common/select-kit/category-row.scss
View File

@@ -1,6 +1,7 @@
.select-kit {
.category-row {
.category-status, .category-desc {
.category-status,
.category-desc {
display: flex;
flex-wrap: wrap;
align-items: center;

3
app/assets/stylesheets/common/select-kit/category-selector.scss
View File

@@ -1,4 +1,5 @@
.select-kit, .select-kit-box {
.select-kit,
.select-kit-box {
&.category-selector {
.selected-name {
.badge-wrapper {

3
app/assets/stylesheets/common/select-kit/composer-actions.scss
View File

@@ -14,7 +14,8 @@
margin: 0 !important;
}
&:hover, &:focus {
&:hover,
&:focus {
background: $primary-low;
}
}

5
app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
View File

@@ -89,7 +89,10 @@
flex: 1;
font-size: $font-down-1;
font-weight: normal;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
color: dark-light-choose(
scale-color($primary, $lightness: 50%),
scale-color($secondary, $lightness: 40%)
);
white-space: normal;
}
}

7
app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
View File

@@ -36,7 +36,8 @@
border-top: 0;
}
&.is-expanded .select-kit-wrapper, .select-kit-wrapper {
&.is-expanded .select-kit-wrapper,
.select-kit-wrapper {
display: none;
}
@@ -78,9 +79,9 @@
}
&:after {
content: '\f00d';
content: "\f00d";
color: $primary-low-mid;
font-family: 'FontAwesome';
font-family: "FontAwesome";
}
&:hover {

11
app/assets/stylesheets/common/select-kit/multi-select.scss
View File

@@ -91,7 +91,8 @@
outline: none;
flex: 1;
.filter-input, .filter-input:focus {
.filter-input,
.filter-input:focus {
border: none;
background: none;
display: inline-block;
@@ -137,9 +138,9 @@
align-items: center;
&:after {
content: '\f00d';
content: "\f00d";
color: $primary-low-mid;
font-family: 'FontAwesome';
font-family: "FontAwesome";
font-size: $font-down-2;
margin-left: 5px;
}
@@ -178,9 +179,9 @@
line-height: $line-height-medium;
&:after {
content: '\f00d';
content: "\f00d";
color: $primary-low-mid;
font-family: 'FontAwesome';
font-family: "FontAwesome";
font-size: $font-down-2;
}

5
app/assets/stylesheets/common/select-kit/period-chooser.scss
View File

@@ -42,7 +42,8 @@
font-size: $font-up-3;
}
&.is-focused, &:hover {
&.is-focused,
&:hover {
background: none;
border: none;
outline: none;
@@ -51,7 +52,7 @@
.period-chooser-row {
font-weight: bold;
padding: 5px;;
padding: 5px;
font-size: $font-up-1;
align-items: center;
display: flex;

9
app/assets/stylesheets/common/select-kit/select-kit.scss
View File

@@ -59,7 +59,7 @@
.select-kit-header {
box-sizing: border-box;
overflow: hidden;
transition: all .25s;
transition: all 0.25s;
cursor: pointer;
outline: none;
display: flex;
@@ -148,7 +148,8 @@
background: $tertiary-low;
}
.discourse-tag, .discourse-tag-count {
.discourse-tag,
.discourse-tag-count {
color: $primary;
}
}
@@ -203,7 +204,9 @@
align-items: center;
justify-content: space-between;
.filter-input, .filter-input:focus, .filter-input:active {
.filter-input,
.filter-input:focus,
.filter-input:active {
background: none;
margin: 0;
padding: 0;

8
app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
View File

@@ -12,9 +12,10 @@
margin-bottom: 5px;
padding: 6px 3px;
background: $primary-low;
transition: all .25s;
transition: all 0.25s;
.name, .d-icon {
.name,
.d-icon {
font-size: $font-0;
font-weight: normal;
color: $primary;
@@ -27,7 +28,8 @@
&.is-highlighted {
background: $primary-medium;
.name, .d-icon {
.name,
.d-icon {
color: $secondary;
}
}

1
app/assets/stylesheets/common/topic-entrance.scss
View File

@@ -1,5 +1,4 @@
#topic-entrance {
border: 1px solid $primary-low;
padding: 5px;
background: $secondary;

7
app/assets/stylesheets/common/topic-timeline.scss
View File

@@ -120,7 +120,7 @@
right: 0;
margin-left: 0;
i.progress {
display: none
display: none;
}
}
.timeline-footer-controls {
@@ -129,7 +129,8 @@
bottom: 10px;
left: 10px;
button, .btn-group {
button,
.btn-group {
float: none;
display: inline-block;
margin-bottom: 0;
@@ -170,13 +171,11 @@
}
}
.timeline-scrollarea-wrapper::after {
content: "";
display: table;
clear: both;
}
}
.topic-timeline {

8
app/assets/stylesheets/desktop/category-list.scss
View File

@@ -2,7 +2,8 @@
margin-bottom: 10px;
width: 100%;
td, th {
td,
th {
@extend .list-cell;
}
@@ -83,7 +84,6 @@
}
tbody {
.category {
border-left: 6px solid;
h3 {
@@ -104,7 +104,8 @@
}
}
.categories-and-latest, .categories-and-top {
.categories-and-latest,
.categories-and-top {
display: flex;
flex-flow: row wrap;
@@ -134,4 +135,3 @@
padding-left: 8px;
}
}

1
app/assets/stylesheets/desktop/components/user-stream-item.scss
View File

@@ -1,6 +1,5 @@
// Desktop styles for "user-stream-item" component
.user-stream {
// DEPRECATION:
// The ".item" class should be eventually removed because it's too generic.
// Once ".item" has been removed, ".user-stream-item" can replace

11
app/assets/stylesheets/desktop/compose.scss
View File

@@ -58,7 +58,7 @@
padding: 4px 0;
background: $tertiary;
&:before {
content: '';
content: "";
display: block;
width: 27px;
margin: auto;
@@ -89,7 +89,6 @@
z-index: z("composer", "dropdown") + 1;
}
&.urgent {
background: $danger-low;
}
@@ -114,17 +113,16 @@
opacity: 0.5;
font-size: $font-up-1;
&:before {
content: 'esc';
content: "esc";
font-size: $font-down-1;
margin-right: 0.5em;
}
}
a.close:hover {
opacity: 1.0;
opacity: 1;
}
ul.topics {
list-style: none;
margin: 0;
@@ -167,7 +165,8 @@
padding: 0;
}
.search-link {
.fa, .blurb {
.fa,
.blurb {
color: dark-light-choose($primary-high, $secondary-medium);
}
span.topic {

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

@@ -36,20 +36,19 @@ header {
}
}
.form-vertical {
.control-group {
margin-bottom: 24px;
}
}
/***********************/
/* bootstrap carryover */
/***********************/
code,
pre {
font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono",
"DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
}
// this removes the unwanted top margin on a paragraph under a heading
@@ -88,7 +87,8 @@ textarea {
color: $primary;
}
input, textarea {
input,
textarea {
width: 210px;
}
@@ -252,7 +252,6 @@ input {
box-shadow: shadow("focus-danger");
}
}
}
&.warning {
@@ -367,12 +366,8 @@ input {
}
}
// Media Queries
@media all
and (max-width : 570px) {
@media all and (max-width: 570px) {
body {
min-width: 0;
}

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

@@ -33,8 +33,7 @@
.group-activity-outlet,
.group-messages-outlet,
.group-manage-outlet
{
.group-manage-outlet {
width: 85%;
}

2
app/assets/stylesheets/desktop/header.scss
View File

@@ -45,7 +45,7 @@
header {
#site-text-logo {
font-size: $font-up-3;
margin-top: .4em;
margin-top: 0.4em;
line-height: $line-height-medium;
}
}

4
app/assets/stylesheets/desktop/history.scss
View File

@@ -1,7 +1,6 @@
// styles that apply to the popup that appears when you show the edit history of a post
.modal.history-modal {
.modal-inner-container {
max-width: 960px;
}
@@ -59,7 +58,8 @@
white-space: pre-wrap;
}
}
.revision-content, .markdown {
.revision-content,
.markdown {
img {
max-width: 100%;
box-sizing: border-box;

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

@@ -1,4 +1,5 @@
.latest-topic-list, .top-topic-list {
.latest-topic-list,
.top-topic-list {
@extend .topic-list-icons;
.table-heading {
@@ -6,7 +7,8 @@
color: dark-light-choose($primary-medium, $secondary-high);
}
.no-topics, .more-topics {
.no-topics,
.more-topics {
margin-top: 1em;
}
}

9
app/assets/stylesheets/desktop/modal.scss
View File

@@ -17,8 +17,8 @@
}
.modal.in {
-webkit-animation: fade .25s;
animation: fade .25s;
-webkit-animation: fade 0.25s;
animation: fade 0.25s;
}
.modal-body {
@@ -117,7 +117,7 @@
margin-top: 0;
}
input[type=radio] {
input[type="radio"] {
margin-right: 10px;
}
@@ -129,7 +129,8 @@
form {
margin-top: 20px;
#split-topic-name, #choose-topic-title {
#split-topic-name,
#choose-topic-title {
width: 520px;
}
}

7
app/assets/stylesheets/desktop/queued-posts.scss
View File

@@ -11,7 +11,9 @@
float: right;
font-size: $font-down-1;
margin-top: 1px;
span {color: dark-light-choose($primary-medium, $secondary-medium); }
span {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
.cooked {
@@ -26,7 +28,7 @@
.tag-chooser {
width: 100%;
margin-bottom: .5em;
margin-bottom: 0.5em;
.select-kit-collection {
padding: 0;
@@ -47,6 +49,5 @@
margin-left: 1em;
}
}
}
}

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

@@ -27,17 +27,24 @@
padding: 3px 12px;
font-size: $font-up-1;
}
}
// Base list
// --------------------------------------------------
.topic-list-icons {
.d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
.d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
a.title {color: $primary;}
.d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
.d-icon-thumb-tack {
color: dark-light-choose($primary-medium, $secondary-medium);
}
.d-icon-thumb-tack.unpinned {
color: dark-light-choose($primary-medium, $secondary-medium);
}
a.title {
color: $primary;
}
.d-icon-bookmark {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
.topic-list {
@@ -55,7 +62,9 @@
}
}
th {
button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
button .d-icon {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
button.bulk-select {
@@ -101,7 +110,6 @@
left: -2px;
}
.sortable {
cursor: pointer;
&:hover {
@@ -204,7 +212,8 @@
color: dark-light-choose($primary-medium, $secondary-medium) !important;
font-size: 0.929em;
}
a.last-posted-at, a.last-posted-at:visited {
a.last-posted-at,
a.last-posted-at:visited {
color: dark-light-choose($primary-medium, $secondary-medium);
font-size: $font-down-1;
}
@@ -284,9 +293,7 @@
/* Tablet (portrait) ----------- */
@media all
and (max-width : 850px) {
@media all and (max-width: 850px) {
// slightly smaller font, tighten spacing on nav pills
.nav-pills {
> li > a {
@@ -306,13 +313,13 @@
}
.topic-list {
// tighter table header spacing
th:first-of-type {
padding: 12px 5px;
}
// smaller table cell spacing
th, td {
th,
td {
padding: 10px;
font-size: $font-0;
}

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

@@ -38,10 +38,13 @@ h1 .topic-statuses .topic-status i {
opacity: 0.7;
transition: opacity 0.7s ease-in-out;
}
.discourse-touch & {opacity: 1;}
.discourse-touch & {
opacity: 1;
}
}
&:hover .actions .fade-out, .selected .actions .fade-out {
&:hover .actions .fade-out,
.selected .actions .fade-out {
opacity: 1;
}
}
@@ -51,7 +54,6 @@ section.post-menu-area {
}
nav.post-controls {
padding: 0;
.like-button {
@@ -79,7 +81,7 @@ nav.post-controls {
}
&:active {
box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
.widget-button {
box-shadow: none;
@@ -117,11 +119,12 @@ nav.post-controls {
color: dark-light-choose($primary-medium, $secondary-high);
}
a, button {
a,
button {
color: dark-light-choose($primary-low-mid, $secondary-high);
.d-icon {
opacity: 1.0;
opacity: 1;
}
margin-right: 2px;
display: inline-block;
@@ -135,7 +138,6 @@ nav.post-controls {
span.badge-posts {
margin-right: 5px;
transition: all linear 0.15s;
}
.actions {
@@ -151,10 +153,14 @@ nav.post-controls {
.show-replies {
margin-left: -10px;
font-size: inherit;
span.badge-posts {color: dark-light-choose($primary-medium, $secondary-high); }
span.badge-posts {
color: dark-light-choose($primary-medium, $secondary-high);
}
&:hover {
background: $primary-low;
span.badge-posts {color: $primary;}
span.badge-posts {
color: $primary;
}
}
i {
margin-left: 5px;
@@ -180,13 +186,14 @@ nav.post-controls {
border: none;
margin-left: 3px;
&.d-hover, &:focus {
&.d-hover,
&:focus {
background: $primary-low;
color: $primary;
}
&:active {
box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
}
&.hidden {
@@ -196,17 +203,21 @@ nav.post-controls {
position: relative;
}
&.delete.d-hover, &.delete:focus {
&.delete.d-hover,
&.delete:focus {
background: $danger;
color: $secondary;
}
&.like.d-hover, &.like:focus {
&.like.d-hover,
&.like:focus {
color: $love;
background: $love-low;
}
&.has-like {color: $love;}
&.has-like {
color: $love;
}
&.has-like[disabled]:hover {
background: transparent;
}
@@ -257,7 +268,11 @@ nav.post-controls {
}
.embedded-posts {
h1, h2, h3 { margin: 10px 0; }
h1,
h2,
h3 {
margin: 10px 0;
}
border: 1px solid $primary-low;
.topic-body {
@@ -280,7 +295,8 @@ nav.post-controls {
padding-top: 15px;
}
.collapse-down, .collapse-up {
.collapse-down,
.collapse-up {
position: absolute;
color: $primary-medium;
background: $secondary;
@@ -307,8 +323,9 @@ nav.post-controls {
transform: translate(-50%, -164%);
}
.row {
padding-bottom: .5em;
.topic-avatar, .topic-body {
padding-bottom: 0.5em;
.topic-avatar,
.topic-body {
border-top: 1px solid $primary-low;
}
}
@@ -324,7 +341,8 @@ nav.post-controls {
width: 699px;
.row {
border-bottom: none;
.topic-avatar, .topic-body {
.topic-avatar,
.topic-body {
border-top: 1px solid $primary-low;
}
}
@@ -333,9 +351,16 @@ nav.post-controls {
padding: 0;
}
.post-date { color: dark-light-choose($primary-medium, $secondary-high); }
.d-icon-arrow-up, .d-icon-arrow-down { margin-left: 5px; }
.reply:first-of-type .row { border-top: none; }
.post-date {
color: dark-light-choose($primary-medium, $secondary-high);
}
.d-icon-arrow-up,
.d-icon-arrow-down {
margin-left: 5px;
}
.reply:first-of-type .row {
border-top: none;
}
.topic-meta-data {
position: relative;
@@ -349,33 +374,43 @@ nav.post-controls {
color: dark-light-choose($primary-low-mid, $secondary-high);
}
}
.arrow {color: dark-light-choose($primary-medium, $secondary-high); }
.arrow {
color: dark-light-choose($primary-medium, $secondary-high);
}
}
.post-action {
.relative-date {
margin-left: 5px;
}
.avatar { margin-right: 2px; }
.avatar {
margin-right: 2px;
}
}
.topic-map {
margin: 20px 0;
.map {
.secondary {text-align: center;}
.secondary {
text-align: center;
}
li {
float: left;
padding: 7px 10px;
&:last-of-type {
border-right: 0;
}
&:nth-child(3) { text-align:center; }
&:nth-child(3) {
text-align: center;
}
a, .number {
}
a,
.number {
line-height: $line-height-large;
}
.number, i {
.number,
i {
color: dark-light-choose($primary-high, $secondary-low);
font-size: $font-up-2;
line-height: $line-height-medium;
@@ -394,8 +429,12 @@ nav.post-controls {
color: $primary;
}
.participants { // PMs //
.user { float: left; margin: 7px 20px 7px 0; }
.participants {
// PMs //
.user {
float: left;
margin: 7px 20px 7px 0;
}
.user a {
color: dark-light-choose($primary-high, $secondary-low);
font-weight: bold;
@@ -455,7 +494,9 @@ nav.post-controls {
}
.btn {
@include topic-footer-button;
.d-icon-bookmark.bookmarked { color: $tertiary; }
.d-icon-bookmark.bookmarked {
color: $tertiary;
}
}
.bookmark.bookmarked .d-icon-bookmark {
@@ -491,7 +532,7 @@ nav.post-controls {
span.post-count {
background: $primary;
color: $secondary;
opacity: .8;
opacity: 0.8;
}
button.expand-post {
@@ -511,28 +552,46 @@ video {
}
@-webkit-keyframes fadein {
from {opacity: 0;}
to {opacity: 1;}
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes fadein {
from {opacity: 0;}
to {opacity: 1;}
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.extra-info-wrapper {
overflow: hidden;
.badge-wrapper, i, .topic-link {
-webkit-animation: fadein .7s;
animation: fadein .7s;
.badge-wrapper,
i,
.topic-link {
-webkit-animation: fadein 0.7s;
animation: fadein 0.7s;
}
.topic-statuses {
i { color: $header_primary; }
.d-icon-envelope { color: $danger; }
.d-icon-lock {padding-top: .15em;}
.unpinned { color: $header_primary; }
i {
color: $header_primary;
}
.d-icon-envelope {
color: $danger;
}
.d-icon-lock {
padding-top: 0.15em;
}
.unpinned {
color: $header_primary;
}
}
.topic-link {
@@ -571,7 +630,6 @@ video {
}
}
.open > .dropdown-menu {
display: block;
}
@@ -585,10 +643,14 @@ video {
position: relative;
}
.deleted {
.topic-body {
background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-60%
);
}
}
@@ -612,7 +674,6 @@ video {
color: $primary;
}
/* solo quotes */
blockquote {
/* leave browser defaults for top and bottom here */
@@ -630,16 +691,20 @@ blockquote {
}
aside {
.quote, .title, blockquote, .onebox, .onebox-result {
.quote,
.title,
blockquote,
.onebox,
.onebox-result {
background: blend-primary-secondary(5%);
border-left: 5px solid $primary-low;
}
aside.quote>blockquote, aside.quote>.title {
aside.quote > blockquote,
aside.quote > .title {
border-left: 0;
}
}
}
// variables are used to calculate the width of .gap
@@ -665,7 +730,9 @@ $topic-avatar-width: 45px;
}
.gap {
width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding});
width: calc(
#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}
);
}
/* hide the reply border above the time gap notices */
@@ -678,7 +745,6 @@ $topic-avatar-width: 45px;
border-bottom: 1px solid $primary-low;
}
.posts-wrapper {
position: relative;
-webkit-font-smoothing: subpixel-antialiased;
@@ -730,7 +796,7 @@ $topic-avatar-width: 45px;
font-weight: normal;
line-height: $line-height-medium;
color: $primary;
transition: all linear .15s;
transition: all linear 0.15s;
& > div {
margin-left: 26px;
@@ -742,7 +808,6 @@ $topic-avatar-width: 45px;
color: $primary;
text-decoration: none;
background-color: $highlight-medium;
}
.dropdown-menu .disabled > a,
@@ -818,8 +883,7 @@ $topic-avatar-width: 45px;
&[href] {
color: $secondary;
}
&:hover
{
&:hover {
color: $secondary;
background: $tertiary-high;
}
@@ -878,7 +942,9 @@ a.attachment:before {
content: "\f019";
}
.private_message .gutter, .deleted-topic .gutter,.read_restricted .gutter {
.private_message .gutter,
.deleted-topic .gutter,
.read_restricted .gutter {
position: relative;
}
@@ -886,14 +952,13 @@ a.attachment:before {
display: block;
position: absolute;
left: 767px;
color: rgba($primary-low, .8);
color: rgba($primary-low, 0.8);
font: 6.429em/1 FontAwesome;
content: "\f014";
z-index: z("base");
}
.topic-meta-data {
&:after {
visibility: hidden;
display: block;
@@ -906,9 +971,10 @@ a.attachment:before {
.post-info {
display: inline-block;
float: right;
a {color: dark-light-choose($primary-medium, $secondary-medium); }
a {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
}
.who-liked {
@@ -945,10 +1011,7 @@ span.highlighted {
/* Tablet (portrait) ----------- */
@media all
and (max-width : 775px) {
@media all and (max-width: 775px) {
.gutter {
display: none;
}
@@ -974,5 +1037,4 @@ and (max-width : 775px) {
width: calc(100% - 56px); // [100% - margin-left]
}
}
}

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

@@ -14,14 +14,18 @@
margin: 20px 0;
}
.edits {margin-right: 5px;}
.edits {
margin-right: 5px;
}
#topic-title {
z-index: z("base");
padding-top: 14px;
margin-bottom: 10px;
#edit-title, .category-chooser, .edit-controls {
#edit-title,
.category-chooser,
.edit-controls {
width: 500px;
}
h1 {
@@ -29,12 +33,16 @@
line-height: $line-height-medium;
overflow: hidden;
width: 100%;
a {color: $primary;}
a {
color: $primary;
}
}
.topic-statuses {
margin-top: -2px;
}
.private-message-glyph { display: none; }
.private-message-glyph {
display: none;
}
.remove-featured-link {
float: right;
text-transform: lowercase;
@@ -47,7 +55,9 @@
float: left;
}
.private_message #topic-title .private-message-glyph { display: inline; }
.private_message #topic-title .private-message-glyph {
display: inline;
}
.topic-error {
padding: 18px;
@@ -171,7 +181,7 @@
max-width: 145px;
border-right: 1px solid $tertiary-low;
background-color: $tertiary-low;
transition: width .75s;
transition: width 0.75s;
}
}
@@ -185,10 +195,9 @@
z-index: z("dropdown");
}
@media all
and (min-width: 400px) {
#topic-progress, #topic-progress-expanded {
@media all and (min-width: 400px) {
#topic-progress,
#topic-progress-expanded {
right: 0;
left: 0;
}
@@ -206,14 +215,11 @@ and (min-width: 400px) {
}
}
@media all
and (max-width : 485px) {
@media all and (max-width: 485px) {
#topic-progress-wrapper.docked {
display: none;
}
#topic-footer-main-buttons {
max-width: 100%;
}

6
app/assets/stylesheets/desktop/upload.scss
View File

@@ -22,7 +22,8 @@
font-size: $font-0;
line-height: $line-height-medium;
}
.description, .hint {
.description,
.hint {
color: dark-light-choose($primary-medium, $secondary-medium);
display: block;
}
@@ -32,7 +33,8 @@
}
}
}
.radios:last-child:not(:nth-child(2)) { // last child for composer modal, but not theme import modal
.radios:last-child:not(:nth-child(2)) {
// last child for composer modal, but not theme import modal
min-height: 20px;
}
}

42
app/assets/stylesheets/desktop/user-card.scss
View File

@@ -4,7 +4,8 @@
$user_card_primary: $primary;
$user_card_background: $secondary;
#user-card, #group-card {
#user-card,
#group-card {
position: absolute;
width: 500px;
left: -9999px;
@@ -16,11 +17,11 @@ $user_card_background: $secondary;
background: $user_card_background center center;
background-size: cover;
min-height: 175px;
-webkit-transition: opacity .2s, -webkit-transform .2s;
transition: opacity .2s, transform .2s;
-webkit-transition: opacity 0.2s, -webkit-transform 0.2s;
transition: opacity 0.2s, transform 0.2s;
opacity: 0;
@include transform(scale(.9));
@include transform(scale(0.9));
&.show {
opacity: 1;
@@ -34,11 +35,11 @@ $user_card_background: $secondary;
.card-content {
padding: 12px 12px 0 12px;
background: rgba($user_card_background, .85);
background: rgba($user_card_background, 0.85);
margin-top: 80px;
&:after {
content: '';
content: "";
display: block;
clear: both;
}
@@ -132,12 +133,17 @@ $user_card_background: $secondary;
h3 {
display: inline;
margin-right: 5px;
.desc, a {
.desc,
a {
color: scale-color($user_card_primary, $lightness: 35%);
}
}
div {display: inline; color: scale-color($user_card_background, $lightness: 50%);
.group-link {color: scale-color($user_card_background, $lightness: 50%);}
div {
display: inline;
color: scale-color($user_card_background, $lightness: 50%);
.group-link {
color: scale-color($user_card_background, $lightness: 50%);
}
}
}
@@ -173,30 +179,33 @@ $user_card_background: $secondary;
width: 100%;
align-items: center;
padding-top: 5px;
.location, .website-name {
.location,
.website-name {
display: flex;
max-width: 90%;
overflow: hidden;
align-items: baseline;
i {
margin-right: .25em;
margin-right: 0.25em;
}
}
.website-name a, .location span {
.website-name a,
.location span {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: $user_card_primary;
}
.location {
margin-right: .5em;
margin-right: 0.5em;
}
.website-name a {
text-decoration: underline;
}
}
.user-card-avatar, .group-card-avatar {
.user-card-avatar,
.group-card-avatar {
float: left;
margin-right: 10px;
margin-top: -53px;
@@ -249,7 +258,10 @@ $user_card_background: $secondary;
float: right;
margin: 0;
button { width: 100%; min-width: 150px; }
button {
width: 100%;
min-width: 150px;
}
}
.new-user a {

19
app/assets/stylesheets/desktop/user.scss
View File

@@ -18,7 +18,7 @@
height: 420px;
width: 100%;
background-size: cover;
transition: height .15s linear;
transition: height 0.15s linear;
}
.no-background {
@@ -85,7 +85,7 @@
}
.btn.right {
float: right
float: right;
}
h2 {
@@ -149,11 +149,11 @@
.details {
padding: 0 0 4px 0;
margin-top: -200px;
transition: margin .15s linear;
transition: margin 0.15s linear;
img.avatar {
margin: 0 20px 10px 0;
transition: all .1s linear;
transition: all 0.1s linear;
}
.primary {
@@ -206,7 +206,6 @@
width: auto;
ul {
li {
display: inline;
}
@@ -237,7 +236,7 @@
}
.user-field {
input[type=text] {
input[type="text"] {
width: 530px;
}
@@ -249,7 +248,8 @@
}
.viewing-self & .about.collapsed-info {
.secondary, .staff-counters {
.secondary,
.staff-counters {
display: inherit;
}
}
@@ -270,7 +270,8 @@
width: 530px;
}
.category-selector, .tag-chooser {
.category-selector,
.tag-chooser {
width: 530px;
}
@@ -279,7 +280,7 @@
width: 530px;
}
&[type=text] {
&[type="text"] {
@include small-width {
width: 450px;
}

11
app/assets/stylesheets/embed.scss
View File

@@ -19,10 +19,13 @@ article.post {
border-left: 5px solid darken($primary-low, 10%);
background-color: $primary-low;
padding: 10px 10px 0 12px;
.avatar { margin-right: 7px; }
.avatar {
margin-right: 7px;
}
}
ol, ul {
ol,
ul {
clear: none;
}
@@ -56,7 +59,6 @@ article.post {
}
}
.cooked {
padding: 10px 0;
margin-left: 65px;
@@ -80,7 +82,7 @@ article.post {
margin: 0 0 10px 0;
a {
color: #5c5c5c
color: #5c5c5c;
}
a.staff {
background-color: #ffffc2;
@@ -119,7 +121,6 @@ img.emoji {
clear: both;
}
header.discourse {
padding-left: 10px;
padding-right: 10px;

1
app/assets/stylesheets/mobile/banner.scss
View File

@@ -14,5 +14,4 @@
@media all and (min-height: 500px) {
max-height: 180px;
}
}

6
app/assets/stylesheets/mobile/components/user-stream-item.scss
View File

@@ -1,6 +1,5 @@
// Mobile styles for "user-stream-item" component
.user-stream {
// DEPRECATION:
// The ".item" class should be eventually removed because it's too generic.
// Once ".item" has been removed, ".user-stream-item" can replace
@@ -17,7 +16,10 @@
.notification {
&.unread {
background-color: dark-light-choose($tertiary-low, srgb-scale($tertiary, $secondary, 15%));
background-color: dark-light-choose(
$tertiary-low,
srgb-scale($tertiary, $secondary, 15%)
);
}
}

3
app/assets/stylesheets/mobile/compose.scss
View File

@@ -70,7 +70,7 @@
.cancel {
font-size: 1.6em;
color: $primary-low-mid;
margin-left: .6em;
margin-left: 0.6em;
padding: 0 5px;
}
}
@@ -155,4 +155,3 @@
margin: 0 0 5px 5px;
}
}

2
app/assets/stylesheets/mobile/discourse.scss
View File

@@ -8,7 +8,6 @@ html {
font-size: 15px; // Increasing overall font-size on mobile by 1px
}
body {
background-color: $secondary;
}
@@ -28,7 +27,6 @@ blockquote {
margin-bottom: 0;
}
}
}
// Common classes

9
app/assets/stylesheets/mobile/group.scss
View File

@@ -22,7 +22,8 @@
float: left;
}
.group-activity, .group-manage {
.group-activity,
.group-manage {
position: relative;
}
@@ -34,7 +35,8 @@
}
}
.group-activity-outlet, .group-messages-outlet {
.group-activity-outlet,
.group-messages-outlet {
float: none;
}
@@ -45,7 +47,7 @@
.group-flair-inputs {
.group-flair-right {
margin: 0
margin: 0;
}
}
}
@@ -100,7 +102,6 @@ table.group-manage-logs {
}
}
.group-add-members-btn {
margin-bottom: 10px;
}

5
app/assets/stylesheets/mobile/header.scss
View File

@@ -12,7 +12,6 @@
}
.d-header {
#site-logo {
max-width: 130px;
}
@@ -41,7 +40,9 @@
line-height: $line-height-medium;
}
.active .icon {
&:after { margin-top: -1px; }
&:after {
margin-top: -1px;
}
}
}

12
app/assets/stylesheets/mobile/modal.scss
View File

@@ -1,6 +1,8 @@
// base styles for every modal popup used in Discourse
.modal-open #main {overflow:hidden;}
.modal-open #main {
overflow: hidden;
}
.modal-middle-container {
margin-top: 10%;
@@ -15,7 +17,7 @@
}
.modal.fade {
transition: opacity .3s linear, top .3s ease-out;
transition: opacity 0.3s linear, top 0.3s ease-out;
top: -25%;
}
.modal.fade.in {
@@ -28,7 +30,7 @@
// we need a little extra room on mobile for the
// stuff inside the footer to fit
.modal-footer {
padding: 10px
padding: 10px;
}
.modal-header {
@@ -49,7 +51,7 @@
margin-top: 0;
}
input[type=radio] {
input[type="radio"] {
margin-right: 10px;
}
@@ -61,7 +63,7 @@
form {
margin-top: 20px;
input[type=text] {
input[type="text"] {
box-sizing: border-box;
width: 100%;
}

4
app/assets/stylesheets/mobile/search.scss
View File

@@ -1,6 +1,6 @@
.search-container {
flex-direction: column;
margin-top: .5em;
margin-top: 0.5em;
.search-advanced {
order: 1;
@@ -14,7 +14,7 @@
.sort-by {
display: flex;
align-items: center;
margin-top: .5em;
margin-top: 0.5em;
margin-left: 0;
width: 100%;

84
app/assets/stylesheets/mobile/topic-list.scss
View File

@@ -56,7 +56,8 @@
margin-bottom: 10px;
}
.categories-admin-dropdown, .tag-notifications-button {
.categories-admin-dropdown,
.tag-notifications-button {
order: 2; // after main nav
}
@@ -68,7 +69,8 @@
i {
margin: 0;
}
@media screen and (max-width: 374px) { // Hide edit label on very tiny screens
@media screen and (max-width: 374px) {
// Hide edit label on very tiny screens
.d-button-label {
display: none;
}
@@ -120,7 +122,6 @@
}
}
}
}
.list-container .full-width {
@@ -131,7 +132,6 @@
// --------------------------------------------------
.topic-list {
.right {
margin-left: 55px;
}
@@ -143,15 +143,20 @@
max-width: 300px;
}
a.title {color: $primary;}
a.title {
color: $primary;
}
.badge-notification, .category-topic-link td.num .badge-notification {
.badge-notification,
.category-topic-link td.num .badge-notification {
position: relative;
display: inline;
top: -1px;
font-size: $font-down-1;
padding: 4px 6px 3px 6px;
i {color: $secondary;}
i {
color: $secondary;
}
&.new-topic::before {
margin-right: 0;
@@ -163,24 +168,28 @@
}
.category-topic-link td.num .badge-notification {
&.new-posts, &.unread-posts {
&.new-posts,
&.unread-posts {
color: dark-light-choose($secondary, $secondary);
}
}
.topic-item-stats {
.category, .num, .last-poster {
.category,
.num,
.last-poster {
float: left;
}
.category a {
max-width: 160px;
}
.num .fa, a, a:visited {
.num .fa,
a,
a:visited {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
.age {
white-space: nowrap;
a {
@@ -212,7 +221,6 @@
}
tbody {
.category {
border-left: 6px solid;
}
@@ -225,7 +233,9 @@
}
// Allow percentage widths on table cells to include their padding
box-sizing: border-box;
*, *:before, *:after {
*,
*:before,
*:after {
box-sizing: inherit;
}
@@ -267,19 +277,30 @@ tr.category-topic-link {
}
}
.latest {
@include mobile-portrait { width: 150px; }
@include mobile-landscape { width: 270px; }
@include tablet-landscape { width: 450px; }
@include mobile-portrait {
width: 150px;
}
@include mobile-landscape {
width: 270px;
}
@include tablet-landscape {
width: 450px;
}
.featured-topic {
margin: 8px 0;
a.last-posted-at, a.last-posted-at:visited {
a.last-posted-at,
a.last-posted-at:visited {
color: dark-light-choose($primary-medium, $secondary-medium);
}
}
}
.stats {
@include not-tablet-landscape { display: none; }
@include tablet-landscape { min-width: 80px; }
@include not-tablet-landscape {
display: none;
}
@include tablet-landscape {
min-width: 80px;
}
}
}
@@ -304,7 +325,9 @@ tr.category-topic-link {
max-width: 80vw;
}
.category-topic-link .main-link, .subcategories-list td, .category-description td {
.category-topic-link .main-link,
.subcategories-list td,
.category-description td {
padding-left: 10px;
}
@@ -343,7 +366,6 @@ tr.category-topic-link {
}
}
.posters {
float: left;
}
@@ -378,7 +400,6 @@ tr.category-topic-link {
margin: 20px 0 0 0;
}
// Misc. stuff
// --------------------------------------------------
.btn-group .dropdown-toggle:active,
@@ -420,7 +441,10 @@ tr.category-topic-link {
box-shadow: shadow("dropdown");
background-clip: padding-box;
margin: 1px 0 20px;
.title {font-weight: bold; display: block;}
.title {
font-weight: bold;
display: block;
}
}
.dropdown-menu a {
display: block;
@@ -443,7 +467,7 @@ tr.category-topic-link {
}
.fade {
opacity: 0;
transition: opacity linear .15s;
transition: opacity linear 0.15s;
}
.fade.in {
opacity: 1;
@@ -467,9 +491,15 @@ ol.category-breadcrumb {
}
.top-lists {
h2 { margin-left: 10px; }
.topic-list { padding-bottom: 10px; }
.btn-default.pull-right { margin-right: 10px; }
h2 {
margin-left: 10px;
}
.topic-list {
padding-bottom: 10px;
}
.btn-default.pull-right {
margin-right: 10px;
}
}
.tags-admin-menu {

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

@@ -69,7 +69,7 @@ span.badge-posts {
}
.d-icon {
opacity: 1.0;
opacity: 1;
}
button {
border: none;
@@ -98,7 +98,6 @@ span.badge-posts {
color: $tertiary;
}
}
}
}
@@ -135,7 +134,6 @@ span.badge-posts {
}
}
.embedded-posts {
.topic-meta-data h5 a {
margin-left: 10px;
@@ -197,7 +195,8 @@ a.reply-to-tab {
.number {
line-height: $line-height-medium;
}
.number, i {
.number,
i {
color: dark-light-choose($primary-high, $secondary-low);
font-size: $font-up-1;
}
@@ -210,7 +209,9 @@ a.reply-to-tab {
display: none;
}
.links, .information, .avatars {
.links,
.information,
.avatars {
padding: 10px;
color: $primary;
overflow: auto;
@@ -222,8 +223,12 @@ a.reply-to-tab {
}
}
.participants { // PMs //
.user {float: left; margin: 0 10px 10px 0;}
.participants {
// PMs //
.user {
float: left;
margin: 0 10px 10px 0;
}
}
.buttons {
@@ -251,7 +256,9 @@ a.reply-to-tab {
#topic-footer-buttons {
@include clearfix;
padding: 20px 0 0 0;
.d-icon-bookmark.bookmarked { color: $tertiary; }
.d-icon-bookmark.bookmarked {
color: $tertiary;
}
.combobox {
float: left;
@@ -261,7 +268,6 @@ a.reply-to-tab {
}
}
#topic-footer-buttons p {
clear: both; /* this is to force the drop-down notification state description para below the button */
margin: 0;
@@ -276,11 +282,17 @@ a.reply-to-tab {
#suggested-topics {
clear: left;
padding: 20px 0 15px 0;
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;
}
a.badge-category, a.badge-category-parent {
a.badge-category,
a.badge-category-parent {
font-size: $font-down-1;
vertical-align: top;
}
@@ -289,10 +301,9 @@ a.reply-to-tab {
span.post-count {
background: $primary;
color: $secondary;
opacity: .8;
opacity: 0.8;
}
#topic-footer-buttons {
.btn {
margin-bottom: 5px;
@@ -381,7 +392,9 @@ iframe {
}
// hide the full set of selection buttons on mobile
.select-posts button { display: none; }
.select-posts button {
display: none;
}
// unhide the simple "select just this post" button
button.select-post {
@@ -394,18 +407,20 @@ button.select-post {
padding: 5px;
}
.post-select {
float: right;
margin-right: 20px;
margin-top: -20px;
}
.deleted {
.topic-body {
background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
background-color: dark-light-diff(
rgba($danger, 0.7),
$secondary,
50%,
-60%
);
}
}
@@ -413,7 +428,9 @@ button.select-post {
font-size: $font-up-5;
}
span.btn-text {display: none;}
span.btn-text {
display: none;
}
blockquote {
clear: both;
@@ -426,9 +443,13 @@ blockquote {
padding: 0.25em 0;
}
.gutter { display: none; }
.gutter {
display: none;
}
.posts-wrapper { position: relative; }
.posts-wrapper {
position: relative;
}
span.highlighted {
background-color: dark-light-choose($highlight-low, $highlight);
@@ -452,7 +473,9 @@ span.highlighted {
}
.post-info {
float: right;
.edits { margin-right: 5px; }
.edits {
margin-right: 5px;
}
}
}

38
app/assets/stylesheets/mobile/topic.scss
View File

@@ -1,4 +1,6 @@
.post-info a {color: #aaa;}
.post-info a {
color: #aaa;
}
.topic-meta-data-inside {
float: right;
@@ -6,12 +8,13 @@
margin-right: 5px;
}
.post-info {
display: inline-block;
}
.edits {margin-right: 5px;}
.edits {
margin-right: 5px;
}
#topic-title {
//margin-bottom: 20px;
@@ -28,13 +31,18 @@
.title-category-wrapper {
margin-top: 5px;
}
.private-message-glyph { display: none; }
.private-message-glyph {
display: none;
}
}
.private_message #topic-title .private-message-glyph { display: inline; }
.private_message #topic-title .private-message-glyph {
display: inline;
}
/* both blocks that appear under the standard post control buttons */
.notification-options, .pinned-options {
.notification-options,
.pinned-options {
float: left;
margin-top: 0;
padding-top: 1px;
@@ -140,7 +148,7 @@
width: 0;
border-right: 1px solid $tertiary-low;
background-color: $tertiary-low;
transition: width .75s;
transition: width 0.75s;
}
}
@@ -164,9 +172,16 @@
position: absolute;
}
.topic-post:last-of-type {padding-bottom: 40px;}
.topic-post:last-of-type {
padding-bottom: 40px;
}
sup sup, sub sup, sup sub, sub sub { top: 0; }
sup sup,
sub sup,
sup sub,
sub sub {
top: 0;
}
// inline editing of title on mobile
#topic-title .title-wrapper {
@@ -192,12 +207,13 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
// make mobile timeline top and bottom dates easier to select
.topic-timeline {
.start-date, .now-date {
.start-date,
.now-date {
font-size: $font-up-1;
padding: 5px;
}
.topic-category {
margin-bottom: .5rem;
margin-bottom: 0.5rem;
}
}

4
app/assets/stylesheets/mobile/upload.scss
View File

@@ -16,7 +16,8 @@
&:first-of-type {
margin-bottom: 1em;
}
input, label {
input,
label {
min-height: 20px;
line-height: $line-height-medium;
margin: 0;
@@ -29,7 +30,6 @@
width: 100%;
}
}
}
.uploaded-image-preview {

4
app/assets/stylesheets/mobile/user.scss
View File

@@ -45,7 +45,7 @@ margin-top: 10px;
margin-top: 10px;
.btn.right {
float: right
float: right;
}
table {
@@ -133,7 +133,6 @@ margin-top: 10px;
display: flex;
flex: 1 1 auto;
flex-wrap: wrap;
}
li {
@@ -233,7 +232,6 @@ margin-top: 10px;
}
.user-preferences {
.instructions {
margin-top: 5px;
}

Some files were not shown because too many files have changed in this diff Show More