Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""

This reverts commit 20780a1eee.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)

app/assets/stylesheets/common/base/_topic-list.scss

@@ -53,7 +53,6 @@
     color: $primary-medium;
   }
   span.badge-category {
-    font-weight: normal;
     color: $primary-medium;
   }
   a.discourse-tag {

app/assets/stylesheets/common/base/alert.scss

@@ -3,6 +3,7 @@
   background-color: $danger-low;
   color: $primary;
   position: relative;
+  margin-bottom: 1em;
 
   .close {
     font-size: $font-up-3;

app/assets/stylesheets/common/base/crawler_layout.scss

@@ -27,6 +27,36 @@ body.crawler {
 
   .topic-list {
     margin-bottom: 1em;
+    @media (max-width: 850px) {
+      td {
+        word-break: break-all;
+        &.posters {
+          a:not(:last-of-type) {
+            display: none;
+          }
+          a:last-of-type {
+            display: block;
+          }
+        }
+      }
+
+      td,
+      th {
+        &.views {
+          display: none;
+        }
+      }
+
+      .link-top-line {
+        a.title {
+          padding: 0;
+        }
+      }
+
+      .link-bottom-line {
+        margin-top: 0.25em;
+      }
+    }
   }
 
   footer {

app/assets/stylesheets/common/base/topic-post.scss

@@ -1005,10 +1005,51 @@ a.mention-group {
 }
 
 #topic-footer-buttons {
-  .reason {
-    color: $primary-high;
-    display: inline;
-    margin: 0 0 0 8px;
-    line-height: $line-height-medium;
+  padding: 0.5em 0;
+
+  .topic-footer-main-buttons {
+    margin: 0 0 -0.5em 0;
+    display: flex;
+    flex-wrap: wrap;
+
+    > .btn {
+      margin: 0 0.5em 0.5em 0;
+      display: inline-flex;
+      align-items: center;
+
+      .d-button-label {
+        display: flex;
+        flex: 1 0 auto;
+        align-items: center;
+      }
+    }
+
+    .topic-admin-menu-button-container {
+      display: inline-flex;
+    }
+
+    .topic-admin-menu-button-container > span:not(:empty) {
+      margin: 0 0.5em 0.5em 0;
+    }
+  }
+
+  .pinned-button:not(.is-hidden) + .topic-notifications-button {
+    margin-top: 0;
+  }
+
+  .pinned-button,
+  .topic-notifications-button {
+    margin: 1em 0;
+
+    .reason {
+      color: $primary-high;
+      display: inline-flex;
+      margin: 0;
+      align-items: center;
+
+      .text {
+        margin-left: 0.5em;
+      }
+    }
   }
 }

app/assets/stylesheets/common/base/user.scss

@@ -653,6 +653,9 @@
     padding: 5px 0;
     font-weight: bold;
   }
+  .save-theme-alert {
+    font-size: $font-down-1;
+  }
 }
 
 .paginated-topics-list {

app/assets/stylesheets/common/components/badges.scss

@@ -17,7 +17,6 @@
 
 .badge-wrapper {
   font-size: $font-down-1;
-  font-weight: bold;
   white-space: nowrap;
   position: relative;
   display: inline-flex;

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

@@ -9,6 +9,9 @@
       -ms-flex: 1 1 auto;
       flex: 1 1 auto;
     }
+    .category-desc p {
+      margin: 0;
+    }
     .category-status {
       .badge-wrapper.box {
         margin-bottom: 1px;

app/assets/stylesheets/common/select-kit/pinned-button.scss

@@ -1,28 +1,7 @@
 #topic-footer-buttons {
   .pinned-button {
-    min-width: auto;
-    margin: 1em 0;
-
     &.is-hidden {
       display: none;
     }
-
-    .btn {
-      margin: 0;
-    }
-
-    .reason {
-      display: inline;
-      line-height: $line-height-medium;
-    }
-  }
-}
-
-.pinned-button {
-  margin: 0;
-  min-width: auto;
-
-  .pinned-options {
-    display: inline;
   }
 }

app/assets/stylesheets/common/select-kit/select-kit.scss

@@ -63,6 +63,11 @@
     flex-direction: row;
     min-height: 30px;
 
+    .d-icon-spinner {
+      -webkit-animation: rotate-forever 1s infinite linear;
+      animation: rotate-forever 1s infinite linear;
+    }
+
     .selected-name {
       text-align: left;
       flex: 0 1 auto;

app/assets/stylesheets/common/select-kit/topic-notifications-button.scss

@@ -1,27 +1,18 @@
-#topic-footer-buttons {
-  .topic-notifications-button {
-    min-width: auto;
-    margin: 1em 0;
+.topic-notifications-button {
+  &.is-loading {
+    pointer-events: none;
+    user-select: none;
 
-    .btn {
+    .d-icon-spinner {
       margin: 0;
     }
 
-    .reason {
-      display: inline;
-      line-height: $line-height-medium;
+    .selected-name .d-icon {
+      display: none;
+    }
+
+    .topic-notifications-options {
+      opacity: 0.5;
     }
   }
 }
-
-.topic-notifications-button .topic-notifications-options {
-  min-width: auto;
-}
-
-.topic-notifications-button {
-  margin: 0;
-
-  .topic-notifications-options {
-    display: inline-flex;
-  }
-}