summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArinde Eniola <eniolaarinde1@gmail.com>2016-03-15 22:41:26 +0100
committerArinde Eniola <eniolaarinde1@gmail.com>2016-03-15 22:41:26 +0100
commitf42728305bc555d16ecf053dc5849a2b169911e8 (patch)
tree4272e93e895c5caeebde626b26759fed51e03363
parentac8c6f24e3070c28ab6f246599c95fd8f3b7e3a5 (diff)
downloadgitlab-ce-install_souce_code_pro.tar.gz
install source code pro as font for diff and build pagesinstall_souce_code_pro
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/fonts/SourceCodePro-Black.ttf.woffbin0 -> 87528 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Black.ttf.woff2bin0 -> 63856 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-BlackIt.ttf.woffbin0 -> 75556 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-BlackIt.ttf.woff2bin0 -> 54168 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Bold.ttf.woffbin0 -> 89188 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Bold.ttf.woff2bin0 -> 65028 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-BoldIt.ttf.woffbin0 -> 76748 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-BoldIt.ttf.woff2bin0 -> 55488 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-ExtraLight.ttf.woffbin0 -> 87952 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff2bin0 -> 63476 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woffbin0 -> 75216 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff2bin0 -> 53712 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-It.ttf.woffbin0 -> 76572 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-It.ttf.woff2bin0 -> 55172 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Light.ttf.woffbin0 -> 89820 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Light.ttf.woff2bin0 -> 65188 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-LightIt.ttf.woffbin0 -> 77152 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-LightIt.ttf.woff2bin0 -> 55580 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Medium.ttf.woffbin0 -> 89448 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Medium.ttf.woff2bin0 -> 64824 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-MediumIt.ttf.woffbin0 -> 76592 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-MediumIt.ttf.woff2bin0 -> 55012 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Regular.ttf.woffbin0 -> 89604 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Regular.ttf.woff2bin0 -> 64948 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Semibold.ttf.woffbin0 -> 89232 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-Semibold.ttf.woff2bin0 -> 64708 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woffbin0 -> 76776 bytes
-rw-r--r--app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff2bin0 -> 55260 bytes
-rw-r--r--app/assets/stylesheets/framework/fonts.scss42
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--app/assets/stylesheets/pages/builds.scss2
-rw-r--r--app/assets/stylesheets/pages/diff.scss4
33 files changed, 48 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ebf49cd2ac0..07d8e07b084 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@ v 8.6.0 (unreleased)
- Add ability to show archived projects on dashboard, explore and group pages
- Move group activity to separate page
- Continue parameters are checked to ensure redirection goes to the same instance
+ - Install source code pro as font for diff and build pages
v 8.5.6
- Obtain a lease before querying LDAP
diff --git a/app/assets/fonts/SourceCodePro-Black.ttf.woff b/app/assets/fonts/SourceCodePro-Black.ttf.woff
new file mode 100644
index 00000000000..c7f89068e09
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Black.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Black.ttf.woff2 b/app/assets/fonts/SourceCodePro-Black.ttf.woff2
new file mode 100644
index 00000000000..e01216eccf2
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Black.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-BlackIt.ttf.woff b/app/assets/fonts/SourceCodePro-BlackIt.ttf.woff
new file mode 100644
index 00000000000..1c80efe18e6
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-BlackIt.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-BlackIt.ttf.woff2 b/app/assets/fonts/SourceCodePro-BlackIt.ttf.woff2
new file mode 100644
index 00000000000..9d865706243
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-BlackIt.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Bold.ttf.woff b/app/assets/fonts/SourceCodePro-Bold.ttf.woff
new file mode 100644
index 00000000000..c65ba841a76
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Bold.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Bold.ttf.woff2 b/app/assets/fonts/SourceCodePro-Bold.ttf.woff2
new file mode 100644
index 00000000000..b78d5235e6a
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Bold.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-BoldIt.ttf.woff b/app/assets/fonts/SourceCodePro-BoldIt.ttf.woff
new file mode 100644
index 00000000000..6a6798a0f4c
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-BoldIt.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-BoldIt.ttf.woff2 b/app/assets/fonts/SourceCodePro-BoldIt.ttf.woff2
new file mode 100644
index 00000000000..2551c2e9b18
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-BoldIt.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff b/app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff
new file mode 100644
index 00000000000..6eaab1383b6
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff2 b/app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff2
new file mode 100644
index 00000000000..bd472869cfe
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-ExtraLight.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff b/app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff
new file mode 100644
index 00000000000..466d3cbc791
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff2 b/app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff2
new file mode 100644
index 00000000000..9f211fe1246
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-ExtraLightIt.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-It.ttf.woff b/app/assets/fonts/SourceCodePro-It.ttf.woff
new file mode 100644
index 00000000000..6dca188f994
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-It.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-It.ttf.woff2 b/app/assets/fonts/SourceCodePro-It.ttf.woff2
new file mode 100644
index 00000000000..4673f487d65
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-It.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Light.ttf.woff b/app/assets/fonts/SourceCodePro-Light.ttf.woff
new file mode 100644
index 00000000000..77507189c43
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Light.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Light.ttf.woff2 b/app/assets/fonts/SourceCodePro-Light.ttf.woff2
new file mode 100644
index 00000000000..8a2ed8fc5a0
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Light.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-LightIt.ttf.woff b/app/assets/fonts/SourceCodePro-LightIt.ttf.woff
new file mode 100644
index 00000000000..a08555e3864
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-LightIt.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-LightIt.ttf.woff2 b/app/assets/fonts/SourceCodePro-LightIt.ttf.woff2
new file mode 100644
index 00000000000..4a9bb347962
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-LightIt.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Medium.ttf.woff b/app/assets/fonts/SourceCodePro-Medium.ttf.woff
new file mode 100644
index 00000000000..1c558ede09e
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Medium.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Medium.ttf.woff2 b/app/assets/fonts/SourceCodePro-Medium.ttf.woff2
new file mode 100644
index 00000000000..ea961dd2d4a
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Medium.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-MediumIt.ttf.woff b/app/assets/fonts/SourceCodePro-MediumIt.ttf.woff
new file mode 100644
index 00000000000..f6399242123
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-MediumIt.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-MediumIt.ttf.woff2 b/app/assets/fonts/SourceCodePro-MediumIt.ttf.woff2
new file mode 100644
index 00000000000..cc4fe89949a
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-MediumIt.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Regular.ttf.woff b/app/assets/fonts/SourceCodePro-Regular.ttf.woff
new file mode 100644
index 00000000000..0af792a1e4b
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Regular.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Regular.ttf.woff2 b/app/assets/fonts/SourceCodePro-Regular.ttf.woff2
new file mode 100644
index 00000000000..18d2199ea49
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Regular.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Semibold.ttf.woff b/app/assets/fonts/SourceCodePro-Semibold.ttf.woff
new file mode 100644
index 00000000000..0fbe76a914c
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Semibold.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-Semibold.ttf.woff2 b/app/assets/fonts/SourceCodePro-Semibold.ttf.woff2
new file mode 100644
index 00000000000..8baef8f0b4d
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-Semibold.ttf.woff2
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff b/app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff
new file mode 100644
index 00000000000..1f40de272c1
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff
Binary files differ
diff --git a/app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff2 b/app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff2
new file mode 100644
index 00000000000..1e846ca650f
--- /dev/null
+++ b/app/assets/fonts/SourceCodePro-SemiboldIt.ttf.woff2
Binary files differ
diff --git a/app/assets/stylesheets/framework/fonts.scss b/app/assets/stylesheets/framework/fonts.scss
index 7a946109e3a..64743f89b4b 100644
--- a/app/assets/stylesheets/framework/fonts.scss
+++ b/app/assets/stylesheets/framework/fonts.scss
@@ -39,3 +39,45 @@
font-url('SourceSansPro-Bold.ttf.woff2') format('woff2'),
font-url('SourceSansPro-Bold.ttf.woff') format('woff');
}
+
+/* Fonts Source Code Pro*/
+@font-face {
+ font-family: 'Source Code Pro';
+ font-style: normal;
+ font-weight: 300;
+ src:
+ local('Source Code Pro Light'),
+ local('SourceCodePro-Light'),
+ font-url('SourceCodePro-Light.ttf.woff2') format('woff2'),
+ font-url('SourceCodePro-Light.ttf.woff') format('woff');
+}
+@font-face {
+ font-family: 'Source Code Pro';
+ font-style: normal;
+ font-weight: 400;
+ src:
+ local('Source Code Pro'),
+ local('SourceCodePro-Regular'),
+ font-url('SourceCodePro-Regular.ttf.woff2') format('woff2'),
+ font-url('SourceCodePro-Regular.ttf.woff') format('woff');
+}
+@font-face {
+ font-family: 'Source Code Pro';
+ font-style: normal;
+ font-weight: 600;
+ src:
+ local('Source Code Pro Semibold'),
+ local('SourceCodePro-Semibold'),
+ font-url('SourceCodePro-Semibold.ttf.woff2') format('woff2'),
+ font-url('SourceCodePro-Semibold.ttf.woff') format('woff');
+}
+@font-face {
+ font-family: 'Source Code Pro';
+ font-style: normal;
+ font-weight: 700;
+ src:
+ local('Source Code Pro Bold'),
+ local('SourceCodePro-Bold'),
+ font-url('SourceCodePro-Bold.ttf.woff2') format('woff2'),
+ font-url('SourceCodePro-Bold.ttf.woff') format('woff');
+}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index d491d01a3cf..2ac2f1acd2a 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -132,6 +132,7 @@ $deleted: #f77;
*/
$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
$regular_font: 'Source Sans Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
+$source_code_font: 'Source Code Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
/*
* Dropdowns
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 75f298019e3..457fdd319f5 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -2,7 +2,7 @@
pre.trace {
background: #111111;
color: #fff;
- font-family: $monospace_font;
+ font-family: $source_code_font;
white-space: pre;
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index a7925e79549..2972186a032 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -54,7 +54,9 @@
table {
width: 100%;
- font-family: $monospace_font;
+ font-family: $source_code_font;
+ font-size: 14pt;
+ color: #555555;
border: none;
border-collapse: separate;
margin: 0px;