Merge branch 'rs-markdown-typography' into 'master'

Markdown typography CSS fixes The `!important` flags recently added to the `md-typography` mixin's `pre` elements were overriding the background and foreground colors for syntax highlighting. | Before | After | |:------:|:-----:| | ![Screen_Shot_2015-09-25_at_3.32.32_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/802163bd9f46864ac89e7be165951f07/Screen_Shot_2015-09-25_at_3.32.32_PM.png) | ![Screen_Shot_2015-09-25_at_3.33.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6be72036653378405320085324dff5ad/Screen_Shot_2015-09-25_at_3.33.30_PM.png) | See merge request !1442

Merge branch 'rs-markdown-typography' into 'master'
19cfa86a · Dmitriy Zaporozhets · 353ddbc7 · d7f2a656 · 19cfa86a · 19cfa86a
Commit 19cfa86a authored Oct 15, 2015 by Dmitriy Zaporozhets
6 changed files
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -101,9 +101,9 @@

  pre {
    margin: 12px 0 12px 0 !important;
-    background-color: #f8fafc !important;
+    background-color: #f8fafc;
    font-size: 13px !important;
-    color: #5b6169 !important;
+    color: #5b6169;
    line-height: 1.6em !important;
    @include border-radius(2px);
  }

--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
 /* https://github.com/MozMorris/tomorrow-pygments */
-pre.code.highlight.dark,
 .code.dark {

-  background-color: #1d1f21;
-  color: #c5c8c6;
+  background-color: #1d1f21 !important;
+  color: #c5c8c6 !important;

-  pre.code,
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: #1d1f21 !important;
@@ -23,8 +22,8 @@ pre.code.highlight.dark,

  // Search result highlight
  span.highlight_word {
-    background: #ffe792;
-    color: #000000;
+    background-color: #ffe792 !important;
+    color: #000000 !important;
  }

  .hll { background-color: #373b41 }

--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
 /* https://github.com/richleland/pygments-css/blob/master/monokai.css */
-pre.code.monokai,
 .code.monokai {

-  background: #272822;
-  color: #f8f8f2;
+  background-color: #272822 !important;
+  color: #f8f8f2 !important;

  pre.highlight,
  .line-numbers,
  .line-numbers a {
-    background:#272822 !important;
-    color:#f8f8f2 !important;
+    background-color :#272822 !important;
+    color: #f8f8f2 !important;
  }

  pre.code {
@@ -23,8 +22,8 @@ pre.code.monokai,

  // Search result highlight
  span.highlight_word {
-    background: #ffe792;
-    color: #000000;
+    background-color: #ffe792 !important;
+    color: #000000 !important;
  }

  .hll { background-color: #49483e }

--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
 /* https://gist.github.com/qguv/7936275 */
-pre.code.highlight.solarized-dark,
 .code.solarized-dark {

-  background-color: #002b36;
-  color: #93a1a1;
+  background-color: #002b36 !important;
+  color: #93a1a1 !important;

-  pre.code,
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: #002b36 !important;
@@ -23,7 +22,7 @@ pre.code.highlight.solarized-dark,

  // Search result highlight
  span.highlight_word {
-    background: #094554;
+    background-color: #094554 !important;
  }

  /* Solarized Dark

--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
 /* https://gist.github.com/qguv/7936275 */
-pre.code.highlight.solarized-light,
 .code.solarized-light {

-  background-color: #fdf6e3;
-  color: #586e75;
+  background-color: #fdf6e3 !important;
+  color: #586e75 !important;

-  pre.code,
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: #fdf6e3 !important;
@@ -23,7 +22,7 @@ pre.code.highlight.solarized-light,

  // Search result highlight
  span.highlight_word {
-    background: #eee8d5;
+    background-color: #eee8d5 !important;
  }

  /* Solarized Light

--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
 /* https://github.com/aahan/pygments-github-style */
-pre.code.highlight.white,
 .code.white {
-  background-color: #f8fafc;
-  font-size: 13px;
-  color: #5b6169;
-  line-height: 1.6em;

+  background-color: #f8fafc !important;
+  color: #5b6169 !important;
+
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: $background-color !important;
    color: $gl-gray !important;
  }

-  pre.highlight {
-    background-color: #fff !important;
-    color: #333 !important;
-  }
-
  pre.code {
    border-left: 1px solid $border-color;
+    background-color: #fff !important;
+    color: #333 !important;
  }

  // highlight line via anchor
@@ -28,7 +24,7 @@ pre.code.highlight.white,

  // Search result highlight
  span.highlight_word {
-    background: #fafe3d;
+    background-color: #fafe3d !important;
  }

  .hll { background-color: #f8f8f8 }