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

FIX: move IE specific CSS rules to discourse-internet-explorer plugin (#8567)

Browse Source
This commit is contained in:
Krzysztof Kotlarek
2019-12-18 15:25:16 +11:00
committed by GitHub
parent 44612f900e
commit f59647cd55
15 changed files with 407 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/stylesheets/common/admin/admin_report_counters.scss
View File

@@ -6,30 +6,6 @@
grid-template-rows: repeat(auto-fit, minmax(32px, 1fr));
align-items: center;
// IE11 grid support
display: -ms-grid;
-ms-grid-columns: 2fr 1fr 1fr 1fr 1fr;
.cell {
-ms-grid-row: 1;
-ms-grid-column-span: 1;
&:nth-of-type(1) {
-ms-grid-column: 1;
}
&:nth-of-type(2) {
-ms-grid-column: 2;
}
&:nth-of-type(3) {
-ms-grid-column: 3;
}
&:nth-of-type(4) {
-ms-grid-column: 4;
}
&:nth-of-type(5) {
-ms-grid-column: 5;
}
}
.cell {
padding: 0.25em;
text-align: right;

60
app/assets/stylesheets/common/admin/api.scss
View File

@@ -41,32 +41,6 @@ table.web-hooks.grid {
grid-row: 2;
}
}
//IE11 Support
@media screen and (max-width: 767px) {
tr {
display: -ms-grid;
-ms-grid-columns: 0.5fr 1fr 1fr 0.5fr;
td {
display: -ms-grid;
&.delivery-status {
-ms-grid-row: 1;
-ms-grid-column: 1;
}
&.payload-url {
-ms-grid-row: 1;
-ms-grid-column: 2;
}
&.description {
-ms-grid-row: 1;
-ms-grid-column: 3;
}
&.controls {
-ms-grid-row: 1;
-ms-grid-column: 4;
}
}
}
}
}
// Api keys
@@ -112,40 +86,6 @@ table.api-keys {
}
}
}
//IE11 Support
@media screen and (max-width: 767px) {
tr {
display: -ms-grid;
-ms-grid-columns: 0.25fr 1fr 1fr;
-ms-grid-rows: auto auto;
td {
display: -ms-grid;
&.key {
-ms-grid-row: 1;
-ms-grid-column: 1;
-ms-grid-column-span: 3;
}
&.key-user {
-ms-grid-row: 2;
-ms-grid-column: 1;
}
&.key-controls {
-ms-grid-row: 2;
-ms-grid-column: 2;
-ms-grid-column-span: 2;
display: -ms-grid;
-ms-grid-columns: 125px 125px;
button:first-of-type {
-ms-grid-column: 1;
}
button:last-of-type {
-ms-grid-column: 2;
}
}
}
}
}
}
.admin-api-keys {

61
app/assets/stylesheets/common/admin/dashboard.scss
View File

@@ -140,49 +140,11 @@
grid-column-gap: 1em;
grid-row-gap: 1em;
// IE11 grid support
display: -ms-grid;
-ms-grid-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-ms-grid-rows: 1fr 1fr;
.admin-report {
-ms-grid-column-span: 4;
&:nth-of-type(1) {
-ms-grid-row: 1;
-ms-grid-column: 1;
}
&:nth-of-type(2) {
-ms-grid-row: 2;
-ms-grid-column: 1;
}
&:nth-of-type(3) {
-ms-grid-row: 2;
-ms-grid-column: 5;
}
&:nth-of-type(4) {
-ms-grid-row: 2;
-ms-grid-column: 9;
}
&:nth-of-type(5) {
-ms-grid-row: 3;
-ms-grid-column: 1;
}
&:nth-of-type(6) {
-ms-grid-row: 3;
-ms-grid-column: 5;
}
&:nth-of-type(7) {
-ms-grid-row: 3;
-ms-grid-column: 9;
}
}
.admin-report {
grid-column: span 4;
&.consolidated-page-views {
grid-column: span 12;
-ms-grid-column-span: 12;
}
}
@@ -318,29 +280,6 @@
text-align: right;
align-items: center;
padding: 0.65em 0.25em;
// IE11 grid support
display: -ms-grid;
-ms-grid-columns: 2fr 1fr 1fr 1fr 1fr;
.counters-cell {
-ms-grid-row: 1;
-ms-grid-column-span: 1;
&:nth-of-type(1) {
-ms-grid-column: 1;
}
&:nth-of-type(2) {
-ms-grid-column: 2;
}
&:nth-of-type(3) {
-ms-grid-column: 3;
}
&:nth-of-type(4) {
-ms-grid-column: 4;
}
&:nth-of-type(5) {
-ms-grid-column: 5;
}
}
}
.admin-report .main {

32
app/assets/stylesheets/common/admin/staff_logs.scss
View File

@@ -432,36 +432,4 @@ table.search-logs-list {
}
}
}
//IE11 Support
@media screen and (max-width: 767px) {
tr {
display: -ms-grid;
-ms-grid-columns: 1fr 1fr 1fr;
-ms-grid-rows: auto 2em;
td {
display: -ms-grid;
-ms-grid-rows: auto auto;
.label {
-ms-grid-row: 2;
}
&.term {
-ms-grid-row: 1;
-ms-grid-column: 1;
-ms-grid-column-span: 3;
}
&.col:nth-of-type(2) {
-ms-grid-row: 2;
-ms-grid-column: 1;
}
&.col:nth-of-type(3) {
-ms-grid-row: 2;
-ms-grid-column: 2;
}
&.col:nth-of-type(4) {
-ms-grid-row: 2;
-ms-grid-column: 3;
}
}
}
}
}

60
app/assets/stylesheets/common/admin/users.scss
View File

@@ -144,66 +144,6 @@
}
}
}
//IE11 Support
@media screen and (max-width: 767px) {
tr.user {
display: -ms-grid;
-ms-grid-columns: 1fr 1fr 1fr;
-ms-grid-rows: 2em 1fr 3em 3em;
td {
display: -ms-grid;
-ms-grid-columns: 1fr;
-ms-grid-rows: 1fr 1fr;
.label {
-ms-grid-row: 1;
-ms-grid-column: 1;
}
div:not(.label) {
-ms-grid-row: 2;
-ms-grid-column: 1;
align-self: center;
}
&.username {
-ms-grid-row: 1;
-ms-grid-column: 1;
-ms-grid-column-span: 2;
}
&.user-status {
-ms-grid-row: 1;
-ms-grid-column: 3;
}
&.email {
-ms-grid-row: 2;
-ms-grid-column: 1;
-ms-grid-column-span: 3;
}
&.last-emailed {
-ms-grid-row: 3;
-ms-grid-column: 1;
}
&.last-seen {
-ms-grid-row: 3;
-ms-grid-column: 2;
}
&.topics-entered {
-ms-grid-row: 3;
-ms-grid-column: 3;
}
&.posts-read {
-ms-grid-row: 4;
-ms-grid-column: 1;
}
&.time-read {
-ms-grid-row: 4;
-ms-grid-column: 2;
}
&.created {
-ms-grid-row: 4;
-ms-grid-column: 3;
}
}
}
}
}
// mobile styles

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

@@ -20,7 +20,6 @@
border: 1px solid $primary-medium;
font-size: $font-0;
transition: none;
height: 10px; // IE11 needs any height here for vertical centering, overriden elsewhere by min-height
}
.select-kit {
align-self: center;
@@ -152,9 +151,6 @@
align-items: center;
.discourse-tags {
flex-wrap: wrap;
// IE11 is being very stubborn but this is only protection for topics with
// a very excessive number of extra long tags - edge case.
-ms-flex: 1 0 0px;
}
a.badge-wrapper.box,
a.discourse-tag.box {

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

@@ -26,11 +26,6 @@
.groups-boxes {
margin: 1em 0;
width: 100%;
// IE11 falls back to flexbox
display: flex;
flex-wrap: wrap;
justify-content: space-between;
// Everything that's not IE11 uses grid
@supports (display: grid) {
display: grid;
grid-template-columns: repeat(4, 24%);
@@ -46,9 +41,6 @@
}
.group-box {
// Flex and margin are for IE11
flex: 1 1 24%;
margin: 1%;
@include breakpoint("mobile-large") {
margin: 0;
}

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

@@ -230,7 +230,6 @@
.extra-info-wrapper {
display: flex;
align-items: center;
flex: 1 1 0%; // unit on flex-basis is required for IE11
height: 100%;
line-height: $line-height-medium;
padding: 0 1.5em 0 0.5em;
@@ -298,7 +297,6 @@
display: inline-flex;
align-items: center;
max-width: 100%;
flex: 1 0 0%; // unit on flex-basis is required for IE11
.discourse-tags {
color: $header_primary-high;
@include ellipsis;
@@ -307,10 +305,6 @@
}
}
}
// the tag container should shrink
.topic-header-extra {
min-width: 1px; // 1px value is needed to avoid IE11 flexbox bug
}
}
// PM header participants

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

@@ -275,7 +275,6 @@ div.menu-links-header {
&.glyphs {
flex-wrap: wrap;
text-align: right;
max-width: 65%; //IE11
a {
// Expand the click area a bit.

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

@@ -209,8 +209,7 @@ aside.quote {
@include post-aside;
color: dark-light-choose($primary-high, $secondary-low);
// IE will screw up the blockquote underneath if bottom padding is 0px
padding: 12px 12px 1px 12px;
padding: 12px 12px 0px 12px;
// blockquote is underneath this and has top margin
.avatar {
margin-right: 7px;

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

@@ -43,38 +43,6 @@
}
}
.user-content-wrapper {
// IE11 Support
display: -ms-grid;
-ms-grid-columns: 1fr 5fr;
-ms-grid-rows: auto auto 1fr auto;
.user-primary-navigation {
-ms-grid-row: 1;
-ms-grid-column: 1;
-ms-grid-column-span: 2;
}
.user-secondary-navigation {
-ms-grid-row: 2;
-ms-grid-column: 1;
}
.solo-preference,
.user-content,
.spinner {
-ms-grid-row: 2;
-ms-grid-column: 2;
-ms-grid-column-span: 2;
}
.user-secondary-navigation + .user-content {
-ms-grid-column: 2;
-ms-grid-column-span: 1;
}
.user-additional-controls {
-ms-grid-row: 3;
-ms-grid-column-align: start;
-ms-grid-row-align: start;
}
}
.user-content {
.list-actions {
display: flex;
@@ -425,29 +393,6 @@
grid-column-start: 2;
grid-column-end: 3;
}
// IE11 Support
.avatar-choice {
display: -ms-grid;
-ms-grid-columns: 2em 1fr auto;
-ms-grid-rows: auto auto;
input[type="radio"] {
-ms-grid-row: 1;
-ms-grid-column: 1;
}
label.radio {
-ms-grid-row: 1;
-ms-grid-column: 2;
}
span.avatar-uploader {
-ms-grid-row: 1;
-ms-grid-column: 3;
}
.error {
-ms-grid-row: 2;
-ms-grid-column-span: 3;
}
}
}
.top-section {

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

@@ -9,9 +9,6 @@
-ms-flex: 1 1 auto;
flex: 1 1 auto;
}
.category-desc {
max-width: 100%; // needed for IE11
}
.category-status {
.badge-wrapper.box {
margin-bottom: 1px;

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

@@ -52,7 +52,6 @@
}
.texts {
width: 0; //IE11
line-height: $line-height-large;
-webkit-box-flex: 1;
-ms-flex: 1;
@@ -86,7 +85,6 @@
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1 1 auto;
width: 100%; //IE11
font-size: $font-down-1;
font-weight: normal;
color: $primary-medium;

1
app/assets/stylesheets/desktop/login.scss
View File

@@ -187,7 +187,6 @@
form,
table {
width: 100%;
display: block; //IE11
}
tr {