ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced ionic fonts with material design icons

This commit is contained in:
Pliable Pixels 2018-03-25 09:28:00 -04:00
parent acdc076b84
commit 14f638e009
8 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/css/ionicons.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
web/fonts/MaterialIcons-Regular.eot Normal file
View File

Binary file not shown.

BIN
web/fonts/MaterialIcons-Regular.ttf Normal file
View File

Binary file not shown.

BIN
web/fonts/MaterialIcons-Regular.woff Normal file
View File

Binary file not shown.

BIN
web/fonts/MaterialIcons-Regular.woff2 Normal file
View File

Binary file not shown.

40
web/skins/classic/css/base/skin.css
View File

@ -21,6 +21,46 @@
* Primary look and feel styles * Primary look and feel styles
*/ */
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(../fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url(../fonts/MaterialIcons-Regular.woff2) format('woff2'),
url(../fonts/MaterialIcons-Regular.woff) format('woff'),
url(../fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
vertical-align:middle;
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
font-feature-settings: 'liga';
}
.material-icons.md-18 { font-size: 18px; }
body { body {
font-family: "Open Sans", Verdana, Arial, Helvetica, sans-serif; font-family: "Open Sans", Verdana, Arial, Helvetica, sans-serif;
font-size: 13px; font-size: 13px;

7
web/skins/classic/includes/functions.php
View File

@ -74,7 +74,6 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
<link rel="stylesheet" href="css/reset.css" type="text/css"/> <link rel="stylesheet" href="css/reset.css" type="text/css"/>
<link rel="stylesheet" href="css/overlay.css" type="text/css"/> <link rel="stylesheet" href="css/overlay.css" type="text/css"/>
<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css"/> <link rel="stylesheet" href="css/bootstrap.min.css" type="text/css"/>
<link rel="stylesheet" href="css/ionicons.min.css" type="text/css"/>
<?php <?php
echo output_link_if_exists( array( echo output_link_if_exists( array(
@ -315,7 +314,7 @@ if ($reload == 'reload') ob_start();
?> ?>
<div id="reload" class="container-fluid"> <div id="reload" class="container-fluid">
<div id="Bandwidth" class="pull-left"> <div id="Bandwidth" class="pull-left">
<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', "<i class='ion-connection-bars'></i>&nbsp;".$bandwidth_options[$_COOKIE['zmBandwidth']] . ' ', ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', "<i class='material-icons'>network_check</i>&nbsp;".$bandwidth_options[$_COOKIE['zmBandwidth']] . ' ', ($user && $user['MaxBandwidth'] != 'low' ) ) ?>
</div> </div>
<div id="Version" class="pull-right"> <div id="Version" class="pull-right">
<?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="version '.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?> <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="version '.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?>
@ -324,8 +323,8 @@ if ($reload == 'reload') ob_start();
<?php } ?> <?php } ?>
</div> </div>
<ul class="list-inline"> <ul class="list-inline">
<li class="Load"><i class="ion-arrow-graph-up-right"></i>&nbsp;<?php echo translate('Load') ?>: <?php echo getLoad() ?></li> <li class="Load"><i class="material-icons">trending_up</i>&nbsp;<?php echo translate('Load') ?>: <?php echo getLoad() ?></li>
<i class="ion-social-buffer"></i> <i class="material-icons">storage</i>
<?php <?php
$connections = dbFetchOne( "SHOW status WHERE variable_name='threads_connected'", 'Value' ); $connections = dbFetchOne( "SHOW status WHERE variable_name='threads_connected'", 'Value' );
$max_connections = dbFetchOne( "SHOW variables WHERE variable_name='max_connections'", 'Value' ); $max_connections = dbFetchOne( "SHOW variables WHERE variable_name='max_connections'", 'Value' );

6
web/skins/classic/views/console.php
View File

@ -146,6 +146,8 @@ if ( $show_storage_areas ) $left_columns += 1;
xhtmlHeaders( __FILE__, translate('Console') ); xhtmlHeaders( __FILE__, translate('Console') );
?> ?>
<body> <body>
<form name="monitorForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>"> <form name="monitorForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?php echo $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value=""/> <input type="hidden" name="action" value=""/>
@ -160,12 +162,12 @@ xhtmlHeaders( __FILE__, translate('Console') );
<?php if ( ZM_WEB_ID_ON_CONSOLE ) { ?> <?php if ( ZM_WEB_ID_ON_CONSOLE ) { ?>
<th class="colId"><?php echo translate('Id') ?></th> <th class="colId"><?php echo translate('Id') ?></th>
<?php } ?> <?php } ?>
<th class="colName"><i class="ion-monitor"></i>&nbsp;<?php echo translate('Name') ?></th> <th class="colName"><i class="material-icons md-18">videocam</i>&nbsp;<?php echo translate('Name') ?></th>
<th class="colFunction"><?php echo translate('Function') ?></th> <th class="colFunction"><?php echo translate('Function') ?></th>
<?php if ( count($servers) ) { ?> <?php if ( count($servers) ) { ?>
<th class="colServer"><?php echo translate('Server') ?></th> <th class="colServer"><?php echo translate('Server') ?></th>
<?php } ?> <?php } ?>
<th class="colSource"><i class="ion-gear-b"></i>&nbsp;<?php echo translate('Source') ?></th> <th class="colSource"><i class="material-icons md-18">settings</i>&nbsp;<?php echo translate('Source') ?></th>
<?php if ( $show_storage_areas ) { ?> <?php if ( $show_storage_areas ) { ?>
<th class="colStorage"><?php echo translate('Storage') ?></th> <th class="colStorage"><?php echo translate('Storage') ?></th>
<?php } <?php }