From d54845a16a8c6c646ecf1d29ca385644f7b2660d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 4 Mar 2013 21:34:26 +0200
Subject: [PATCH] use md-typography for note content
---
app/assets/stylesheets/gitlab_bootstrap/mixins.scss | 11 +++++++++++
.../stylesheets/gitlab_bootstrap/typography.scss | 10 ++--------
app/assets/stylesheets/sections/notes.scss | 1 +
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index f416be95dee..0a27a8350b7 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -75,3 +75,14 @@
line-height: 36px;
font-weight: normal;
}
+
+@mixin md-typography {
+ code { padding: 0 4px; }
+ p { font-size: 13px; }
+ h1 { font-size: 26px; line-height: 40px; margin: 10px 0;}
+ h2 { font-size: 22px; line-height: 40px; margin: 10px 0;}
+ h3 { font-size: 18px; line-height: 40px; margin: 10px 0;}
+ h4 { font-size: 16px; line-height: 20px; margin: 10px 0;}
+ h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
+ h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index 2f7b1d25a45..a7d71d53c2f 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -87,17 +87,11 @@ a:focus {
*
*/
.wiki {
+ @include md-typography;
+
font-size: 13px;
line-height: 20px;
- code { padding: 0 4px; }
- p { font-size: 13px; }
- h1 { font-size: 26px; line-height: 40px; margin: 10px 0;}
- h2 { font-size: 22px; line-height: 40px; margin: 10px 0;}
- h3 { font-size: 18px; line-height: 40px; margin: 10px 0;}
- h4 { font-size: 16px; line-height: 20px; margin: 10px 0;}
- h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
- h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
.white .highlight pre { background: #f5f5f5; }
ul { margin: 0 0 9px 25px !important; }
}
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 1f92a3a835d..1b4280f4974 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -83,6 +83,7 @@ ul.notes {
margin-top: -20px;
}
.note-body {
+ @include md-typography;
margin-left: 45px;
}
.note-header {
--
2.30.9