Merge branch 'master' of github.com:tsi/redmine-theme-flat

Conflicts:
	stylesheets/application.css
This commit is contained in:
Tsachi Shlidor
2015-09-16 12:02:27 +03:00
2 changed files with 4 additions and 4 deletions

View File

@@ -1,8 +1,8 @@
/* load the default Redmine stylesheet */
@import url(../../../stylesheets/application.css);
@import url('../../../stylesheets/application.css');
// Open Sans
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800);
@import url('//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800');
$gray-dark: #202020;
$gray-text: #484848;

View File

@@ -1,6 +1,6 @@
/* load the default Redmine stylesheet */
@import url(../../../stylesheets/application.css);
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800);
@import url("../../../stylesheets/application.css");
@import url("//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800");
.input_tiny {
width: 50px;
}