diff --git a/app/fonts/DroidSans-Bold.eot b/app/fonts/DroidSans-Bold.eot
deleted file mode 100644
index eb2713a8..00000000
Binary files a/app/fonts/DroidSans-Bold.eot and /dev/null differ
diff --git a/app/fonts/DroidSans-Bold.svg b/app/fonts/DroidSans-Bold.svg
deleted file mode 100644
index 7261a47f..00000000
--- a/app/fonts/DroidSans-Bold.svg
+++ /dev/null
@@ -1,2023 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/DroidSans-Bold.ttf b/app/fonts/DroidSans-Bold.ttf
deleted file mode 100644
index d673c96c..00000000
Binary files a/app/fonts/DroidSans-Bold.ttf and /dev/null differ
diff --git a/app/fonts/DroidSans-Bold.woff b/app/fonts/DroidSans-Bold.woff
deleted file mode 100644
index 17284a0d..00000000
Binary files a/app/fonts/DroidSans-Bold.woff and /dev/null differ
diff --git a/app/fonts/DroidSans.eot b/app/fonts/DroidSans.eot
deleted file mode 100644
index 4bb3ed5f..00000000
Binary files a/app/fonts/DroidSans.eot and /dev/null differ
diff --git a/app/fonts/DroidSans.svg b/app/fonts/DroidSans.svg
deleted file mode 100644
index 9f01d0a6..00000000
--- a/app/fonts/DroidSans.svg
+++ /dev/null
@@ -1,2023 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/DroidSans.ttf b/app/fonts/DroidSans.ttf
deleted file mode 100644
index 3f406f29..00000000
Binary files a/app/fonts/DroidSans.ttf and /dev/null differ
diff --git a/app/fonts/DroidSans.woff b/app/fonts/DroidSans.woff
deleted file mode 100644
index 51083939..00000000
Binary files a/app/fonts/DroidSans.woff and /dev/null differ
diff --git a/app/fonts/OpenSans-CondLight-webfont.eot b/app/fonts/OpenSans-CondLight.eot
similarity index 100%
rename from app/fonts/OpenSans-CondLight-webfont.eot
rename to app/fonts/OpenSans-CondLight.eot
diff --git a/app/fonts/OpenSans-CondLight-webfont.svg b/app/fonts/OpenSans-CondLight.svg
similarity index 100%
rename from app/fonts/OpenSans-CondLight-webfont.svg
rename to app/fonts/OpenSans-CondLight.svg
diff --git a/app/fonts/OpenSans-CondLight-webfont.ttf b/app/fonts/OpenSans-CondLight.ttf
similarity index 100%
rename from app/fonts/OpenSans-CondLight-webfont.ttf
rename to app/fonts/OpenSans-CondLight.ttf
diff --git a/app/fonts/OpenSans-CondLight-webfont.woff b/app/fonts/OpenSans-CondLight.woff
similarity index 100%
rename from app/fonts/OpenSans-CondLight-webfont.woff
rename to app/fonts/OpenSans-CondLight.woff
diff --git a/app/fonts/opensans-regular.eot b/app/fonts/opensans-regular.eot
new file mode 100644
index 00000000..6bbc3cf5
Binary files /dev/null and b/app/fonts/opensans-regular.eot differ
diff --git a/app/fonts/opensans-regular.svg b/app/fonts/opensans-regular.svg
new file mode 100644
index 00000000..25a39523
--- /dev/null
+++ b/app/fonts/opensans-regular.svg
@@ -0,0 +1,1831 @@
+
+
+
\ No newline at end of file
diff --git a/app/fonts/opensans-regular.ttf b/app/fonts/opensans-regular.ttf
new file mode 100644
index 00000000..c537f838
Binary files /dev/null and b/app/fonts/opensans-regular.ttf differ
diff --git a/app/fonts/opensans-regular.woff b/app/fonts/opensans-regular.woff
new file mode 100644
index 00000000..e231183d
Binary files /dev/null and b/app/fonts/opensans-regular.woff differ
diff --git a/app/fonts/opensans-semibold.eot b/app/fonts/opensans-semibold.eot
new file mode 100644
index 00000000..d8375dd0
Binary files /dev/null and b/app/fonts/opensans-semibold.eot differ
diff --git a/app/fonts/opensans-semibold.svg b/app/fonts/opensans-semibold.svg
new file mode 100644
index 00000000..eec4db8b
--- /dev/null
+++ b/app/fonts/opensans-semibold.svg
@@ -0,0 +1,1830 @@
+
+
+
\ No newline at end of file
diff --git a/app/fonts/opensans-semibold.ttf b/app/fonts/opensans-semibold.ttf
new file mode 100644
index 00000000..b3290843
Binary files /dev/null and b/app/fonts/opensans-semibold.ttf differ
diff --git a/app/fonts/opensans-semibold.woff b/app/fonts/opensans-semibold.woff
new file mode 100644
index 00000000..28d6adee
Binary files /dev/null and b/app/fonts/opensans-semibold.woff differ
diff --git a/app/fonts/ostrichSans.eot b/app/fonts/ostrichSans.eot
deleted file mode 100755
index 8cad119a..00000000
Binary files a/app/fonts/ostrichSans.eot and /dev/null differ
diff --git a/app/fonts/ostrichSans.svg b/app/fonts/ostrichSans.svg
deleted file mode 100755
index ddb14919..00000000
--- a/app/fonts/ostrichSans.svg
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/ostrichSans.ttf b/app/fonts/ostrichSans.ttf
deleted file mode 100755
index 58545d6f..00000000
Binary files a/app/fonts/ostrichSans.ttf and /dev/null differ
diff --git a/app/fonts/ostrichSans.woff b/app/fonts/ostrichSans.woff
deleted file mode 100755
index 19d50b5c..00000000
Binary files a/app/fonts/ostrichSans.woff and /dev/null differ
diff --git a/app/styles/components/basic-table.scss b/app/styles/components/basic-table.scss
index c89b2c03..d6849312 100644
--- a/app/styles/components/basic-table.scss
+++ b/app/styles/components/basic-table.scss
@@ -3,8 +3,8 @@
width: 100%;
.row {
@include table-flex(stretch, center, flex, row, nowrap, flex-start);
- border-bottom: 1px solid $gray-light;
- padding: .5rem 0;
+ border-bottom: 1px solid darken($whitish, 4%);
+ padding: .3rem 0;
text-align: left;
width: 100%;
@for $i from 1 through 8 {
diff --git a/app/styles/components/wysiwyg.scss b/app/styles/components/wysiwyg.scss
index 4d63ed21..af5dc3cd 100644
--- a/app/styles/components/wysiwyg.scss
+++ b/app/styles/components/wysiwyg.scss
@@ -1,4 +1,5 @@
.wysiwyg {
+ line-height: 1.4rem;
overflow: auto;
h1 {
@extend %xlarge;
@@ -44,6 +45,7 @@
}
}
p {
+ line-height: 1.4rem;
margin-bottom: 1rem;
}
pre,
@@ -57,7 +59,7 @@
white-space: pre;
}
pre {
- line-height: 135%;
+ line-height: 1.4rem;
padding: .5rem;
}
table {
diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss
index 8ea1f17b..92dc71b8 100755
--- a/app/styles/dependencies/typography.scss
+++ b/app/styles/dependencies/typography.scss
@@ -2,7 +2,7 @@
// Font face
-@each $font-face in DroidSans, DroidSans-Bold, OpenSans-CondLight-webfont, taiga {
+@each $font-face in OpenSans-CondLight, opensans-regular, opensans-semibold, taiga {
@font-face {
font-family: '#{$font-face}';
src: url('../fonts/#{$font-face}.eot?#iefix') format('embedded-opentype'),
@@ -35,9 +35,9 @@ h6 {
%xxlarge {font-size: 3rem;}
// __Font Types__ //
-%title {font-family: 'OpenSans-CondLight-webfont';}
-%text {font-family: 'DroidSans';}
-%bold {font-family: 'DroidSans-Bold';}
+%title {font-family: 'OpenSans-CondLight';}
+%text {font-family: 'opensans-regular'; line-height: 1.3rem;}
+%bold {font-family: 'opensans-semibold';}
%taiga {font-family: 'taiga';}
h1 {
diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss
index 0291d525..9dc54351 100644
--- a/app/styles/layout/base.scss
+++ b/app/styles/layout/base.scss
@@ -5,9 +5,9 @@ html {
width: 100%;
}
body {
+ @extend %text;
background: #fff; // fallback
color: #444;
- font: 16px/21px 'DroidSans', Arial, sans-serif;
-webkit-font-smoothing: antialiased; // Fix for webkit renderin
height: 100%;
min-height: 100%;
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index e42ef3b7..0ea2aa2a 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -110,6 +110,7 @@
.backlog-table-body {
.row {
+ border-bottom: 1px solid darken($whitish, 4%);
cursor: move;
flex-wrap: nowrap;
position: relative;
diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss
index 6f59d3c7..3c773832 100644
--- a/app/styles/modules/issues/issues-table.scss
+++ b/app/styles/modules/issues/issues-table.scss
@@ -30,7 +30,7 @@
}
.table-main {
@extend %small;
- border-bottom: 1px solid $gray-light;
+ border-bottom: 1px solid darken($whitish, 4%);
}
.avatar {
@include table-flex(stretch, center, flex, row, wrap, flex-start);