Merge pull request #8853 from owncloud/design-typeface

Use Open Sans as typeface

4 files changed, 33 insertions, 3 deletions

diff --git a/core/css/apps.css b/core/css/apps.css
index 22eb4e5cf11..18e299552e5 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -278,3 +278,12 @@ button.loading {
 .appear.transparent {
 	opacity: 0;
 }
+
+
+/* do not use italic typeface style, instead lighter color */
+em {
+	font-style: normal;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
diff --git a/core/css/fixes.css b/core/css/fixes.css
index fc122b1eff1..acea53258eb 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -10,6 +10,11 @@ select {
 	height: 32px;
 }
 
+/* reset typeface for IE8 because OpenSans renders too small */
+.ie8 body {
+    font-family: Frutiger, Calibri, 'Myriad Pro', Myriad, Arial, sans-serif;
+}
+
 .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
 .lte8 .delete-icon:hover, .delete-icon:focus {
 	background-image: url('../img/actions/delete-hover.png');
@@ -72,7 +77,7 @@ select {
 
 /* IE8 isn't able to display transparent background. So it is specified using a gradient */
 .ie8 #nojavascript {
-	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */
+	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000');
 }
 
 /* IE8 doesn't have rounded corners, so the strengthify bar should be wider */
@@ -80,3 +85,4 @@ select {
 	width: 271px;
 	left: 6px;
 }
+
diff --git a/core/css/fonts.css b/core/css/fonts.css
new file mode 100644
index 00000000000..aa6e71bef21
--- /dev/null
+++ b/core/css/fonts.css
@@ -0,0 +1,13 @@
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: normal;
+	src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.woff) format('woff');
+}
+
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-weight: bold;
+	src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/OpenSans-Bold.woff) format('woff');
+}
\ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index bd688f0ada5..595b5532674 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -16,7 +16,10 @@ ul { list-style:none; }
 
 body {
 	background: #fefefe;
-	font: normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif;
+	font-weight: normal;
+	font-size: .8em;
+	line-height: 1.6em;
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 	color: #000;
 	height: auto;
 }
@@ -802,7 +805,6 @@ label.infield {
 	display: block;
 	padding: 7px 12px 6px 7px;
 	cursor: pointer;
-	font-weight: bold;
 }
 #expand:hover, #expand:focus, #expand:active { color:#fff; }
 #expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; }