Merge pull request #3670 from stephaniehobson/stylus-reorg

Bug 1070001: Organizing custom CSS
mdn · Nov 24, 2015 · 5731b46 · 5731b46
2 parents 33153c6 + bd739cf
commit 5731b46
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 89 deletions.
diff --git a/kuma/static/styles/base/elements/forms.styl b/kuma/static/styles/base/elements/forms.styl
@@ -65,17 +65,17 @@ label {
     }
 
     &.neutral {
-        background-color: #0095dd;
+        background-color: $blue;
         box-shadow: inset 0 -1px $homepage-background-color;
     }
 
     &.negative {
-        background-color: #ea3b28;
+        background-color: $red;
         box-shadow: inset 0 -1px #c13832;
     }
 
     &.positive {
-        background-color: #70a300;
+        background-color: $green;
         box-shadow: inset 0 -1px #486900;
     }
 

diff --git a/kuma/static/styles/components/content.styl b/kuma/static/styles/components/content.styl
@@ -215,6 +215,7 @@ ul.directory-tree {
 div.bug {
     font-style: italic;
     prevent-last-child-bottom-spacing();
+    overflow: hidden;
 
     pre {
         color: $text-color;

diff --git a/kuma/static/styles/components/wiki/customcss.styl b/kuma/static/styles/components/wiki/customcss.styl
@@ -277,6 +277,8 @@ table.html5ArticleToc {
     margin: 0 0.25em;
 }
 
+/* -- */
+
 table.withoutBorder,
 table.withoutBorder td,
 table.withoutBorder tr,
@@ -422,39 +424,6 @@ table.HTMLElmNav td {
     color: #888;
     font-weight: normal;
 }
-
-.experimentalIcon {
-    display: inline-block;
-    width: 4px;
-    height: 4px;
-    color: #ffa500;
-    background-color: #fff;
-    border: 3px solid #ffa500;
-}
-.nonstandardIcon {
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    color: #f00;
-    background-color: #f00;
-    border: 1px solid #f00;
-}
-.obsoleteIcon {
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    color: #000;
-    background-color: #000;
-    border: 1px solid #000;
-}
-.deprecatedIcon {
-    display: inline-block;
-    width: 4px;
-    height: 4px;
-    color: #000;
-    background-color: #fff;
-    border: 3px solid #000;
-}
 /* Used to to create icon-badged APIs inline */
 .indexListRow {
     vendorize-value(display, flex);
@@ -622,26 +591,6 @@ dl {
     font-weight: 700;
 }
 
-/* color setting */
-#wikiArticle i.icon-beaker {
-    color: #09d;
-}
-/* experimental */
-#wikiArticle i.icon-warning-sign {
-    color: #db0;
-}
-/* non-standard */
-#wikiArticle i.icon-thumbs-down-alt {
-    color: #000;
-}
-/* deprecated */
-#wikiArticle i.icon-trash {
-    color: #d00;
-}
-/* obsolete */
-#wikiArticle i.icon-stethoscope {
-    color: #483d8b;
-}
 /* style for next and previous pages in tutorial */
 
 .previousPage {
@@ -726,6 +675,7 @@ a.liveSample:focus {
     font-weight: 700;
     text-align: left;
 }
+/* TODO */
 /* This is a specific item for the CSS tutorial: https://developer.mozilla.org/en-US/docs/CSS/Getting_Started/Selectors */
 /* To be removed once we have Live Examples */
 a.tutospecial:link,
@@ -766,32 +716,7 @@ a.tutospecial:active {
 #tutochallenge:target + a {
     display: none;
 }
-/* Fix for wiki-min.css */
-div.bug,
-div.warning {
-    overflow: hidden;
-}
-.page-content dd {
-    margin: 0.5em;
-}
-[dir="rtl"] .hasJS #nav-main #nav-sub-docs,
-[dir="rtl"] #nav-main .menu:hover #nav-sub-docs {
-    margin-left: -300px;
-}
-[dir="rtl"] #nav-main #nav-sub-docs li {
-    float: right;
-}
-[dir="rtl"] #nav-main #nav-sub-docs p {
-    text-align: left;
-}
-[dir="rtl"] .page-content ul {
-    padding-left: 0;
-    padding-right: 22px;
-}
-[dir="rtl"] .page-content dd {
-    padding-left: 0;
-    padding-right: 15px;
-}
+
 /* for B2G docs, to allow use of B2G lookalike UX elements */
 /* For display of Firefox OS UX screenshots in a grid */
 table.fxosScreenGrid,
@@ -811,6 +736,8 @@ div.fxosLiveSampleWrapper {
     border: 1px solid #b8b2a4;
     background-color: #f3ecdd;
 }
+
+/* -- */
 .rightButtonBox {
     float: right;
     width: 250px;
@@ -838,6 +765,7 @@ div.fxosLiveSampleWrapper {
 /*
  * Colorized icons
  */
+
 #wikiArticle i.icon-beaker,
 #wikiArticle i.icon-warning-sign,
 #wikiArticle i.icon-thumbs-down-alt,
@@ -1187,8 +1115,5 @@ a.addpage-button .right-align {
     font-style: italic;
     background-color: #fef9f5;
 }
-.fa-trash:before {
-    content: "\f014";
-}
 
 /*end!*/
diff --git a/kuma/static/styles/includes/mixins.styl b/kuma/static/styles/includes/mixins.styl
@@ -221,12 +221,10 @@ set-message-base(remove-last-spacing = true) {
     padding: ($grid-spacing / 2);
     margin-bottom: $grid-spacing;
     set-smaller-font-size();
+    overflow: hidden;
 
     if(remove-last-spacing) {
-        & *:last-child {
-            margin-bottom: 0;
-            padding-bottom: 0;
-        }
+        prevent-last-child-bottom-spacing();
     }
 }