Merge branch 'master' into ldap_group_security

This commit is contained in:
Ivan Filippov 2016-04-21 00:52:26 -06:00
commit 73e607b692
2 changed files with 5 additions and 0 deletions

View file

@ -1,5 +1,9 @@
/* here you can put your own css to customize and override the theme */
#tbl_record_manage td {
font-family:'Roboto Mono' !important;
}
/***
Rounded Portlets
***/

View file

@ -13,6 +13,7 @@
<!-- BEGIN GLOBAL MANDATORY STYLES -->
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all" rel="stylesheet" type="text/css"/>
<link href='http://fonts.googleapis.com/css?family=Roboto+Mono:400,300,700' rel='stylesheet' type='text/css'>
<link href="{{ url_for('static', filename='global/plugins/font-awesome/css/font-awesome.min.css') }}" rel="stylesheet" type="text/css"/>
<link href="{{ url_for('static', filename='global/plugins/simple-line-icons/simple-line-icons.min.css') }}" rel="stylesheet" type="text/css"/>
<link href="{{ url_for('static', filename='global/plugins/bootstrap/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>