Merge branch 'develop' into release/v3.0.0

.htaccess

@@ -1,4 +1,4 @@
-IndexIgnore *
+Options -Indexes
 
 # ---
 # Uncomment these lines to change PHP parameters if you are using the PHP Apache module

README.md

@@ -59,6 +59,7 @@ Here's a list of all available Plugins and Extensions:
 | lychee-redirect | Redirect from an album-name to a Lychee-album | [More »](https://github.com/electerious/lychee-redirect) |
 | lychee-watermark | Adds a second watermarked photo when uploading images | [More »](https://github.com/electerious/lychee-watermark) |
 | lychee-rss | Creates a RSS-Feed out of your photos | [More »](https://github.com/cternes/Lychee-RSS) |
+| lychee-FlashAir | Import from a Toshiba FlashAir WiFi SD card | [More »](https://github.com/mhp/Lychee-FlashAir) |
 
 ## Troubleshooting
 

docs/Keyboard Shortcuts.md

@@ -1,6 +1,6 @@
 ### About
 
-The following keys and shortcuts can be used in Lychee. Single char-shortcuts are also working, when using them with together the `ctrl`-key.
+The following keys and shortcuts can be used in Lychee.
 
 ### Everywhere
 | Key | Action |

docs/Plugins.md

@@ -152,3 +152,11 @@ These hooks are called from `php/modules/Session.php`.
 | Session::login:after |  |
 | Session::logout:before | User logs out |
 | Session::logout:after |  |
+
+##### Import
+These hooks are called from `php/modules/Import.php`.
+
+| Name | Description |
+|:-----------|:------------|:------------|
+| Import::server:before | User imports photos from the server |
+| Import::server:after |  |

docs/Settings.md

@@ -17,10 +17,10 @@ All settings are stored in the database. You can change the properties manually,
 
 #### Login
 
-	username = Username for Lychee
+	username = Username for Lychee (hashed)
-	password = Password for Lychee, saved as an md5 hash
+	password = Password for Lychee (hashed)
 
-Your photos and albums are protected by an username and password you need to set. If both rows are empty, Lychee will prompt you to set them. 
+Your photos and albums are protected by an username and password. If both rows are empty, Lychee will prompt you to set them.
 
 #### Thumb Quality
 

index.html

@@ -29,39 +29,75 @@
 	<!-- Header -->
 	<header>
 
-		<!-- Buttons -->
+		<!-- Title -->
-		<div id="tools_albums">
-			<a class="button left icon-cog" id="button_settings" title="Settings"></a>
-			<a class="button left icon-signout" id="button_signin" title="Sign In"></a>
-			<a id="hostedwith">Hosted with Lychee</a>
-			<a class="button right icon icon-plus button_add" title="Add"></a>
-			<a class="button_divider"></a>
-			<input id="search" type="text" name="search" placeholder="Search …">
-			<a id="clearSearch" class="button right">&times;</a>
-		</div>
-		<div id="tools_album">
-			<a class="button left icon-arrow-left" id="button_back_home" title="Close Album"></a>
-			<a class="button right icon icon-plus button_add" title="Add"></a>
-			<a class="button_divider"></a>
-			<div class="tools" id="button_trash_album" title="Delete Album"><a class="icon-trash"></a></div>
-			<div class="tools" id="button_info_album" title="Show Info"><a class="icon-info-sign"></a></div>
-			<div class="tools" id="button_archive" title="Download Album"><a class="icon-circle-arrow-down"></a></div>
-			<div class="tools" id="button_share_album" title="Share Album"><a class="icon-share"></a></div>
-		</div>
-		<div id="tools_photo">
-			<a class="button left icon-arrow-left" id="button_back" title="Close Photo"></a>
-			<div class="tools" id="button_more" title="More"><a class="icon-caret-down"></a></div>
-			<a class="button_divider"></a>
-			<div class="tools" id="button_trash" title="Delete"><a class="icon-trash"></a></div>
-			<div class="tools" id="button_move" title="Move"><a class="icon-folder-open"></a></div>
-			<div class="tools" id="button_info" title="Show Info"><a class="icon-info-sign"></a></div>
-			<a class="button_divider"></a>
-			<div class="tools" id="button_share" title="Share Photo"><a class="icon-share"></a></div>
-			<div class="tools" id="button_star" title="Star Photo"><a class="icon-star-empty"></a></div>
-		</div>
-
 		<a id="title"></a>
 
+		<!-- Buttons -->
+		<div class="toolbar" id="tools_albums">
+			<a class="button button--left" id="button_settings" title="Settings">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#cog"></use></svg>
+			</a>
+			<a class="button button--left" id="button_signin" title="Sign In">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#account-login"></use></svg>
+			</a>
+			<a id="hostedwith">Hosted with Lychee</a>
+			<a class="button button--right button_add" title="Add">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#plus"></use></svg>
+			</a>
+			<a class="button_divider"></a>
+			<a class="button button--right" id="button_search" title="Search">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#magnifying-glass"></use></svg>
+			</a>
+			<!-- <input id="search" type="text" name="search" placeholder="Search …">
+			<a id="clearSearch">&times;</a> -->
+		</div>
+		<div class="toolbar" id="tools_album">
+			<a class="button button--left" id="button_back_home" title="Close Album">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#chevron-left"></use></svg>
+			</a>
+			<a class="button button--right button_add" title="Add">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#plus"></use></svg>
+			</a>
+			<a class="button_divider"></a>
+			<a class="button button--right" id="button_trash_album" title="Delete Album">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#trash"></use></svg>
+			</a>
+			<a class="button button--right" id="button_info_album" title="About Album">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#info"></use></svg>
+			</a>
+			<a class="button button--right" id="button_archive" title="Download Album">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#cloud-download"></use></svg>
+			</a>
+			<a class="button button--right button--eye" id="button_share_album" title="Share Album">
+				<svg viewBox="0 0 8 8" class="iconic iconic--eye"><use xlink:href="src/images/iconic.svg#eye"></use></svg>
+			</a>
+		</div>
+		<div class="toolbar" id="tools_photo">
+			<a class="button button--left" id="button_back" title="Close Photo">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#chevron-left"></use></svg>
+			</a>
+			<a class="button button--right" id="button_more" title="More">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#ellipses"></use></svg>
+			</a>
+			<a class="button_divider"></a>
+			<a class="button button--right" id="button_trash" title="Delete">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#trash"></use></svg>
+			</a>
+			<a class="button button--right" id="button_info" title="About Photo">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#info"></use></svg>
+			</a>
+			<a class="button button--right" id="button_move" title="Move">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#folder"></use></svg>
+			</a>
+			<a class="button_divider"></a>
+			<a class="button button--right button--eye" id="button_share" title="Share Photo">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#eye"></use></svg>
+			</a>
+			<a class="button button--right button--star" id="button_star" title="Star Photo">
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#star"></use></svg>
+			</a>
+		</div>
+
 	</header>
 
 	<!-- Content -->
@@ -71,7 +107,16 @@
 	<div id="imageview"></div>
 
 	<!-- Infobox -->
-	<div id="infobox"></div>
+	<div id="infobox">
+		<div class='header'>
+			<h1>About</h1>
+			<a class='close' title='Close About'>
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#circle-x"></use></svg>
+			</a>
+		</div>
+		<div class='wrapper'>
+		</div>
+	</div>
 
 	<!-- Upload -->
 	<div id="upload">

php/access/Access.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Access
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/access/Admin.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Admin Access
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -15,50 +15,50 @@ class Admin extends Access {
 		switch ($fn) {
 
 			# Album functions
-			case 'getAlbums':			$this->getAlbums(); break;
+			case 'Album::getAll':			$this->getAlbums(); break;
-			case 'getAlbum':			$this->getAlbum(); break;
+			case 'Album::get':				$this->getAlbum(); break;
-			case 'addAlbum':			$this->addAlbum(); break;
+			case 'Album::add':				$this->addAlbum(); break;
-			case 'setAlbumTitle':		$this->setAlbumTitle(); break;
+			case 'Album::setTitle':			$this->setAlbumTitle(); break;
-			case 'setAlbumDescription':	$this->setAlbumDescription(); break;
+			case 'Album::setDescription':	$this->setAlbumDescription(); break;
-			case 'setAlbumPublic':		$this->setAlbumPublic(); break;
+			case 'Album::setPublic':		$this->setAlbumPublic(); break;
-			case 'deleteAlbum':			$this->deleteAlbum(); break;
+			case 'Album::delete':			$this->deleteAlbum(); break;
 
 			# Photo functions
-			case 'getPhoto':			$this->getPhoto(); break;
+			case 'Photo::get':				$this->getPhoto(); break;
-			case 'setPhotoTitle':		$this->setPhotoTitle(); break;
+			case 'Photo::setTitle':			$this->setPhotoTitle(); break;
-			case 'setPhotoDescription':	$this->setPhotoDescription(); break;
+			case 'Photo::setDescription':	$this->setPhotoDescription(); break;
-			case 'setPhotoStar':		$this->setPhotoStar(); break;
+			case 'Photo::setStar':			$this->setPhotoStar(); break;
-			case 'setPhotoPublic':		$this->setPhotoPublic(); break;
+			case 'Photo::setPublic':		$this->setPhotoPublic(); break;
-			case 'setPhotoAlbum':		$this->setPhotoAlbum(); break;
+			case 'Photo::setAlbum':			$this->setPhotoAlbum(); break;
-			case 'setPhotoTags':		$this->setPhotoTags(); break;
+			case 'Photo::setTags':			$this->setPhotoTags(); break;
-			case 'duplicatePhoto':		$this->duplicatePhoto(); break;
+			case 'Photo::duplicate':		$this->duplicatePhoto(); break;
-			case 'deletePhoto':			$this->deletePhoto(); break;
+			case 'Photo::delete':			$this->deletePhoto(); break;
 
 			# Add functions
-			case 'upload':				$this->upload(); break;
+			case 'Photo::add':				$this->upload(); break;
-			case 'importUrl':			$this->importUrl(); break;
+			case 'Import::url':				$this->importUrl(); break;
-			case 'importServer':		$this->importServer(); break;
+			case 'Import::server':			$this->importServer(); break;
 
 			# Search functions
-			case 'search':				$this->search(); break;
+			case 'search':					$this->search(); break;
 
 			# Session functions
-			case 'init':				$this->init(); break;
+			case 'Session::init':			$this->init(); break;
-			case 'login':				$this->login(); break;
+			case 'Session::login':			$this->login(); break;
-			case 'logout':				$this->logout(); break;
+			case 'Session::logout':			$this->logout(); break;
 
 			# Settings functions
-			case 'setLogin':			$this->setLogin(); break;
+			case 'Settings::setLogin':		$this->setLogin(); break;
-			case 'setSorting':			$this->setSorting(); break;
+			case 'Settings::setSorting':	$this->setSorting(); break;
-			case 'setDropboxKey':		$this->setDropboxKey(); break;
+			case 'Settings::setDropboxKey':	$this->setDropboxKey(); break;
 
 			# $_GET functions
-			case 'getAlbumArchive':		$this->getAlbumArchive(); break;
+			case 'Album::getArchive':		$this->getAlbumArchive(); break;
-			case 'getPhotoArchive':		$this->getPhotoArchive(); break;
+			case 'Photo::getArchive':		$this->getPhotoArchive(); break;
 
 			# Error
-			default:					exit('Error: Function not found! Please check the spelling of the called function.');
+			default:						exit('Error: Function not found! Please check the spelling of the called function.');
-										return false; break;
+											return false; break;
 
 		}
 

php/access/Guest.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Guest Access (Public Mode)
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -15,21 +15,21 @@ class Guest extends Access {
 		switch ($fn) {
 
 			# Album functions
-			case 'getAlbums':			$this->getAlbums(); break;
+			case 'Album::getAll':		$this->getAlbums(); break;
-			case 'getAlbum':			$this->getAlbum(); break;
+			case 'Album::get':			$this->getAlbum(); break;
-			case 'checkAlbumAccess':	$this->checkAlbumAccess(); break;
+			case 'Album::getPublic':	$this->checkAlbumAccess(); break;
 
 			# Photo functions
-			case 'getPhoto':			$this->getPhoto(); break;
+			case 'Photo::get':			$this->getPhoto(); break;
 
 			# Session functions
-			case 'init':				$this->init(); break;
+			case 'Session::init':		$this->init(); break;
-			case 'login':				$this->login(); break;
+			case 'Session::login':		$this->login(); break;
-			case 'logout':				$this->logout(); break;
+			case 'Session::logout':		$this->logout(); break;
 
 			# $_GET functions
-			case 'getAlbumArchive':		$this->getAlbumArchive(); break;
+			case 'Album::getArchive':	$this->getAlbumArchive(); break;
-			case 'getPhotoArchive':		$this->getPhotoArchive(); break;
+			case 'Photo::getArchive':	$this->getPhotoArchive(); break;
 
 			# Error
 			default:					exit('Error: Function not found! Please check the spelling of the called function.');
@@ -58,8 +58,8 @@ class Guest extends Access {
 		if ($album->getPublic()) {
 
 			# Album public
-			if ($album->checkPassword($_POST['password'])) echo json_encode($album->get());
+			if ($album->checkPassword($_POST['password']))	echo json_encode($album->get());
-			else echo 'Warning: Wrong password!';
+			else											echo 'Warning: Wrong password!';
 
 		} else {
 
@@ -78,8 +78,8 @@ class Guest extends Access {
 		if ($album->getPublic()) {
 
 			# Album public
-			if ($album->checkPassword($_POST['password'])) echo true;
+			if ($album->checkPassword($_POST['password']))	echo true;
-			else echo false;
+			else											echo false;
 
 		} else {
 
@@ -97,8 +97,8 @@ class Guest extends Access {
 		Module::dependencies(isset($_POST['photoID'], $_POST['albumID'], $_POST['password']));
 		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
 
-		if ($photo->getPublic($_POST['password'])) echo json_encode($photo->get($_POST['albumID']));
+		if ($photo->getPublic($_POST['password']))	echo json_encode($photo->get($_POST['albumID']));
-		else echo 'Warning: Wrong password!';
+		else										echo 'Warning: Wrong password!';
 
 	}
 
@@ -138,8 +138,8 @@ class Guest extends Access {
 		if ($album->getPublic()&&$album->getDownloadable()) {
 
 			# Album Public
-			if ($album->checkPassword($_GET['password'])) $album->getArchive();
+			if ($album->checkPassword($_GET['password']))	$album->getArchive();
-			else exit('Warning: Wrong password!');
+			else											exit('Warning: Wrong password!');
 
 		} else {
 

php/access/Installation.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Installation Access
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -14,11 +14,11 @@ class Installation extends Access {
 
 		switch ($fn) {
 
-			case 'dbCreateConfig':	$this->dbCreateConfig(); break;
+			case 'Database::createConfig':	$this->dbCreateConfig(); break;
 
 			# Error
-			default:				exit('Warning: No configuration!');
+			default:						exit('Warning: No configuration!');
-									return false; break;
+											return false; break;
 
 		}
 

php/api.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			API
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 @ini_set('max_execution_time', '200');
@@ -53,10 +53,6 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
 	$plugins = explode(';', $settings['plugins']);
 	$plugins = new Plugins($plugins, $database, $settings);
 
-	# Escape
-	foreach(array_keys($_POST) as $key)	$_POST[$key] = urldecode($_POST[$key]);
-	foreach(array_keys($_GET) as $key)	$_GET[$key] = urldecode($_GET[$key]);
-
 	# Validate parameters
 	if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1)	exit('Error: Wrong parameter type for albumIDs!');
 	if (isset($_POST['photoIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['photoIDs'])!==1)	exit('Error: Wrong parameter type for photoIDs!');

php/autoload.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Autoload
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/database/update_020100.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.1
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 $query = Database::prepare($database, "SELECT `tags` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
 if(!$database->query($query)) {
 	$query = Database::prepare($database, "ALTER TABLE `?` ADD `tags` VARCHAR( 1000 ) NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));

php/database/update_020101.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.1.1
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 $query	= Database::prepare($database, "ALTER TABLE `?` CHANGE `value` `value` VARCHAR( 200 ) NULL DEFAULT ''", array(LYCHEE_TABLE_SETTINGS));
 $result	= $database->query($query);
 if (!$result) {

php/database/update_020200.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.2
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 $query = Database::prepare($database, "SELECT `visible` FROM `?` LIMIT 1", array(LYCHEE_TABLE_ALBUMS));
 if (!$database->query($query)) {
 	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `visible` TINYINT(1) NOT NULL DEFAULT 1", array(LYCHEE_TABLE_ALBUMS));

php/database/update_020500.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.5
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 # Add `plugins`
 $query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'plugins' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result	= $database->query($query);

php/database/update_020505.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.5.5
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 # Add `checksum`
 $query = Database::prepare($database, "SELECT `checksum` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
 if (!$database->query($query)) {

php/database/update_020601.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.6.1
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 # Add `downloadable`
 $query = Database::prepare($database, "SELECT `downloadable` FROM `?` LIMIT 1", array(LYCHEE_TABLE_ALBUMS));
 if (!$database->query($query)) {

php/database/update_020602.php

@@ -2,9 +2,11 @@
 
 ###
 # @name			Update to version 2.6.2
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 # Add a checksum
 $query	= Database::prepare($database, "SELECT `id`, `url` FROM `?` WHERE `checksum` IS NULL", array(LYCHEE_TABLE_PHOTOS));
 $result	= $database->query($query);

php/database/update_020700.php

@@ -1,10 +1,12 @@
 <?php
 
 ###
-# @name			Update to version 2.6.2
+# @name			Update to version 2.7.0
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
 # Add medium to photos
 $query = Database::prepare($database, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
 if (!$database->query($query)) {

php/database/update_030000.php

@@ -0,0 +1,37 @@
+<?php
+
+###
+# @name			Update to version 3.0.0
+# @copyright	2015 by Tobias Reich
+###
+
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
+# Remove login
+# Login now saved as crypt without md5. Legacy code has been removed.
+$query			= Database::prepare($database, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$resetUsername	= $database->query($query);
+if (!$resetUsername) {
+	Log::error($database, 'update_030000', __LINE__, 'Could not reset username (' . $database->error . ')');
+	return false;
+}
+$query			= Database::prepare($database, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$resetPassword	= $database->query($query);
+if (!$resetPassword) {
+	Log::error($database, 'update_030000', __LINE__, 'Could not reset password (' . $database->error . ')');
+	return false;
+}
+
+# Make public albums private and reset password
+# Password now saved as crypt without md5. Legacy code has been removed.
+$query			= Database::prepare($database, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
+$resetPublic	= $database->query($query);
+if (!$resetPublic) {
+	Log::error($database, 'update_030000', __LINE__, 'Could not reset public albums (' . $database->error . ')');
+	return false;
+}
+
+# Set version
+if (Database::setVersion($database, '030000')===false) return false;
+
+?>

php/define.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Define
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 # Define root

php/modules/Album.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Album Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -547,22 +547,23 @@ class Album extends Module {
 		if (strlen($password)>0) {
 
 			# Get hashed password
-			$password = get_hashed_password($password);
+			$password = getHashedString($password);
 
 			# Set hashed password
 			# Do not prepare $password because it is hashed and save
 			# Preparing (escaping) the password would destroy the hash
 			$query	= Database::prepare($this->database, "UPDATE ? SET password = '$password' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-			$result	= $this->database->query($query);
 
 		} else {
 
 			# Unset password
 			$query	= Database::prepare($this->database, "UPDATE ? SET password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-			$result	= $this->database->query($query);
 
 		}
 
+		# Execute query
+		$result	= $this->database->query($query);
+
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
@@ -591,7 +592,7 @@ class Album extends Module {
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if ($album->password=='') return true;
-		else if ($album->password===$password||$album->password===crypt($password, $album->password)) return true;
+		else if ($album->password===crypt($password, $album->password)) return true;
 		return false;
 
 	}

php/modules/Database.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Database Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -54,7 +54,8 @@ class Database extends Module {
 			'020505', #2.5.5
 			'020601', #2.6.1
 			'020602', #2.6.2
-			'020700' #2.7.0
+			'020700', #2.7.0
+			'030000' #3.0.0
 		);
 
 		# For each update

php/modules/Import.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Upload Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/modules/Log.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Log Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/modules/Module.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/modules/Photo.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Photo Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/modules/Plugins.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Plugins Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

php/modules/Session.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Session Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -88,20 +88,18 @@ class Session extends Module {
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
-		# Check login with MD5 hash
+		$username = crypt($username, $this->settings['username']);
-		if ($username===$this->settings['username']&&$password===$this->settings['password']) {
+		$password = crypt($password, $this->settings['password']);
-			$_SESSION['login'] = true;
-			return true;
-		}
 
 		# Check login with crypted hash
-		if ($username===$this->settings['username']&&$this->settings['password']===crypt($password, $this->settings['password'])) {
+		if ($this->settings['username']===$username&&
-			$_SESSION['login'] = true;
+			$this->settings['password']===$password) {
-			return true;
+				$_SESSION['login'] = true;
+				return true;
 		}
 
 		# No login
-		if ($this->settings['username']===''&&$this->settings['password']==='') {
+		if ($this->noLogin()===true) {
 			$_SESSION['login'] = true;
 			return true;
 		}
@@ -119,9 +117,10 @@ class Session extends Module {
 		self::dependencies(isset($this->settings));
 
 		# Check if login credentials exist and login if they don't
-		if ($this->settings['username']===''&&$this->settings['password']==='') {
+		if ($this->settings['username']===''&&
-			$_SESSION['login'] = true;
+			$this->settings['password']==='') {
-			return true;
+				$_SESSION['login'] = true;
+				return true;
 		}
 
 		return false;

php/modules/Settings.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Settings Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -50,10 +50,10 @@ class Settings extends Module {
 		if ($oldPassword===$settings['password']||$settings['password']===crypt($oldPassword, $settings['password'])) {
 
 			# Save username
-			if (!$this->setUsername($username)) exit('Error: Updating username failed!');
+			if ($this->setUsername($username)!==true) exit('Error: Updating username failed!');
 
 			# Save password
-			if (!$this->setPassword($password)) exit('Error: Updating password failed!');
+			if ($this->setPassword($password)!==true) exit('Error: Updating password failed!');
 
 			return true;
 
@@ -68,15 +68,13 @@ class Settings extends Module {
 		# Check dependencies
 		self::dependencies(isset($this->database));
 
-		# Parse
+		# Hash username
-		$username = htmlentities($username);
+		$username = getHashedString($username);
-		if (strlen($username)>50) {
-			Log::notice($this->database, __METHOD__, __LINE__, 'Username is longer than 50 chars');
-			return false;
-		}
 
 		# Execute query
-		$query	= Database::prepare($this->database, "UPDATE ? SET value = '?' WHERE `key` = 'username'", array(LYCHEE_TABLE_SETTINGS, $username));
+		# Do not prepare $username because it is hashed and save
+		# Preparing (escaping) the username would destroy the hash
+		$query	= Database::prepare($this->database, "UPDATE ? SET value = '$username' WHERE `key` = 'username'", array(LYCHEE_TABLE_SETTINGS));
 		$result	= $this->database->query($query);
 
 		if (!$result) {
@@ -92,7 +90,8 @@ class Settings extends Module {
 		# Check dependencies
 		self::dependencies(isset($this->database));
 
-		$password = get_hashed_password($password);
+		# Hash password
+		$password = getHashedString($password);
 
 		# Execute query
 		# Do not prepare $password because it is hashed and save

php/modules/misc.php

@@ -2,7 +2,7 @@
 
 ###
 # @name			Misc Module
-# @copyright	2014 by Tobias Reich
+# @copyright	2015 by Tobias Reich
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
@@ -64,12 +64,13 @@ function getGraphHeader($database, $photoID) {
 	else					$dir = 'big';
 
 	$parseUrl	= parse_url('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+	$url		= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query'];
 	$picture	= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url;
 
 	$return = '<!-- General Meta Data -->';
-	$return .= '<meta name="title" content="'.$row->title.'" />';
+	$return .= '<meta name="title" content="'.$row->title.'">';
-	$return .= '<meta name="description" content="'.$row->description.' - via Lychee" />';
+	$return .= '<meta name="description" content="'.$row->description.' - via Lychee">';
-	$return .= '<link rel="image_src" type="image/jpeg" href="'.$picture.'" />';
+	$return .= '<link rel="image_src" type="image/jpeg" href="'.$picture.'">';
 
 	$return .= '<!-- Twitter Meta Data -->';
 	$return .= '<meta name="twitter:card" content="photo">';
@@ -79,6 +80,8 @@ function getGraphHeader($database, $photoID) {
 	$return .= '<!-- Facebook Meta Data -->';
 	$return .= '<meta property="og:title" content="'.$row->title.'">';
 	$return .= '<meta property="og:image" content="'.$picture.'">';
+	$return .= '<meta property="og:description" content="'.$row->description.' - via Lychee">';
+	$return .= '<meta property="og:url" content="'.$url.'">';
 
 	return $return;
 
@@ -94,7 +97,7 @@ function getExtension($filename) {
 
 }
 
-function get_hashed_password($password) {
+function getHashedString($password) {
 
 	# Inspired by http://alias.io/2010/01/store-passwords-safely-with-php-and-mysql/
 

plugins/check/index.php

@@ -21,59 +21,60 @@ header('content-type: text/plain');
 # Declare
 $error = '';
 
+# Show separator
+echo('Diagnostics' . PHP_EOL);
+echo('-----------' . PHP_EOL);
+
+# PHP Version
+if (floatval(phpversion())<5.2)		$error .= ('Error: Upgrade to PHP 5.2 or higher!' . PHP_EOL);
+
+# Extensions
+if (!extension_loaded('session'))	$error .= ('Error: PHP session extension not activated' . PHP_EOL);
+if (!extension_loaded('exif'))		$error .= ('Error: PHP exif extension not activated' . PHP_EOL);
+if (!extension_loaded('mbstring'))	$error .= ('Error: PHP mbstring extension not activated' . PHP_EOL);
+if (!extension_loaded('gd'))		$error .= ('Error: PHP gd extension not activated' . PHP_EOL);
+if (!extension_loaded('mysqli'))	$error .= ('Error: PHP mysqli extension not activated' . PHP_EOL);
+if (!extension_loaded('json'))		$error .= ('Error: PHP json extension not activated' . PHP_EOL);
+if (!extension_loaded('zip'))		$error .= ('Error: PHP zip extension not activated' . PHP_EOL);
+
+# Permissions
+if (hasPermissions(LYCHEE_UPLOADS_BIG)===false)			$error .= ('Error: \'uploads/big\' missing or not readable and writable (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false)		$error .= ('Error: \'uploads/medium\' missing or not readable and writable (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false)		$error .= ('Error: \'uploads/thumb\' missing or not readable and writable (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false)		$error .= ('Error: \'uploads/import\' missing or not readable and writable (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS)===false)				$error .= ('Error: \'uploads/\' missing or not readable and writable (777 required)' . PHP_EOL);
+if (hasPermissions(LYCHEE_DATA)===false)				$error .= ('Error: \'data/\' missing or not readable and writable (777 required)' . PHP_EOL);
+
 # Load config
-if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error 001: Configuration not found. Please install Lychee first.');
+if (!file_exists(LYCHEE_CONFIG_FILE))	exit('Error: Configuration not found. Please install Lychee for additional tests.');
-require(LYCHEE_CONFIG_FILE);
+else									require(LYCHEE_CONFIG_FILE);
 
 # Define the table prefix
 if (!isset($dbTablePrefix)) $dbTablePrefix = '';
 defineTablePrefix($dbTablePrefix);
 
-# Show separator
-echo('Diagnostics' . PHP_EOL);
-echo('-----------' . PHP_EOL);
-
 # Database
 $database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
-if (mysqli_connect_errno()!=0) $error .= ('Error 100: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL);
+if (mysqli_connect_errno()!=0) $error .= ('Error: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL);
 
 # Load settings
 $settings = new Settings($database);
 $settings = $settings->get();
 
-# PHP Version
-if (floatval(phpversion())<5.2)		$error .= ('Error 200: Please upgrade to PHP 5.2 or higher!' . PHP_EOL);
-
-# Extensions
-if (!extension_loaded('exif'))		$error .= ('Error 300: PHP exif extension not activated' . PHP_EOL);
-if (!extension_loaded('mbstring'))	$error .= ('Error 301: PHP mbstring extension not activated' . PHP_EOL);
-if (!extension_loaded('gd'))		$error .= ('Error 302: PHP gd extension not activated' . PHP_EOL);
-if (!extension_loaded('mysqli'))	$error .= ('Error 303: PHP mysqli extension not activated' . PHP_EOL);
-if (!extension_loaded('json'))		$error .= ('Error 304: PHP json extension not activated' . PHP_EOL);
-if (!extension_loaded('zip'))		$error .= ('Error 305: PHP zip extension not activated' . PHP_EOL);
-
 # Config
-if (!isset($dbName)||$dbName==='')	$error .= ('Error 400: No property for $dbName in config.php' . PHP_EOL);
+if (!isset($dbName)||$dbName==='')	$error .= ('Error: No property for $dbName in config.php' . PHP_EOL);
-if (!isset($dbUser)||$dbUser==='')	$error .= ('Error 401: No property for $dbUser in config.php' . PHP_EOL);
+if (!isset($dbUser)||$dbUser==='')	$error .= ('Error: No property for $dbUser in config.php' . PHP_EOL);
-if (!isset($dbPassword))			$error .= ('Error 402: No property for $dbPassword in config.php' . PHP_EOL);
+if (!isset($dbPassword))			$error .= ('Error: No property for $dbPassword in config.php' . PHP_EOL);
-if (!isset($dbHost)||$dbHost==='')	$error .= ('Error 403: No property for $dbHost in config.php' . PHP_EOL);
+if (!isset($dbHost)||$dbHost==='')	$error .= ('Error: No property for $dbHost in config.php' . PHP_EOL);
 
 # Settings
-if (!isset($settings['username'])||$settings['username']=='')			$error .= ('Error 404: Username empty or not set in database' . PHP_EOL);
+if (!isset($settings['username'])||$settings['username']=='')			$error .= ('Error: Username empty or not set in database' . PHP_EOL);
-if (!isset($settings['password'])||$settings['password']=='')			$error .= ('Error 405: Password empty or not set in database' . PHP_EOL);
+if (!isset($settings['password'])||$settings['password']=='')			$error .= ('Error: Password empty or not set in database' . PHP_EOL);
-if (!isset($settings['thumbQuality'])||$settings['thumbQuality']=='')	$error .= ('Error 406: No or wrong property for thumbQuality in database' . PHP_EOL);
+if (!isset($settings['thumbQuality'])||$settings['thumbQuality']=='')	$error .= ('Error: No or wrong property for thumbQuality in database' . PHP_EOL);
-if (!isset($settings['sorting'])||$settings['sorting']=='')				$error .= ('Error 407: Wrong property for sorting in database' . PHP_EOL);
+if (!isset($settings['sorting'])||$settings['sorting']=='')				$error .= ('Error: Wrong property for sorting in database' . PHP_EOL);
-if (!isset($settings['plugins']))										$error .= ('Error 408: No property for plugins in database' . PHP_EOL);
+if (!isset($settings['plugins']))										$error .= ('Error: No property for plugins in database' . PHP_EOL);
-if (!isset($settings['imagick'])||$settings['imagick']=='')				$error .= ('Error 409: No or wrong property for imagick in database' . PHP_EOL);
+if (!isset($settings['imagick'])||$settings['imagick']=='')				$error .= ('Error: No or wrong property for imagick in database' . PHP_EOL);
-if (!isset($settings['checkForUpdates'])||($settings['checkForUpdates']!='0'&&$settings['checkForUpdates']!='1')) $error .= ('Error 410: No or wrong property for checkForUpdates in database' . PHP_EOL);
+if (!isset($settings['checkForUpdates'])||($settings['checkForUpdates']!='0'&&$settings['checkForUpdates']!='1')) $error .= ('Error: No or wrong property for checkForUpdates in database' . PHP_EOL);
-
-# Permissions
-if (hasPermissions(LYCHEE_UPLOADS_BIG)===false)			$error .= ('Error 500: \'uploads/big\' missing or not readable and writable (777 required)' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false)		$error .= ('Error 500: \'uploads/medium\' missing or not readable and writable (777 required)' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false)		$error .= ('Error 501: \'uploads/thumb\' missing or not readable and writable (777 required)' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false)		$error .= ('Error 502: \'uploads/import\' missing or not readable and writable (777 required)' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS)===false)				$error .= ('Error 503: \'uploads/\' missing or not readable and writable (777 required)' . PHP_EOL);
-if (hasPermissions(LYCHEE_DATA)===false)				$error .= ('Error 504: \'data/\' missing or not readable and writable (777 required)' . PHP_EOL);
 
 # Check dropboxKey
 if (!$settings['dropboxKey']) echo('Warning: Dropbox import not working. No property for dropboxKey.' . PHP_EOL);
@@ -85,8 +86,8 @@ if (ini_get('max_execution_time')<200&&ini_set('upload_max_filesize', '20M')===f
 if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);
 
 # Output
-if ($error=='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
+if ($error==='')	echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
-else echo $error;
+else				echo $error;
 
 # Show separator
 echo(PHP_EOL . PHP_EOL . 'System Information' . PHP_EOL);
@@ -96,13 +97,14 @@ echo('------------------' . PHP_EOL);
 $json = file_get_contents(LYCHEE_SRC . 'package.json');
 $json = json_decode($json, true);
 
+# About imagick
 $imagick = extension_loaded('imagick');
-if ($imagick===false) $imagick = '-';
+if ($imagick===true)	$imagickVersion = @Imagick::getVersion();
-
+else					$imagick = '-';
-if ($imagick===true) $imagickVersion = @Imagick::getVersion();
+if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='')	$imagickVersion = '-';
-if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='') $imagickVersion = '-';
+else																					$imagickVersion = $imagickVersion['versionNumber'];
-else $imagickVersion = $imagickVersion['versionNumber'];
 
+# About GD
 $gdVersion = gd_info();
 
 # Output system information

src/bower.json

@@ -2,9 +2,10 @@
   "name": "Lychee",
   "private": true,
   "dependencies": {
-    "jQuery": "~2.1.1",
+    "jQuery": "~2.1.3",
     "js-md5": "~1.1.0",
     "mousetrap": "~1.4.6",
-    "basicContext": "~2.0.2"
+    "basicContext": "~2.0.2",
+    "basicModal": "~2.0.3"
   }
 }

src/fonts/fontawesome-webfont.svg

@@ -1,255 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="FontAwesomeRegular" horiz-adv-x="1843" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="512" />
-<glyph horiz-adv-x="0" />
-<glyph horiz-adv-x="0" />
-<glyph unicode="&#xd;" horiz-adv-x="512" />
-<glyph unicode=" "  horiz-adv-x="512" />
-<glyph unicode="&#x09;" horiz-adv-x="512" />
-<glyph unicode="&#xa0;" horiz-adv-x="512" />
-<glyph unicode="o" horiz-adv-x="1591" />
-<glyph unicode="&#xa8;" horiz-adv-x="2048" />
-<glyph unicode="&#xa9;" horiz-adv-x="2048" />
-<glyph unicode="&#xae;" horiz-adv-x="2048" />
-<glyph unicode="&#xb4;" horiz-adv-x="2048" />
-<glyph unicode="&#xc6;" horiz-adv-x="2048" />
-<glyph unicode="&#xcd;" horiz-adv-x="2048" />
-<glyph unicode="&#x2000;" horiz-adv-x="784" />
-<glyph unicode="&#x2001;" horiz-adv-x="1569" />
-<glyph unicode="&#x2002;" horiz-adv-x="784" />
-<glyph unicode="&#x2003;" horiz-adv-x="1569" />
-<glyph unicode="&#x2004;" horiz-adv-x="523" />
-<glyph unicode="&#x2005;" horiz-adv-x="392" />
-<glyph unicode="&#x2006;" horiz-adv-x="261" />
-<glyph unicode="&#x2007;" horiz-adv-x="261" />
-<glyph unicode="&#x2008;" horiz-adv-x="196" />
-<glyph unicode="&#x2009;" horiz-adv-x="313" />
-<glyph unicode="&#x200a;" horiz-adv-x="87" />
-<glyph unicode="&#x202f;" horiz-adv-x="313" />
-<glyph unicode="&#x203a;" horiz-adv-x="2048" />
-<glyph unicode="&#x205f;" horiz-adv-x="392" />
-<glyph unicode="&#x2122;" horiz-adv-x="2048" />
-<glyph unicode="&#x221e;" horiz-adv-x="2048" />
-<glyph unicode="&#xe000;" horiz-adv-x="1024" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1536" d="M6 1489q20 47 70 47h1382q51 0 72 -47q20 -47 -17 -84l-610 -610v-641h248q33 0 55.5 -22.5t22.5 -53.5q0 -33 -22.5 -55.5t-55.5 -22.5h-768q-31 0 -53.5 22.5t-22.5 55.5q0 31 22.5 53.5t53.5 22.5h250v641l-610 610q-37 37 -17 84z" />
-<glyph unicode="&#xf001;" horiz-adv-x="1488" d="M0 213q0 57 27.5 103t72.5 77t98.5 47.5t106.5 16.5q25 0 50.5 -4t50.5 -11v779q0 27 16 48t43 29q23 6 99.5 29t178 52.5t215 62.5t211 60.5t164 46t74.5 18.5q35 0 58.5 -23.5t23.5 -58.5v-1028q0 -59 -27.5 -104.5t-73 -76t-99.5 -47t-105 -16.5t-105.5 16.5t-98.5 47 t-71.5 75.5t-27.5 105q0 57 27.5 103t71.5 77t98.5 47t105.5 16q27 0 52.5 -4t49.5 -10v537l-678 -195v-815q0 -59 -27.5 -104.5t-71.5 -76t-98.5 -47t-105.5 -16.5q-53 0 -106.5 16.5t-98.5 47t-72.5 76t-27.5 104.5z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1597" d="M0 901q0 137 52 258t143.5 212t212 143.5t258.5 52.5q137 0 257.5 -52.5t212 -143.5t143.5 -212t52 -258q0 -98 -28.5 -191.5t-81.5 -174.5l358 -359q18 -18 18 -47q0 -16 -18 -43t-45 -53.5t-53.5 -45t-42.5 -18.5q-29 0 -47 19l-359 358q-82 -53 -175 -81.5t-191 -28.5 q-137 0 -258 52t-212.5 143t-143.5 212t-52 258zM266 901q0 -84 32 -156.5t86 -126t127 -85t155 -31.5t154.5 31.5t126.5 85t86 126t32 156.5q0 82 -32 154.5t-86 127t-126.5 86t-154.5 31.5t-155 -31.5t-127 -86t-86 -127t-32 -154.5zM414 901q0 51 19.5 97t54 81t80 54.5 t98.5 19.5q20 0 34.5 -14.5t14.5 -36.5q0 -20 -14.5 -34.5t-34.5 -14.5q-63 0 -107.5 -44t-44.5 -108q0 -20 -14.5 -34.5t-34.5 -14.5q-23 0 -37 14.5t-14 34.5z" />
-<glyph unicode="&#xf003;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM154 154h1536v852q-31 -31 -58 -50q-106 -80 -212.5 -159.5t-211.5 -163.5q-61 -49 -131.5 -94t-156.5 -45q-82 0 -153 45t-132 94 q-104 84 -211 164t-213 159q-27 18 -57 50v-852zM154 1317q0 -31 14 -65.5t35.5 -66.5t47 -59.5t50.5 -46.5q100 -76 199.5 -150.5t199.5 -152.5q20 -16 48 -37.5t58 -42t59.5 -35t54.5 -14.5h2h2q25 0 54.5 14.5t59 35t57 42t48.5 37.5q100 78 199.5 153t199.5 150 q25 18 50.5 46t47 60t36 66.5t14.5 65.5v65h-1536v-65z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1802" d="M0 1073q0 113 34 205t97.5 155.5t153.5 98.5t202 35q59 0 117 -18.5t110 -48.5t99 -68.5t88 -77.5q39 39 87 77.5t100.5 68.5t109 48.5t115.5 18.5q113 0 204 -35t154.5 -98.5t97 -155.5t33.5 -205q0 -66 -18.5 -130t-51 -124.5t-74.5 -115t-87 -99.5l-615 -612 q-23 -23 -55 -23q-31 0 -57 23l-615 614q-45 45 -87 99.5t-73.5 114t-50 124t-18.5 129.5z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1675" d="M1 959.5q9 27.5 54 33.5l506 74l227 459q20 41 49 41t50 -41l227 -459l506 -74q45 -6 54 -33.5t-23 -60.5l-367 -356l86 -504q8 -45 -15.5 -62.5t-64.5 5.5l-452 237l-453 -237q-41 -23 -64.5 -5.5t-15.5 62.5l86 504l-364 356q-35 33 -26 60.5z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1675" d="M0 948q0 23 18.5 32t36.5 13l506 74l227 459q6 14 20 27.5t30 13.5q18 0 30.5 -13.5t18.5 -27.5l227 -459l506 -74q18 -4 36.5 -13t18.5 -32q0 -14 -7 -26.5t-17 -22.5l-367 -356l86 -504q0 -4 1 -9t1 -12q0 -20 -9 -34.5t-32 -14.5t-41 13l-452 237l-453 -237 q-18 -12 -39 -13q-23 0 -33 14.5t-10 34.5q0 6 1 11.5t1 9.5l86 504l-364 356q-10 10 -18.5 22.5t-8.5 26.5zM289 866l274 -268l-65 -377l340 178l340 -178l-66 377l274 268l-378 56l-170 344l-170 -344z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1566" d="M0 57v387q0 37 18.5 82t48 86t65.5 74t71 43q18 6 66 13.5t102.5 14.5t104.5 13t77 10q-92 59 -144.5 153.5t-52.5 205.5q0 88 34 165.5t91.5 136t135 92.5t165.5 34t166 -34t136.5 -92.5t92 -136t33.5 -165.5q0 -109 -52 -204.5t-144 -154.5q27 -4 77 -10t104 -13 t101 -14.5t68 -13.5q35 -10 70.5 -42t65.5 -74t48.5 -87t18.5 -82v-387q-10 -4 -22.5 -14t-27 -19.5t-27.5 -16.5t-22 -7h-1370q-35 0 -53 21.5t-45 35.5z" />
-<glyph unicode="&#xf008;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM115 154q0 -16 11 -27.5t28 -11.5h153q16 0 27.5 11t11.5 28v153q0 16 -11 27.5t-28 11.5h-153q-16 0 -27.5 -11t-11.5 -28v-153zM115 512 q0 -16 11 -27.5t28 -11.5h153q16 0 27.5 11.5t11.5 27.5v154q0 16 -11 27.5t-28 11.5h-153q-16 0 -27.5 -11.5t-11.5 -27.5v-154zM115 870q0 -16 11 -27.5t28 -11.5h153q16 0 27.5 11.5t11.5 27.5v154q0 16 -11 27.5t-28 11.5h-153q-16 0 -27.5 -11.5t-11.5 -27.5v-154z M115 1229q0 -16 11 -27.5t28 -11.5h153q16 0 27.5 11t11.5 28v153q0 16 -11 27.5t-28 11.5h-153q-16 0 -27.5 -11t-11.5 -28v-153zM461 154q0 -16 11 -27.5t28 -11.5h843q16 0 27.5 11t11.5 28v512q0 16 -11 27.5t-28 11.5h-843q-16 0 -27.5 -11.5t-11.5 -27.5v-512z M461 870q0 -16 11 -27.5t28 -11.5h843q16 0 27.5 11.5t11.5 27.5v512q0 16 -11 27.5t-28 11.5h-843q-16 0 -27.5 -11t-11.5 -28v-512zM1497 154q0 -16 11.5 -27.5t27.5 -11.5h154q16 0 27.5 11t11.5 28v153q0 16 -11.5 27.5t-27.5 11.5h-154q-16 0 -27.5 -11t-11.5 -28v-153 zM1497 512q0 -16 11.5 -27.5t27.5 -11.5h154q16 0 27.5 11.5t11.5 27.5v154q0 16 -11.5 27.5t-27.5 11.5h-154q-16 0 -27.5 -11.5t-11.5 -27.5v-154zM1497 870q0 -16 11.5 -27.5t27.5 -11.5h154q16 0 27.5 11.5t11.5 27.5v154q0 16 -11.5 27.5t-27.5 11.5h-154 q-16 0 -27.5 -11.5t-11.5 -27.5v-154zM1497 1229q0 -16 11.5 -27.5t27.5 -11.5h154q16 0 27.5 11t11.5 28v153q0 16 -11.5 27.5t-27.5 11.5h-154q-16 0 -27.5 -11t-11.5 -28v-153z" />
-<glyph unicode="&#xf009;" d="M0 78v536q0 33 22.5 55.5t55.5 22.5h690q33 0 55.5 -22.5t22.5 -55.5v-536q0 -33 -22.5 -55.5t-55.5 -22.5h-690q-33 0 -55.5 22.5t-22.5 55.5zM0 922v538q0 31 22.5 53.5t55.5 22.5h690q33 0 55.5 -22.5t22.5 -53.5v-538q0 -33 -22.5 -54.5t-55.5 -21.5h-690 q-33 0 -55.5 21.5t-22.5 54.5zM999 78v536q0 33 21.5 55.5t54.5 22.5h692q31 0 53.5 -22.5t22.5 -55.5v-536q0 -33 -22.5 -55.5t-53.5 -22.5h-692q-33 0 -54.5 22.5t-21.5 55.5zM999 922v538q0 31 21.5 53.5t54.5 22.5h692q31 0 53.5 -22.5t22.5 -53.5v-538 q0 -33 -22.5 -54.5t-53.5 -21.5h-692q-33 0 -54.5 21.5t-21.5 54.5z" />
-<glyph unicode="&#xf00a;" d="M0 78v270q0 33 22.5 54.5t55.5 21.5h358q31 0 53.5 -21.5t22.5 -54.5v-270q0 -33 -22.5 -55.5t-53.5 -22.5h-358q-33 0 -55.5 22.5t-22.5 55.5zM0 655v226q0 33 22.5 54t55.5 21h358q31 0 53.5 -21.5t22.5 -53.5v-226q0 -33 -22.5 -55t-53.5 -22h-358q-33 0 -55.5 22.5 t-22.5 54.5zM0 1188v272q0 31 22.5 53.5t55.5 22.5h358q31 0 53.5 -22.5t22.5 -53.5v-272q0 -33 -22.5 -55.5t-53.5 -22.5h-358q-33 0 -55.5 22.5t-22.5 55.5zM666 78v270q0 33 22.5 54.5t54.5 21.5h359q31 0 53.5 -21.5t22.5 -54.5v-270q0 -33 -22.5 -55.5t-53.5 -22.5 h-359q-33 0 -55 22.5t-22 55.5zM666 655v226q0 33 22.5 54t54.5 21h359q31 0 53.5 -21.5t22.5 -53.5v-226q0 -33 -22.5 -55t-53.5 -22h-359q-33 0 -55 22.5t-22 54.5zM666 1188v272q0 31 22.5 53.5t54.5 22.5h359q31 0 53.5 -22.5t22.5 -53.5v-272q0 -33 -22.5 -55.5 t-53.5 -22.5h-359q-33 0 -55 22.5t-22 55.5zM1331 78v270q0 33 22.5 54.5t55.5 21.5h358q31 0 53.5 -21.5t22.5 -54.5v-270q0 -33 -22.5 -55.5t-53.5 -22.5h-358q-33 0 -55.5 22.5t-22.5 55.5zM1331 655v226q0 33 22.5 54t55.5 21h358q31 0 53.5 -21.5t22.5 -53.5v-226 q0 -33 -22.5 -55t-53.5 -22h-358q-33 0 -55.5 22.5t-22.5 54.5zM1331 1188v272q0 31 22.5 53.5t55.5 22.5h358q31 0 53.5 -22.5t22.5 -53.5v-272q0 -33 -22.5 -55.5t-53.5 -22.5h-358q-33 0 -55.5 22.5t-22.5 55.5z" />
-<glyph unicode="&#xf00b;" d="M0 78v270q0 33 22.5 54.5t55.5 21.5h297q31 0 53.5 -21.5t22.5 -54.5v-270q0 -33 -22.5 -55.5t-53.5 -22.5h-297q-33 0 -55.5 22.5t-22.5 55.5zM0 655v226q0 33 22.5 54t55.5 21h297q31 0 53.5 -21.5t22.5 -53.5v-226q0 -33 -22.5 -55t-53.5 -22h-297q-33 0 -55.5 22.5 t-22.5 54.5zM0 1188v272q0 31 22.5 53.5t55.5 22.5h297q31 0 53.5 -22.5t22.5 -53.5v-272q0 -33 -22.5 -55.5t-53.5 -22.5h-297q-33 0 -55.5 22.5t-22.5 55.5zM604 78v270q0 33 22.5 54.5t55.5 21.5h1085q31 0 53.5 -21.5t22.5 -54.5v-270q0 -33 -22.5 -55.5t-53.5 -22.5 h-1085q-33 0 -55.5 22.5t-22.5 55.5zM604 655v226q0 33 22.5 54t55.5 21h1085q31 0 53.5 -21.5t22.5 -53.5v-226q0 -33 -22.5 -55t-53.5 -22h-1085q-33 0 -55.5 22.5t-22.5 54.5zM604 1188v272q0 31 22.5 53.5t55.5 22.5h1085q31 0 53.5 -22.5t22.5 -53.5v-272 q0 -33 -22.5 -55.5t-53.5 -22.5h-1085q-33 0 -55.5 22.5t-22.5 55.5z" />
-<glyph unicode="&#xf00c;" d="M0 732.5q0 33.5 23 55.5l174 175q23 23 56.5 22.5t55.5 -22.5l365 -365q23 -23 56.5 -23t55.5 23l746 745q23 23 56.5 23t56.5 -23l174 -174q23 -23 22.5 -56.5t-22.5 -55.5l-910 -910q-23 -23 -62.5 -39t-72.5 -16h-88q-35 0 -75 16.5t-62 38.5l-526 529 q-23 23 -23 56.5z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1536" d="M0 192.5q0 38.5 29 67.5l508 510l-508 500q-29 29 -29 67.5t29 67.5l100 100q29 29 68 29t67 -29l504 -504l504 504q29 29 67.5 29t67.5 -29l100 -100q29 -29 29 -68t-29 -67l-508 -510l508 -500q29 -29 29 -66.5t-29 -66.5l-100 -102q-29 -29 -68 -29t-67 29l-504 505 l-506 -505q-29 -29 -66.5 -29t-66.5 29l-100 100q-29 29 -29 67.5z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1597" d="M0 901q0 137 52 258t143.5 212t212 143.5t258.5 52.5q137 0 259 -52.5t212 -143.5t142 -212t52 -258q0 -102 -28.5 -195.5t-81.5 -170.5l358 -359q18 -18 18 -46t-18 -48l-94 -94q-20 -18 -48 -18.5t-46 18.5l-359 358q-78 -53 -171 -81.5t-195 -28.5q-137 0 -258 52 t-212.5 142t-143.5 211t-52 260zM266 901q0 -84 32 -156.5t86 -126t127 -85t155 -31.5t155.5 31.5t126.5 85t85 126t32 156.5q0 82 -32 154.5t-85 127t-126.5 86t-155.5 31.5t-155 -31.5t-127 -86t-86 -127t-32 -154.5zM399 868v66q0 33 33 33h168v168q0 33 33 32h65 q14 0 24.5 -9t10.5 -23v-168h166q33 0 33 -33v-66q0 -14 -9.5 -24t-23.5 -10h-166v-166q0 -14 -10 -23.5t-25 -9.5h-65q-33 0 -33 33v166h-168q-14 0 -23.5 10t-9.5 24z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1597" d="M0 901q0 137 52 258t143.5 212t212 143.5t258.5 52.5q137 0 259 -52.5t212 -143.5t142 -212t52 -258q0 -102 -28.5 -195.5t-81.5 -170.5l358 -359q18 -18 18 -46t-18 -48l-94 -94q-20 -18 -48 -18.5t-46 18.5l-359 358q-78 -53 -171 -81.5t-195 -28.5q-137 0 -258 52 t-212.5 142t-143.5 211t-52 260zM266 901q0 -84 32 -156.5t86 -126t127 -85t155 -31.5t155.5 31.5t126.5 85t85 126t32 156.5q0 82 -32 154.5t-85 127t-126.5 86t-155.5 31.5t-155 -31.5t-127 -86t-86 -127t-32 -154.5zM399 868v66q0 33 33 33h467q33 0 33 -33v-66 q0 -14 -9.5 -24t-23.5 -10h-467q-14 0 -23.5 10t-9.5 24z" />
-<glyph unicode="&#xf011;" horiz-adv-x="1488" d="M0 713q0 186 86 349t240 267q12 10 28 6q18 -4 25 -16l90 -131q10 -12 6 -27.5t-16 -25.5q-106 -72 -164.5 -182.5t-58.5 -239.5q0 -104 39.5 -197.5t108.5 -162t162 -108.5t197 -40t197.5 40t163.5 108.5t109.5 161.5t39.5 198q0 129 -59 239.5t-164 182.5 q-14 10 -16 24q-4 16 6 29l88 131q10 12 25.5 15t29.5 -5q154 -104 240 -267t86 -349q0 -154 -58.5 -289t-160 -236.5t-237.5 -160t-290 -58.5t-289 58.5t-236 160t-159.5 236.5t-58.5 289zM627 793v704q0 16 11 27.5t28 11.5h157q16 0 27.5 -11.5t11.5 -27.5v-704 q0 -16 -11 -27.5t-28 -11.5h-157q-16 0 -27.5 11t-11.5 28z" />
-<glyph unicode="&#xf012;" d="M0 39v260q0 16 11.5 27.5t27.5 11.5h192q16 0 26.5 -11.5t10.5 -27.5v-260q0 -16 -10 -27.5t-27 -11.5h-192q-39 0 -39 39zM393 39v434q0 16 11.5 27.5t27.5 11.5h193q16 0 26.5 -11.5t10.5 -27.5v-434q0 -16 -10.5 -27.5t-26.5 -11.5h-193q-16 0 -27.5 11.5t-11.5 27.5z M786 39v676q0 16 11.5 27.5t27.5 11.5h193q16 0 27.5 -11.5t11.5 -27.5v-676q0 -16 -11.5 -27.5t-27.5 -11.5h-193q-16 0 -27.5 11.5t-11.5 27.5zM1182 39v995q0 16 10 27.5t27 11.5h192q16 0 27.5 -11t11.5 -28v-995q0 -16 -11.5 -27.5t-27.5 -11.5h-192q-16 0 -26.5 11.5 t-10.5 27.5zM1575 39v1458q0 39 39 39h190q39 0 39 -39v-1458q0 -39 -39 -39h-190q-39 0 -39 39z" />
-<glyph unicode="&#xf013;" horiz-adv-x="1593" d="M0 651v236q0 12 30.5 21.5t68.5 15.5t74 9t48 5q18 61 49 117q-55 82 -120 157l-7 15q0 8 28 38.5t62.5 65.5t66.5 62.5t40 27.5q2 0 26.5 -18.5t54.5 -41t56.5 -43t32.5 -24.5q29 16 58.5 26.5t60.5 20.5q0 12 3 49t9 75t15.5 69t21.5 31h237q14 0 19 -15 q12 -49 17 -103t14 -106q31 -8 59.5 -19t56.5 -28q8 6 34 26.5t55.5 43t53 40t29.5 17.5t37 -27.5t65 -62.5t61.5 -65.5t27.5 -38.5q0 -4 -17.5 -28.5t-39 -53.5t-42 -55.5t-24.5 -32.5q33 -55 51 -123q49 -10 103.5 -13t101.5 -20q16 -4 16 -18v-236q0 -12 -29.5 -21.5 t-68.5 -15.5t-76 -9t-49 -5q-14 -57 -47 -117q55 -82 121 -157l6 -15q0 -8 -27.5 -38.5t-62.5 -65.5t-66.5 -62.5t-40.5 -27.5q-2 0 -26.5 18.5t-54 41t-56 43t-33.5 24.5q-29 -16 -58.5 -27.5t-59.5 -19.5q-2 -12 -5.5 -49.5t-9.5 -76t-14 -69.5t-21 -31h-237q-14 0 -19 17 q-14 49 -19 103t-11 103q-61 18 -117 50q-41 -31 -81 -60.5t-79 -62.5l-12 -4q-6 0 -37 27.5t-64.5 62.5t-61 65.5t-27.5 38.5q0 2 16 26.5t37.5 53.5t42 55.5t26.5 34.5q-33 55 -51 123q-51 10 -104.5 13t-100.5 20q-16 4 -16 18zM557 768q0 -49 18.5 -93t51 -77t77 -52.5 t93.5 -19.5t93 19.5t75.5 52.5t51 77t19.5 93t-19.5 92t-51 76t-75.5 51.5t-93 18.5t-93.5 -18.5t-77 -51.5t-51 -76t-18.5 -92z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1304" d="M0 1175.5v34.5v36t2 36q25 14 71 23.5t98 15.5t102.5 9t78.5 5q-8 82 11.5 128t59.5 68.5t98.5 29t131.5 6.5q55 0 109.5 -3t97.5 -20.5t68.5 -54.5t25.5 -105v-24t-2 -25q29 -2 79 -5t102.5 -9t99.5 -15.5t72 -23.5v-72v-69q-37 -20 -123 -32.5t-185.5 -19t-193.5 -7.5 t-150 -1q-55 0 -150 1t-194.5 7.5t-184.5 18.5t-122 33q-2 16 -2 34.5zM133 154v837q123 -16 244 -21t244 -5h32q129 2 258 6t258 20v-837q0 -63 -44 -108.5t-107 -45.5h-731q-63 0 -108.5 45t-45.5 109zM303 199q0 -16 10.5 -26.5t26.5 -10.5h39q16 0 27.5 10t11.5 27v614 q0 16 -11.5 27.5t-27.5 11.5h-39q-16 0 -26.5 -11.5t-10.5 -27.5v-614zM504 1384q0 -10 1 -22t3 -23q144 2 291 0q0 12 2 23.5t0 21.5v15q-35 10 -74 11t-74 1q-37 0 -75.5 -1t-73.5 -11v-15zM596 199q0 -16 10 -26.5t27 -10.5h39q16 0 27.5 10t11.5 27v614q0 16 -11.5 27.5 t-27.5 11.5h-39q-16 0 -26.5 -11.5t-10.5 -27.5v-614zM887 199q0 -16 11 -26.5t28 -10.5h39q16 0 27.5 10t11.5 27v614q0 16 -11.5 27.5t-27.5 11.5h-39q-16 0 -27.5 -11.5t-11.5 -27.5v-614z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1880" d="M0 809.5q2 15.5 14 26.5l867 710q27 20 59 21q33 0 59 -21l240 -196v102q0 16 11.5 27.5t27.5 11.5h223q16 0 26.5 -11.5t10.5 -27.5v-348l328 -268q12 -10 14 -25.5t-8 -28.5l-45 -53q-10 -14 -29 -14h-65q-16 0 -25 8l-743 608q-25 20 -50 0l-743 -608q-8 -8 -25 -8 h-65q-18 0 -29 14l-45 53q-10 12 -8 27.5zM266 76v622l674 553l674 -553v-622q0 -33 -21.5 -54.5t-54.5 -21.5h-422v498h-352v-498h-422q-33 0 -54.5 21.5t-21.5 54.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1228" d="M0 78v1382q0 31 22.5 53.5t55.5 22.5h614q33 0 71 -16.5t60 -38.5l351 -351q23 -23 39 -60.5t16 -70.5v-921q0 -33 -22.5 -55.5t-53.5 -22.5h-1075q-33 0 -55.5 22.5t-22.5 55.5zM154 154h921v692h-459q-31 0 -53 22.5t-22 55.5v458h-387v-1228zM268 326v116h693v-116 h-693zM268 596v115h693v-115h-693zM694 999h381q0 4 -4 13.5t-6 11.5l-350 348q-2 4 -9.5 6t-11.5 4v-383z" />
-<glyph unicode="&#xf017;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44t218 44t177 120t120 177 t44 218t-44 218t-120 177t-177.5 120t-217.5 44q-117 0 -218.5 -44t-177 -120t-119.5 -177t-44 -218zM635 608v465q0 33 23.5 56.5t56.5 23.5h80q35 0 57 -23.5t22 -56.5v-305h201q33 0 56.5 -23.5t23.5 -56.5v-80q0 -33 -23.5 -56.5t-56.5 -23.5h-360q-33 0 -56.5 23.5 t-23.5 56.5z" />
-<glyph unicode="&#xf018;" d="M2 35l594 1466q6 14 21.5 24.5t31.5 10.5h195l-8 -170h172l-9 170h195q16 0 31.5 -10t21.5 -25l594 -1466q6 -14 -1 -24.5t-23 -10.5h-740l-26 512h-258l-27 -512h-739q-16 0 -23.5 10t-1.5 25zM807 797h229l-20 413h-189z" />
-<glyph unicode="&#xf019;" d="M0 39v614q0 16 11.5 27.5t27.5 11.5h229q16 0 27.5 -11t11.5 -28v-346h1229v346q0 16 11.5 27.5t27.5 11.5h229q16 0 27.5 -11t11.5 -28v-614q0 -39 -39 -39h-1765q-39 0 -39 39zM345.5 944.5q6.5 16.5 39.5 16.5h307v499q0 31 21.5 53.5t54.5 22.5h307q33 0 55.5 -22.5 t22.5 -53.5v-499h307q31 0 37 -16.5t-16 -39.5l-504 -506q-23 -23 -55.5 -22.5t-55.5 22.5l-504 506q-23 23 -16.5 39.5z" />
-<glyph unicode="&#xf01a;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44t218 44t177 120t120 177 t44 218t-44 218t-120 177t-177.5 120t-217.5 44q-117 0 -218.5 -44t-177 -120t-119.5 -177t-44 -218zM414 743q10 25 37 25h208v358q0 16 11.5 28.5t27.5 12.5h201q16 0 27.5 -12t11.5 -29v-358h209q27 0 37 -25t-10 -43l-347 -346q-14 -10 -28 -10t-29 10l-346 346 q-20 18 -10 43z" />
-<glyph unicode="&#xf01b;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44t218 44t177 120t120 177 t44 218t-44 218t-120 177t-177 120t-218 44t-218.5 -44t-177 -120t-119.5 -177t-44 -218zM414 793q-10 25 10 43l346 346q14 10 29 10q14 0 28 -10l347 -346q20 -18 10 -43t-37 -25h-209v-360q0 -16 -11.5 -27.5t-27.5 -11.5h-201q-16 0 -27.5 11t-11.5 28v360h-208 q-27 0 -37 25z" />
-<glyph unicode="&#xf01c;" d="M0 78v577q0 33 9 76t22 72l284 663q12 29 44 49.5t63 20.5h999q31 0 63 -20.5t44 -49.5l284 -663q12 -29 21.5 -72t9.5 -76v-577q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM238 694h387l114 -231h383l117 231h367q-2 4 -2 9.5t-2 9.5l-256 594 h-848l-256 -596q-2 -2 -2 -7.5t-2 -9.5z" />
-<glyph unicode="&#xf01d;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44t218 44t177 120t120 177 t44 218t-44 218t-120 177t-177.5 120t-217.5 44q-117 0 -218.5 -44t-177 -120t-119.5 -177t-44 -218zM582 453v628q0 18 16 29q20 8 31 0l545 -315q16 -6 16 -27q0 -20 -16 -27l-545 -315q-8 -4 -15 -4q-8 0 -16 4q-16 10 -16 27z" />
-<glyph unicode="&#xf01e;" horiz-adv-x="1591" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5q141 0 271 -48.5t239 -140.5l161 162q35 35 58.5 24.5t23.5 -57.5v-463q0 -33 -22 -55q-10 -10 -23.5 -16t-29.5 -6h-463q-47 0 -58.5 23.5t23.5 58.5l160 159q-72 57 -159 88t-181 31q-117 0 -218.5 -44t-177 -120 t-119.5 -177t-44 -218t44 -218t119.5 -177t177 -120t218.5 -44q104 0 198.5 37t169 101.5t123.5 153.5t64 191q0 16 14 27q14 10 31 8l157 -20q16 -4 26.5 -16.5t8.5 -28.5q-20 -147 -89.5 -274.5t-176 -220.5t-242 -145.5t-284.5 -52.5q-166 0 -311.5 62.5t-254 171 t-171 254t-62.5 311.5z" />
-<glyph unicode="&#xf021;" horiz-adv-x="1916" d="M6 311l150 437q10 33 39 45t59 4l438 -150q45 -16 46 -40.5t-42 -47.5l-202 -100q53 -78 123.5 -134.5t160.5 -86.5q111 -37 221.5 -28t207 56t170 129t110.5 193q6 16 20.5 22t30.5 2l152 -51q16 -6 23 -20.5t1 -30.5q-53 -158 -159.5 -274.5t-243.5 -184t-296 -81 t-315 39.5q-135 47 -241.5 134t-179.5 208l-205 -100q-43 -23 -63.5 -5.5t-4.5 64.5zM203 1024q53 156 159.5 273.5t243.5 185t295 81t316 -39.5q133 -47 240.5 -134t180.5 -208l205 100q43 23 63.5 5.5t4.5 -62.5l-150 -439q-10 -33 -39 -45t-59 -4l-438 150 q-45 16 -46 40.5t40 47.5l202 100q-51 78 -122.5 134.5t-159.5 86.5q-111 37 -221.5 28t-207 -56t-170 -129t-110.5 -193q-6 -16 -20.5 -22t-30.5 -2l-152 51q-16 6 -23 20.5t-1 30.5z" />
-<glyph unicode="&#xf022;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM154 154h1536v1075h-1536v-1075zM307 346v76q0 39 39 39h154q16 0 27.5 -11.5t11.5 -27.5v-76q0 -16 -11.5 -27.5t-27.5 -11.5h-154q-39 0 -39 39 zM307 653v76q0 39 39 39h154q16 0 27.5 -11.5t11.5 -27.5v-76q0 -16 -11.5 -27.5t-27.5 -11.5h-154q-39 0 -39 39zM307 961v75q0 39 39 39h154q16 0 27.5 -11t11.5 -28v-75q0 -16 -11.5 -27.5t-27.5 -11.5h-154q-39 0 -39 39zM692 346v76q0 16 10.5 27.5t26.5 11.5h768 q39 0 39 -39v-76q0 -39 -39 -39h-768q-16 0 -26.5 11.5t-10.5 27.5zM692 653v76q0 16 10.5 27.5t26.5 11.5h768q39 0 39 -39v-76q0 -39 -39 -39h-768q-16 0 -26.5 11.5t-10.5 27.5zM692 961v75q0 16 10.5 27.5t26.5 11.5h768q39 0 39 -39v-75q0 -39 -39 -39h-768 q-16 0 -26.5 11t-10.5 28z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1253" d="M0 117v626q0 39 21.5 69t56.5 42v164q0 113 43 213t117.5 175t175 118t213.5 43t213 -43t175 -118t118 -175.5t43 -212.5v-164q35 -12 56 -42t21 -69v-626q0 -47 -34.5 -82t-81.5 -35h-1020q-47 0 -82 35t-35 82zM313 862h627v156q0 66 -24.5 123t-67.5 99t-100.5 66.5 t-120.5 24.5q-66 0 -122 -24.5t-99.5 -66.5t-68 -99.5t-24.5 -122.5v-156zM494 164h266l-66 285q29 18 47.5 48.5t18.5 65.5q0 55 -39 95t-94 40t-94 -40t-39 -95q0 -35 18 -65.5t47 -46.5z" />
-<glyph unicode="&#xf024;" d="M0 1382q0 63 45 108.5t109 45.5q63 0 108 -45.5t45 -108.5q0 -41 -20.5 -74.5t-55.5 -56.5v-1212q0 -16 -11 -27.5t-27 -11.5h-78q-16 0 -26.5 11.5t-10.5 27.5v1212q-35 23 -56.5 56.5t-21.5 74.5zM307 416v745q0 33 19.5 66t48.5 49q104 55 188 86t144 45q70 16 124 18 q68 0 124.5 -11t107.5 -29.5t99 -43t100 -51.5q63 -29 145 -33q70 -4 164 15.5t207 87.5q29 16 47 6t18 -43v-748q0 -31 -18.5 -64.5t-46.5 -49.5q-113 -68 -207 -87.5t-164 -15.5q-82 4 -145 33q-51 27 -99.5 51.5t-99.5 43t-107.5 29.5t-124.5 11q-55 -2 -124 -18 q-59 -14 -143.5 -45t-188.5 -88q-29 -16 -48.5 -4t-19.5 45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1916" d="M0 729q0 172 85 324.5t221 266.5t307 180.5t345 66.5t345.5 -66.5t307.5 -180.5t221 -266.5t85 -326.5q0 -182 -78 -350l-27 -60l-174 -26q-27 -104 -110.5 -173t-196.5 -69v-41q0 -16 -12 -27.5t-29 -11.5h-80q-16 0 -27.5 11.5t-11.5 27.5v719q0 16 11.5 28.5 t27.5 12.5h80q16 0 28.5 -12.5t12.5 -28.5v-39q88 0 161 -44t114 -116l39 7q33 90 32 192q0 125 -65.5 233.5t-170 190.5t-232.5 129t-251 47t-250.5 -47t-232 -128t-170 -190.5t-65.5 -232.5q0 -104 32 -194l39 -7q41 72 114 116t161 44v39q0 16 12 28.5t29 12.5h80 q16 0 27 -12.5t11 -28.5v-719q0 -16 -11 -27.5t-27 -11.5h-80q-16 0 -28.5 11.5t-12.5 27.5v41q-55 0 -106.5 18.5t-91.5 50.5t-68.5 76t-40.5 97l-175 26l-26 60q-78 168 -78 352z" />
-<glyph unicode="&#xf026;" horiz-adv-x="905" d="M0 578v380q0 16 11.5 27.5t27.5 11.5h420l325 326q49 51 84 37t35 -86v-1012q0 -72 -34.5 -86t-84.5 37l-325 326h-420q-16 0 -27.5 11t-11.5 28z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1277" d="M0 578v380q0 16 11.5 27.5t27.5 11.5h420l325 326q49 51 84 37t35 -86v-1012q0 -72 -34.5 -86t-84.5 37l-325 326h-420q-16 0 -27.5 11t-11.5 28zM1027 406q-9 32 7 61q84 145 84 301t-84 301q-16 29 -7 61t38 48t60.5 8t48.5 -37q104 -182 104 -381q0 -201 -104 -381 q-23 -41 -70 -41q-20 0 -39 12q-29 16 -38 48z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1916" d="M0 578v380q0 16 11.5 27.5t27.5 11.5h420l325 326q49 51 84 37t35 -86v-1012q0 -72 -34.5 -86t-84.5 37l-325 326h-420q-16 0 -27.5 11t-11.5 28zM1027 406q-9 32 7 61q84 145 84 301t-84 301q-16 29 -7 61t38 48t60.5 8t48.5 -37q104 -182 104 -381q0 -201 -104 -381 q-23 -41 -70 -41q-20 0 -39 12q-29 16 -38 48zM1285 219q-7 33 11 62q141 225 142 487q0 262 -142 487q-18 29 -11 62t36 49q29 18 61 11t50 -36q82 -131 123.5 -275t41.5 -298q0 -309 -167 -573q-10 -18 -29 -27.5t-37 -9.5q-25 0 -43 12q-29 16 -36 49zM1540 33 q-6 33 12 59q100 154 152.5 325t52.5 351t-52 351t-153 323q-18 29 -12 61.5t35 50.5q29 16 61 10.5t50 -32.5q115 -174 173 -366.5t58 -397.5t-58.5 -397.5t-172.5 -364.5q-10 -18 -29 -27.5t-37 -9.5q-25 0 -45 13q-29 18 -35 51z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1536" d="M0 0v698h698v-698h-698zM0 838v698h698v-698h-698zM139 139h420v420h-420v-420zM139 977h420v420h-420v-420zM279 279v141h141v-141h-141zM279 1116v139h141v-139h-141zM838 0v698h417v-139h142v139h139v-419h-420v139h-139v-418h-139zM838 838v698h698v-698h-698z M977 977h420v420h-420v-420zM1116 0v139h139v-139h-139zM1116 1116v139h139v-139h-139zM1397 0v139h139v-139h-139z" />
-<glyph unicode="&#xf02a;" d="M0 0v1536h154v-1536h-154zM227 0v1536h37v-1536h-37zM356 0v1536h117v-1536h-117zM545 0v1536h78v-1536h-78zM715 0v1536h76v-1536h-76zM903 0v1536h37v-1536h-37zM1014 0v1536h153v-1536h-153zM1221 0v1536h77v-1536h-77zM1409 0v1536h39v-1536h-39zM1579 0v1536h37 v-1536h-37zM1690 0v1536h153v-1536h-153z" />
-<glyph unicode="&#xf02b;" horiz-adv-x="1488" d="M0 961v454q0 49 35 85t86 36h454q51 0 113 -24.5t94 -61.5l672 -748q33 -39 34 -88t-34 -84l-526 -526q-35 -35 -86 -36t-86 36l-670 750q-35 37 -60.5 96t-25.5 111zM197 1223q0 -49 33.5 -83t82.5 -34t83 34t34 83t-34 82.5t-83 33.5t-82.5 -33.5t-33.5 -82.5z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1875" d="M0 961v454q0 49 35 85t86 36h454q25 0 53.5 -6t57.5 -18.5t54.5 -28t41.5 -33.5l670 -748q33 -37 34 -86t-34 -84l-526 -524q-35 -35 -86.5 -37t-83.5 37l-670 746q-35 39 -60.5 98t-25.5 109zM195 1223q0 -47 34.5 -82t83.5 -35q47 0 82 35t35 82q0 49 -35 83.5 t-82 34.5q-49 0 -83.5 -34.5t-34.5 -83.5zM791 1534h174q51 0 112.5 -24.5t93.5 -61.5l670 -748q35 -37 35 -87t-35 -85l-524 -524q-35 -35 -86 -36t-86 36l-12 14l514 514q35 35 34.5 84.5t-34.5 85.5l-670 748q-31 35 -84 56.5t-102 27.5z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1710" d="M10 311q2 16 4 31.5t4 34.5q0 10 -4 20.5t-2 20.5q2 16 15.5 31.5t25.5 35.5q23 37 45.5 90.5t32.5 92.5q4 16 -1 30.5t-1 26.5q4 16 16.5 27.5t20.5 23.5q10 18 21.5 42t21.5 49.5t16 50t8 40.5t-2 33t0 29q6 16 20.5 26.5t24.5 24.5q10 12 21.5 34.5t23 49.5t19.5 52.5 t10 45.5q2 12 -4 24.5t-2 27.5q4 14 18.5 29.5t26.5 31.5q16 25 28.5 58.5t30 61t46 43t77.5 1.5l-2 -4q31 10 54 10h780q78 0 119 -57q41 -53 18 -129l-283 -906q-18 -63 -77.5 -107t-126.5 -44h-893q-10 0 -20.5 -2t-18.5 -12q-12 -20 0 -56q16 -43 60 -75.5t87 -32.5h946 q29 0 57.5 21.5t37.5 47.5l309 987q4 16 5 29.5t-1 28.5q41 -14 61 -43q41 -53 19 -129l-283 -905q-18 -66 -77.5 -109t-127.5 -43h-946q-41 0 -79.5 14.5t-73.5 39t-61.5 58t-41.5 72.5q-25 68 -2 127zM500 961q-10 -39 26 -39h615q16 0 30.5 11t18.5 28l24 75 q4 16 -3 27.5t-23 11.5h-615q-16 0 -31.5 -11t-19.5 -28zM569 1190q-4 -16 3.5 -26.5t23.5 -10.5h614q16 0 30.5 10.5t21.5 26.5l22 78q4 16 -3 27.5t-24 11.5h-614q-16 0 -30.5 -11.5t-20.5 -27.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1253" d="M0 84v1337q0 47 34 81t81 34h1024q47 0 80.5 -34t33.5 -81v-1337q0 -47 -33.5 -81t-80.5 -34t-80 33l-432 432l-432 -432q-33 -33 -80 -33t-81 34t-34 81z" />
-<glyph unicode="&#xf02f;" d="M0 39v346q0 47 18.5 89t50 73t73.5 49t89 18h1383q47 0 89 -18t72.5 -49t49 -73t18.5 -89v-346q0 -39 -39 -39h-1765q-39 0 -39 39zM268 193q0 -16 11.5 -26.5t27.5 -10.5h1229q16 0 27.5 10t11.5 27v38q0 16 -11.5 27.5t-27.5 11.5h-1229q-16 0 -27.5 -11t-11.5 -28v-38 zM307 729v731q0 31 22.5 53.5t55.5 22.5h651v-383q0 -49 34 -83t81 -34h385v-307h-1229zM1151 1153v383l385 -383h-385z" />
-<glyph unicode="&#xf030;" d="M0 115v1075q0 47 34 82t81 35h366l58 125q18 43 66 73.5t95 30.5h443q47 0 95 -30.5t67 -73.5l57 -125h367q47 0 80.5 -35t33.5 -82v-1075q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM442 653q0 -100 38 -187t102.5 -152.5t153 -103.5t186.5 -38t186 38 t152.5 103.5t102.5 152.5t38 187q0 98 -38 186.5t-102.5 153t-152.5 102.5t-186 38t-186.5 -38t-153 -102.5t-102.5 -152.5t-38 -187zM596 653q0 68 25.5 127.5t69.5 103.5t103.5 69.5t127.5 25.5t127 -25.5t103 -69.5t69.5 -103.5t25.5 -127.5t-25.5 -127t-69.5 -104 t-103.5 -70.5t-126.5 -25.5q-68 0 -127.5 25.5t-103.5 70.5t-69.5 104.5t-25.5 126.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1644" d="M0 0l2 80q10 4 29.5 8t48.5 8q92 18 108 33q16 10 50 68l233 614l277 725h73h53l11 -20l202 -482q33 -78 64 -151.5t59 -145.5q29 -72 52.5 -130t42.5 -103q12 -29 28.5 -70t36.5 -94q23 -66 64 -150q25 -49 34 -57q20 -18 68 -24q25 -2 49.5 -9.5t52.5 -17.5 q6 -37 7 -55v-10.5t-3 -16.5q-43 0 -90 2t-98 6q-53 4 -99 6t-87 2h-80t-53 -2l-199 -10l-57 -2q0 20 1 39.5t3 38.5l129 26q57 14 67 25q12 8 13 27q0 14 -7 30l-47 115l-90 227l-446 2q-12 -29 -37 -96t-66 -178q-23 -63 -22 -84q0 -27 16 -43q14 -10 40 -17.5t63 -13.5 q14 -4 84 -12v-59q0 -16 -2 -27q-35 0 -121 5t-224 16l-49 -9q-43 -8 -83 -11t-81 -3h-20zM549 655q135 -2 216 -4t105 0l29 2q-18 51 -40.5 111.5t-51.5 130.5t-51.5 122t-38.5 87z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1419" d="M0 0l2 94q27 6 68 12q39 6 69.5 13.5t55.5 17.5q8 14 13 26.5t7 24.5q6 33 8 81t2 112l-2 498q-2 39 -3 139t-5 266q-4 88 -12 109q-4 8 -13 10q-20 14 -69 16q-23 0 -115 13l-4 84l262 6l383 12h45q8 2 15.5 2h13.5t21.5 -1t39.5 -1h76q92 0 193 -27q18 -4 42.5 -13 t53.5 -26q63 -31 104 -75q45 -47 66 -105q10 -29 15 -58.5t5 -62.5q0 -72 -32 -129q-31 -57 -95 -104q-16 -12 -54 -30.5t-97 -47.5q178 -41 268 -145q92 -104 92 -236q0 -72 -28 -162q-23 -66 -72 -116q-66 -72 -141 -109q-78 -35 -205 -59q-70 -12 -199 -11l-199 5 q-63 2 -138 -2.5t-163 -10.5q-25 -2 -93 -4t-181 -6zM537 1419q0 -12 1 -31.5t3 -44.5q2 -51 4 -119.5t0 -158.5v-98v-78q25 -4 52.5 -6t57.5 -2q176 0 267 65q90 66 90 225q0 113 -86 187q-84 76 -258 76q-53 0 -131 -15zM545 457l4 -271q0 -16 10 -43q74 -33 141 -32 q131 0 220 41q82 39 122 112q18 37 28.5 82t10.5 100q0 113 -43 181q-59 94 -141 125q-80 33 -250 32q-37 0 -61.5 -3t-40.5 -7v-143v-174z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1054" d="M0 0l18 84q12 4 32 9t46 11q41 10 71 19.5t50 19.5q29 39 41 103l29 137l57 268l12 64q23 119 41.5 178t18.5 63l30 156l17 64l22 135l9 49v39q-45 23 -148 28q-14 0 -23.5 1.5t-17.5 1.5l21 104l325 -14q31 -2 49.5 -2h26.5q35 0 89 2t132 6q41 4 68.5 6t38.5 2 q-2 -10 -3 -19.5t-3 -19.5q-4 -10 -7.5 -22.5t-7.5 -28.5q-49 -16 -110 -31q-66 -16 -105 -31q-12 -33 -24 -88q-6 -25 -9.5 -45t-5.5 -37q-23 -100 -40 -175.5t-27 -129.5l-64 -311l-39 -158l-43 -235l-14 -45v-10.5t2 -16.5q35 -8 64.5 -13t58.5 -9q4 0 21.5 -2.5 l45.5 -6.5q-2 -18 -3 -32.5t-3 -26.5q-2 -6 -4 -16.5t-6 -22.5q-8 0 -14 -1t-10 -1q-18 -2 -28.5 -2h-14.5h-11.5t-17.5 4q-8 0 -45 4t-105 12l-202 2q-61 0 -181 -12q-39 -4 -63.5 -6t-36.5 -2z" />
-<glyph unicode="&#xf034;" d="M0 1151q14 37 34.5 110.5t45.5 184.5q8 33 13 54.5t9 31.5h58q4 -6 6 -10t4 -9q29 -57 41 -71q16 -4 129 -4q35 0 66.5 1t60.5 1l20 2l113 2l213 -2h289l55 10q10 8 27 53q2 6 4 12.5t6 16.5l43 2h10.5t16.5 -2q2 -39 1 -97.5t1 -138.5v-100v-57q0 -14 -1 -27.5t-3 -23.5 q-20 -8 -37 -11.5t-31 -7.5q-27 51 -53 129q-29 82 -37 92q-12 14 -27 21q-10 4 -60 4h-138h-31t-35 -4q-6 -43 -6 -72l2 -151v-334l2 -359v-147q0 -72 10 -117q8 -4 21.5 -8t34.5 -8q4 0 21 -4t50 -13q27 -10 49 -18q4 -20 4 -33.5v-17.5v-11.5t-2 -17.5h-34q-47 0 -88 2 t-76 6t-95.5 6t-148.5 2q-16 0 -57 -4t-109 -10q-29 -2 -45 -3t-24 -1q0 10 -1.5 16.5t-1.5 10.5l-2 24v10q18 31 80 50q94 27 135 49q4 10 6.5 25.5t4.5 31.5q4 68 6 176.5t0 255.5l-4 428q-2 90 -2 142.5t-4 72.5q0 8 -7 15q-4 6 -12 6q-16 4 -63 4h-127q-90 0 -119 -21 q-41 -29 -121 -153q-23 -35 -35 -35q-23 12 -36 23.5t-19 19.5zM1383 1305.5q-5 13.5 14 33.5l184 185q14 12 33 12q14 0 31 -12l184 -185q18 -20 13 -33.5t-34 -13.5h-118v-1048h118q29 0 34 -13.5t-13 -31.5l-184 -187q-16 -12 -33 -12q-16 0 -31 12l-184 187 q-18 18 -13 31.5t31 13.5h121v1048h-121q-27 0 -32 13.5z" />
-<glyph unicode="&#xf035;" horiz-adv-x="1536" d="M0 233q0 18 12 31l187 185q18 20 31.5 14t13.5 -33v-121h1048v121q0 27 13.5 33t33.5 -14l185 -185q12 -12 12 -31q0 -18 -12 -30l-185 -187q-20 -18 -33.5 -13t-13.5 34v119h-1048v-119q0 -29 -13.5 -34t-31.5 13l-187 187q-12 12 -12 30zM0 1233q14 29 33.5 87 t44.5 146q6 27 11 43.5t9 26.5h56q8 -12 10 -14q27 -47 37 -58q2 0 35.5 -1t77.5 -1h90.5h74.5h123l19 2h108h203h416l53 6q12 10 24 46l4.5 9l6.5 13h39h28v-188v-80v-45q0 -12 -1 -21.5t-3 -19.5q-33 -10 -63 -15q-25 37 -52 103q-27 59 -34 74q-12 10 -27 14q-6 2 -42 3 t-85 1h-103.5h-97.5h-28.5t-34.5 -2q-2 -18 -3 -32.5t-1 -24.5l4 -445l-2 -119q0 -61 12 -92q12 -6 53 -12q4 0 20.5 -4t45.5 -10q14 -4 26.5 -7.5t22.5 -7.5q2 -16 3 -25.5t1 -13.5t-1 -10t-1 -14h-33q-94 0 -157 6q-66 6 -236 6q-14 0 -53 -3t-105 -7q-27 -2 -43 -3 t-24 -1q0 16 -2 20v21v8q20 27 73 39q90 20 132 41q4 8 6 19t4 26q0 18 1 70.5t1 120t-1 142t-2 139t-2 107.5t-1 47q0 8 -6 13q-2 2 -13 6q-14 2 -59 2h-123q-20 0 -62 -1t-85 -2t-78 -4t-41 -7q-41 -25 -117 -123q-20 -29 -33 -29q-23 10 -35 19.5t-18 15.5z" />
-<glyph unicode="&#xf036;" d="M0 78v115q0 31 22.5 53t55.5 22h1689q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM0 500v114q0 33 22.5 55.5t55.5 22.5h1075q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1075 q-33 0 -55.5 22.5t-22.5 55.5zM0 922v114q0 33 22.5 55.5t55.5 22.5h1536q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-1536q-33 0 -55.5 21.5t-22.5 54.5zM0 1343v117q0 31 22.5 53.5t55.5 22.5h921q31 0 53.5 -22.5t22.5 -53.5v-117q0 -31 -22.5 -53 t-53.5 -22h-921q-33 0 -55.5 22.5t-22.5 52.5z" />
-<glyph unicode="&#xf037;" d="M0 78v115q0 31 22.5 53t55.5 22h1689q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM78 922v114q0 33 21.5 55.5t54.5 22.5h1536q33 0 55 -22.5t22 -55.5v-114q0 -33 -22.5 -54.5t-54.5 -21.5h-1536 q-33 0 -54.5 21.5t-21.5 54.5zM307 500v114q0 33 22.5 55.5t55.5 22.5h1075q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1075q-33 0 -55.5 22.5t-22.5 55.5zM385 1343v117q0 31 21.5 53.5t54.5 22.5h921q33 0 55.5 -22.5t22.5 -53.5v-117 q0 -31 -22.5 -53t-55.5 -22h-921q-33 0 -54.5 22.5t-21.5 52.5z" />
-<glyph unicode="&#xf038;" d="M0 78v115q0 31 22.5 53t55.5 22h1689q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM154 922v114q0 33 22.5 55.5t54.5 22.5h1536q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-1536 q-33 0 -55 21.5t-22 54.5zM614 500v114q0 33 22.5 55.5t55.5 22.5h1075q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1075q-33 0 -55.5 22.5t-22.5 55.5zM768 1343v117q0 31 22.5 53.5t55.5 22.5h921q31 0 53.5 -22.5t22.5 -53.5v-117q0 -31 -22.5 -53 t-53.5 -22h-921q-33 0 -55.5 22.5t-22.5 52.5z" />
-<glyph unicode="&#xf039;" d="M0 78v115q0 31 22.5 53t55.5 22h1689q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM0 500v114q0 33 22.5 55.5t55.5 22.5h1689q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1689 q-33 0 -55.5 22.5t-22.5 55.5zM0 922v114q0 33 22.5 55.5t55.5 22.5h1689q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-1689q-33 0 -55.5 21.5t-22.5 54.5zM0 1343v117q0 31 22.5 53.5t55.5 22.5h1689q31 0 53.5 -22.5t22.5 -53.5v-117 q0 -31 -22.5 -53t-53.5 -22h-1689q-33 0 -55.5 22.5t-22.5 52.5z" />
-<glyph unicode="&#xf03a;" d="M0 78v115q0 31 22.5 53t55.5 22h153q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-153q-33 0 -55.5 22.5t-22.5 55.5zM0 500v114q0 33 22.5 55.5t55.5 22.5h153q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-153 q-33 0 -55.5 22.5t-22.5 55.5zM0 922v114q0 33 22.5 55.5t55.5 22.5h153q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-153q-33 0 -55.5 21.5t-22.5 54.5zM0 1343v117q0 31 22.5 53.5t55.5 22.5h153q31 0 53.5 -22.5t22.5 -53.5v-117q0 -31 -22.5 -53 t-53.5 -22h-153q-33 0 -55.5 22.5t-22.5 52.5zM461 78v115q0 31 22.5 53t55.5 22h1228q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-1228q-33 0 -55.5 22.5t-22.5 55.5zM461 500v114q0 33 22.5 55.5t55.5 22.5h1228q31 0 53.5 -22.5t22.5 -55.5v-114 q0 -33 -22.5 -55.5t-53.5 -22.5h-1228q-33 0 -55.5 22.5t-22.5 55.5zM461 922v114q0 33 22.5 55.5t55.5 22.5h1228q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-1228q-33 0 -55.5 21.5t-22.5 54.5zM461 1343v117q0 31 22.5 53.5t55.5 22.5h1228 q31 0 53.5 -22.5t22.5 -53.5v-117q0 -31 -22.5 -53t-53.5 -22h-1228q-33 0 -55.5 22.5t-22.5 52.5z" />
-<glyph unicode="&#xf03b;" d="M0 756v75q0 39 39 39h213v154q0 31 16.5 37t38.5 -17l215 -215q16 -16 17 -36q0 -18 -17 -35l-215 -215q-23 -23 -39 -17t-16 39v152h-213q-39 0 -39 39zM614 39v1458q0 39 39 39h76q39 0 39 -39v-1458q0 -39 -39 -39h-76q-39 0 -39 39zM922 78v115q0 31 22.5 53t54.5 22 h768q31 0 53.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-53.5 -22.5h-768q-33 0 -55 22.5t-22 55.5zM922 500v114q0 33 22.5 55.5t54.5 22.5h615q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-615q-33 0 -55 22.5t-22 55.5zM922 922v114 q0 33 22.5 55.5t54.5 22.5h691q33 0 55 -22.5t22 -55.5v-114q0 -33 -22.5 -54.5t-54.5 -21.5h-691q-33 0 -55 21.5t-22 54.5zM922 1343v117q0 31 22.5 53.5t54.5 22.5h537q33 0 55.5 -22.5t22.5 -53.5v-117q0 -31 -22.5 -53t-55.5 -22h-537q-33 0 -55 22.5t-22 52.5z" />
-<glyph unicode="&#xf03c;" d="M0 78v115q0 31 22.5 53t53.5 22h768q33 0 55.5 -22.5t22.5 -52.5v-115q0 -33 -22.5 -55.5t-55.5 -22.5h-768q-31 0 -53.5 22.5t-22.5 55.5zM0 500v114q0 33 22.5 55.5t53.5 22.5h614q33 0 55.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-55.5 -22.5h-614 q-31 0 -53.5 22.5t-22.5 55.5zM0 922v114q0 33 22.5 55.5t53.5 22.5h692q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-692q-31 0 -53.5 21.5t-22.5 54.5zM0 1343v117q0 31 22.5 53.5t53.5 22.5h538q31 0 53.5 -22.5t22.5 -53.5v-117q0 -31 -22.5 -53 t-53.5 -22h-538q-31 0 -53.5 22.5t-22.5 52.5zM1075 39v1458q0 39 39 39h76q16 0 27.5 -11.5t11.5 -27.5v-1458q0 -16 -11.5 -27.5t-27.5 -11.5h-76q-39 0 -39 39zM1305 743q0 16 14 35l217 215q23 23 38 17t15 -39v-152h215q16 0 27.5 -11t11.5 -28v-75q0 -16 -11 -27.5 t-28 -11.5h-215v-154q0 -31 -15 -38t-38 15l-217 218q-14 18 -14 36z" />
-<glyph unicode="&#xf03d;" d="M0 324v768q0 47 18.5 89t50 72.5t73.5 49t89 18.5h768q47 0 89 -18.5t73 -49t49.5 -72.5t18.5 -89v-240l483 471q23 23 55 23q13 -1 29 -7q47 -20 47 -69v-1127q0 -49 -47 -69q-16 -6 -29 -6q-33 0 -55 22l-483 471v-237q0 -47 -18.5 -89t-49.5 -74t-72.5 -50.5 t-89.5 -18.5h-768q-47 0 -89 18.5t-73.5 50.5t-50 73.5t-18.5 89.5z" />
-<glyph unicode="&#xf03e;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM154 154h1536v1228h-1536v-1228zM307 307v105l277 360l188 -156l354 537l410 -424v-422h-1229zM307 1073q0 66 45 111t111 45q63 0 108 -45 t45 -111q0 -63 -45 -108t-108 -45q-66 0 -111 45t-45 108z" />
-<glyph unicode="&#xf040;" horiz-adv-x="1536" d="M0 0l137 418l867 866l280 -280l-866 -867zM287 407.5q0 -12.5 10 -22.5q8 -8 22 -8q12 0 21 8l690 690q20 20 0 43q-10 10 -22.5 10t-20.5 -10l-690 -688q-10 -10 -10 -22.5zM1102 1382l119 119q35 35 84 35t84 -35l57 -55l55 -57q35 -35 35 -84.5t-35 -83.5l-119 -119z " />
-<glyph unicode="&#xf041;" horiz-adv-x="1128" d="M0 1001q0 117 44 220.5t121 180.5t180.5 121t219.5 44q117 0 219.5 -44t179 -121t120.5 -180.5t44 -220.5q0 -84 -24.5 -159.5t-65.5 -143.5l-379 -661q-41 -68 -95 -68t-93 68l-381 663q-41 68 -65.5 143t-24.5 158zM285 1001q0 -57 21.5 -108t60.5 -89t89 -59.5 t109 -21.5q57 0 108.5 21.5t89.5 59.5t59.5 89t21.5 108t-21.5 108.5t-59.5 90.5t-89 60.5t-109 21.5q-59 0 -109 -21.5t-89 -60.5t-60.5 -90t-21.5 -109z" />
-<glyph unicode="&#xf042;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44v1118q-117 0 -218.5 -44 t-177 -120t-119.5 -177t-44 -218z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1130" d="M0 535q0 86 23.5 161.5t66.5 141.5q20 33 69.5 99.5t108 154.5t113.5 193.5t90 217.5q10 35 37 51.5t57 12.5q31 4 57.5 -12.5t36.5 -51.5q33 -113 89.5 -218t115 -193t107.5 -154.5t69 -99.5q43 -66 66.5 -141.5t23.5 -161.5q0 -117 -44 -220.5t-120.5 -180.5t-180 -121 t-220.5 -44t-220 44t-180 121t-121 180.5t-44 220.5zM248 410q0 -59 41 -100.5t100 -41.5t100 41t41 101q0 43 -22 75q-6 8 -18.5 24.5t-26.5 39t-28.5 48.5t-22.5 54q-4 20 -23 17q-18 4 -24 -17q-8 -29 -21.5 -54.5t-28 -48t-27 -38.5t-18.5 -25q-23 -33 -22 -75z" />
-<glyph unicode="&#xf044;" d="M0 307v922q0 63 24.5 119.5t65.5 97.5t97.5 65.5t119.5 24.5h1075q4 0 10.5 -1t10.5 -1l-191 -191h-905q-47 0 -80.5 -33.5t-33.5 -80.5v-922q0 -47 33.5 -80.5t80.5 -33.5h1075q47 0 81 33.5t34 80.5v445l193 192v-637q0 -63 -25 -118.5t-67 -97.5t-97 -66.5t-119 -24.5 h-1075q-63 0 -119.5 24.5t-97.5 66.5t-65.5 97.5t-24.5 118.5zM631 324l108 329l652 652l221 -222l-651 -651zM866 629q6 -8 17 -8q10 0 16 8l512 510q18 18 0 35q-18 16 -35 0l-510 -510q-18 -18 0 -35zM1501 1415l92 94q29 29 68 29t65 -29l46 -45l45 -45 q27 -29 27.5 -66.5t-27.5 -66.5l-95 -92z" />
-<glyph unicode="&#xf045;" d="M0 307v922q0 63 24.5 119.5t65.5 97.5t97.5 65.5t119.5 24.5h836q-6 -31 -6 -63v-52q-164 -20 -310 -78h-520q-47 0 -80.5 -33.5t-33.5 -80.5v-922q0 -47 33.5 -80.5t80.5 -33.5h1075q47 0 81 33.5t34 80.5v111q16 10 31.5 21.5t32.5 27.5l129 127v-287q0 -63 -25 -118.5 t-67 -97.5t-97 -66.5t-119 -24.5h-1075q-63 0 -119.5 24.5t-97.5 66.5t-65.5 97.5t-24.5 118.5zM385 388.5v37.5q0 166 56.5 312.5t173 256t293.5 173t419 65.5v231q0 57 28.5 69.5t69.5 -28.5l392 -391q27 -25 26 -65q0 -39 -26 -64l-392 -391q-41 -41 -69.5 -28.5 t-28.5 69.5v260q-207 0 -364.5 -43t-266 -116.5t-170 -174t-77.5 -215.5q-4 -27 -31 -27q-25 0 -29 27q-4 23 -4 42.5z" />
-<glyph unicode="&#xf046;" d="M0 307v922q0 63 24.5 119.5t65.5 97.5t97.5 65.5t119.5 24.5h1075q27 0 52 -6l-187 -187h-940q-47 0 -80.5 -33.5t-33.5 -80.5v-922q0 -47 33.5 -80.5t80.5 -33.5h1075q47 0 81 33.5t34 80.5v326l193 192v-518q0 -63 -25 -118.5t-67 -97.5t-97 -66.5t-119 -24.5h-1075 q-63 0 -119.5 24.5t-97.5 66.5t-65.5 97.5t-24.5 118.5zM385 966.5q0 32.5 23 55.5l98 98q23 23 55.5 23t54.5 -23l340 -340l654 656q23 23 56.5 22.5t55.5 -22.5l99 -99q23 -23 22.5 -55.5t-22.5 -54.5l-711 -711l-98 -98q-23 -23 -55.5 -23t-55.5 23l-100 98l-393 395 q-23 23 -23 55.5z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1597" d="M0 768q0 25 18 43l256 256q27 27 45.5 19.5t18.5 -46.5v-170h360v359h-172q-37 0 -45 18.5t19 44.5l256 256q18 18 43 19q25 0 43 -19l256 -256q27 -27 19.5 -45t-46.5 -18h-172v-359h361v170q0 39 18 46.5t45 -19.5l256 -256q18 -18 18 -43t-18 -43l-256 -256 q-27 -27 -45 -19.5t-18 46.5v176h-361v-365h172q39 0 47 -18.5t-20 -44.5l-256 -256q-18 -18 -43 -19q-25 0 -43 19l-256 256q-27 27 -20 45t46 18h172v365h-360v-176q0 -39 -18.5 -46.5t-45.5 19.5l-256 256q-18 18 -18 43z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1075" d="M0 76q0 -31 22.5 -53.5t53.5 -22.5h153q33 0 55.5 22.5t22.5 53.5v1382q0 33 -22.5 55.5t-55.5 22.5h-153q-31 0 -53.5 -22.5t-22.5 -55.5v-1382zM307.5 768q-0.5 27 16.5 43l653 707q14 18 41 18q6 0 22 -4q35 -18 35 -59v-1412q0 -41 -35 -57q-39 -14 -63 14l-653 705 q-16 18 -16.5 45z" />
-<glyph unicode="&#xf049;" d="M0 76q0 -31 22.5 -53.5t53.5 -22.5h153q33 0 55.5 22.5t22.5 53.5v1382q0 33 -22.5 55.5t-55.5 22.5h-153q-31 0 -53.5 -22.5t-22.5 -55.5v-1382zM307.5 768q-0.5 27 16.5 43l653 707q14 18 41 18q6 0 22 -4q35 -18 35 -59v-1412q0 -41 -35 -57q-39 -14 -63 14l-653 705 q-16 18 -16.5 45zM1075.5 768q-0.5 27 16.5 43l653 707q14 18 41 18q6 0 22 -4q35 -18 35 -59v-1412q0 -41 -35 -57q-39 -14 -63 14l-653 705q-16 18 -16.5 45z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1536" d="M0 767q0 26 16 44l654 707q14 18 41 18q10 0 22 -6q35 -14 35 -57v-1412q0 -41 -35 -57q-37 -16 -63 14l-654 705q-16 18 -16 44zM768 767q0 26 16 44l654 707q14 18 41 18q10 0 22 -6q35 -14 35 -57v-1412q0 -41 -35 -57q-37 -16 -63 14l-654 705q-16 18 -16 44z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1349" d="M0 70v1396q0 39 35 60q37 23 69 0l1211 -697q35 -25 35 -61q0 -37 -35 -61l-1211 -697q-16 -10 -34 -10t-35 10q-35 20 -35 60z" />
-<glyph unicode="&#xf04c;" horiz-adv-x="1536" d="M0 70v1396q0 29 20.5 49.5t49.5 20.5h489q29 0 49.5 -20.5t20.5 -49.5v-1396q0 -29 -20.5 -49.5t-49.5 -20.5h-489q-29 0 -49.5 20.5t-20.5 49.5zM907 70v1396q0 29 20.5 49.5t49.5 20.5h489q29 0 49.5 -20.5t20.5 -49.5v-1396q0 -29 -20.5 -49.5t-49.5 -20.5h-489 q-29 0 -49.5 20.5t-20.5 49.5z" />
-<glyph unicode="&#xf04d;" horiz-adv-x="1536" d="M0 70v1396q0 29 20.5 49.5t49.5 20.5h1396q29 0 49.5 -20.5t20.5 -49.5v-1396q0 -29 -20.5 -49.5t-49.5 -20.5h-1396q-29 0 -49.5 20.5t-20.5 49.5z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1536" d="M0 61v1414q0 39 35 57q39 14 63 -14l654 -705q16 -18 16 -45t-16 -45l-654 -705q-16 -18 -41 -18q-6 0 -22 4q-35 16 -35 57zM768 61v1414q0 39 35 57q39 14 63 -14l654 -705q16 -18 16 -45t-16 -45l-654 -705q-16 -18 -41 -18q-6 0 -22 4q-35 16 -35 57z" />
-<glyph unicode="&#xf050;" d="M0 61v1414q0 39 35 57q39 14 63 -14l654 -705q16 -18 16 -45t-16 -45l-654 -705q-16 -18 -41 -18q-6 0 -22 4q-35 16 -35 57zM768 61v1414q0 39 35 57q39 14 63 -14l654 -705q16 -18 16 -45t-16 -45l-654 -705q-16 -18 -41 -18q-6 0 -22 4q-35 16 -35 57zM1536 76 q0 -31 22.5 -53.5t53.5 -22.5h153q33 0 55.5 22.5t22.5 53.5v1382q0 33 -22.5 55.5t-55.5 22.5h-153q-31 0 -53.5 -22.5t-22.5 -55.5v-1382z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1075" d="M0 61v1414q0 39 35 57q39 14 63 -14l654 -705q16 -18 16 -45t-16 -45l-654 -705q-16 -18 -41 -18q-6 0 -22 4q-35 16 -35 57zM768 76q0 -31 22.5 -53.5t53.5 -22.5h153q33 0 55.5 22.5t22.5 53.5v1382q0 33 -22.5 55.5t-55.5 22.5h-153q-31 0 -53.5 -22.5t-22.5 -55.5 v-1382z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1536" d="M0 70v198q0 29 20.5 49.5t49.5 20.5h1396q29 0 49.5 -20.5t20.5 -49.5v-198q0 -29 -20.5 -49.5t-49.5 -20.5h-1396q-29 0 -49.5 20.5t-20.5 49.5zM6 594q-18 43 14 76l699 698q20 20 49 20.5t49 -20.5l699 -698q33 -33 14 -76q-16 -43 -64 -43h-1396q-47 0 -64 43z" />
-<glyph unicode="&#xf053;" horiz-adv-x="964" d="M0 765q0 38 29 66l671 674q29 29 68 29t68 -29l100 -100q29 -29 29 -68t-29 -67l-508 -510l508 -500q29 -29 29 -66.5t-29 -66.5l-100 -102q-29 -29 -68 -29t-68 29l-671 673q-29 29 -29 67z" />
-<glyph unicode="&#xf054;" horiz-adv-x="964" d="M0 194.5q0 38.5 29 67.5l508 508l-508 502q-29 29 -29 66.5t29 66.5l100 102q29 29 68 29t67 -29l672 -673q29 -29 29 -68t-29 -68l-672 -671q-29 -29 -67.5 -29t-67.5 29l-100 100q-29 29 -29 67.5z" />
-<glyph unicode="&#xf055;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM338 688q0 -33 33 -33h313v-344q0 -33 33 -32h164q33 0 32 32v344h314 q12 0 22.5 9.5t10.5 23.5v158q0 14 -10.5 23.5t-22.5 9.5h-314v346q0 33 -32 32h-164q-33 0 -33 -32v-346h-313q-33 0 -33 -33v-158z" />
-<glyph unicode="&#xf056;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM338 688q0 -33 33 -33h856q12 0 22.5 9.5t10.5 23.5v158q0 14 -10.5 23.5 t-22.5 9.5h-856q-33 0 -33 -33v-158z" />
-<glyph unicode="&#xf057;" horiz-adv-x="1597" d="M0 770q0 154 58.5 301.5t174.5 263.5q117 117 264.5 175.5t301 58.5t301 -58.5t264.5 -175.5t175 -264t58 -301t-58 -301t-175 -264t-264.5 -175.5t-301 -58.5t-301 58.5t-264.5 175.5t-175 264t-58 301zM385 505q0 -13 10 -24l115 -116q10 -10 23.5 -10.5t23.5 10.5 l244 243l219 -221q10 -10 23.5 -10t23.5 10l113 113q23 23 0 47l-222 219l246 246q23 23 0 47l-117 115q-25 25 -47 0l-243 -244l-222 221q-10 10 -23 10t-24 -10l-110 -113q-25 -23 0 -47l219 -219l-242 -244q-10 -10 -10 -23z" />
-<glyph unicode="&#xf058;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 718q0 -20 14 -34l319 -319q14 -14 38 -24.5t44 -10.5h56q20 0 43.5 10 t38.5 25l550 550q14 14 14.5 34t-14.5 34l-104 107q-16 14 -35.5 14t-34.5 -14l-452 -453q-14 -14 -33.5 -14t-34.5 14l-221 221q-14 14 -33.5 14t-36.5 -14l-104 -106q-14 -14 -14 -34z" />
-<glyph unicode="&#xf059;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM532 1100l95 -115q4 -8 20 -12q12 0 23 6l10 8t27.5 17.5t39 16.5t46.5 7 q41 0 69.5 -22.5t28.5 -57.5q0 -37 -24.5 -64.5t-61.5 -60.5q-23 -18 -46.5 -40.5t-43 -51.5t-31.5 -63.5t-12 -79.5v-64q0 -12 9 -21t21 -9h164q12 0 20.5 9t8.5 21v51q0 39 25.5 66.5t62.5 60.5q25 20 49.5 46t46 57t34.5 69.5t13 90.5q0 68 -27.5 121t-73.5 87.5 t-103.5 53t-114.5 18.5q-63 0 -113.5 -16.5t-85.5 -35.5t-53 -35.5t-20 -18.5q-16 -16 -3 -39zM672 252q0 -12 9 -21.5t21 -9.5h164q12 0 20.5 9.5t8.5 21.5v156q0 12 -8 21t-21 9h-164q-12 0 -21 -9t-9 -21v-156z" />
-<glyph unicode="&#xf05a;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM573 858q0 -29 29 -29h86v-409h-78q-12 0 -21 -8.5t-9 -20.5v-139q0 -12 9 -21.5 t21 -9.5h402q12 0 20 9.5t8 21.5v139q0 29 -28 29h-78v577q0 12 -8 21.5t-21 9.5h-303q-12 0 -20.5 -9t-8.5 -22v-139zM686 1151q0 -12 9.5 -21.5t21.5 -9.5h188q12 0 20.5 9.5t8.5 21.5v166q0 29 -29 29h-188q-12 0 -21.5 -8.5t-9.5 -20.5v-166z" />
-<glyph unicode="&#xf05b;" horiz-adv-x="1536" d="M0 692v154q0 16 11.5 26.5t27.5 10.5h164q18 84 59 158.5t99.5 133t133 99.5t158.5 59v164q0 39 39 39h154q16 0 26.5 -11.5t10.5 -27.5v-164q84 -18 158.5 -59t133 -99.5t99.5 -133t59 -158.5h164q16 0 27.5 -10.5t11.5 -26.5v-154q0 -39 -39 -39h-164 q-18 -84 -59 -158.5t-99.5 -133t-133 -99.5t-158.5 -59v-164q0 -16 -10.5 -27.5t-26.5 -11.5h-154q-39 0 -39 39v164q-84 18 -158.5 59t-133 99.5t-99.5 133t-59 158.5h-164q-39 0 -39 39zM365 653q29 -106 105.5 -183t182.5 -105v174q0 16 11.5 26t27.5 10h154 q16 0 26.5 -10t10.5 -26v-174q106 29 183 105.5t105 182.5h-172q-39 0 -38 39v154q0 16 11 26.5t27 10.5h172q-29 106 -105.5 183t-182.5 105v-172q0 -16 -10.5 -27t-26.5 -11h-154q-39 0 -39 38v172q-106 -29 -183 -105.5t-105 -182.5h174q16 0 26 -10.5t10 -26.5v-154 q0 -16 -10 -27.5t-26 -11.5h-174z" />
-<glyph unicode="&#xf05c;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44t218 44t177 120t120 177 t44 218t-44 218t-120 177t-177.5 120t-217.5 44q-117 0 -218.5 -44t-177 -120t-119.5 -177t-44 -218zM451 573.5q0 16.5 12 28.5l166 166l-166 166q-12 12 -12 28.5t12 28.5l112 113q29 29 58 0l166 -166l166 166q29 29 57 0l113 -113q29 -29 0 -57l-166 -166l166 -166 q29 -29 0 -57l-113 -113q-12 -12 -28.5 -12t-28.5 12l-166 166l-166 -166q-12 -12 -28.5 -12t-29.5 12l-112 113q-12 12 -12 28.5z" />
-<glyph unicode="&#xf05d;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -117 44 -218t119.5 -177t177 -120t218.5 -44t218 44t177 120t120 177 t44 218t-44 218t-120 177t-177.5 120t-217.5 44q-117 0 -218.5 -44t-177 -120t-119.5 -177t-44 -218zM332 717.5q0 17.5 10 27.5l115 115q10 10 27.5 10t27.5 -10l178 -180q29 -25 58 0l337 340q10 10 27.5 10t28.5 -10l114 -115q10 -10 10.5 -27.5t-10.5 -27.5l-409 -410 q-12 -12 -32.5 -20t-37.5 -8h-114q-16 0 -37 8t-33 20l-250 250q-10 10 -10 27.5z" />
-<glyph unicode="&#xf05e;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -84 23.5 -160t66.5 -141l770 770q-66 43 -141.5 66.5t-159.5 23.5 q-117 0 -218.5 -44t-177 -120t-119.5 -177t-44 -218zM498 297q66 -41 141.5 -64.5t159.5 -23.5q117 0 218 44t177 120t120 177t44 218q0 84 -23.5 160t-64.5 141z" />
-<glyph unicode="&#xf060;" horiz-adv-x="1536" d="M0 768q0 39 29 68l671 673q29 29 68 29t68 -29l100 -100q29 -29 29 -67.5t-29 -67.5l-338 -338h842q41 0 68.5 -27.5t27.5 -68.5v-144q0 -39 -27.5 -66.5t-66.5 -27.5h-844l338 -338q29 -29 29 -67.5t-29 -67.5l-100 -100q-29 -29 -68 -29t-68 29l-671 671q-29 29 -29 68 z" />
-<glyph unicode="&#xf061;" horiz-adv-x="1536" d="M0 698v144q0 39 27.5 66.5t66.5 27.5h844l-338 338q-29 29 -29 67.5t29 67.5l100 100q29 29 68 29t68 -29l671 -673q29 -29 29 -67t-29 -67l-671 -673q-29 -29 -68 -29t-68 29l-100 100q-29 29 -29 68t29 67l338 338h-844q-39 0 -66.5 27.5t-27.5 68.5z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1536" d="M-1 768q-1 39 28 68l673 671q29 29 68 29t68 -29l671 -671q29 -29 29 -68t-29 -68l-100 -100q-29 -29 -66.5 -29t-66.5 29l-340 338v-844q0 -39 -27.5 -66.5t-66.5 -27.5h-144q-41 0 -67.5 27.5t-26.5 66.5v844l-338 -338q-29 -29 -67.5 -29t-67.5 29l-100 100 q-29 29 -30 68z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1536" d="M0 766q0 39 29 68l100 100q29 29 68 29t67 -29l338 -338v844q0 39 27.5 66.5t66.5 27.5h144q41 0 67.5 -27.5t26.5 -66.5v-844l340 338q29 29 66.5 29t66.5 -29l102 -100q29 -29 29 -68t-29 -68l-673 -671q-29 -29 -68 -29t-68 29l-671 671q-29 29 -29 68z" />
-<glyph unicode="&#xf064;" d="M0 135q0 209 71.5 393.5t218 322.5t371 219t531.5 83v293q0 72 36 87t89 -36l491 -493q35 -33 35 -82q0 -47 -35 -82l-491 -494q-51 -51 -88 -35.5t-37 86.5v330q-262 -2 -461 -56.5t-336 -147.5t-215 -219t-98 -271q-4 -33 -37 -33h-2q-33 0 -37 33q-6 51 -6 102z" />
-<glyph unicode="&#xf065;" horiz-adv-x="1536" d="M0 86v522q0 53 26.5 64.5t65.5 -25.5l166 -166l274 275q12 12 31 12t33 -12l160 -160q12 -14 12 -32.5t-12 -31.5l-275 -274l166 -166q39 -39 27 -65.5t-66 -26.5h-520q-37 0 -61 25q-27 27 -27 61zM768 972.5q0 18.5 12 31.5l275 274l-166 166q-39 39 -27 65.5t66 26.5 h520q37 0 61 -25q27 -27 27 -61v-522q0 -53 -26.5 -64.5t-65.5 25.5l-166 166l-274 -273q-12 -14 -31 -14t-33 14l-160 158q-12 14 -12 32.5z" />
-<glyph unicode="&#xf066;" horiz-adv-x="1536" d="M0 202.5q0 18.5 12 33.5l275 272l-166 166q-39 39 -27 65.5t66 26.5h520q38 0 61 -25q27 -27 27 -61v-522q0 -53 -26.5 -64.5t-65.5 27.5l-166 166l-274 -275q-12 -14 -31 -14t-33 14l-160 160q-12 12 -12 30.5zM768 854v522q0 53 26.5 64.5t65.5 -27.5l166 -166l274 275 q12 14 31 14t33 -14l160 -160q12 -12 12 -30.5t-12 -33.5l-275 -272l166 -166q39 -39 27 -65.5t-66 -26.5h-520q-41 0 -61 25q-27 27 -27 61z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1536" d="M0 696v144q0 39 27.5 66.5t66.5 27.5h508v506q0 41 26.5 68.5t67.5 27.5h144q39 0 66.5 -27.5t27.5 -66.5v-508h508q39 0 66.5 -27.5t27.5 -66.5v-144q0 -39 -27.5 -66.5t-66.5 -27.5h-508v-506q0 -41 -27.5 -68.5t-66.5 -27.5h-144q-39 0 -66.5 27.5t-27.5 66.5v508 h-506q-41 0 -68.5 26.5t-27.5 67.5z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1536" d="M0 696v144q0 39 27.5 66.5t66.5 27.5h1348q39 0 66.5 -27.5t27.5 -66.5v-144q0 -39 -27.5 -66.5t-66.5 -27.5h-1346q-41 0 -68.5 26.5t-27.5 67.5z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1427" d="M2 1018q-10 37 10 72l72 124q20 35 58 44.5t73 -9.5l332 -192v383q0 41 27.5 68.5t68.5 27.5h141q41 0 69 -27.5t28 -66.5v-385l331 192q35 18 73 9t58 -44l70 -124q20 -35 11 -72t-44 -57l-333 -193l333 -193q35 -20 44.5 -57t-9.5 -72l-72 -124q-20 -35 -58 -44.5 t-73 9.5l-331 192v-383q0 -41 -28 -68.5t-69 -27.5h-141q-41 0 -68.5 27.5t-27.5 66.5v385l-332 -192q-35 -20 -73 -10t-58 45l-72 124q-18 35 -9 72t44 57l334 193l-334 193q-35 20 -45 57z" />
-<glyph unicode="&#xf06a;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM672 1274l14 -739q4 -29 31 -29h162q12 0 21 8t9 21l17 739q0 10 -8 22q-8 8 -23 9 h-193q-14 0 -22 -9q-8 -12 -8 -22zM680 236q0 -12 8 -21.5t21 -9.5h180q12 0 21.5 9t9.5 22v174q0 12 -9.5 21t-21.5 9h-180q-12 0 -20.5 -9t-8.5 -21v-174z" />
-<glyph unicode="&#xf06b;" horiz-adv-x="1880" d="M0 588v391q0 16 11.5 27.5t27.5 11.5h539q-57 0 -107.5 21.5t-87.5 58.5t-58.5 87t-21.5 107t21.5 107.5t58.5 87.5t87 58.5t108 21.5q61 0 115.5 -24.5t88.5 -69.5l158 -203l158 203q35 45 89 69.5t116 24.5q57 0 107 -21.5t87 -58.5t58.5 -87t21.5 -108 q0 -57 -21.5 -107t-58.5 -87t-87 -58.5t-107 -21.5h538q16 0 27.5 -11.5t11.5 -27.5v-391q0 -16 -11 -27.5t-28 -11.5h-117v-432q0 -47 -34.5 -82t-83.5 -35h-1332q-49 0 -82.5 35t-33.5 82v432h-119q-16 0 -27.5 11t-11.5 28zM461 1292q0 -49 33.5 -82.5t83.5 -33.5h237 l-151 196q-10 10 -32 24.5t-54 14.5q-49 0 -83 -35t-34 -84zM743 221q0 -33 24 -56.5t56 -23.5h234q33 0 56.5 23.5t23.5 56.5v797h-394v-797zM1065 1176h238q49 0 82.5 33.5t33.5 82.5t-33.5 84t-82.5 35q-33 0 -54.5 -14.5t-31.5 -24.5z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1916" d="M6 135q20 53 56 89t71 65q29 23 50.5 43t27.5 43q2 6 0 12t-10 25q-6 12 -11.5 27.5t-9.5 35.5q-25 160 13 295t120 242.5t195 185.5t235 121q82 29 179.5 34t203.5 7q61 0 127 2t127.5 11t113.5 28.5t85 54.5q20 20 38.5 41t38 36t43 24.5t58.5 9.5q23 0 42.5 -11.5 t29.5 -31.5q66 -133 83 -281.5t-18 -322.5q-90 -487 -579 -740q-231 -123 -467 -123q-154 0 -307 54q-23 8 -45.5 20t-44.5 25q-29 16 -57.5 30.5t-49.5 14.5q-10 -2 -23.5 -17.5t-27.5 -35t-26.5 -41t-20.5 -33.5q-14 -23 -26.5 -41.5t-22.5 -32.5q-25 -31 -64 -31h-4 q-29 2 -49.5 12.5t-33.5 24.5t-20.5 28.5t-9.5 22.5q-27 37 -10 78zM401 507.5q2 -32.5 29 -54.5q20 -18 51 -19q37 0 62 27q90 102 181 175t191.5 117t212 62t242.5 14q33 -4 57.5 19.5t26.5 56.5q2 35 -20.5 58.5t-57.5 25.5q-147 6 -277 -16.5t-247 -73.5t-223.5 -133 t-206.5 -199q-23 -27 -21 -59.5z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1445" d="M0 442q0 123 63.5 254t174.5 238q10 16 33.5 13t31.5 -21q4 -16 0 -29q-8 -35 -14 -84t-4 -101.5t13 -101.5t38 -84q31 -37 78 -49q-49 154 -40 293t49 259t101.5 217t118.5 167t98 106.5t43 39.5q25 18 47 0q10 -8 13.5 -21.5t-0.5 -24.5q0 -2 -15.5 -42.5t-21.5 -102 t7 -134.5t71 -136q37 -43 67.5 -85t52 -93.5t34 -120t12.5 -162.5q0 -33 -31 -39q-12 -2 -24.5 4t-16.5 19q-14 31 -42 49t-63 18q-47 0 -79.5 -33.5t-32.5 -81.5q0 -121 156 -120q98 0 153 63q37 43 53.5 101.5t20.5 114.5t2 102.5t-4 62.5q-6 12 0 29q8 18 31.5 21 t35.5 -13q111 -106 173.5 -237.5t62.5 -254.5q0 -109 -51.5 -195.5t-145.5 -148t-228 -95.5t-298 -34t-298 34t-228.5 95.5t-145.5 148.5t-51 195z" />
-<glyph unicode="&#xf06e;" d="M0 722q0 44 25 83q78 125 178 224t216 168t242.5 104.5t260.5 35.5q135 0 262 -35.5t241.5 -103.5t215 -167t180.5 -226q23 -39 22.5 -83t-22.5 -81q-80 -127 -180.5 -226.5t-215 -167t-241.5 -103t-262 -35.5q-133 0 -260 35.5t-243 104t-216.5 168t-177.5 224.5 q-25 37 -25 81zM154 723q66 -104 149.5 -190.5t182 -145.5t208 -92t228.5 -33t228.5 33t207.5 92t182 145t150 191q-80 129 -187.5 226.5t-236.5 156.5q51 -59 79.5 -133t28.5 -160q0 -96 -35.5 -179t-99 -146.5t-147.5 -99.5t-179 -36q-96 0 -179 36t-146.5 99.5t-99 146.5 t-35.5 179q0 78 25.5 148.5t68.5 128.5q-117 -59 -217.5 -152.5t-175.5 -214.5zM614 813q0 -23 16.5 -40t41.5 -17t41 17.5t16 39.5q0 78 53.5 131t130.5 53q25 0 41.5 17.5t16.5 40.5q0 25 -16.5 41t-41.5 16q-61 0 -116.5 -23.5t-95 -63.5t-63.5 -95.5t-24 -116.5z" />
-<glyph unicode="&#xf070;" d="M0 767q0 44 25 83q78 125 178 224.5t216 168t242.5 104t260.5 35.5q53 0 105 -7t103 -17l89 158q8 14 24 18q12 6 29 -2l133 -76q14 -8 19.5 -23.5t-3.5 -29.5l-774 -1383q-6 -14 -22 -18q-4 -2 -11 -2q-6 0 -18 4l-135 76q-14 8 -18.5 23.5t3.5 29.5l66 115 q-145 68 -269 178.5t-218 259.5q-25 37 -25 81zM154 768q82 -131 191.5 -229.5t240.5 -157.5l57 104q-86 63 -138 159.5t-52 213.5q0 78 25.5 148.5t68.5 130.5q-117 -61 -217.5 -153.5t-175.5 -215.5zM614 858q0 -23 16.5 -40t41.5 -17t41 17.5t16 39.5q0 78 53.5 131 t130.5 53q25 0 41.5 17.5t16.5 40.5q0 25 -16.5 41t-41.5 16q-61 0 -116.5 -23.5t-95 -63.5t-63.5 -95.5t-24 -116.5zM928 154l88 159q209 25 382 145t292 310q-109 170 -263 283l76 137q92 -66 172 -150t146 -188q23 -39 22.5 -83t-22.5 -81q-160 -254 -392.5 -392 t-500.5 -140zM1081 430l285 510q4 -20 6 -39.5t2 -42.5q0 -74 -21.5 -140.5t-60.5 -121.5t-93 -98t-118 -68z" />
-<glyph unicode="&#xf071;" horiz-adv-x="1775" d="M0 92q0 20 6 39t17 35l768 1331q16 27 39.5 48.5t56.5 21.5t56.5 -21.5t39.5 -48.5l770 -1331q10 -16 16.5 -34.5t6.5 -39.5q0 -49 -38 -70.5t-81 -21.5h-1538q-43 0 -81 21.5t-38 70.5zM770 1114l12 -633q0 -14 10.5 -24.5t24.5 -10.5h139q14 0 24.5 10.5t10.5 24.5 l15 633q0 14 -10.5 24.5t-24.5 10.5h-166q-16 0 -25.5 -10.5t-9.5 -24.5zM776 168q0 -16 10.5 -25.5t24.5 -9.5h154q35 0 34 35v147q0 16 -9 26.5t-25 10.5h-154q-14 0 -24.5 -10t-10.5 -27v-147z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1597" d="M0 541v4q0 31 23 57l30 29q20 25 56 24q8 0 10 -2l280 -32q39 63 93.5 134.5t125.5 151.5l-583 457q-31 25 -31 59v4q0 31 23 58l57 57q27 23 57 23h13.5t13.5 -4l803 -293l151 149q70 70 161 110t167 40q72 0 109 -37q20 -18 28 -46t8 -63q0 -76 -38.5 -167t-110.5 -160 l-150 -152l293 -803q6 -12 6 -26q0 -33 -24 -58l-58 -57q-23 -25 -57 -25h-4q-35 4 -59 31l-455 586q-82 -72 -153.5 -126t-135.5 -93l35 -281v-10q0 -33 -22 -55l-31 -31q-23 -23 -58 -23h-4q-39 4 -59 31l-205 272l-274 207q-29 25 -31 60z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1566" d="M0 117v1147q0 47 35 81.5t82 34.5h39v13q0 31 10 62.5t32.5 56t59.5 40t90 15.5t90 -15.5t59.5 -40t33 -56.5t10.5 -62v-13h49v13q0 31 10 62.5t32.5 56t59.5 40t90 15.5t90 -15.5t60.5 -40t34 -56.5t10.5 -62v-13h49v13q0 31 10.5 62.5t33 56t59 40t90.5 15.5 q53 0 90 -15.5t59.5 -40t32.5 -56.5t10 -62v-13h39q47 0 82 -34.5t35 -81.5v-1147q0 -47 -35 -82t-82 -35h-1333q-47 0 -82 35t-35 82zM158 158h282v250h-282v-250zM158 446h282v252h-282v-252zM158 737h282v252h-282v-252zM272 1165q0 -57 76 -57t76 57v228q0 57 -76 57 t-76 -57v-228zM479 158h285v250h-285v-250zM479 446h285v252h-285v-252zM479 737h285v252h-285v-252zM709 1165q0 -31 16 -44t57 -13t58.5 13.5t17.5 43.5v228q0 29 -17.5 43t-58.5 14t-57 -14.5t-16 -42.5v-228zM803 158h284v250h-284v-250zM803 446h284v252h-284v-252z M803 737h284v252h-284v-252zM1126 158h283v250h-283v-250zM1126 446h283v252h-283v-252zM1126 737h283v252h-283v-252zM1143 1165q0 -57 76 -57t75 57v228q0 57 -75 57q-76 0 -76 -57v-228z" />
-<glyph unicode="&#xf074;" d="M0 252v154q0 16 11.5 27t27.5 11h219q51 0 99.5 31t93.5 83t90 119.5t90 139.5q55 88 114.5 175t127 156t147.5 110.5t180 41.5h203v185q0 41 24.5 49t59.5 -21l334 -278q23 -18 22 -45q0 -29 -22 -47l-334 -277q-35 -29 -59.5 -20.5t-24.5 49.5v174h-203 q-53 0 -100 -31.5t-93 -84t-91.5 -120t-90.5 -139.5q-55 -88 -113.5 -174t-126 -154.5t-148.5 -110.5t-179 -42h-219q-16 0 -27.5 11.5t-11.5 27.5zM0 1108v154q0 39 39 38h219q68 0 127 -20t111.5 -56t97.5 -84t88 -104q-61 -90 -117 -178q-4 -8 -9 -14t-9 -15 q-70 102 -139.5 172t-149.5 70h-219q-16 0 -27.5 10.5t-11.5 26.5zM778 481q29 41 56.5 85t56.5 87q4 10 10 17.5t10 17.5q70 -102 139.5 -170.5t149.5 -68.5h203v190q0 41 24.5 49t59.5 -20l334 -277q23 -18 22 -47q0 -27 -22 -45l-334 -279q-35 -29 -59.5 -20.5 t-24.5 49.5v168h-203q-68 0 -127 20.5t-110.5 56.5t-97.5 84t-87 103z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1916" d="M0 866q0 145 76 272.5t206 222.5t303.5 150.5t372.5 55.5t373 -55.5t304 -150.5t206 -222t76 -273q0 -145 -76 -272t-206 -222.5t-304 -150.5t-373 -55q-92 0 -180 12q-176 -139 -411 -192q-25 -4 -50.5 -8.5t-54.5 -8.5q-16 -2 -27.5 6.5t-15.5 24.5t5 26.5t20 20.5 q23 23 43 44.5t36.5 51t30 69.5t23.5 97q-174 98 -275.5 241.5t-101.5 315.5z" />
-<glyph unicode="&#xf076;" horiz-adv-x="1566" d="M0 621v288q0 16 11.5 27.5t27.5 11.5h391q16 0 28.5 -11t12.5 -28v-288q0 -29 22.5 -60t63.5 -58.5t98.5 -45t128.5 -17.5q70 0 128.5 17.5t99.5 45t63.5 58.5t22.5 60v288q0 39 39 39h391q16 0 27.5 -11t11.5 -28v-288q0 -135 -61.5 -254t-168 -207t-249 -139.5 t-304.5 -51.5q-164 0 -306 51.5t-248.5 139.5t-168 206.5t-61.5 254.5zM0 1106v391q0 16 11.5 27.5t27.5 11.5h391q16 0 28.5 -11.5t12.5 -27.5v-391q0 -16 -12.5 -27.5t-28.5 -11.5h-391q-16 0 -27.5 11.5t-11.5 27.5zM1098 1106v391q0 16 11 27.5t28 11.5h391 q16 0 27.5 -11.5t11.5 -27.5v-391q0 -16 -11.5 -27.5t-27.5 -11.5h-391q-39 0 -39 39z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1536" d="M-1 355.5q-1 37.5 28 66.5l673 674q29 29 68 28.5t68 -28.5l671 -674q29 -29 29 -67t-29 -66l-100 -103q-29 -29 -68 -28.5t-67 28.5l-508 510l-500 -510q-29 -29 -67.5 -28.5t-67.5 28.5l-100 103q-29 29 -30 66.5z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1536" d="M0 918.5q0 37.5 29 66.5l100 102q29 29 68 29t67 -29l508 -509l500 509q29 29 67.5 29t67.5 -29l100 -102q29 -29 30 -66.5t-28 -66.5l-673 -674q-29 -29 -68 -28.5t-68 28.5l-671 674q-29 29 -29 66.5z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1916" d="M2.5 1038.5q-12.5 30.5 28.5 75.5l385 424q25 29 63 29q39 0 64 -29l385 -424q41 -45 28.5 -75.5t-67.5 -30.5h-250v-680h174q6 -10 12 -19.5t17 -19.5l252 -281h-695q-33 0 -56.5 23.5t-23.5 56.5v920h-249q-55 0 -67.5 30.5zM823 1526h695q33 0 56 -22.5t23 -57.5v-918 h250q55 0 67.5 -30.5t-28.5 -75.5l-385 -424q-25 -29 -63 -29q-39 0 -64 29l-385 424q-41 45 -28.5 75.5t67.5 30.5h250v678h-174q-6 10 -12.5 20.5t-14.5 20.5z" />
-<glyph unicode="&#xf07a;" d="M0 1421v76q0 39 39 39h231q16 0 38 -4t36 -8q6 -4 14.5 -14.5t15.5 -23.5t12 -26.5t7 -21.5l27 -125h1347q35 0 58 -27t16 -59l-108 -578q-6 -25 -26.5 -42t-49.5 -17h-1084l35 -168q4 -16 17.5 -26.5t29.5 -10.5h856q16 0 27.5 -11.5t11.5 -27.5v-78q0 -16 -11 -26.5 t-28 -10.5h-163h-652h-104q-16 0 -36.5 3.5t-35.5 9.5q-6 2 -14 13t-15.5 24.5t-12.5 27t-7 21.5l-215 1016q-4 16 -17.5 26t-29.5 10h-170q-39 0 -39 39zM582 115q0 47 33.5 81.5t80.5 34.5q49 0 83 -34.5t34 -81.5t-34 -81t-83 -34q-47 0 -80.5 34t-33.5 81zM1233 115 q0 47 33.5 81.5t81.5 34.5q47 0 80.5 -34.5t33.5 -81.5t-33.5 -81t-80.5 -34t-81 34t-34 81z" />
-<glyph unicode="&#xf07b;" d="M0 115v1306q0 47 34 81t81 34h692q47 0 81 -34t34 -81t33.5 -80.5t80.5 -33.5h693q47 0 80.5 -35t33.5 -82v-1075q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81z" />
-<glyph unicode="&#xf07c;" d="M0 379v1042q0 47 34 81t81 34h692q47 0 81 -34t34 -81t33.5 -80.5t80.5 -33.5h443q47 0 80.5 -35t33.5 -82v-221h-1228q-37 0 -72 -12.5t-65.5 -34t-53 -51t-35.5 -64.5zM43 0l246 760q6 23 30.5 39t47.5 16h1476l-260 -758q-6 -23 -30.5 -40t-47.5 -17h-1462z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="798" d="M2 368.5q10 22.5 57 22.5h203v754h-203q-47 0 -57 22.5t25 57.5l319 319q23 23 53 23q31 0 54 -23l321 -319q33 -35 22.5 -57.5t-57.5 -22.5h-202v-754h202q47 0 57.5 -22.5t-24.5 -57.5l-319 -319q-23 -23 -54 -23t-53 23l-321 319q-33 35 -23 57.5z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1597" d="M0 729q0 31 23 53l319 322q35 33 57.5 23.5t22.5 -56.5v-205h754v203q0 47 22.5 57.5t56.5 -22.5l320 -322q23 -23 22 -53q0 -31 -22 -53l-320 -322q-35 -33 -57 -22.5t-22 57.5v203h-754v-203q0 -47 -22.5 -57t-57.5 24l-319 320q-23 23 -23 53z" />
-<glyph unicode="&#xf080;" d="M0 115v1306q0 47 35 81t82 34h1612q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1612q-47 0 -82 34t-35 81zM154 154h1536v1228h-1536v-1228zM307 264v363h203v-363h-203zM649 264v776h201v-776h-201zM993 264v592h203v-592h-203zM1333 264v922h203v-922 h-203z" />
-<glyph unicode="&#xf081;" horiz-adv-x="1536" d="M0 193v1150q0 39 15.5 75t41 61.5t60.5 41t73 15.5h1153q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-75 -15.5h-1153q-39 0 -73.5 15.5t-60 41t-41 60.5t-15.5 76zM201 559q80 -111 198.5 -169t259.5 -58q96 0 184.5 26.5t160 73.5 t124 112.5t76.5 143.5q82 6 129 57q14 14 4 33q-8 18 -30 15h-4q23 23 30 45q8 20 -8 32q-14 14 -33 2q-8 -4 -29.5 -10t-45.5 -6q-4 0 -7.5 1t-7.5 1q0 2 -1 4t-1 4q-16 61 -57 110.5t-94 72.5q4 4 6 8t6 8q6 16 0 33q-2 6 -12.5 16t-34.5 8q-2 4 -6 8q-12 12 -25 9 q-25 -4 -49 -13l-2 2q-14 8 -31 -2q-59 -37 -98 -100t-68 -135q-35 31 -57 41q-61 35 -129 63.5t-154 61.5q-14 4 -24 -4q-10 -6 -15 -21q-2 -27 8.5 -58.5t38.5 -62.5q-25 -6 -20 -32q12 -68 68 -101l-13 -12q-14 -14 -4 -33q4 -12 26.5 -37.5t65.5 -38.5q-6 -12 -6 -22 t2 -14q6 -33 39 -50q-37 -25 -79 -34t-85 -5.5t-83 20.5t-70 46q-8 8 -19.5 8t-19.5 -8q-23 -18 -4 -39z" />
-<glyph unicode="&#xf082;" horiz-adv-x="1536" d="M2 193v1150q0 39 15.5 75t41 61.5t60.5 41t74 15.5h1153q80 0 136 -56.5t56 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-74 -15.5h-486v643h172q12 0 21.5 8t9.5 21l12 168q0 14 -8 24q-10 10 -23 10h-184v74q0 41 10.5 54.5t53.5 13.5q25 0 55.5 -4t58.5 -11 q6 0 13.5 1.5t11.5 5.5q10 6 14 22l23 162q4 29 -25 35q-90 25 -188 24q-301 0 -301 -293v-84h-103q-33 0 -32 -32v-168q0 -12 9 -21.5t23 -9.5h103v-643h-393q-39 0 -74 15.5t-60.5 41t-41 60.5t-15.5 76z" />
-<glyph unicode="&#xf083;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM154 160h1536v114h-1536v-114zM154 1145h1536v231h-957l-14 -92h-565v-139zM266 1341h316v93h-316v-93zM557 709q0 -76 28.5 -142.5t78 -116 t116 -78t142.5 -28.5t142 28.5t115.5 78t78 116t28.5 142.5t-28.5 142.5t-78 115.5t-116 77.5t-141.5 28.5q-76 0 -142.5 -28.5t-116 -77.5t-78 -115.5t-28.5 -142.5zM672 709q0 51 19.5 97t53 80t79.5 53t98 19q51 0 97 -19t80 -53t53 -80t19 -97t-19 -97.5t-53 -80 t-80 -53t-97 -19.5t-97.5 19.5t-80 53t-53 79.5t-19.5 98zM743 709q0 -16 12.5 -28.5t28.5 -12.5q18 0 30.5 12.5t12.5 28.5q0 41 28 67.5t67 26.5v2q18 0 30.5 12t12.5 29q0 18 -12.5 30.5t-30.5 12.5q-74 0 -126.5 -53.5t-52.5 -126.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1916" d="M0 803.5q-6 111.5 30 230.5t113 228q78 109 179.5 180t209 102t213 17.5t191.5 -74.5q76 -53 121 -134t59 -176.5t-4 -199t-68 -203.5l414 -297l101 139l-105 74q-14 10 -17 27.5t7 32.5l51 69q10 14 26.5 17.5t32.5 -7.5l344 -247q16 -10 18.5 -27.5t-7.5 -32.5l-49 -69 q-10 -14 -27.5 -17.5t-32.5 6.5l-102 76l-101 -139l248 -178q43 -31 52.5 -83t-21.5 -95q-33 -43 -84 -51.5t-94 22.5l-803 573q-78 -80 -170 -130t-186.5 -68.5t-185.5 -2t-167 71.5q-86 61 -133 157.5t-53 208zM230.5 766q7.5 -41 30 -78t58.5 -63q37 -27 79 -36t83 -2 t78 29.5t64 59.5q39 53 41 114.5t-27 114.5q59 -10 116.5 11.5t96.5 74.5q27 37 36 79t2 84t-29.5 79t-59.5 63q-37 27 -79 36t-84 2t-79 -29.5t-63 -59.5q-37 -53 -39 -114.5t26 -114.5q-59 10 -116.5 -12.5t-96.5 -75.5q-27 -37 -36 -79t-1.5 -83z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1916" d="M0 801v180q0 8 22.5 15.5t52 11.5t56.5 7t37 3q12 49 37 88q-23 31 -45.5 61.5t-46.5 59.5l-4 10q0 6 20.5 29.5t47 50t50 47t29.5 20.5q2 0 20.5 -13t41 -30.5t43 -34t24.5 -20.5q43 25 90 37q0 8 3 37t7 57.5t10.5 52t16.5 23.5h178q8 0 15.5 -23.5t11.5 -52t7 -57.5 t5 -37q45 -12 86 -35q31 23 62.5 45.5t60.5 46.5l8 4q4 0 27.5 -21.5t49.5 -47t47.5 -49t21.5 -29.5q0 -4 -13.5 -22.5t-30 -40t-32 -41t-19.5 -25.5q23 -39 39 -92q10 -2 37 -5t55.5 -8.5t51 -11.5t22.5 -14v-178q0 -10 -22.5 -16.5t-51 -11.5t-56.5 -7t-36 -4 q-14 -43 -37 -88q23 -31 44.5 -60.5t48.5 -58.5l2 -10q0 -6 -20.5 -30t-47.5 -50.5t-50.5 -47t-29.5 -20.5q-2 0 -20.5 13.5t-41 31t-42 32.5t-25.5 20q-45 -23 -88 -37q0 -10 -3 -37t-8 -56.5t-12.5 -52t-15.5 -22.5h-178q-8 0 -15.5 22.5t-11.5 52t-7 56t-3 37.5 q-45 12 -88 37q-31 -23 -61.5 -46.5t-59.5 -48.5l-10 -2q-4 0 -27.5 20.5t-49 47t-46 50.5t-20.5 30q0 2 13 20.5t29.5 40t31 41t18.5 25.5q-23 43 -39 94q-10 2 -37 5t-55.5 7t-51 10.5t-22.5 14.5zM420 889q0 -37 14.5 -70t39 -57.5t58 -38.5t70.5 -14t70 14t57.5 38.5 t38.5 57.5t14 70t-14 70.5t-38.5 58t-57.5 39t-70 14.5q-76 0 -129 -53t-53 -129zM1114 373q0 6 13.5 13t31 14.5t33.5 12.5t22 7q4 23 9.5 39t15.5 37q-4 4 -13 17t-18.5 27.5t-16.5 28t-7 17.5t18.5 23.5t43 41t47 40t28.5 24.5l8 4q4 0 16.5 -8.5t25.5 -19.5t25.5 -21.5 t16.5 -14.5q35 12 76 19q2 6 9 21.5t16.5 30.5t17.5 27.5t14 12.5q4 0 34 -7t63.5 -18.5t60.5 -23.5t27 -23q0 -23 -5.5 -47t-9.5 -47q16 -12 28.5 -26.5t22.5 -30.5q25 2 49.5 3t47.5 1q8 0 18 -26.5t17.5 -60.5t12.5 -64.5t5 -39.5q0 -6 -13.5 -13t-29.5 -13t-32.5 -12.5 t-22.5 -8.5q-9 -38 -23 -71q2 -6 11.5 -18.5t18.5 -27t16 -27.5t7 -18q0 -4 -18.5 -23.5t-43 -41t-47 -40.5t-28.5 -26l-8 -4q-4 0 -16.5 8.5t-25.5 19.5t-25.5 21.5t-16.5 14.5q-37 -12 -78 -19q-2 -6 -9 -21.5t-15.5 -30.5t-16.5 -27.5t-14 -12.5t-35 7.5t-62.5 18.5 t-60 23.5t-26.5 22.5q0 23 5 47.5t9 46.5q-16 12 -28.5 26.5t-22.5 30.5q-23 -2 -45.5 -3t-44.5 -1h-14.5t-8.5 11q-2 8 -8 35.5t-13.5 58t-12.5 55.5t-5 29zM1192 1264q0 6 12.5 12t29.5 10t33.5 6t22.5 4q10 33 31 64q-2 4 -8 17.5t-12.5 27.5t-11.5 25.5t-5 15.5 q0 6 21.5 22.5t49 35t51.5 32.5t28 14t13 -9t20.5 -21.5t20.5 -23.5t13 -15q14 4 28.5 6t29.5 0h14q2 4 11 16.5t18.5 25.5t17.5 23.5t12 10.5t30 -11.5t55.5 -26t53 -28.5t23.5 -20q0 -4 -4 -15.5t-8 -26t-8.5 -27.5t-6.5 -17q20 -25 39 -60q51 -4 74 -7t29 -18.5t5 -52 t3 -106.5q0 -6 -12.5 -12.5t-28.5 -10.5t-32.5 -6t-22.5 -4q-13 -36 -31 -63q2 -4 8 -16.5t13.5 -27t12.5 -26.5t5 -14q0 -6 -22.5 -23.5t-50 -36t-51.5 -33t-26 -14.5q-4 0 -14 9.5t-21.5 21.5t-20.5 23.5t-13 15.5q-14 -4 -28.5 -6t-29.5 0h-14q-4 -4 -12 -16.5t-17.5 -26 t-18.5 -23.5t-13 -10t-30 11t-54.5 25.5t-52 29t-23.5 20.5q0 2 3 14.5t8 26.5t9 27.5t6 17.5q-23 23 -38 59q-53 2 -75 5t-29 18.5t-5 52.5t-4 109zM1397 367q0 -49 34.5 -85t84.5 -36q49 0 84.5 34.5t35.5 86.5q0 49 -34.5 83.5t-85.5 34.5q-49 0 -84 -34.5t-35 -83.5z M1446 1206q0 -47 31.5 -78.5t76.5 -31.5q47 0 79 31.5t32 76.5q0 47 -31.5 79t-77.5 32q-47 0 -78.5 -32t-31.5 -77z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1916" d="M0 997q0 119 61.5 222.5t167 180.5t246.5 122t303 45t303.5 -45t247 -122t166.5 -180.5t61 -222.5q0 -117 -61 -221t-166.5 -181t-247 -122t-303.5 -45q-37 0 -73.5 3t-71.5 7q-147 -113 -336 -155q-20 -4 -40.5 -7.5t-43.5 -7.5q-12 -2 -21.5 6.5t-13.5 18.5v2 q-4 12 3 19.5t18 17.5q18 18 34.5 36.5t29.5 42t24.5 55.5t19.5 79q-141 78 -224 195.5t-83 256.5zM649 258q6 4 13.5 8t13.5 8q51 -6 102 -6q197 0 369 56.5t298 155t198.5 231.5t72.5 286q0 41 -6 84q96 -78 151.5 -175t55.5 -208q0 -139 -83 -256.5t-224 -195.5 q8 -47 19 -79t25.5 -55.5t30 -42t33.5 -36.5q10 -10 17.5 -18.5t3.5 -18.5v-2q-2 -12 -12.5 -19.5t-22.5 -5.5q-23 4 -43.5 7.5t-40.5 7.5q-96 20 -180 60t-156 95q-35 -4 -71.5 -7t-73.5 -3q-141 0 -265 35t-225 94z" />
-<glyph unicode="&#xf087;" horiz-adv-x="1597" d="M0 193v643q0 49 35 83.5t84 34.5h348q27 14 43 30.5t35 39.5q16 20 32.5 38.5t34.5 37.5q33 35 76 68.5t66 74.5q16 29 23 64.5t12.5 71.5t12.5 70t23.5 60.5t47 42t81.5 15.5q61 0 111.5 -25.5t85.5 -68.5t54.5 -98.5t19.5 -112.5q0 -59 -17.5 -112.5t-42.5 -107.5 q35 2 70 4.5t70 2.5q55 0 107 -10.5t93 -35t66.5 -67.5t25.5 -109q0 -29 -5 -57t-15 -57q18 -43 18 -90q0 -78 -41 -142q10 -59 -7 -118.5t-58 -104.5q-4 -84 -45 -139.5t-102.5 -89t-135 -47t-143.5 -13.5q-72 0 -144.5 10.5t-142.5 28.5q-70 20 -139.5 43t-142.5 23h-375 q-49 0 -84 34.5t-35 84.5zM236 276q0 -35 22 -57t57 -22q33 0 56.5 22.5t23.5 56.5q0 33 -23.5 56.5t-56.5 23.5q-35 0 -57 -23.5t-22 -56.5zM492 193q70 0 136 -16.5t133.5 -35t141.5 -35t160 -16.5q45 0 98 6t99.5 26.5t78 56.5t31.5 95q0 10 -1 18.5t-3 18.5 q35 16 53.5 53t18.5 74q0 39 -21 68q60 49 60 123q0 23 -12.5 43t-26.5 35q16 29 28.5 57.5t12.5 62.5q0 35 -17.5 55.5t-43 31t-56.5 12.5t-57 2q-45 0 -90.5 -3t-90.5 -3q-31 0 -61.5 3t-58.5 15q0 41 16 78t35.5 74.5t35 78.5t15.5 91q0 33 -10.5 65.5t-29.5 59t-47 44 t-65 17.5h-11t-11 -2q-8 -4 -9 -8t-3 -13q-12 -59 -22.5 -123.5t-39.5 -117.5q-29 -51 -74 -88t-86 -78q-29 -31 -49 -56.5t-41.5 -48t-48.5 -42t-65 -35.5h-2v-643z" />
-<glyph unicode="&#xf088;" horiz-adv-x="1597" d="M0 309q0 29 5 57.5t15 57.5q-18 43 -18 90q0 78 41 141q-10 59 7.5 119t58.5 105q4 84 45 139t102 89t135 47t144 13q72 0 144.5 -10t141.5 -29q70 -20 139.5 -42.5t143.5 -22.5h375q49 0 83.5 -35t34.5 -84v-643q0 -49 -34.5 -84t-83.5 -35h-349q-27 -14 -43 -30.5 t-34 -38.5q-16 -20 -32.5 -39t-35.5 -37q-33 -35 -76 -69t-65 -74q-25 -43 -31 -99.5t-18.5 -106.5t-44 -84t-107.5 -34q-61 0 -111.5 25.5t-85 68.5t-54 98.5t-19.5 112.5q0 59 17.5 112.5t41.5 106.5q-35 -2 -69.5 -4t-69.5 -2q-55 0 -107.5 10.5t-93.5 35t-66.5 67.5 t-25.5 108zM119 309q0 -35 17.5 -55.5t43 -30.5t56 -12t57.5 -2q47 0 91 3t89 3q31 0 61.5 -3t59.5 -15q0 -41 -16.5 -78t-36 -75t-34.5 -79t-15 -90q0 -33 10 -65.5t29.5 -59t47 -43t64.5 -16.5q4 0 11.5 -1t11.5 1q8 4 9 8l3 12q12 59 22.5 124t38.5 118q29 51 74 88 t86 78q29 31 49.5 56.5t42 48t47 42t66.5 35.5h2v643q-72 0 -137.5 16.5t-133 36t-141 36t-159.5 16.5q-45 0 -98.5 -7.5t-99.5 -27t-78 -56t-32 -96.5q0 -10 1 -18t3 -19q-35 -16 -53 -53t-18 -74q0 -39 20 -67q-59 -49 -59 -123q0 -23 12 -43.5t27 -34.5 q-16 -29 -28.5 -57.5t-12.5 -63.5zM1202 860q0 -33 23.5 -56.5t56.5 -23.5q35 0 57.5 23.5t22.5 56.5q0 35 -22.5 57.5t-57.5 22.5q-33 0 -56.5 -22.5t-23.5 -57.5z" />
-<glyph unicode="&#xf089;" horiz-adv-x="837" d="M1 959.5q9 27.5 54 33.5l506 74l227 459q23 41 50 41v-1348l-453 -237q-41 -23 -64.5 -6.5t-15.5 63.5l86 504l-364 356q-35 33 -26 60.5z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1802" d="M0 1073q0 137 43 231.5t112.5 153t156.5 84t177 25.5q63 0 125 -21.5t115 -53.5t97 -70t75 -68q31 31 76 68.5t98 69.5t113.5 53.5t126.5 21.5q88 0 175 -25.5t156.5 -84t112.5 -153t43 -231.5q0 -94 -34.5 -177t-76.5 -146.5t-79 -102.5t-39 -43l-615 -612 q-26 -23 -57 -23q-33 0 -55 23l-617 614q-4 2 -39.5 41t-77.5 102.5t-77 146.5t-35 177zM160 1073q0 -68 27.5 -131t61.5 -112.5t63 -79.5l28 -29l561 -559l561 559l29 29q29 30 62.5 79.5t61 113t27.5 130.5q0 104 -29.5 169t-77.5 101.5t-106.5 50t-113.5 13.5 q-53 0 -107.5 -25.5t-102.5 -61.5t-86 -74t-56 -60q-25 -31 -62 -31t-61 31q-18 23 -56.5 60.5t-86.5 73.5t-102.5 61.5t-105.5 25.5q-57 0 -115.5 -13.5t-106.5 -50t-77.5 -101t-29.5 -169.5z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1689" d="M0 307v922q0 63 24.5 118.5t66.5 97.5t97.5 66.5t118.5 24.5h461v-193h-461q-47 0 -80.5 -33.5t-33.5 -80.5v-922q0 -47 33.5 -80.5t80.5 -33.5h461v-193h-461q-63 0 -118.5 24.5t-97.5 66.5t-66.5 97.5t-24.5 118.5zM508 584v368q0 33 22.5 54.5t55.5 21.5h428v293 q0 41 39 57q39 14 65 -14l553 -553q18 -18 18.5 -44t-18.5 -42l-553 -553q-18 -18 -43 -18q-10 0 -22 4q-39 16 -39 57v291h-428q-33 0 -55.5 22.5t-22.5 55.5z" />
-<glyph unicode="&#xf08c;" horiz-adv-x="1536" d="M0 193v1150q0 39 15.5 75t41 61.5t60.5 41t76 15.5h1150q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-75 -15.5h-1150q-80 0 -136.5 56.5t-56.5 136.5zM207 1192q0 -57 40 -97t95 -40q57 0 97 40t40 97q0 55 -40 95t-97 40q-55 0 -95 -40 t-40 -95zM213 240q0 -10 9 -19.5t20 -9.5h200q12 0 20.5 9t8.5 20v706q0 29 -29 29h-200q-10 0 -19.5 -8.5t-9.5 -20.5v-706zM580 240q0 -10 9 -19.5t19 -9.5h201q12 0 20.5 9t8.5 20v383q0 68 26.5 113.5t102.5 45.5q59 0 79.5 -28.5t20.5 -81.5v-432q0 -10 8 -19.5 t21 -9.5h204q10 0 19.5 9t9.5 20v477q0 141 -81 208.5t-216 67.5q-55 0 -107.5 -15t-93.5 -56q0 16 -3 34.5t-25 18.5h-195q-10 0 -19 -8.5t-9 -20.5v-706z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1916" d="M2 950q8 82 45 172t100 176t139 147.5t152 92.5t145.5 30t121.5 -40q53 -41 73.5 -107.5t12.5 -148.5l301 -225q111 63 215 73t180 -47q55 -41 80.5 -108.5t23.5 -150.5t-30.5 -177t-83.5 -188l428 -410q25 -25 4 -53q-12 -16 -33 -17q-10 0 -18 6l-517 293 q-74 -80 -155.5 -135t-161.5 -80.5t-151.5 -19.5t-127.5 47q-76 55 -95 158.5t9 228.5l-303 223q-76 -33 -145.5 -32t-122.5 40q-51 39 -72.5 104.5t-13.5 147.5zM171 858.5q3 -16.5 15 -27.5q21 -14 50 -14q31 0 65.5 17.5t71.5 46t72.5 66.5t66.5 79q10 14 7 30.5 t-15 26.5q-14 10 -30.5 8.5t-27.5 -16.5q-78 -104 -138 -143t-72 -35q-14 10 -31 7t-27 -15q-10 -14 -7 -30.5zM465 754l364 -271q8 -8 23 -8q20 0 33 17q10 14 8 29.5t-16 25.5l-347 258q-16 -14 -32.5 -27.5t-32.5 -23.5zM829.5 239.5q1.5 -16.5 16.5 -26.5q29 -23 69 -23 q41 0 88.5 21.5t95.5 57.5t94 84.5t87 101.5q10 12 8 28.5t-16 26.5q-12 10 -28.5 8t-26.5 -16q-51 -68 -102.5 -116t-95.5 -75.5t-78 -36t-48 4.5q-14 10 -29.5 7t-25.5 -18q-10 -12 -8.5 -28.5z" />
-<glyph unicode="&#xf08e;" d="M0 307v922q0 63 24.5 119.5t65.5 97.5t97.5 65.5t119.5 24.5h582q-2 -14 -4 -27.5t-2 -29.5v-88q0 -23 6 -48h-582q-47 0 -80.5 -33.5t-33.5 -80.5v-922q0 -47 33.5 -80.5t80.5 -33.5h1075q47 0 81 33.5t34 80.5v340q41 -31 90 -49t103 -20v-271q0 -63 -25 -118.5 t-67 -97.5t-97 -66.5t-119 -24.5h-1075q-63 0 -119.5 24.5t-97.5 66.5t-65.5 97.5t-24.5 118.5zM692.5 522q-0.5 25 16.5 41l770 772h-269q-25 0 -41 16.5t-16 41.5v86q-2 23 15.5 40t41.5 17h576q23 0 40 -17.5t17 -39.5v-86v-490q0 -25 -17.5 -42t-39.5 -15h-86 q-25 0 -41.5 16.5t-16.5 40.5v268l-772 -770q-16 -16 -40.5 -16t-41.5 16l-79 80q-16 16 -16.5 41z" />
-<glyph unicode="&#xf090;" horiz-adv-x="1689" d="M0 584v368q0 33 22.5 54.5t55.5 21.5h428v293q0 41 37 57q39 14 67 -14l553 -553q16 -18 16.5 -44t-16.5 -42l-553 -553q-18 -18 -43 -18q-8 0 -24 4q-37 16 -37 57v291h-428q-33 0 -55.5 22.5t-22.5 55.5zM922 0v193h460q47 0 81 33.5t34 80.5v922q0 47 -33.5 80.5 t-81.5 33.5h-460v193h460q63 0 118.5 -24.5t97.5 -65.5t67 -97.5t25 -119.5v-922q0 -63 -25 -118.5t-67 -97.5t-97 -66.5t-119 -24.5h-460z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1689" d="M0 1042v187q0 33 22.5 54.5t55.5 21.5h323q-2 12 -2 25v24v4q0 53 4.5 88t15.5 54.5t31.5 27.5t55.5 8h678q33 0 54.5 -8t32.5 -27.5t15 -54.5t4 -88v-25.5t-2 -27.5h324q33 0 55.5 -21.5t22.5 -54.5v-187q0 -63 -45.5 -130.5t-122 -128t-180 -106.5t-222.5 -65 q-51 -10 -91 -41.5t-40 -70.5q0 -35 17.5 -51.5t39 -31t40 -31.5t22.5 -52q4 -23 -2 -47q-4 -14 23.5 -23.5t67.5 -18.5t82 -22.5t64 -34.5q12 -10 19.5 -39.5t9.5 -64.5q2 -33 -6 -58.5t-29 -25.5h-985q-20 0 -28.5 25.5t-6.5 58.5q2 35 9.5 64.5t19.5 39.5q23 20 64 34 t80.5 23t68.5 18t25 24q-4 14 -4 25.5v21.5q2 35 21.5 52t42 31.5t39.5 31t17 51.5q0 39 -39.5 70.5t-93.5 41.5q-117 20 -220 66.5t-180 106t-122 127t-45 130.5zM154 1042q0 -20 23.5 -54t67.5 -70.5t106.5 -71.5t140.5 -60q-25 80 -44.5 175.5t-33.5 189.5h-260v-109z M1198 786q78 25 140.5 60t106.5 71.5t67.5 70.5t23.5 54v109h-262q-12 -94 -31.5 -189.5t-44.5 -175.5z" />
-<glyph unicode="&#xf092;" horiz-adv-x="1536" d="M0 193v1150q0 39 15.5 75t41 61.5t60.5 41t76 15.5h1150q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-75 -15.5h-337v25q0 39 2 97t-3.5 115.5t-24.5 104.5t-65 66q188 20 290 110t102 287q0 66 -22.5 128t-67.5 114q6 23 8 45t2 45 q0 41 -9.5 91t-31.5 85h-12q-43 2 -79 -8.5t-68 -27.5t-62.5 -37.5t-65.5 -39.5q-33 4 -65.5 6t-65.5 2t-65.5 -2t-65.5 -6q-35 18 -65.5 39t-62.5 38t-67.5 27.5t-79.5 8.5h-12q-23 -35 -32 -85t-9 -91q0 -23 2 -45.5t8 -44.5q-45 -51 -66.5 -114t-21.5 -128 q0 -193 95.5 -283t281.5 -112q-39 -16 -59.5 -50t-32.5 -75q-27 -8 -49.5 -15.5t-50.5 -7.5q-55 0 -88 28.5t-59.5 62.5t-56.5 62.5t-79 28.5q-4 0 -20.5 -2t-16.5 -12q0 -23 19.5 -32t31.5 -19q39 -31 56.5 -71t39 -76.5t62.5 -62.5t127 -26q35 0 80 11q0 -10 -1 -18.5 t-1 -16.5q0 -29 2 -59.5t-2 -59.5h-317q-80 0 -136.5 56.5t-56.5 136.5z" />
-<glyph unicode="&#xf093;" d="M0 39v614q0 16 11.5 27.5t27.5 11.5h229q16 0 27.5 -11t11.5 -28v-346h1229v346q0 16 11.5 27.5t27.5 11.5h229q16 0 27.5 -11t11.5 -28v-614q0 -39 -39 -39h-1765q-39 0 -39 39zM346 969.5q-6 15.5 16 38.5l504 505q23 23 55.5 23t55.5 -23l506 -505q23 -23 15.5 -38.5 t-38.5 -15.5h-307v-499q0 -33 -22.5 -55.5t-55.5 -22.5h-307q-33 0 -54.5 22.5t-21.5 55.5v499h-307q-33 0 -39 15.5z" />
-<glyph unicode="&#xf094;" horiz-adv-x="1609" d="M2 514q-2 35 1 68.5t7 74.5q4 35 7 72t10 66q14 66 30.5 128t44.5 117q20 41 45 81t54 79q10 14 21 24.5t24 20.5q23 23 45 45.5t49 42.5t57.5 36.5t65.5 33.5q33 16 67.5 29.5t71.5 27.5q70 29 156 51l2 2q45 12 85 17.5t79 5.5q59 0 112.5 -9t106.5 -20q41 -8 85 -15 t93 -7h2q29 0 62.5 5t66.5 5q25 0 45.5 -6t32.5 -25q23 -31 26 -71.5t-2 -75.5q-4 -35 -8 -71t2 -72q4 -23 11.5 -39.5t15.5 -36.5q8 -18 11 -40t7 -42q18 -104 15.5 -195.5t-23 -170.5t-56.5 -148.5t-81 -132.5q-37 -49 -79 -97.5t-92 -91.5t-110.5 -77.5t-134.5 -59.5 q-76 -27 -158.5 -34t-158.5 -11h-31q-104 0 -194.5 16.5t-192.5 16.5h-4q-35 0 -77 -10.5t-83 -12.5h-2q-37 0 -65.5 17.5t-42.5 42.5q-20 35 -17.5 72.5t12.5 68.5t10.5 66.5t-5 75.5t-12.5 81t-9 82z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1597" d="M0 1169q0 55 14.5 114.5t43 114t68.5 98.5t93 69q12 -2 26.5 0t26.5 2q10 0 30 -1l40 -2t38.5 -4.5t27.5 -7.5q8 -6 15 -18t12 -26.5t9.5 -30t8.5 -25.5q6 -18 23.5 -65.5t35.5 -97.5t32.5 -93t14.5 -53q0 -37 -24.5 -68t-54 -57.5t-54.5 -50t-25 -45.5q0 -20 16.5 -49 t26.5 -46q84 -145 188.5 -248.5t252.5 -187.5q18 -10 45.5 -27.5t50.5 -17.5t52.5 32t60 70.5t62 70.5t58.5 32q10 0 51.5 -22.5t89.5 -50t93 -55.5t61 -36q16 -10 46 -25.5t40 -35.5q2 -6 2 -23q0 -16 -3 -36.5t-8 -43t-12 -43t-13 -35.5q-18 -39 -59.5 -71.5t-92.5 -55 t-104.5 -36t-92.5 -13.5q-80 0 -153.5 25.5t-145.5 54.5q-123 45 -232.5 118t-203.5 164t-175 196.5t-144 215.5q-25 41 -52.5 95.5t-51 112t-39 113.5t-15.5 105z" />
-<glyph unicode="&#xf096;" d="M0 307v922q0 63 24.5 118.5t66.5 97.5t97.5 66.5t118.5 24.5h1075q63 0 118.5 -24.5t97.5 -66.5t67 -97.5t25 -118.5v-922q0 -63 -25 -118.5t-67 -97.5t-97 -66.5t-119 -24.5h-1075q-63 0 -118.5 24.5t-97.5 66.5t-66.5 97.5t-24.5 118.5zM193 307q0 -47 33.5 -80.5 t80.5 -33.5h1075q47 0 81 33.5t34 80.5v922q0 47 -34 80.5t-81 33.5h-1075q-47 0 -80.5 -33.5t-33.5 -80.5v-922z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1253" d="M0 84v1337q0 47 34 81t81 34h1024q47 0 80.5 -34t33.5 -81v-1337q0 -47 -33.5 -81t-80.5 -34t-80 33l-432 432l-432 -432q-33 -33 -80 -33t-81 34t-34 81zM158 186l469 471l469 -471v1194h-938v-1194z" />
-<glyph unicode="&#xf098;" horiz-adv-x="1536" d="M0 193v1150q0 39 15.5 75t41 61.5t60.5 41t76 15.5h1150q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-75 -15.5h-1150q-80 0 -136.5 56.5t-56.5 136.5zM193 1040q2 -35 15 -76.5t30 -78.5q16 -37 33.5 -72t33.5 -63q74 -129 176.5 -241 t225.5 -190q31 -18 67.5 -36.5t75.5 -32.5q41 -16 83 -31.5t81 -21.5q63 -10 112.5 2t90.5 34q27 12 57.5 33.5t44.5 52.5q4 8 9 27t9 38t6.5 37.5t-2.5 29.5q-4 12 -24.5 22t-36.5 21q-43 25 -71.5 41t-67.5 38q-16 10 -36 23.5t-38 13.5q-23 0 -46.5 -27.5t-37.5 -43.5 q-12 -14 -36.5 -43t-47.5 -31q-14 -2 -32.5 10t-37.5 23q-106 59 -182 136t-135 177q-10 16 -21.5 37.5t-7.5 38.5q2 18 24.5 33.5t35.5 29.5q14 16 31.5 37t19.5 43q4 16 -5 38t-16 42q-16 43 -28.5 76t-26.5 76q-6 16 -12 40.5t-21 30.5q-8 4 -26.5 7t-39 4.5t-37.5 0 t-24 -1.5h-8q-33 -16 -62.5 -45.5t-51 -69.5t-34 -88t-9.5 -100z" />
-<glyph unicode="&#xf099;" d="M0 399q0 20 13.5 33.5t33.5 13.5q14 0 31 -12q123 -109 287 -108q59 0 117.5 15t107.5 48q-29 16 -47.5 42t-18.5 58q0 23 8 39q-18 6 -44.5 20.5t-51 34t-41 43t-16.5 46.5q0 16 10 28.5t25 22.5q-41 25 -76 74t-35 98q0 33 33 43q-35 35 -55.5 81t-20.5 95 q0 23 9.5 41.5t37.5 18.5q18 0 84 -27t142.5 -60.5t146.5 -67.5t98 -48q25 -14 47.5 -31.5t44.5 -36.5q20 51 47 106.5t60 106.5t73 96t89 74q8 6 24 6q18 0 27 -8q16 6 41.5 13.5t42.5 7.5q29 0 43 -27q31 0 56.5 -15.5t25.5 -50.5q0 -31 -27 -53q96 -43 159.5 -125 t90.5 -182q6 -2 23 -2q47 0 88 16.5t57 16.5q18 0 31.5 -14.5t13.5 -32.5q0 -23 -19.5 -48.5t-33.5 -39.5q23 4 42 -7.5t19 -38.5q0 -29 -26.5 -50t-61.5 -37.5t-72.5 -25.5t-58.5 -11q-43 -139 -133 -246t-210 -178.5t-258 -109.5t-275 -38q-219 0 -415 93.5t-325 273.5 q-8 16 -8 26z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="790" d="M0 862v203q0 16 11.5 28.5t27.5 12.5h125v102q0 358 366 359q123 0 232 -31q33 -10 29 -43l-27 -199q-4 -16 -16 -26q-16 -10 -31 -6q-35 8 -72.5 12t-66.5 4q-53 0 -65.5 -16.5t-12.5 -67.5v-88h223q14 0 29 -14q10 -10 10 -29l-17 -205q0 -16 -11 -25.5t-27 -9.5h-207 v-784q0 -16 -11.5 -27.5t-27.5 -11.5h-258q-16 0 -27.5 11.5t-11.5 27.5v784h-125q-16 0 -27.5 11.5t-11.5 27.5z" />
-<glyph unicode="&#xf09b;" horiz-adv-x="1847" d="M0 743q0 115 37 222.5t113 193.5l-3 4l3 2q-16 39 -21.5 81t-5.5 85q0 25 2 56.5t8 65.5t15.5 63.5t23.5 50.5h8q61 0 110.5 -12.5t94.5 -35t87 -52t91 -60.5q86 25 178.5 33t182.5 8t182 -8t180 -33q47 31 90 60.5t87 52t93.5 35t110.5 12.5h10q12 -20 21.5 -50 t15.5 -64t9 -65.5t3 -56.5q0 -43 -6 -85t-20 -81v-2l-2 -4q76 -86 112.5 -193.5t36.5 -222.5q0 -233 -66.5 -383.5t-188.5 -236.5t-292 -120t-376 -34q-207 0 -378 34t-292 120t-187.5 236.5t-66.5 383.5zM250 483q0 -145 64.5 -224t165 -116t219 -43t227.5 -6q74 0 152.5 2 t153.5 12.5t142.5 34t117.5 67.5t80 111.5t30 165.5q0 84 -27 147.5t-75 106.5t-114.5 64.5t-146.5 21.5q-78 0 -156.5 -7t-156.5 -7t-157 7t-157 7q-162 0 -262 -87t-100 -257zM494 524q0 66 26.5 113t65.5 47t66.5 -47t27.5 -113t-27.5 -112.5t-66.5 -46.5t-65.5 46.5 t-26.5 112.5zM795 258q-6 16 12 25q16 6 24 -13q27 -76 93 -75q31 0 56.5 20.5t35.5 54.5q8 20 26 13q16 -6 13 -25q-16 -47 -51 -75.5t-80 -28.5q-43 0 -78 28.5t-51 75.5zM864 369q0 -12 17.5 -21.5t42.5 -9.5t42 9.5t17 21.5t-17.5 21t-41.5 9q-25 0 -42.5 -9t-17.5 -21z M1167 524q0 -66 28 -112.5t67 -46.5t65.5 46.5t26.5 112.5t-27 113t-65 47q-39 0 -67 -47t-28 -113z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1880" d="M0 117v626q0 49 35 84t82 35h665v156q0 113 43 213t118 175t175 118t213 43t213.5 -43t175 -118t117.5 -175.5t43 -212.5v-152q0 -33 -22.5 -55.5t-55.5 -22.5h-80q-33 0 -55 23t-22 55v152q0 66 -25 123t-67 99t-99 66.5t-123 24.5t-122 -24.5t-99 -66.5t-67.5 -99.5 t-24.5 -122.5v-156h119q47 0 81.5 -34.5t34.5 -84.5v-626q0 -47 -34.5 -82t-81.5 -35h-1020q-47 0 -82 35t-35 82zM494 164h266l-66 285q29 18 47.5 48.5t18.5 65.5q0 55 -39 95t-94 40t-94 -40t-39 -95q0 -35 18 -65.5t47 -46.5z" />
-<glyph unicode="&#xf09d;" d="M0 154v1228q0 63 45 108.5t109 45.5h1536q63 0 108 -45t45 -109v-1228q0 -63 -45 -108.5t-108 -45.5h-1536q-63 0 -108.5 45t-45.5 109zM154 154h1536v575h-1536v-575zM154 1114h1536v268h-1536v-268zM260 250v115h307v-115h-307zM676 250v115h446v-115h-446z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1566" d="M0 236q0 49 18.5 91t50 74.5t75 51t92.5 18.5t91 -18.5t74.5 -51t51 -74.5t18.5 -91t-18.5 -92.5t-51 -75t-74.5 -50t-91 -18.5t-92.5 18.5t-75 50t-50 74.5t-18.5 93zM0 819v158q0 35 25 57q23 23 53 23q2 0 3 -1t3 -1q193 -14 362.5 -95t301 -212.5t212 -301.5 t95.5 -362q4 -35 -21 -59q-23 -25 -57 -25h-158q-29 0 -51.5 20.5t-26.5 51.5q-12 133 -68.5 249.5t-145.5 205.5t-205.5 145.5t-249.5 68.5q-31 4 -51.5 27t-20.5 51zM0 1331v158q0 33 25 55q23 23 53 23h4q301 -16 565 -137t463 -320t319.5 -463t137.5 -565q4 -31 -23 -57 q-23 -25 -55 -25h-158q-31 0 -53.5 21.5t-24.5 52.5q-14 238 -110 446.5t-255 367.5t-368 255t-446 110q-31 2 -52.5 24.5t-21.5 53.5z" />
-<glyph unicode="&#xf0a0;" d="M0 193v382q0 23 6 45.5t12 45.5l238 727q20 63 75.5 103t121.5 40h938q66 0 121 -40t75 -103l238 -727q6 -23 12 -45.5t6 -45.5v-382q0 -41 -15.5 -76t-41 -60.5t-61 -41t-74.5 -15.5h-1458q-80 0 -136.5 56.5t-56.5 136.5zM154 193q0 -16 11 -27.5t28 -11.5h1458 q16 0 27.5 11t11.5 28v382q0 16 -11.5 27.5t-27.5 11.5h-1458q-16 0 -27.5 -11t-11.5 -28v-382zM213 768h1417l-188 578q-4 16 -19.5 26t-31.5 10h-938q-16 0 -31.5 -10t-20.5 -26zM1057 385q0 39 27.5 66.5t68.5 27.5q39 0 66.5 -27.5t27.5 -66.5q0 -41 -27.5 -68.5 t-66.5 -27.5q-41 0 -68.5 27.5t-27.5 68.5zM1364 385q0 39 27.5 66.5t68.5 27.5q39 0 66.5 -27.5t27.5 -66.5q0 -41 -27.5 -68.5t-66.5 -27.5q-41 0 -68.5 27.5t-27.5 68.5z" />
-<glyph unicode="&#xf0a1;" d="M0 754v229q0 63 45 108.5t109 45.5h499q115 0 245 33.5t255 90t235.5 128t186.5 147.5q63 0 108.5 -45t45.5 -109v-368q49 -12 81.5 -52.5t32.5 -93.5t-32.5 -93t-81.5 -52v-369q0 -63 -45.5 -108t-108.5 -45q-68 68 -164 132t-206.5 117.5t-227.5 91.5t-227 50 q-43 -12 -70 -40t-37 -62.5t-2 -70.5t37 -65q-25 -41 -23 -75.5t20.5 -66.5t49.5 -61.5t66 -58.5q-20 -43 -69.5 -65.5t-106 -25.5t-110.5 10.5t-85 43.5q-18 61 -40 125t-36 130.5t-14 138t24 151.5h-200q-63 0 -108.5 45t-45.5 109zM807 741q102 -16 206.5 -49t205 -78 t191.5 -99t165 -112v930q-76 -59 -166 -113.5t-190.5 -98.5t-205 -77.5t-206.5 -48.5v-254z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1759" d="M0 317q104 78 172 172.5t109 201t60 224t28 240.5q6 84 56 159t126 131t163 89t167 33q74 0 163 -33t165.5 -88t129 -129t52.5 -158q6 -121 27.5 -239.5t63.5 -227t109.5 -204t167.5 -171.5q-4 -70 -56 -114.5t-120 -44.5h-469q-18 -82 -82.5 -135.5t-150.5 -53.5 t-151.5 53.5t-84.5 135.5h-469q-68 0 -120 45t-56 114zM238 317h1284q-78 86 -129.5 183.5t-84 202t-50 214t-25.5 222.5q-4 55 -41 104t-89 86t-111.5 57.5t-110.5 20.5q-47 0 -107.5 -21.5t-114 -56.5t-91.5 -83t-40 -99q-6 -111 -23.5 -222.5t-51 -218t-87 -205 t-128.5 -184.5zM713 209q0 -70 49 -119t119 -49q18 0 18 20t-18 21q-53 0 -91 37t-38 90q0 20 -19 20q-20 0 -20 -20z" />
-<glyph unicode="&#xf0a3;" horiz-adv-x="1597" d="M0 573q0 33 23 56l143 139l-143 139q-23 23 -23 56q0 25 16.5 45t40.5 26l195 49q-6 18 -15.5 48t-18.5 61t-16 59.5t-7 46.5q0 31 21.5 52.5t51.5 21.5q18 0 47 -7t60 -16.5t60.5 -18.5t47.5 -15l49 194q6 25 27 41.5t45 16.5q35 0 53 -23l142 -143l139 143q23 23 53 23 q27 0 47.5 -15.5t26.5 -42.5l49 -194q18 6 48 15t60.5 18.5t59.5 16.5t47 7q29 0 51.5 -21.5t22.5 -52.5q0 -18 -7 -46.5t-16.5 -59.5t-18.5 -60.5t-15 -48.5l194 -49q25 -6 41 -26.5t16 -44.5q0 -33 -22 -56l-145 -139l145 -139q23 -23 22 -56q0 -25 -16 -45t-41 -26 l-194 -49q6 -18 15 -48t18.5 -61t16.5 -59.5t7 -46.5q0 -29 -21.5 -51.5t-52.5 -22.5q-18 0 -47 7t-59.5 16.5t-60 18.5t-48.5 15l-49 -194q-6 -25 -26.5 -41.5t-45.5 -16.5q-33 0 -55 23l-139 143l-142 -143q-18 -23 -53 -23q-25 0 -45 16.5t-27 41.5l-49 194 q-18 -6 -47.5 -15t-60.5 -18.5t-59.5 -16.5t-47.5 -7q-31 0 -52 22.5t-21 51.5q0 18 7 46.5t16 59.5t18.5 60.5t15.5 48.5l-195 49q-25 6 -41 26.5t-16 44.5z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1916" d="M0 193v643q0 49 35 83.5t84 34.5h348q27 14 42 30.5t34 39.5q16 20 33.5 38.5t33.5 37.5q35 35 77 68.5t65 74.5q25 43 29.5 99.5t17 106.5t44 84t109.5 34q61 0 111.5 -25.5t85.5 -68.5t54.5 -98.5t19.5 -112.5q0 -53 -15.5 -104.5t-38.5 -98.5h134l376 -2 q49 0 93.5 -17.5t76 -49.5t50 -75t18.5 -94q0 -49 -18.5 -92t-50 -74.5t-75.5 -49t-94 -17.5h-200q-10 -59 -39 -107q10 -59 -7.5 -117.5t-56.5 -103.5q0 -76 -28.5 -131t-75.5 -90t-109.5 -52.5t-132.5 -17.5q-78 0 -148.5 16.5t-136 36t-128 36t-123.5 16.5h-375 q-49 0 -84 34.5t-35 84.5zM233 276q0 -35 22.5 -57t57.5 -22q33 0 56.5 22.5t23.5 56.5q0 33 -23.5 56.5t-56.5 23.5q-35 0 -57.5 -23.5t-22.5 -56.5zM489 193q70 0 136.5 -16.5t133 -35t133 -35t138.5 -16.5q43 0 84 8t72 27.5t50 52.5t19 82q0 14 -1 26.5t-3 24.5 q35 16 53.5 53t18.5 74q0 39 -20 68q59 49 59 123q0 23 -12.5 43.5t-26.5 34.5q90 0 178 1t178 1q51 0 84 30.5t33 81.5q0 53 -32.5 85t-84.5 32q-172 0 -340 1t-338 1q0 41 16.5 78t35 74.5t34 78.5t15.5 91q0 33 -10.5 65.5t-29 59t-46 44t-64.5 17.5h-11t-11 -2 q-8 -4 -9 -8t-3 -13q-12 -59 -22.5 -123.5t-39.5 -117.5q-29 -51 -73 -88t-85 -78q-29 -31 -49 -56.5t-41.5 -48t-48.5 -42t-65 -35.5h-5v-643z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1916" d="M0 821q0 51 18.5 94t50 75t75.5 49.5t94 17.5l376 2h134q-23 47 -38.5 98t-15.5 105q0 57 19.5 112.5t54.5 98.5t85 68.5t112 25.5q78 0 109.5 -34t43.5 -84t17.5 -106.5t29.5 -99.5q23 -41 65 -74.5t77 -68.5q16 -18 33.5 -37t33.5 -39q18 -23 33.5 -39t42.5 -31h348 q49 0 84 -34.5t35 -83.5v-643q0 -49 -35 -84t-84 -35h-375q-61 0 -123.5 -16.5t-128 -36t-136 -36t-148.5 -16.5q-70 0 -132.5 17.5t-109.5 52.5t-75.5 90t-28.5 131q-39 45 -56.5 103.5t-7.5 117.5q-29 47 -39 107h-200q-49 0 -93.5 17.5t-76 49t-50 74.5t-18.5 92z M121 821q0 -51 32.5 -81.5t84.5 -30.5q90 0 178 -1t178 -1q-14 -14 -26.5 -35t-12.5 -43q0 -74 59 -123q-20 -29 -20 -68q0 -37 18.5 -73.5t53.5 -53.5q-2 -12 -3 -24.5t-1 -26.5q0 -49 19 -82t50 -52.5t72 -27.5t84 -8q70 0 137.5 16.5t134 35t133 35t135.5 16.5v643h-4 q-41 16 -66.5 35.5t-47 42t-42 48t-48.5 56.5q-41 41 -85 78t-73 88q-29 53 -39 117.5t-23 123.5q-2 8 -3 12.5t-9 8.5q-4 2 -11 2h-11q-37 0 -65 -17.5t-46 -44t-28.5 -59.5t-10.5 -65q0 -49 15.5 -90.5t34 -79t34.5 -74.5t16 -78q-170 0 -337.5 -1t-339.5 -1 q-51 0 -84 -32t-33 -85zM1524 276q0 -35 23.5 -57t56.5 -22q35 0 57 22.5t22 56.5q0 33 -22.5 56.5t-56.5 23.5q-33 0 -56.5 -23.5t-23.5 -56.5z" />
-<glyph unicode="&#xf0a6;" horiz-adv-x="1597" d="M0 602q0 61 25.5 111.5t68.5 85.5t98.5 54t112.5 19q53 0 104.5 -15t98.5 -38v133l2 377q0 49 17.5 93t49 76t74.5 50.5t94 18.5q49 0 92.5 -18.5t75 -50.5t49 -76t17.5 -93v-201q59 -10 106 -38q59 10 118 -7.5t104 -56.5q76 0 131 -28.5t90 -76t52 -109.5t17 -132 q0 -78 -16 -148.5t-35.5 -136t-36 -128t-16.5 -124.5v-374q0 -49 -35 -84t-84 -35h-643q-49 0 -84 34.5t-35 84.5v348q-14 27 -30.5 42t-38.5 34q-20 16 -39 33.5t-37 33.5q-35 35 -68.5 77t-74.5 64q-43 25 -99.5 30t-106.5 17.5t-84 44t-34 109.5zM120 591q-1 -7 1 -11 q4 -8 8 -9.5t12 -3.5q59 -12 124 -22t118 -39q51 -29 88 -73t78 -85q31 -29 56.5 -49t48 -41.5t42 -48.5t35.5 -66v-4h643q0 70 16.5 136.5t35 133t35 133t16.5 138.5q0 43 -8.5 84t-28 71.5t-52 50t-81.5 19.5q-14 0 -26.5 -1t-25.5 -3q-16 35 -53 53.5t-74 18.5 q-39 0 -67 -21q-49 59 -123 60q-23 0 -43.5 -12.5t-34.5 -26.5q0 90 -1 178t-1 178q0 51 -30.5 84t-82.5 33q-53 0 -84.5 -33t-31.5 -84q0 -172 -1 -340t-1 -338q-41 0 -78 16.5t-75 35t-79 34t-90 15.5q-33 0 -65.5 -10.5t-59 -29t-43 -46t-16.5 -64.5q0 -4 -1 -11z M1210 -37q0 -35 23.5 -57.5t56.5 -22.5q35 0 57.5 22.5t22.5 57.5q0 33 -22.5 56.5t-57.5 23.5q-33 0 -56.5 -23.5t-23.5 -56.5z" />
-<glyph unicode="&#xf0a7;" horiz-adv-x="1597" d="M0 584q0 78 34 109.5t84 44t106.5 17.5t99.5 29q41 23 74.5 65t68.5 77q18 16 36.5 33.5t39.5 33.5q23 18 39 33.5t30 42.5v348q0 49 35 84t84 35h643q49 0 84 -35t35 -84v-375q0 -61 16.5 -123.5t36 -128t35.5 -136t16 -148.5q0 -70 -17 -132.5t-52 -109.5t-90.5 -75.5 t-130.5 -28.5q-45 -39 -103.5 -56.5t-118.5 -7.5q-47 -29 -106 -39v-200q0 -49 -17.5 -93.5t-49 -76t-74.5 -50t-93 -18.5q-51 0 -94 18.5t-74.5 50t-49 75.5t-17.5 94l-2 376v134q-47 -23 -98.5 -38.5t-104.5 -15.5q-57 0 -112.5 19.5t-98.5 54.5t-68.5 85t-25.5 112z M120 595q1 -7 1 -11q0 -37 16.5 -64.5t43 -46t59 -29t65.5 -10.5q49 0 90 15.5t79 34t75 35t78 16.5q0 -170 1 -338t1 -340q0 -51 31.5 -84t84.5 -33q51 0 82 32.5t31 84.5q0 90 1 178t1 178q14 -14 34.5 -26.5t43.5 -12.5q74 0 123 59q29 -20 67 -20q37 0 74 18.5t53 53.5 q12 -2 24.5 -3t27.5 -1q49 0 81.5 19t52 50t28 72t8.5 84q0 70 -16.5 137.5t-35 134t-35 133t-16.5 136.5h-643v-5q-16 -41 -35.5 -66.5t-42 -47t-48 -42t-56.5 -48.5q-41 -41 -78 -85t-88 -73q-53 -29 -117.5 -39t-124.5 -23l-12 -3t-8 -9q-2 -4 -1 -11zM1210 1223 q0 -33 23.5 -56.5t56.5 -23.5q35 0 57.5 23.5t22.5 56.5q0 35 -22.5 57.5t-57.5 22.5q-33 0 -56.5 -23t-23.5 -57z" />
-<glyph unicode="&#xf0a8;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -29 20 -49l490 -490q20 -20 48.5 -20t49.5 20l74 74q20 20 20 48 t-20 50l-246 246h612q29 0 49.5 19.5t20.5 48.5v104q0 29 -20.5 49.5t-49.5 20.5h-612l246 246q20 20 20 48.5t-20 49.5l-74 74q-20 20 -48 20t-50 -20l-490 -490q-20 -20 -20 -49z" />
-<glyph unicode="&#xf0a9;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 717q0 -29 20.5 -49.5t48.5 -20.5h613l-246 -246q-20 -20 -20.5 -48.5 t20.5 -49.5l74 -74q20 -20 47.5 -20t50.5 20l489 490q20 20 20.5 49t-20.5 49l-489 490q-20 20 -49 20t-49 -20l-74 -74q-20 -20 -20.5 -48t20.5 -50l246 -246h-613q-29 0 -49 -19.5t-20 -48.5v-104z" />
-<glyph unicode="&#xf0aa;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 768q0 -29 20 -49l74 -74q20 -20 48 -20t50 20l246 246v-612q0 -29 19.5 -49.5 t47.5 -20.5h105q29 0 49.5 20.5t20.5 49.5v612l245 -246q20 -20 49 -20t50 20l73 74q20 20 20.5 48t-20.5 50l-489 490q-20 20 -49 20t-49 -20l-490 -490q-20 -20 -20 -49z" />
-<glyph unicode="&#xf0ab;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5t-311.5 62.5t-254 171t-171 254t-62.5 311.5zM240 769q0 -28 20 -50l490 -490q20 -20 48.5 -20t49.5 20l489 490q20 20 20.5 49 t-20.5 49l-73 74q-20 20 -48 20t-51 -20l-245 -246v612q0 29 -19.5 49.5t-48.5 20.5h-104q-29 0 -49.5 -20.5t-20.5 -49.5v-612l-246 246q-20 20 -49 20t-49 -20l-74 -74q-20 -20 -20 -48z" />
-<glyph unicode="&#xf0ac;" horiz-adv-x="1597" d="M0 768q0 162 63.5 307.5t173 255t254 173t308.5 63.5q162 0 307 -63.5t254.5 -173t173 -255t63.5 -307.5q0 -164 -63.5 -308.5t-173 -254t-254.5 -173t-307 -63.5q-164 0 -308.5 63.5t-254 173t-173 254t-63.5 308.5zM186 1141h4q4 0 12.5 3t8.5 -9q0 -4 -3 -10.5 t11 -6.5q4 0 5 6t3 0l4 -16v-2q0 -4 -5 -6t-3 -6q4 -4 9.5 -4h9.5l4 2l2 2q0 -6 6 -8.5t10 -2.5h2q0 -2 -4 -4t0 -6l23 -4v-2l14 -29q0 -4 -3 -10t-7 -6t-3 3t1 7t-2 7t-15 3q-2 0 -5 -1t-1 -5l12 -26l3 -2l2 -2q-10 0 -13.5 -24t-3.5 -34l4 -18l2 -6v-4l-4 -19l29 -43h6 q2 -4 -2 -8t-2 -8l8 -8q0 -10 4 -14.5t13 -12.5q-2 -12 20.5 -22.5t28.5 -14.5q8 -23 20 -45.5t29 -38.5l2 -14q0 -2 -5 -4t-1 -6l16 -7q4 4 10.5 -8t10.5 -16l-2 -6l12 -17l6 -2l4 8q-4 10 -14 26.5t-20.5 32t-17.5 28t-7 14.5t-2 16t-4 17q6 -4 15 -7.5t15 -7.5 q4 -25 19.5 -40t27.5 -34q-4 -4 0 -5t7 -1q4 -4 4 -14q14 -16 36.5 -44t22.5 -44v-2l-4 -14q6 -16 20.5 -25.5t28.5 -15.5h4q20 -10 41 -21.5t43 -19.5l23 14q8 -2 17 -10t20.5 -18.5t27 -19.5t35.5 -11q14 10 14 -5v-4l25 -30l4 -15q10 -6 20.5 -15t16.5 -20h4 q10 0 16.5 -9t16.5 -9q6 0 6 6q0 14 2 18.5t5 5.5t6 1t3 4l-4 6q-4 0 -6 -5t-6 -1l-14 -8l-17 4l-24 41l8 57q2 4 -7.5 9t-5.5 10q-14 8 -34 8q-4 0 -20.5 -3t-16.5 3t3 16t7 21.5t6 19.5t2 10l13 27l-3 4l-16 4q-4 0 -13 -6t-17.5 -14.5t-14.5 -16.5t-6 -14l-45 -10 q-14 0 -23 12q-4 16 -17 35.5t-13 34.5q0 23 8 43t-6 43q2 0 5 2t1 6l12 14l2 2l2 -2q14 10 37 7t29 14l16 -13q4 -2 9 4.5t5 10.5l-8 4l39 10l2 -6l19 2l22 -14q4 0 8 5t9 1l20 -21q-4 -8 -1 -12t3 -8q0 -6 10.5 -27.5t18.5 -21.5q10 0 9 13t-1 17q0 20 -8 39t-15 39v6 q0 10 12.5 17.5t12.5 9.5q10 8 22.5 16t18.5 19l8 16v10h6t4 6q0 2 -3 3.5t-7 5.5q-4 2 -8 6l6 4q4 6 6 15t-2 16l15 8q-2 -6 4 -8t10 0l10 16q-4 10 -5 7t5 7q10 4 19.5 9.5t19.5 5.5q2 -2 4 -2q6 0 6 2q0 10 -4 12l12 25q14 0 21 12l18 2q6 2 6 8v2l35 10l4 11l-10 14 q2 0 2 4t-4 6t-7 4t-7 4l-4 -2l4 2h6h13t9 9q0 12 -14 12q-18 0 -41.5 -8.5t-32.5 -28.5l-14 -8l18 18l3 6q0 4 -9.5 5.5t-5.5 1.5q18 0 27.5 4t15.5 9t12.5 10t18.5 9q23 -4 44 -2t44 2q6 4 12 8.5t8 10.5l23 4q4 -4 12 2t8 10q0 10 -11 13t-11 14q0 2 1 6t-3 4 q-6 0 -19.5 -6t-19.5 -10q-4 -2 -5 1t-1 7l2 -2l8 4l23 8l4 4q0 6 -7.5 8t-11.5 2t-12 -3t-8 3l2 4q-12 10 -21.5 22.5t-9.5 16.5t1 8.5t-5 4.5q-4 0 -7 -1t-3 5q0 4 -5 17t-14 13l-8 -8q0 -6 -6 -9t-6 -7h-4l-21 -12q-2 4 -5 2t-7 -2h-2l-2 -2q8 0 7 9t-7 9l-16 -4 q-4 0 -4.5 1t2 4t4.5 7t0 8t-6.5 1t-4.5 1h6l5 5q2 2 -1.5 7t-5.5 7l-22 4l-14 12q-2 -2 -7.5 3t-9.5 7l-16 -6l-39 9q-4 0 -8 -2.5t-4 -6.5t4 -6t4 -6t3 -21.5t-5 -13.5l-10 -14q2 -4 7 -7t10 -7.5t9 -10.5t2 -18l-45 -31v-4q0 -8 4 -15t8 -18q10 -4 9.5 -7t-7 -6t-12.5 -6 t-6 -5t-4 -2h-8h-4q0 2 2 3t2 5l-19 12v-2l-8 16q4 10 1 14.5t-3 10.5q0 16 -14.5 16t-30.5 -4q4 2 -1 6.5t-7 4.5q-16 0 -38 14t-36 14q-6 0 -14 -2t-15 -4q4 2 5 10l-13 23l-2 2q-6 0 -14 -5t-8 9q0 2 2 4t0 4q-2 12 5 20.5t11 18.5q4 4 4 8t4 4q8 0 15.5 4.5t17.5 6.5 l2 6q0 4 -21.5 7t-21.5 7l2 2q20 -6 30.5 -7t17.5 2t16.5 8t29.5 14q0 4 -21.5 8t-27.5 8h12q4 0 10.5 -2t10.5 -4q0 -4 6 -5t10 -1l15 10v6l-4 6l22 4q-2 2 1 4t5 2q6 0 12.5 -6t8.5 -6l20 8q-2 2 5.5 3t4.5 6l-14 16q-2 0 -3 3t1 3q10 0 6 10q-8 4 -17 9.5t-20 5.5 q-4 0 -9 -2t-5 -7q0 -4 5 -4t7 -4q4 -4 -2 -4t-6 -2q-8 0 -15 -12t-18 -17q-4 0 -3 2.5t-1 4.5q-2 4 -7 5t-5 5t5 13t-13 9q-8 0 -11.5 -6t-7.5 -12l-22 25l-17 2q0 8 3.5 14t-9.5 16q-6 4 -11 7.5t-11 3.5q-2 0 -9.5 -4.5t-13.5 -8.5t-6 -8t10 -4h-2q-6 0 -6 -8 q0 -2 9.5 -5t13.5 -3q4 2 6 -1.5t6 -3.5l8 3v-5q-2 -2 -2 -4l2 -8l-20 -10q-2 -2 -4 -2t-5 -2q0 -6 5.5 -12.5t-11.5 -6.5l-6 4q0 8 -16.5 13.5t-40 7.5t-47 3t-35.5 1l-33 -10l8 -19q-4 0 -5 -3t3 -5q-4 4 -15 14.5t-15 10.5l-17 4q-35 -2 -78 -33t-84 -72t-75.5 -84 t-53.5 -71zM471 674h2h-2zM487 1413q14 2 25.5 8t24.5 6l6 -4q6 -2 11 -2t9 -4q8 2 17 -2l6 4v8l-2 5l6 -2q6 0 12 10l-2 4q-4 2 -10 4t-10 2t-16.5 -5t-28 -11.5t-29.5 -12.5t-19 -8zM918 86q0 -4 3 -9t3 -9q0 -5 -2 -7q115 20 217 74.5t182 140.5h-2q-8 -4 -14 0l-5 -4 l-12 4h-4l-4 -8l2 8q-6 8 -14 15l-4 2q-4 0 -4 -8q2 16 -8.5 27.5t-26.5 11.5q0 -2 -2 -2h-4l-5 4h7l4 12l-11 8l-2 -2q-14 2 -20 16l-4 2l-2 -2l-4 -2q-12 -4 -21 -8q-12 4 -18 10l-27 -2q0 6 -4 12.5t-12 6.5q-10 0 -20.5 -2t-14.5 -13q0 -4 2 -8t4 -6v-8l-2 -6l-4 -2h-2 l-6 16l6 10q-2 4 -2 10.5t-2 10.5l-2 4h-6l-15 -10h-8l-4 -4q-2 -2 -2 -4t-2 -3l-2 3h-8q-8 -8 -9 -19l3 -4l-9 -6l-2 -4l-6 -4q0 -2 -1 -2t-1 -2v-2v-9l-2 -2v4l-2 2q-2 12 -23 21h-6v-4q2 -6 8.5 -10.5t10.5 -8.5q-2 2 -5 1t-3 -3v-4l14 -20v-39l4 -10q-4 -16 -16 -27v2 l-4 -2l-3 -2l-2 -10l2 -2v-2l-4 4l-2 -13l-12 -4q-6 -4 -5 -11t-5 -11l2 -4l-6 -6q0 -4 -1 -6.5t-1 -6.5l2 -14l6 -4l4 4l2 6l2 -12q0 -4 -4 -8q-6 -4 -12 -9.5t-6 -15.5z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1593" d="M8 242q0 33 12.5 62.5t34.5 51.5l609 609q-16 66 -17 122q0 98 38 186.5t102.5 153t151.5 102.5t185 38q94 0 181.5 -36t154.5 -101l-442 -162l-43 -236l184 -153l443 159q-10 -92 -50.5 -171t-104 -137t-145 -91t-174.5 -33q-61 0 -127 17l-606 -607q-47 -47 -112 -47 q-68 0 -115 47q-23 23 -50.5 47.5t-52 52t-41 58.5t-16.5 68zM203 242q0 -33 22.5 -56.5t57.5 -23.5q33 0 56 23.5t23 56.5q0 35 -23.5 57.5t-55.5 22.5q-35 0 -57.5 -23t-22.5 -57z" />
-<glyph unicode="&#xf0ae;" d="M0 76v217q0 31 22.5 53.5t53.5 22.5h1689q33 0 55.5 -22.5t22.5 -53.5v-217q0 -31 -22.5 -53.5t-55.5 -22.5h-1689q-31 0 -53.5 22.5t-22.5 53.5zM0 662v215q0 31 22.5 53t53.5 22h1689q33 0 55.5 -22.5t22.5 -52.5v-215q0 -33 -22.5 -55.5t-55.5 -22.5h-1689 q-31 0 -53.5 22.5t-22.5 55.5zM0 1243v217q0 31 22.5 53.5t53.5 22.5h1689q33 0 55.5 -22.5t22.5 -53.5v-217q0 -31 -22.5 -53.5t-55.5 -22.5h-1689q-31 0 -53.5 22.5t-22.5 53.5zM752 692h999v154h-999v-154zM1059 109h692v153h-692v-153zM1366 1274h385v153h-385v-153z " />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1566" d="M0 1458q0 33 22.5 55.5t55.5 22.5h1411q33 0 55.5 -22.5t22.5 -55.5t-23 -55l-565 -565v-791q0 -33 -22.5 -55.5t-55.5 -22.5t-55 23l-236 235q-23 23 -22 56v555l-565 565q-23 23 -23 55z" />
-<glyph unicode="&#xf0b1;" d="M0 115v512h713q-2 -6 -2 -19v-153q0 -55 38.5 -95.5t96.5 -40.5h153q55 0 94.5 40t39.5 96v153q0 12 -3 19h713v-512q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM0 743v371q0 47 34 81t81 34h424v231q0 31 21.5 53.5t53.5 22.5h615q33 0 55.5 -22.5 t22.5 -53.5v-231h422q47 0 80.5 -34t33.5 -81v-371h-1843zM692 1229h461v153h-461v-153zM825 455v153q0 18 21 19h153q18 0 19 -19v-153q0 -18 -19 -19h-153q-20 0 -21 19z" />
-<glyph unicode="&#xf0b2;" horiz-adv-x="1536" d="M0 80v477q0 51 24.5 61.5t59.5 -24.5l162 -162l340 338l-338 338l-164 -164q-35 -35 -59.5 -25.5t-24.5 60.5v477q0 31 23 57q27 23 57 23h477q51 0 61.5 -24.5t-24.5 -59.5l-160 -158l338 -338l332 334l-162 162q-35 35 -24.5 59.5t61.5 24.5h477q33 0 55 -23 q25 -25 25 -57v-477q0 -51 -24.5 -61.5t-59.5 24.5l-162 162l-334 -334l338 -336l158 160q35 35 59.5 24.5t24.5 -61.5v-477q0 -35 -25 -55q-23 -25 -55 -25h-477q-51 0 -61.5 24.5t24.5 59.5l166 166l-336 336l-340 -340l162 -162q35 -35 24.5 -59.5t-61.5 -24.5h-477 q-31 0 -55 25q-25 20 -25 55z" />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1880" d="M0 852v152q0 18 1 47.5t10 56.5t29.5 46.5t57.5 19.5q-45 29 -71.5 75.5t-26.5 104.5q0 43 16.5 82t46 68.5t68.5 46t82 16.5q45 0 84 -16.5t67.5 -46t46 -68.5t17.5 -82q0 -57 -27.5 -104t-72.5 -76q37 0 57.5 -19.5t29.5 -46.5t11 -56.5t2 -47.5v-152 q-14 -8 -23.5 -18.5t-27.5 -10.5h-328q-16 0 -26.5 10.5t-22.5 18.5zM158 57v387q0 78 45 138.5t98 109.5q10 10 25.5 21.5t33.5 15.5q18 6 41 7t45 5q61 10 130 19.5t135 19.5q-90 57 -144.5 151.5t-54.5 207.5q0 88 34 166.5t92 136t136 91.5t166 34t166 -34t136 -91.5 t92 -136t34 -166.5q0 -113 -54 -207t-145 -152q66 -10 134.5 -19t130.5 -20q23 -4 45 -5t41 -7q18 -4 33.5 -15.5t27.5 -21.5q66 -59 103.5 -116.5t37.5 -131.5v-387q-12 -6 -20 -13t-18.5 -14t-23.5 -14.5t-36 -15.5h-1368q-35 0 -54.5 22.5t-43.5 34.5zM1452 852v152 q0 18 2 47.5t11.5 56.5t30 46.5t56.5 19.5q-45 29 -72.5 75.5t-27.5 104.5q0 43 16.5 82t46 68.5t68.5 46t84 16.5q43 0 82 -16.5t68.5 -46t46 -68.5t16.5 -82q0 -57 -26.5 -104t-71.5 -76q37 0 56.5 -19.5t28.5 -46.5t11 -56.5t2 -47.5v-152q-12 -8 -22.5 -18.5 t-26.5 -10.5h-328q-18 0 -27.5 10.5t-23.5 18.5z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1597" d="M0 1137q0 88 34 166.5t92 137t136 92.5t168 34q86 0 166 -33t139 -92q8 -8 21.5 -20.5t26 -25t21.5 -25.5t9 -25q0 -18 -12 -31q-6 -8 -25 -12q-47 -10 -88 -22.5t-86 -31.5q-4 -4 -16 -4t-25.5 10.5t-31 21.5t-42 21.5t-57.5 10.5q-35 0 -66.5 -13.5t-54 -37t-36 -54 t-13.5 -67.5q0 -41 17.5 -75t43 -63.5t56.5 -56.5t57 -53l180 -178q23 -25 54.5 -37t66.5 -12q43 0 73 16t46 16q12 0 39 -21.5t55.5 -49t50 -55t21.5 -42.5q0 -29 -36 -51t-83 -38.5t-94 -26t-72 -9.5q-86 0 -164.5 33t-140.5 92l-303 305q-61 59 -94 139.5t-33 166.5z M578 1010q0 29 35.5 51t82.5 38.5t94 26t72 9.5q86 0 166 -33t139 -92l303 -305q61 -59 94 -139.5t33 -166.5q0 -90 -33.5 -167.5t-92 -136t-137.5 -92.5t-167 -34q-86 0 -165.5 34t-139.5 93q-8 8 -21.5 19.5t-25.5 25t-21.5 26.5t-9.5 26q0 18 13 28q6 8 24 12 q47 10 88 22.5t86 33.5q12 4 17 4q12 0 25.5 -10.5t30.5 -21.5t41 -21.5t58 -10.5q72 0 121 49.5t49 120.5q0 41 -17 76t-44 63.5t-56.5 55.5t-56.5 53l-178 180q-53 49 -123 50q-43 0 -72.5 -17.5t-46.5 -17.5q-12 0 -38.5 21.5t-55 49t-50 56t-21.5 41.5z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1880" d="M0 391q0 70 23.5 132.5t64.5 113.5t96.5 86t120.5 51q-33 41 -51 90t-18 105q0 66 24.5 123t66.5 99t99 66.5t123 24.5q113 0 196 -72q18 76 61.5 141.5t103 113.5t133 75t157.5 27q96 0 182 -37t149.5 -100.5t100.5 -149.5t37 -182q0 -57 -13 -109.5t-36 -99.5 q117 -59 188.5 -170t71.5 -248q0 -98 -37 -183t-101.5 -149.5t-149.5 -101.5t-183 -37h-1018q-80 0 -151.5 30.5t-125 84t-84 125t-30.5 151.5z" />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1536" d="M16 72q-39 72 7 141l516 803v366h-78q-33 0 -54.5 22.5t-21.5 55.5q0 31 21.5 53.5t54.5 22.5h614q33 0 55.5 -22.5t22.5 -53.5q0 -33 -22.5 -55.5t-55.5 -22.5h-76v-368l514 -801q45 -70 7 -141q-18 -35 -51 -53.5t-70 -18.5h-1262q-37 0 -69.5 18.5t-51.5 53.5z M377 479h782l-313 490v413h-154v-411z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1916" d="M0 180q0 86 44 168t113.5 146.5t154.5 103.5t169 39h13q18 25 57 60.5t63 58.5v12v12q-12 12 -28.5 27.5t-35 32t-33.5 32t-23 27.5q-84 -6 -172.5 33t-160 105.5t-116.5 150.5t-45 168q0 98 62.5 154.5t160.5 56.5q82 0 168 -39t155.5 -103.5t114 -146.5t44.5 -168 q0 -10 -1.5 -21.5t-3.5 -21.5l86 -76l34 17q34 18 90.5 46.5t129 65.5t148.5 76t150.5 77t135 69.5t102.5 52t52 26.5q16 8 37 9q14 0 39 -4.5t52.5 -9.5t53 -11t41.5 -8q29 -4 47.5 -26.5t18.5 -51.5q0 -43 -35 -66l-700 -485l700 -485q35 -23 35 -66q0 -29 -18.5 -51.5 t-47.5 -26.5q-16 -4 -41.5 -9t-53 -10t-52.5 -9.5t-39 -4.5q-10 0 -18.5 2.5t-18.5 6.5l-842 430l-86 -76q2 -10 3.5 -21.5t1.5 -21.5q0 -86 -44.5 -168t-114 -146.5t-155.5 -103.5t-168 -39q-98 0 -160.5 56.5t-62.5 154.5zM197 1358q0 -23 11 -49.5t27.5 -51t35 -45 t34.5 -34.5q35 -29 82 -54.5t94 -25.5q10 0 27 4v6q0 23 -11.5 48.5t-27.5 50t-34.5 46t-35.5 35.5q-35 29 -82 54.5t-94 25.5q-14 0 -26 -4v-6zM199 180q0 -6 2 -10q6 0 11 -1t11 -1q41 0 90 24.5t92.5 61.5t72 83t28.5 89q0 4 -1 5t-1 5q-8 2 -23 2q-41 0 -90 -24.5 t-92 -61.5t-71.5 -83t-28.5 -89zM586 616q53 -25 82 -69l108 96l45 -27l1016 703l-172 31l-975 -498l6 -127zM586 920l35 -35q12 29 36.5 41t53.5 26l-43 37q-29 -45 -82 -69zM741 768q0 35 23.5 57.5t58.5 22.5q33 0 55.5 -22.5t22.5 -57.5q0 -33 -22.5 -56.5t-57.5 -23.5 q-33 0 -56.5 23.5t-23.5 56.5zM903 575l762 -389l172 31l-727 502z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1597" d="M0 385v707q0 33 16.5 70.5t38.5 60.5l258 258q23 23 61 39t70 16h463q31 0 53.5 -22.5t22.5 -53.5v-250q16 8 35.5 13.5t40.5 5.5h463q31 0 53 -22.5t22 -53.5v-1075q0 -33 -22.5 -55.5t-52.5 -22.5h-830q-33 0 -55.5 22.5t-22.5 55.5v229h-536q-33 0 -55.5 22.5 t-22.5 55.5zM154 461h460v293q0 45 10.5 87t45.5 74l159 162v305h-278v-321q0 -31 -22.5 -53.5t-53.5 -22.5h-321v-524zM186 1139h211v211zM768 154h676v921h-279v-321q0 -31 -22.5 -53.5t-52.5 -22.5h-322v-524zM801 831h211v211z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1470" d="M0 1128q0 90 35 170t94 139.5t139 94.5t170 35q88 0 169 -34t143 -95l655 -656q12 -12 12 -28q0 -10 -11 -26.5t-26.5 -32t-32 -27t-26.5 -11.5q-16 0 -29 13l-655 655q-41 41 -92 61.5t-107 20.5q-57 0 -108 -21.5t-89 -59.5t-59.5 -89t-21.5 -109q0 -55 20.5 -106 t61.5 -92l745 -746q55 -55 133 -55q39 0 74 15.5t60.5 41t41 60.5t15.5 73q0 78 -56 134l-563 563q-29 29 -69 28q-41 0 -71 -29.5t-30 -70.5t29 -70l475 -475q12 -12 12 -28q0 -10 -11 -26.5t-26.5 -32t-32 -27t-26.5 -11.5q-16 0 -29 13l-475 473q-35 37 -55.5 85 t-20.5 99q0 53 20.5 100.5t55.5 83t83.5 56t101.5 20.5q51 0 99 -20.5t85 -55.5l561 -563q102 -102 102 -246q0 -74 -27.5 -137t-74.5 -110t-110.5 -75t-137.5 -28q-143 0 -246 103l-745 745q-61 61 -95 142t-34 169z" />
-<glyph unicode="&#xf0c7;" horiz-adv-x="1536" d="M0 154v1228q0 63 45 108.5t109 45.5h1075q63 0 108 -45l154 -154q45 -45 45 -108v-1075q0 -63 -45 -108.5t-109 -45.5h-1228q-63 0 -108.5 45t-45.5 109zM154 846h1075v536h-1075v-536zM846 922v385h190v-385h-190z" />
-<glyph unicode="&#xf0c8;" horiz-adv-x="1536" d="M0 193v1150q0 39 15.5 75t41 61.5t60.5 41t76 15.5h1150q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-75 -15.5h-1150q-80 0 -136.5 56.5t-56.5 136.5z" />
-<glyph unicode="&#xf0c9;" d="M0 78v215q0 31 22.5 53.5t55.5 22.5h1689q31 0 53.5 -22.5t22.5 -53.5v-215q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM0 659v218q0 31 22.5 53t55.5 22h1689q31 0 53.5 -22.5t22.5 -52.5v-218q0 -31 -22.5 -53t-53.5 -22h-1689 q-33 0 -55.5 22.5t-22.5 52.5zM0 1243v217q0 31 22.5 53.5t55.5 22.5h1689q31 0 53.5 -22.5t22.5 -53.5v-217q0 -31 -22.5 -53.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 53.5z" />
-<glyph unicode="&#xf0ca;" d="M0 211q0 39 15.5 75t41 61.5t60.5 40.5t76 15q39 0 73.5 -15t61 -40.5t42 -61.5t15.5 -75q0 -41 -15.5 -76t-42 -60.5t-61.5 -41t-73 -15.5q-80 0 -136.5 56.5t-56.5 136.5zM0 768q0 39 15.5 75t41 61.5t60.5 41t76 15.5q39 0 73.5 -15.5t61 -41t42 -61.5t15.5 -75 q0 -41 -15.5 -76t-42 -60.5t-61.5 -41t-73 -15.5q-41 0 -76 15.5t-60.5 41t-41 60.5t-15.5 76zM0 1325q0 39 15.5 75t41 61.5t60.5 41t76 15.5q39 0 73.5 -15.5t61 -41t42 -61.5t15.5 -75q0 -41 -15.5 -76t-42 -60.5t-61.5 -40.5t-73 -15q-41 0 -76 15t-60.5 40.5t-41 60.5 t-15.5 76zM522 154v114q0 33 22.5 55.5t55.5 22.5h1167q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-1167q-33 0 -55.5 21.5t-22.5 54.5zM522 711v114q0 33 22.5 55.5t55.5 22.5h1167q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5 h-1167q-33 0 -55.5 22.5t-22.5 55.5zM522 1268v114q0 33 22.5 55.5t55.5 22.5h1167q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1167q-33 0 -55.5 22.5t-22.5 55.5z" />
-<glyph unicode="&#xf0cb;" d="M0 594q0 55 30.5 90t68.5 61.5t69 50t31 56.5q0 29 -17.5 44t-46.5 15q-25 0 -44 -15t-34 -36l-53 37q23 39 58.5 60.5t78.5 21.5q55 0 96.5 -32t41.5 -91q0 -49 -30 -80t-67 -55.5t-67.5 -47t-30.5 -55.5h143v54h66v-115h-289q-2 10 -3 18.5t-1 18.5zM4 55l37 54 q6 -4 12 -10.5t15 -10.5q12 -8 29.5 -14t37.5 -6q35 0 55.5 18t20.5 47q0 31 -23.5 48.5t-58.5 17.5h-23l-16 37l90 108l6 6t7 6l4 6h-9q-4 -2 -14 -2h-92v-49h-66v111h263v-53l-97 -115q41 -6 74 -35t33 -82t-38 -95t-110 -42q-35 0 -60.5 9t-41.5 20q-25 14 -35 26z M14 1434l105 102h67v-360h93v-62h-259v62h93v258v8h-2q-10 -16 -22.5 -28.5t-29.5 -27.5zM522 154v114q0 33 22.5 55.5t55.5 22.5h1167q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -54.5t-53.5 -21.5h-1167q-33 0 -55.5 21.5t-22.5 54.5zM522 711v114q0 33 22.5 55.5 t55.5 22.5h1167q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1167q-33 0 -55.5 22.5t-22.5 55.5zM522 1268v114q0 33 22.5 55.5t55.5 22.5h1167q31 0 53.5 -22.5t22.5 -55.5v-114q0 -33 -22.5 -55.5t-53.5 -22.5h-1167q-33 0 -55.5 22.5t-22.5 55.5z " />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1536" d="M0 692v152h1536v-152h-1536zM268 1114q0 117 44 202t118 141t170 83t203 27q88 0 176 -20.5t172 -49.5q20 -72 27.5 -156t7.5 -157q0 -10 -1 -22.5t-3 -24.5l-13 -2q-23 2 -50 2t-50 6q-18 59 -44 114.5t-62.5 98.5t-88 68.5t-122.5 25.5q-49 0 -94.5 -13.5t-80 -40 t-56 -66.5t-21.5 -93q0 -59 28.5 -102t75.5 -75t105.5 -54.5t118 -42t113.5 -39t93 -41.5h-696q-33 53 -51.5 110.5t-18.5 120.5zM285 310v63v45l110 2q31 -72 64 -134.5t76 -108.5t104 -71.5t152 -25.5q55 0 110 16.5t100.5 48t74 78.5t28.5 109q0 76 -49 128t-119 88 t-146.5 59.5t-132.5 45.5h617q8 -16 15 -38.5t10.5 -48t5.5 -50t2 -43.5q0 -131 -47.5 -226t-127 -156.5t-186 -91.5t-225.5 -30q-53 0 -93 4t-78 12.5t-78 20.5t-93 29q-12 4 -38 12t-36 16q-8 6 -12 50.5t-6 96.5t-2 100z" />
-<glyph unicode="&#xf0cd;" horiz-adv-x="1536" d="M0 0v154h1536v-154h-1536zM0 1532q10 2 19.5 2h19.5q72 0 140.5 -5t137.5 -5q100 0 200.5 2t199.5 6q-4 -16 -1 -36.5t3 -37.5v-8q-66 -10 -108 -7t-65.5 -5t-32.5 -39t-9 -109q0 -137 4 -272t10 -273q8 -147 88 -237t238 -90q125 0 207 29.5t131 88t69.5 146.5t20.5 203 q0 20 -2 65t-5 102.5t-8.5 119t-11.5 113.5t-13 89t-15 45q-33 33 -78 33q-6 0 -23.5 -1t-36 -1t-34 1t-21.5 3l2 82q82 4 163 -3t165 -7q39 0 77.5 5t79.5 5q4 0 9.5 -1t9.5 -1q2 -12 4 -24.5t2 -24.5t-4 -29q-23 -6 -52.5 -8t-58 -7t-48 -16.5t-19.5 -38.5q0 -14 1 -27 t3 -28q2 -6 5 -38.5t5 -79t4 -101.5t4 -103t3 -85t1 -50q0 -37 -2 -80.5t-8 -89t-17.5 -87.5t-29.5 -74q-41 -68 -104.5 -114t-137 -72.5t-153.5 -38t-154 -11.5q-72 0 -144.5 9.5t-140.5 35.5q-96 35 -151 88.5t-84 121t-36 148.5t-7 173v321v42t-1 62.5t-5 60.5t-10 38 q-12 16 -37 23.5t-53.5 10.5t-56.5 3t-44 4z" />
-<glyph unicode="&#xf0ce;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM154 154h460v335h-460v-335zM154 565h460v332h-460v-332zM154 975h460v332h-460v-332zM692 154h461v335h-461v-335zM692 565h461v332h-461v-332z M692 975h461v332h-461v-332zM1229 154h461v335h-461v-335zM1229 565h461v332h-461v-332zM1229 975h461v332h-461v-332z" />
-<glyph unicode="&#xf0d0;" d="M0 197q0 39 29 61l1579 1247q20 17 47 17q35 0 59 -29q10 -12 29.5 -33.5t38 -44t32 -47.5t13.5 -43q0 -39 -29 -61l-1579 -1248q-20 -16 -47 -16q-37 0 -59 29q-10 12 -30 33.5t-38 44t-31.5 47t-13.5 43.5zM256 922l117 36l37 117l34 -117l119 -36l-119 -37l-34 -117 l-37 117zM373 1229l235 71l72 236l72 -236l235 -71l-235 -72l-72 -235l-72 235zM942 1382l117 37l37 117l37 -117l116 -37l-116 -36l-37 -117l-37 117zM1286 1153l94 -121l369 291l-94 121zM1536 885l117 35l37 118l36 -118l117 -35l-117 -37l-36 -117l-37 117z" />
-<glyph unicode="&#xf0d1;" d="M0 358v404q0 25 6 51.5t17.5 53t27 51t31.5 40.5l223 222q16 16 41 31.5t51.5 26.5t53 17.5t51.5 6.5h80v198q0 31 22.5 53.5t52.5 22.5h1108q33 0 55.5 -22.5t22.5 -53.5v-1102q0 -31 -22.5 -53t-55.5 -22h-75v-7q0 -63 -25 -119.5t-65.5 -97.5t-97 -65.5t-120.5 -24.5 q-63 0 -119.5 24.5t-97.5 65.5t-65.5 97.5t-24.5 119.5v7h-307v-7q0 -63 -24.5 -119.5t-65.5 -97.5t-97.5 -65.5t-119.5 -24.5t-119.5 24.5t-97.5 65.5t-65.5 97.5t-24.5 119.5v7h-78q-31 0 -53.5 22.5t-22.5 52.5zM193 700h387v369h-78q-10 0 -31.5 -8t-30.5 -17l-223 -221 q-8 -8 -16 -29.5t-8 -31.5v-62zM346 276q0 -47 34 -80.5t81 -33.5t80.5 33.5t33.5 80.5t-33.5 81t-80.5 34t-81 -33.5t-34 -81.5zM1268 276q0 -47 33.5 -80.5t80.5 -33.5t81 33.5t34 80.5t-33.5 81t-81.5 34q-47 0 -80.5 -33.5t-33.5 -81.5z" />
-<glyph unicode="&#xf0d2;" horiz-adv-x="1597" d="M0 768q0 166 62.5 311.5t171 254t254 171t311.5 62.5t311 -62.5t254 -171t171 -254t62 -311.5t-62 -311.5t-171 -254t-254 -171t-311 -62.5q-59 0 -115.5 8.5t-112.5 24.5q23 35 46.5 80t35.5 92l11 41q6 23 16 66t29 112q23 -41 76 -70.5t118 -29.5q96 0 176 41 t136.5 114.5t88 174t31.5 217.5q0 88 -35.5 171t-102.5 147.5t-160 102t-208 37.5q-141 0 -248.5 -46t-179 -118.5t-107.5 -160.5t-36 -174q0 -104 40 -187.5t124 -117.5q31 -10 41 20q2 10 7 31.5t9 32.5q4 16 1 23t-13 22q-53 59 -53 155q0 76 27.5 145.5t78.5 122t124 84 t163 31.5q80 0 142.5 -23.5t105.5 -64.5t64.5 -96t21.5 -121q0 -86 -18.5 -164t-52.5 -136t-80 -92t-103 -34q-31 0 -57.5 12.5t-45 34t-25.5 49t1 60.5q18 76 44.5 151.5t26.5 130.5q0 49 -26.5 84t-81.5 35q-66 0 -110 -58.5t-44 -146.5q-2 -23 2 -45q2 -18 7.5 -40.5 t15.5 -41.5q-33 -141 -53.5 -225t-30.5 -131q-12 -55 -18 -80q-10 -45 -13.5 -93t-1.5 -89q-104 45 -192 119.5t-151.5 169t-98.5 207t-35 235.5z" />
-<glyph unicode="&#xf0d3;" horiz-adv-x="1536" d="M0 193v1150q0 39 15.5 75t41 61.5t60.5 41t76 15.5h1150q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5t-61.5 -41t-75 -15.5h-829q27 39 59.5 95.5t49.5 117.5l10 41q6 25 17.5 68t29.5 112q20 -41 75.5 -70.5t121.5 -29.5q96 0 176 42t137 115.5 t89 175t32 220.5q0 90 -37 173t-103.5 147.5t-161 102.5t-208.5 38q-143 0 -251 -46.5t-180.5 -120t-108.5 -162.5t-36 -175q0 -104 40 -188.5t124 -118.5q14 -6 25.5 -1t15.5 21q4 10 8 31.5t8 34.5q8 23 -12 43q-23 29 -37 67.5t-14 91.5q0 76 27.5 145.5t79 123t124 85 t164.5 31.5q82 0 144.5 -23.5t105.5 -64.5t64.5 -97t21.5 -124q0 -86 -18.5 -164t-52 -136t-81 -93t-104.5 -35q-31 0 -57.5 12.5t-45 34t-25.5 49t1 60.5q18 78 45 154.5t27 131.5q0 49 -26.5 85t-82.5 36q-66 0 -110.5 -59t-44.5 -150q-2 -23 2 -45q4 -43 22 -84 q-35 -141 -54.5 -226t-29.5 -132q-12 -55 -18 -80q-16 -70 -14 -142.5t6 -117.5h-260q-80 0 -136.5 56.5t-56.5 136.5z" />
-<glyph unicode="&#xf0d4;" horiz-adv-x="1536" d="M0 342v438q55 -68 120.5 -96.5t153.5 -28.5h36t34 4q-8 -23 -14 -42t-6 -42q0 -41 18 -77.5t43 -67.5q-104 -4 -198.5 -22.5t-186.5 -65.5zM0 1214v129q0 39 15.5 75t41 61.5t60.5 41t76 15.5h1150q80 0 136.5 -56.5t56.5 -136.5v-1150q0 -41 -15.5 -76t-41 -60.5 t-61.5 -41t-75 -15.5h-583q23 39 36 81t13 89q0 70 -21.5 121t-54.5 90t-70.5 69.5t-70.5 57.5t-54.5 53.5t-21.5 59.5q0 49 34 81.5t76 72.5t75.5 99.5t33.5 163.5q0 78 -39 157t-106 122h131l133 76h-428q-129 0 -237.5 -36t-188.5 -143zM2 170q14 57 55 96t96.5 61.5 t115 33t110.5 10.5h31.5t31.5 -2q37 -27 78 -54.5t75 -61.5t55.5 -75t21.5 -92q0 -47 -19 -86h-460q-72 0 -126.5 49t-64.5 121zM102 1094q0 43 11.5 85t35 73.5t59.5 51t85 19.5q68 0 118 -41t81.5 -100.5t47 -128t15.5 -123.5q0 -45 -9 -84t-30.5 -68.5t-56.5 -47 t-84 -17.5q-66 0 -116 39t-85 96t-53.5 123.5t-18.5 122.5zM854 1051h223v-224h109v224h223v108h-223v225h-109v-225h-223v-108z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1536" d="M0 262q0 100 56.5 166t139.5 105.5t179 56t174 18.5q-23 29 -41.5 64t-18.5 76q0 23 6.5 41t14.5 40q-16 -4 -33.5 -4h-34.5q-68 0 -130 23.5t-108 66.5t-74 101.5t-28 130.5q0 68 25 128t67 109.5t98 84t120 49.5q88 18 176 18h411l-127 -74h-127q72 -43 107 -120.5 t35 -157.5q0 -94 -33 -149.5t-73 -94.5t-72.5 -70.5t-32.5 -78.5q0 -45 44 -82t97 -82t97 -107.5t44 -161.5q0 -102 -50 -175.5t-126.5 -121t-170 -70t-181.5 -22.5q-66 0 -141.5 15.5t-140 50.5t-106.5 90t-42 137zM174 307q0 -68 35 -116t87 -78.5t114.5 -44t117.5 -13.5 q51 0 104.5 11.5t96.5 38t69.5 68.5t26.5 103q0 49 -21.5 89.5t-53 72t-70.5 59t-76 52.5q-14 2 -29.5 3t-29.5 1q-57 0 -123 -12.5t-121 -41t-91 -75.5t-36 -117zM276 1247q0 -53 17.5 -117.5t51.5 -120t82.5 -92t111.5 -36.5q96 0 134 61.5t38 147.5q0 53 -14.5 118.5 t-45 124t-78 97t-112.5 38.5q-47 0 -82 -18t-57.5 -49t-34 -71t-11.5 -83zM999 1206h215v-215h107v215h215v105h-215v217h-107v-217h-215v-105z" />
-<glyph unicode="&#xf0d6;" d="M0 78v1382q0 31 22.5 53.5t55.5 22.5h1689q31 0 53.5 -22.5t22.5 -53.5v-1382q0 -33 -22.5 -55.5t-53.5 -22.5h-1689q-33 0 -55.5 22.5t-22.5 55.5zM154 461q63 0 119.5 -24.5t97.5 -65.5t65.5 -97.5t24.5 -119.5h921q0 63 25 119.5t65.5 97.5t97 65.5t120.5 24.5v614 q-63 0 -120 24.5t-97.5 65.5t-65.5 97.5t-25 119.5h-921q0 -63 -24.5 -119.5t-65.5 -97.5t-97.5 -65.5t-119.5 -24.5v-614zM539 768q0 104 29.5 195.5t81.5 159t122 106.5t150 39t149.5 -39t121.5 -106.5t83 -159t31 -195.5t-31 -195.5t-83 -159t-122 -106.5t-149 -39 q-80 0 -150 39t-122 106.5t-81.5 159t-29.5 195.5zM692 969l94 -99l39 35q8 6 11.5 13.5t7.5 11.5q4 2 8 10h2v-16q0 -8 -1 -16.5t-1 -18.5v-283h-139v-129h438v129h-141v529h-140z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1228" d="M6 967q20 47 72 47h1075q50 0 70 -47t-17 -84l-536 -537q-27 -23 -56 -22q-29 0 -55 22l-536 537q-37 37 -17 84z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1228" d="M6 371q-20 47 17 84l536 536q23 23 55 23q31 0 54 -23l538 -536q37 -37 17 -84t-70 -47h-1077q-50 0 -70 47z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="692" d="M0 768q0 33 23 55l538 537q16 16 38 21t44 -5q23 -8 36 -27.5t13 -41.5v-1076q0 -25 -13 -43t-36 -28t-44 -5t-38 21l-538 539q-23 23 -23 53z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="692" d="M0 231v1076q0 49 47 69t84 -16l539 -537q23 -23 22 -55q0 -31 -22 -53l-539 -539q-37 -37 -84 -16q-47 20 -47 71z" />
-<glyph unicode="&#xf0db;" d="M0 115v1306q0 47 34 81t81 34h1614q47 0 80.5 -34t33.5 -81v-1306q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34t-34 81zM154 154h692v1153h-692v-1153zM999 154h691v1153h-691v-1153z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1228" d="M0 584q0 31 22.5 54.5t53.5 23.5h1075q33 0 55.5 -23t22.5 -55q0 -33 -23 -56l-536 -536q-23 -23 -56 -23t-55 23l-536 536q-23 23 -23 56zM0 952q0 33 23 56l536 536q23 23 55 23q33 0 56 -23l536 -536q23 -23 23 -56q0 -31 -22.5 -54.5t-55.5 -23.5h-1075 q-31 0 -53.5 23t-22.5 55z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1228" d="M0 584q0 31 22.5 54.5t53.5 23.5h1077q31 0 53.5 -23t22.5 -55q0 -33 -23 -56l-536 -536q-23 -23 -56 -23q-35 0 -53 23l-538 536q-23 23 -23 56z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1228" d="M0 952q0 33 23 56l536 536q23 23 55 23q33 0 56 -23l536 -536q23 -23 23 -56q0 -31 -22.5 -54.5t-53.5 -23.5h-1077q-31 0 -53.5 23t-22.5 55z" />
-<glyph unicode="&#xf0e0;" d="M0 115v905q10 -10 20.5 -17.5t20.5 -15.5q129 -96 256 -191.5t252 -195.5q39 -31 82 -62.5t89 -57t96.5 -41t103.5 -15.5q55 0 105 15.5t96 40t89 56t84 64.5q125 100 252 195.5t256 191.5q10 8 20.5 15.5t20.5 17.5v-905q0 -47 -33.5 -81t-80.5 -34h-1614q-47 0 -81 34 t-34 81zM2 1434q0 41 36 71.5t77 30.5h1614q41 0 76.5 -30.5t35.5 -71.5q0 -31 -18.5 -69t-45 -75t-57 -67.5t-53.5 -48.5q-123 -92 -241.5 -182.5t-239.5 -182.5q-25 -18 -57.5 -45t-67.5 -51.5t-71 -42t-66 -17.5h-2h-2q-31 0 -67 17.5t-70.5 42t-67.5 51.5t-58 45 q-121 92 -239.5 182t-241.5 183q-23 18 -53.5 48.5t-57 67.5t-45 75t-18.5 69z" />
-<glyph unicode="&#xf0e1;" horiz-adv-x="1576" d="M0 1376q0 39 15.5 74t41 60.5t60 41t73.5 15.5t74 -15.5t61.5 -41t41 -60.5t14.5 -74t-14.5 -73.5t-41 -60t-61.5 -41t-74 -15.5t-73.5 15.5t-60 41t-41 60t-15.5 73.5zM10 41v991q0 16 12.5 28.5t28.5 12.5h281q16 0 28.5 -12t12.5 -29v-991q0 -16 -12.5 -28.5 t-28.5 -12.5h-281q-16 0 -28.5 12.5t-12.5 28.5zM524 41v991q0 16 12.5 28.5t28.5 12.5h273q33 0 37 -25.5t4 -48.5q57 53 129.5 76t150.5 23q190 0 304 -95.5t114 -293.5v-668q0 -16 -12.5 -28.5t-28.5 -12.5h-289q-16 0 -27.5 12.5t-11.5 28.5v604q0 76 -27.5 116 t-111.5 40q-53 0 -89 -17.5t-56.5 -47t-28.5 -70.5t-8 -88v-537q0 -16 -12.5 -28.5t-28.5 -12.5h-281q-16 0 -28.5 12.5t-12.5 28.5z" />
-<glyph unicode="&#xf0e2;" horiz-adv-x="1591" d="M0 662q-4 39 35 45l158 20q12 2 30 -8q12 -8 15 -27q14 -102 63 -191t123 -153.5t169 -101.5t200 -37q115 0 217 44t178 120t120 177t44 218t-44 218t-120 177t-178.5 120t-216.5 44q-94 0 -181.5 -30.5t-158.5 -88.5l159 -159q35 -35 24 -58.5t-58 -23.5h-463 q-16 0 -29.5 6t-24.5 16q-25 25 -24 55v463q0 47 24.5 57.5t59.5 -24.5l162 -162q109 92 238.5 140.5t271.5 48.5q166 0 311 -62.5t253.5 -171t171 -254t62.5 -311.5t-62.5 -311.5t-171 -254t-254 -171t-310.5 -62.5q-150 0 -285 52.5t-241.5 145.5t-176.5 220t-90 275z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1916" d="M0 651q0 49 37 91t88 42q35 0 68 -22q-20 14 -21 37q0 8 8 24l334 502q14 20 37 21q16 0 24 -9q-25 18 -40 43t-15 56q0 49 38 90t87 41q33 0 62 -19l514 -342q23 -16 36 -40.5t13 -53.5q0 -25 -10.5 -48.5t-26.5 -41.5t-40 -29.5t-48 -11.5q-33 0 -68 23q20 -14 21 -37 q0 -14 -8 -25l-105 -158l227 -151q14 4 28 6t28 2q53 0 94 -29l475 -315q37 -27 58.5 -65.5t21.5 -84.5q0 -74 -52.5 -126t-125.5 -52q-55 0 -99 31l-475 315q-70 47 -75 131l-228 152l-106 -158q-14 -20 -37 -20q-14 0 -25 8q55 -39 56 -100q0 -25 -10.5 -47.5t-28 -41 t-40 -29.5t-46.5 -11q-35 0 -62 18l-514 342q-49 33 -49 92z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1880" d="M0 627q0 195 73.5 365.5t201.5 298.5t299 202t366 74t366 -74t299 -202t201.5 -299t73.5 -365q0 -78 -14.5 -159t-42 -159t-68.5 -149.5t-92 -130.5q-23 -29 -59 -29h-1328q-37 0 -59 29q-53 59 -93 130.5t-67.5 149.5t-42 159t-14.5 159zM158 627q0 -49 33.5 -83 t82.5 -34t83 34t34 83t-34.5 82.5t-82.5 33.5q-49 0 -82.5 -33.5t-33.5 -82.5zM352 1098q0 -49 35 -84t82 -35q49 0 84 35t35 84t-35 82.5t-84 33.5q-47 0 -82 -33.5t-35 -82.5zM743 313q0 -82 57.5 -139t139.5 -57t139.5 57t57.5 139q0 49 -26 91t-67 71q4 14 15.5 55 t27 95.5t33 114t30.5 110.5t22.5 88t9.5 43q0 23 -17.5 40t-40.5 17q-20 0 -35.5 -12t-21.5 -31l-135 -487q-39 -2 -74 -17.5t-60.5 -42t-40 -61.5t-14.5 -74zM823 1292q0 -49 34 -82.5t83 -33.5t83 33.5t34 82.5t-34 83t-83 34t-83 -34t-34 -83zM1292 1098q0 -49 35 -83 t84 -34t83 34t34 83t-34 82.5t-83 33.5t-84 -33.5t-35 -82.5zM1489 627q0 -49 34 -83t83 -34t82.5 34t33.5 83t-33.5 82.5t-82.5 33.5t-83 -33.5t-34 -82.5z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1916" d="M0 866q0 123 49 225.5t130 183.5t184.5 139.5t209.5 92.5q94 31 190.5 45.5t194.5 14.5t194.5 -14.5t190.5 -45.5q106 -35 210 -93t185 -139t130 -183.5t49 -225.5t-49 -225t-130 -183t-184.5 -140.5t-210.5 -92.5q-94 -31 -190 -45t-195 -14q-92 0 -180 12 q-92 -72 -195.5 -119t-215.5 -73q-27 -4 -55.5 -10.5t-53.5 -6.5q-16 0 -27.5 11.5t-11.5 27.5q0 12 8.5 21.5t16.5 17.5q31 33 53 60.5t37.5 57.5t25 64.5t17.5 79.5q-78 43 -145.5 100.5t-120 128t-82 153.5t-29.5 175zM160 866q0 -72 24.5 -133t65.5 -113.5t94 -95.5 t111 -75q27 -14 51 -27.5t49 -28.5q-10 -47 -17.5 -94t-19.5 -94q59 29 111.5 64.5t105.5 76.5q55 -8 110.5 -14t112.5 -6q156 0 308 43q84 25 171 68.5t158.5 107t116.5 143.5t45 178t-45 178t-116.5 143.5t-158.5 107.5t-171 69q-152 43 -308 43q-158 0 -307 -43 q-84 -25 -171 -69t-158.5 -107.5t-116.5 -143t-45 -178.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1916" d="M0 997q0 98 40 182.5t106.5 151t150.5 113.5t170 76q76 25 154.5 36t156.5 11q80 0 159 -11.5t155 -35.5q86 -29 170 -76t149.5 -113.5t105 -150.5t39.5 -183q0 -98 -39.5 -182t-105 -149.5t-149.5 -113.5t-170 -77q-154 -47 -314 -47q-37 0 -72.5 3t-72.5 7 q-150 -115 -336 -155q-20 -4 -43 -9.5t-45 -5.5q-12 0 -21.5 9.5t-9.5 23.5q0 10 7.5 17.5l13.5 13.5q51 51 72.5 96t35.5 117q-63 35 -118.5 82t-97.5 104t-66.5 124t-24.5 142zM160 997q0 -72 30.5 -127t77.5 -99t104.5 -78t112.5 -64l-20 -111q33 18 63.5 42t59.5 46 q47 -6 95 -12t95 -6q135 0 264 41q61 18 124 52t114 81t84 105.5t33 129.5q0 72 -33 131.5t-84 105.5t-113.5 80t-124.5 52q-63 23 -129.5 32t-134.5 9q-66 0 -132 -9t-132 -32q-59 -18 -122.5 -52t-115 -80t-84 -105.5t-32.5 -131.5zM649 258l27 16q51 -6 102 -6 q197 0 381 62q111 37 211 99.5t177 147.5t123 190t46 230q0 41 -6 84q90 -72 148.5 -169t58.5 -214q0 -76 -24.5 -142.5t-66.5 -123.5t-97.5 -104t-118.5 -82q14 -72 35.5 -117t72.5 -96q6 -6 13.5 -14.5t7.5 -18.5q0 -16 -10.5 -23.5t-24.5 -7.5q-20 0 -43 5.5t-41 9.5 q-186 41 -336 155q-37 -4 -72.5 -7t-72.5 -3q-129 0 -254 32t-236 97z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="933" d="M0 557q0 8 2 10l209 932q4 16 16.5 26.5t28.5 10.5h344q18 0 31.5 -13.5t13.5 -33.5q0 -6 -1 -10t-3 -11l-180 -524q12 4 47 13.5t81 21.5t95 26.5t93 25.5t75 18.5t37 7.5q18 0 31.5 -13.5t13.5 -33.5q0 -12 -2 -19l-565 -1306q-10 -29 -43 -29q-18 0 -33 13.5t-15 33.5 q0 6 3 10l204 914q-12 -4 -48 -14.5t-82 -22.5t-97 -26.5t-95 -27t-76 -19.5t-38 -7q-20 0 -33.5 14.5t-13.5 32.5z" />
-<glyph unicode="&#xf0e8;" d="M0 78v383q0 33 22.5 55.5t55.5 22.5h133v153q0 55 40 94t95 39h518v174h-135q-31 0 -53.5 21.5t-22.5 54.5v385q0 31 22.5 53.5t53.5 22.5h385q31 0 53.5 -22.5t22.5 -53.5v-385q0 -33 -22.5 -54.5t-53.5 -21.5h-135v-174h518q55 0 95 -38.5t40 -94.5v-153h135 q31 0 53.5 -22.5t22.5 -55.5v-383q0 -33 -22.5 -55.5t-53.5 -22.5h-385q-33 0 -54 22.5t-21 55.5v383q0 33 21.5 55.5t53.5 22.5h136v153q0 18 -21 19h-518v-172h135q31 0 53.5 -22.5t22.5 -55.5v-383q0 -33 -22.5 -55.5t-53.5 -22.5h-385q-31 0 -53.5 22.5t-22.5 55.5v383 q0 33 22.5 55.5t53.5 22.5h135v172h-518q-20 0 -20 -19v-153h135q33 0 55.5 -22.5t22.5 -55.5v-383q0 -33 -22.5 -55.5t-55.5 -22.5h-383q-33 0 -55.5 22.5t-22.5 55.5z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1884" d="M0 770q31 137 109.5 253t193.5 204t257 141t302 66v53q0 35 23.5 57.5t56.5 22.5q35 0 57.5 -22.5t22.5 -57.5v-53q160 -12 303 -65.5t258 -141.5t192.5 -204t108.5 -253q6 -29 -20 -43q-10 -6 -19 -6q-20 0 -28 12q-98 102 -218 103q-86 0 -163.5 -54.5t-130.5 -152.5 q-10 -23 -35 -23t-35 23q-82 150 -213 194v-526q0 -68 -23.5 -127t-63.5 -104.5t-93.5 -71t-114.5 -25.5t-115.5 25.5t-94.5 71t-63.5 104.5t-23.5 127q0 35 23.5 57.5t56.5 22.5q35 0 57.5 -22.5t22.5 -57.5q0 -70 40 -119t97 -49q55 0 95 49t40 119v526 q-131 -45 -213 -194q-10 -23 -35 -23t-34 23q-53 98 -130 152.5t-163 54.5q-121 0 -217 -103q-12 -12 -31 -12q-10 0 -19 6q-25 14 -20 43z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1597" d="M0 385v1075q0 31 22.5 53.5t55.5 22.5h921q31 0 53.5 -22.5t22.5 -53.5v-231h33h61q25 0 55.5 -13.5t49.5 -29.5l280 -281q18 -18 30.5 -49t12.5 -55v-62v-678q0 -27 -17 -44t-44 -17h-860q-27 0 -44.5 17.5t-17.5 43.5v246h-536q-33 0 -55.5 22.5t-22.5 55.5zM276 1321 q0 -12 9.5 -21.5t21.5 -9.5h461q12 0 21.5 9.5t9.5 21.5v61q0 12 -9.5 21.5t-21.5 9.5h-461q-12 0 -21.5 -9t-9.5 -22v-61zM737 123h738v555h-367q-27 0 -44 17.5t-17 43.5v367h-310v-983zM1169 801h306q0 2 -3.5 8t-5.5 10l-280 279q0 4 -6 4q-2 0 -2 1t-2 1t-3.5 1t-3.5 1 v-305z" />
-<glyph unicode="&#xf105;" horiz-adv-x="2048" />
-<glyph unicode="&#xf200;" horiz-adv-x="1536" d="M0 57v379q0 39 20.5 87t54.5 90t74.5 73t81.5 35q-35 -59 -34 -129q0 -59 16 -124t59 -106q-18 -37 -18 -75q0 -72 50 -122t122 -50q37 0 68.5 13t55 36.5t37 55.5t13.5 67t-13.5 66.5t-37 55t-55 38t-68.5 14.5q-18 0 -36.5 -5t-35.5 -14q-12 12 -20 31t-13.5 40.5 t-7.5 41.5t-2 37q0 47 28 86t62 67l142 21q-92 57 -142.5 150.5t-50.5 201.5q0 86 33 162t90 133t133 90t162 33t162 -33t133 -90t90 -133t33 -162q0 -109 -50.5 -202t-142.5 -150l158 -23q18 -16 34.5 -36.5t16.5 -47.5q0 -45 -18 -77q-59 33 -121 32q-45 0 -87 -17 t-77 -46q-6 2 -11 3t-11 1q-47 0 -82 -34t-35 -81t34.5 -80.5t82.5 -33.5q47 0 80.5 33.5t33.5 80.5q0 8 -2 15.5t-4 13.5q16 12 35.5 20.5t42.5 8.5q55 0 95 -39t40 -94q0 -23 -8 -41.5t-19 -34.5q-25 10 -45 10q-47 0 -81.5 -34t-34.5 -81t34.5 -80.5t81.5 -33.5t81 33.5 t34 80.5l-2 4q74 74 74 177q0 74 -41 137q45 70 45 157q0 31 -12 62q41 -4 83 -34t74.5 -72t53 -90t20.5 -89v-379q-10 -6 -22.5 -15t-25.5 -18.5t-26.5 -16.5t-21.5 -7h-1344q-35 0 -52 20.5t-44 36.5zM369 287q0 25 17 41t40 16q25 0 41 -16t16 -41q0 -23 -16 -40.5 t-41 -17.5q-23 0 -40 17.5t-17 40.5z" />
-<glyph unicode="&#xf201;" horiz-adv-x="1597" />
-<glyph unicode="&#xf202;" horiz-adv-x="1597" />
-<glyph unicode="&#xf203;" horiz-adv-x="1597" />
-<glyph unicode="&#xf204;" horiz-adv-x="1597" />
-</font>
-</defs></svg> 

src/gulpfile.js

@@ -1,6 +1,6 @@
 var	gulp = require('gulp'),
-	plugins = require("gulp-load-plugins")(),
+	plugins = require('gulp-load-plugins')(),
-	paths = {}
+	paths = {};
 
 /* Error Handler -------------------------------- */
 
@@ -15,16 +15,13 @@ var catchError = function(err) {
 
 paths.view = {
 	js: [
-		'bower_components/jQuery/dist/jquery.min.js',
+		'../src/scripts/_gup.js',
-		'../src/scripts/_frameworks.js',
+		'../src/scripts/build.js',
 		'../src/scripts/view/main.js'
 	],
-	coffee: [
-		'../src/scripts/build.coffee'
-	],
 	scripts: [
-		'../dist/_view--javascript.js',
+		'bower_components/jQuery/dist/jquery.min.js',
-		'../dist/_view--coffee.js'
+		'../dist/_view--javascript.js'
 	]
 }
 
@@ -32,6 +29,8 @@ gulp.task('view--js', function() {
 
 	var stream =
 		gulp.src(paths.view.js)
+			.pipe(plugins.babel())
+			.on('error', catchError)
 			.pipe(plugins.concat('_view--javascript.js', {newLine: "\n"}))
 			.pipe(gulp.dest('../dist/'));
 
@@ -39,20 +38,7 @@ gulp.task('view--js', function() {
 
 });
 
-gulp.task('view--coffee', function() {
+gulp.task('view--scripts', ['view--js'], function() {
-
-	var stream =
-		gulp.src(paths.view.coffee)
-			.pipe(plugins.coffee({bare: true}))
-			.on('error', catchError)
-			.pipe(plugins.concat('_view--coffee.js', {newLine: "\n"}))
-			.pipe(gulp.dest('../dist/'));
-
-	return stream;
-
-});
-
-gulp.task('view--scripts', ['view--js', 'view--coffee'], function() {
 
 	var stream =
 		gulp.src(paths.view.scripts)
@@ -69,25 +55,23 @@ gulp.task('view--scripts', ['view--js', 'view--coffee'], function() {
 
 paths.main = {
 	js: [
+		'../src/scripts/*.js'
+	],
+	scripts: [
 		'bower_components/jQuery/dist/jquery.min.js',
 		'bower_components/js-md5/js/md5.min.js',
 		'bower_components/mousetrap/mousetrap.min.js',
 		'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
 		'bower_components/basicContext/dist/basicContext.min.js',
-		'../src/scripts/*.js'
+		'bower_components/basicModal/dist/basicModal.min.js',
-	],
+		'../dist/_main--javascript.js'
-	coffee: [
-		'../src/scripts/*.coffee'
-	],
-	scripts: [
-		'../dist/_main--javascript.js',
-		'../dist/_main--coffee.js'
 	],
 	scss: [
 		'../src/styles/*.scss'
 	],
 	styles: [
 		'bower_components/basicContext/src/styles/main.scss',
+		'bower_components/basicModal/src/styles/main.scss',
 		'../src/styles/main.scss'
 	]
 }
@@ -96,6 +80,8 @@ gulp.task('main--js', function() {
 
 	var stream =
 		gulp.src(paths.main.js)
+			.pipe(plugins.babel())
+			.on('error', catchError)
 			.pipe(plugins.concat('_main--javascript.js', {newLine: "\n"}))
 			.pipe(gulp.dest('../dist/'));
 
@@ -103,20 +89,7 @@ gulp.task('main--js', function() {
 
 });
 
-gulp.task('main--coffee', function() {
+gulp.task('main--scripts', ['main--js'], function() {
-
-	var stream =
-		gulp.src(paths.main.coffee)
-			.pipe(plugins.coffee({bare: true}))
-			.on('error', catchError)
-			.pipe(plugins.concat('_main--coffee.js', {newLine: "\n"}))
-			.pipe(gulp.dest('../dist/'));
-
-	return stream;
-
-});
-
-gulp.task('main--scripts', ['main--js', 'main--coffee'], function() {
 
 	var stream =
 		gulp.src(paths.main.scripts)
@@ -168,10 +141,8 @@ gulp.task('default', ['view--scripts', 'main--scripts', 'main--styles'], functio
 gulp.task('watch', ['default'], function() {
 
 	gulp.watch(paths.view.js,		['view--scripts']);
-	gulp.watch(paths.view.coffee,	['view--scripts']);
 
 	gulp.watch(paths.main.js,		['main--scripts']);
-	gulp.watch(paths.main.coffee,	['main--scripts']);
 	gulp.watch(paths.main.scss,		['main--styles']);
 
 });

src/images/ionicons.svg

@@ -0,0 +1,11 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<symbol id="twitter" viewBox="0 0 512 512">
+		<path d="M492 109.5c-17.4 7.7-36 12.9-55.6 15.3 20-12 35.4-31 42.6-53.6-18.7 11.1-39.4 19.2-61.5 23.5C399.8 75.8 374.6 64 346.8 64c-53.5 0-96.8 43.4-96.8 96.9 0 7.6.8 15 2.5 22.1-80.5-4-151.9-42.6-199.6-101.3-8.3 14.3-13.1 31-13.1 48.7 0 33.6 17.2 63.3 43.2 80.7-16-.4-31-4.8-44-12.1v1.2c0 47 33.4 86.1 77.7 95-8.1 2.2-16.7 3.4-25.5 3.4-6.2 0-12.3-.6-18.2-1.8 12.3 38.5 48.1 66.5 90.5 67.3-33.1 26-74.9 41.5-120.3 41.5-7.8 0-15.5-.5-23.1-1.4C62.8 432 113.7 448 168.3 448 346.6 448 444 300.3 444 172.2c0-4.2-.1-8.4-.3-12.5C462.6 146 479 129 492 109.5z"/>
+	</symbol>
+	<symbol id="facebook" viewBox="0 0 512 512">
+		<path d="M288 192v-38.1c0-17.2 3.8-25.9 30.5-25.9H352V64h-55.9c-68.5 0-91.1 31.4-91.1 85.3V192h-45v64h45v192h83V256h56.4l7.6-64h-64z"/>
+	</symbol>
+	<symbol id="dropbox" viewBox="0 0 512 512">
+		<path d="M177 77L64 150.9l78.1 62.7L256 143.1zM64 276.3l113 73.9 79-66.1-113.9-70.5zM256 284.1l79 66.1 113-73.9-78.1-62.7zM448 150.9L335 77l-79 66.1 113.9 70.5zM256.2 298.3l-79.8 66-34.4-22.2V367l114 68 114-68v-24.9l-34.2 22.2z"/>
+	</symbol>
+</svg>

src/package.json

@@ -1,8 +1,8 @@
 {
   "name": "Lychee",
-  "version": "2.7.1",
+  "version": "3.0.0",
   "description": "Self-hosted photo-management done right.",
-  "authors": "Tobias Reich <tobias.reich.ich@gmail.com>",
+  "authors": "Tobias Reich <tobias@electerious.com>",
   "license": "MIT",
   "private": true,
   "repository": {
@@ -10,14 +10,14 @@
     "url": "https://github.com/electerious/Lychee.git"
   },
   "devDependencies": {
-    "gulp": "^3.8.10",
+    "gulp": "^3.8.11",
-    "gulp-autoprefixer": "2.0.0",
+    "gulp-autoprefixer": "2.1.0",
-    "gulp-coffee": "^2.2.0",
+    "gulp-babel": "^4.0.0",
-    "gulp-concat": "^2.4.2",
+    "gulp-concat": "^2.5.0",
     "gulp-load-plugins": "^0.8.0",
-    "gulp-minify-css": "^0.3.11",
+    "gulp-minify-css": "^0.4.5",
     "gulp-rimraf": "^0.1.1",
-    "gulp-sass": "^1.2.4",
+    "gulp-sass": "^1.3.3",
-    "gulp-uglify": "^1.0.2"
+    "gulp-uglify": "^1.1.0"
   }
 }

src/scripts/_frameworks.js

@@ -1,8 +0,0 @@
-/* Browser Detection */
-var BrowserDetect={init:function(){this.browser=this.searchString(this.dataBrowser)||"An unknown browser";this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||"an unknown version";this.OS=this.searchString(this.dataOS)||"an unknown OS"},searchString:function(d){for(var a=0;a<d.length;a++){var b=d[a].string;var c=d[a].prop;this.versionSearchString=d[a].versionSearch||d[a].identity;if(b){if(b.indexOf(d[a].subString)!=-1){return d[a].identity}}else{if(c){return d[a].identity}}}},searchVersion:function(b){var a=b.indexOf(this.versionSearchString);if(a==-1){return}return parseFloat(b.substring(a+this.versionSearchString.length+1))},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",versionSearch:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"}]};BrowserDetect.init();
-function mobileBrowser() { if (/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) return true; else return false; }
-/* GET */
-function gup(b){b=b.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var a="[\\?&]"+b+"=([^&#]*)",d=new RegExp(a),c=d.exec(window.location.href);if(c===null){return""}else{return c[1]}};
-/*! jQuery Retina Plugin */
-(function(a){a.fn.retina=function(c){var d={"retina-background":false,"retina-suffix":"@2x"};if(c){a.extend(d,c)}var b=function(f,g){var e=new Image();e.onload=function(){g(e)};e.src=f};if(window.devicePixelRatio>1){this.each(function(){var e=a(this);if(this.tagName.toLowerCase()=="img"&&e.attr("src")){var g=e.attr("src").replace(/\.(?!.*\.)/,d["retina-suffix"]+".");b(g,function(h){e.attr("src",h.src);var i=a("<div>").append(e.clone()).remove().html();if(!(/(width|height)=["']\d+["']/.test(i))){e.attr("width",h.width/2)
-}})}if(d["retina-background"]){var f=e.css("background-image");if(/^url\(.*\)$/.test(f)){var g=f.substring(4,f.length-1).replace(/\.(?!.*\.)/,d["retina-suffix"]+".");b(g,function(h){e.css("background-image","url("+h.src+")");if(e.css("background-size")=="auto auto"){e.css("background-size",(h.width/2)+"px auto")}})}}})}}})(jQuery);

src/scripts/_gup.js

@@ -0,0 +1,12 @@
+function gup(b) {
+
+	b = b.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+
+	var a = "[\\?&]" + b + "=([^&#]*)",
+		d = new RegExp(a),
+		c = d.exec(window.location.href);
+
+	if (c === null) return '';
+	else return c[1];
+
+};

src/scripts/_retina.js

@@ -0,0 +1,46 @@
+/*! jQuery Retina Plugin */
+(function(a) {
+    a.fn.retina = function(c) {
+        var d = {
+            "retina-background": false,
+            "retina-suffix": "@2x"
+        };
+        if (c) {
+            a.extend(d, c)
+        }
+        var b = function(f, g) {
+            var e = new Image();
+            e.onload = function() {
+                g(e)
+            };
+            e.src = f
+        };
+        if (window.devicePixelRatio > 1) {
+            this.each(function() {
+                var e = a(this);
+                if (this.tagName.toLowerCase() == "img" && e.attr("src")) {
+                    var g = e.attr("src").replace(/\.(?!.*\.)/, d["retina-suffix"] + ".");
+                    b(g, function(h) {
+                        e.attr("src", h.src);
+                        var i = a("<div>").append(e.clone()).remove().html();
+                        if (!(/(width|height)=["']\d+["']/.test(i))) {
+                            e.attr("width", h.width / 2)
+                        }
+                    })
+                }
+                if (d["retina-background"]) {
+                    var f = e.css("background-image");
+                    if (/^url\(.*\)$/.test(f)) {
+                        var g = f.substring(4, f.length - 1).replace(/\.(?!.*\.)/, d["retina-suffix"] + ".");
+                        b(g, function(h) {
+                            e.css("background-image", "url(" + h.src + ")");
+                            if (e.css("background-size") == "auto auto") {
+                                e.css("background-size", (h.width / 2) + "px auto")
+                            }
+                        })
+                    }
+                }
+            })
+        }
+    }
+})(jQuery);

src/scripts/album.js

@@ -1,6 +1,6 @@
 /**
  * @description	Takes care of every action an album can handle and execute.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 album = {
@@ -42,8 +42,12 @@ album.load = function(albumID, refresh) {
 
 		startTime = new Date().getTime();
 
-		params = 'getAlbum&albumID=' + albumID + '&password=' + password.value;
+		params = {
-		lychee.api(params, function(data) {
+			albumID,
+			password: password.value
+		}
+
+		api.post('Album::get', params, function(data) {
 
 			if (data==='Warning: Album private!') {
 				if (document.location.hash.replace('#', '').split('/')[1]!=undefined) {
@@ -80,7 +84,7 @@ album.load = function(albumID, refresh) {
 
 				if (!refresh) {
 					lychee.animate('.album, .photo', 'contentZoomIn');
-					view.header.mode('album');
+					header.setMode('album');
 				}
 
 			}, waitTime);
@@ -99,116 +103,148 @@ album.parse = function() {
 
 album.add = function() {
 
-	var title,
+	var action;
-		params,
-		buttons,
-		isNumber = function(n) { return !isNaN(parseFloat(n)) && isFinite(n) };
 
-	buttons = [
+	action = function(data) {
-		['Create Album', function() {
 
-			title = $('.message input.text').val();
+		var isNumber,
+			title = data.title;
 
-			if (title.length===0) title = 'Untitled';
+		basicModal.close();
 
-			modal.close();
+		isNumber = function(n) {
 
-			params = 'addAlbum&title=' + escape(encodeURI(title));
+			return !isNaN(parseFloat(n)) && isFinite(n)
-			lychee.api(params, function(data) {
 
-				// Avoid first album to be true
+		}
-				if (data===true) data = 1;
 
-				if (data!==false&&isNumber(data)) {
+		if (title.length===0) title = 'Untitled';
-					albums.refresh();
-					lychee.goto(data);
-				} else {
-					lychee.error(null, params, data);
-				}
 
-			});
+		api.post('Album::add', { title }, function(data) {
 
-		}],
+			// Avoid first album to be true
-		['Cancel', function() {}]
+			if (data===true) data = 1;
-	];
 
-	modal.show('New Album', "Enter a title for this album: <input class='text' type='text' maxlength='30' placeholder='Title' value='Untitled'>", buttons);
+			if (data!==false&&isNumber(data)) {
+				albums.refresh();
+				lychee.goto(data);
+			} else {
+				lychee.error(null, params, data);
+			}
+
+		});
+
+	}
+
+	basicModal.show({
+		body: "<p>Enter a title for the new album: <input class='text' data-name='title' type='text' maxlength='30' placeholder='Title' value='Untitled'></p>",
+		buttons: {
+			action: {
+				title: 'Create Album',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
+			}
+		}
+	});
 
 }
 
 album.delete = function(albumIDs) {
 
-	var params,
+	var action = {},
-		buttons,
+		cancel = {},
-		albumTitle;
+		msg = '',
+		albumTitle = '';
 
 	if (!albumIDs) return false;
 	if (albumIDs instanceof Array===false) albumIDs = [albumIDs];
 
-	buttons = [
+	action.fn = function() {
-		['', function() {
 
-			params = 'deleteAlbum&albumIDs=' + albumIDs;
+		var params;
-			lychee.api(params, function(data) {
 
-				if (visible.albums()) {
+		basicModal.close();
 
-					albumIDs.forEach(function(id) {
+		params = {
-						albums.json.num--;
+			albumIDs: albumIDs.join()
-						view.albums.content.delete(id);
+		}
-						delete albums.json.content[id];
-					});
 
-				} else {
+		api.post('Album::delete', params, function(data) {
 
-					albums.refresh();
+			if (visible.albums()) {
-					lychee.goto('');
 
-				}
+				albumIDs.forEach(function(id) {
+					albums.json.num--;
+					view.albums.content.delete(id);
+					delete albums.json.content[id];
+				});
 
-				if (data!==true) lychee.error(null, params, data);
+			} else {
 
-			});
+				albums.refresh();
+				lychee.goto('');
 
-		}],
+			}
-		['', function() {}]
+
-	];
+			if (data!==true) lychee.error(null, params, data);
+
+		});
+
+	}
 
 	if (albumIDs.toString()==='0') {
 
-		buttons[0][0] = 'Clear Unsorted';
+		action.title = 'Clear Unsorted';
-		buttons[1][0] = 'Keep Unsorted';
+		cancel.title = 'Keep Unsorted';
 
-		modal.show('Clear Unsorted', "Are you sure you want to delete all photos from 'Unsorted'?<br>This action can't be undone!", buttons);
+		msg = "<p>Are you sure you want to delete all photos from 'Unsorted'?<br>This action can't be undone!</p>";
 
 	} else if (albumIDs.length===1) {
 
-		buttons[0][0] = 'Delete Album and Photos';
+		action.title = 'Delete Album and Photos';
-		buttons[1][0] = 'Keep Album';
+		cancel.title = 'Keep Album';
 
 		// Get title
 		if (album.json)			albumTitle = album.json.title;
 		else if (albums.json)	albumTitle = albums.json.content[albumIDs].title;
 
-		modal.show('Delete Album', "Are you sure you want to delete the album '" + albumTitle + "' and all of the photos it contains? This action can't be undone!", buttons);
+		msg = "<p>Are you sure you want to delete the album '" + albumTitle + "' and all of the photos it contains? This action can't be undone!</p>";
 
 	} else {
 
-		buttons[0][0] = 'Delete Albums and Photos';
+		action.title = 'Delete Albums and Photos';
-		buttons[1][0] = 'Keep Albums';
+		cancel.title = 'Keep Albums';
 
-		modal.show('Delete Albums', "Are you sure you want to delete all " + albumIDs.length + " selected albums and all of the photos they contain? This action can't be undone!", buttons);
+		msg = "<p>Are you sure you want to delete all " + albumIDs.length + " selected albums and all of the photos they contain? This action can't be undone!</p>";
 
 	}
 
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: action.title,
+				fn: action.fn,
+				class: 'red'
+			},
+			cancel: {
+				title: cancel.title,
+				fn: basicModal.close
+			}
+		}
+	});
+
 }
 
 album.setTitle = function(albumIDs) {
 
 	var oldTitle = '',
-		newTitle,
+		input = '',
-		params,
+		msg = '',
-		buttons;
+		action;
 
 	if (!albumIDs) return false;
 	if (albumIDs instanceof Array===false) albumIDs = [albumIDs];
@@ -224,86 +260,118 @@ album.setTitle = function(albumIDs) {
 
 	}
 
-	buttons = [
+	action = function(data) {
-		['Set Title', function() {
 
-			// Get input
+		var params,
-			newTitle = $('.message input.text').val();
+			newTitle = data.title;
 
-			// Remove html from input
+		basicModal.close();
-			newTitle = lychee.removeHTML(newTitle);
 
-			// Set to Untitled when empty
+		// Remove html from input
-			newTitle = (newTitle==='') ? 'Untitled' : newTitle;
+		newTitle = lychee.removeHTML(newTitle);
 
-			if (visible.album()) {
+		// Set to Untitled when empty
+		newTitle = (newTitle==='') ? 'Untitled' : newTitle;
 
-				album.json.title = newTitle;
+		if (visible.album()) {
-				view.album.title();
 
-				if (albums.json) {
+			album.json.title = newTitle;
-					var id = albumIDs[0];
+			view.album.title();
-					albums.json.content[id].title = newTitle;
-				}
-
-			} else if (visible.albums()) {
-
-				albumIDs.forEach(function(id) {
-					albums.json.content[id].title = newTitle;
-					view.albums.content.title(id);
-				});
 
+			if (albums.json) {
+				var id = albumIDs[0];
+				albums.json.content[id].title = newTitle;
 			}
 
-			params = 'setAlbumTitle&albumIDs=' + albumIDs + '&title=' + escape(encodeURI(newTitle));
+		} else if (visible.albums()) {
-			lychee.api(params, function(data) {
-
-				if (data!==true) lychee.error(null, params, data);
 
+			albumIDs.forEach(function(id) {
+				albums.json.content[id].title = newTitle;
+				view.albums.content.title(id);
 			});
 
-		}],
+		}
-		['Cancel', function() {}]
-	];
 
-	if (albumIDs.length===1) modal.show('Set Title', "Enter a new title for this album: <input class='text' type='text' maxlength='30' placeholder='Title' value='" + oldTitle + "'>", buttons);
+		params = {
-	else modal.show('Set Titles', "Enter a title for all " + albumIDs.length + " selected album: <input class='text' type='text' maxlength='30' placeholder='Title' value='" + oldTitle + "'>", buttons);
+			albumIDs: albumIDs.join(),
+			title: newTitle
+		}
+
+		api.post('Album::setTitle', params, function(data) {
+
+			if (data!==true) lychee.error(null, params, data);
+
+		});
+
+	}
+
+	input = "<input class='text' data-name='title' type='text' maxlength='30' placeholder='Title' value='" + oldTitle + "'>";
+
+	if (albumIDs.length===1)	msg = "<p>Enter a new title for this album: " + input + "</p>";
+	else						msg = "<p>Enter a title for all " + albumIDs.length + " selected albums: " + input +"</p>";
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Set Title',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
+			}
+		}
+	});
 
 }
 
-album.setDescription = function(photoID) {
+album.setDescription = function(albumID) {
 
 	var oldDescription = album.json.description.replace("'", '&apos;'),
-		description,
+		action;
-		params,
-		buttons;
 
-	buttons = [
+	action = function(data) {
-		['Set Description', function() {
 
-			// Get input
+		var params,
-			description = $('.message input.text').val();
+			description = data.description;
 
-			// Remove html from input
+		basicModal.close();
-			description = lychee.removeHTML(description);
 
-			if (visible.album()) {
+		// Remove html from input
-				album.json.description = description;
+		description = lychee.removeHTML(description);
-				view.album.description();
+
+		if (visible.album()) {
+			album.json.description = description;
+			view.album.description();
+		}
+
+		params = {
+			albumID,
+			description
+		}
+
+		api.post('Album::setDescription', params, function(data) {
+
+			if (data!==true) lychee.error(null, params, data);
+
+		});
+
+	}
+
+	basicModal.show({
+		body: "<p>Please enter a description for this album: <input class='text' data-name='description' type='text' maxlength='800' placeholder='Description' value='" + oldDescription + "'></p>",
+		buttons: {
+			action: {
+				title: 'Set Description',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
 			}
-
+		}
-			params = 'setAlbumDescription&albumID=' + photoID + '&description=' + escape(encodeURI(description));
+	});
-			lychee.api(params, function(data) {
-
-				if (data!==true) lychee.error(null, params, data);
-
-			});
-
-		}],
-		['Cancel', function() {}]
-	];
-
-	modal.show('Set Description', "Please enter a description for this album: <input class='text' type='text' maxlength='800' placeholder='Description' value='" + oldDescription + "'>", buttons);
 
 }
 
@@ -316,14 +384,67 @@ album.setPublic = function(albumID, e) {
 
 	albums.refresh();
 
-	if (!visible.message()&&album.json.public==0) {
+	if (!basicModal.visible()&&album.json.public==0) {
 
-		modal.show('Share Album', "This album will be shared with the following properties:</p><form><div class='choice'><input type='checkbox' name='listed' value='listed' checked><h2>Visible</h2><p>Listed to visitors of your Lychee.</p></div><div class='choice'><input type='checkbox' name='downloadable' value='downloadable'><h2>Downloadable</h2><p>Visitors of your Lychee can download this album.</p></div><div class='choice'><input type='checkbox' name='password' value='password'><h2>Password protected</h2><p>Only accessible with a valid password.<input class='text' type='password' placeholder='password' value='' style='display: none;'></p></div></form><p style='display: none;'>", [['Share Album', function() { album.setPublic(album.getID(), e) }], ['Cancel', function() {}]], -170);
+		var msg = '',
+			action;
 
-		$('.message .choice input[name="password"]').on('change', function() {
+		action = function() {
 
-			if ($(this).prop('checked')===true)	$('.message .choice input.text').show();
+			basicModal.close();
-			else								$('.message .choice input.text').hide();
+			album.setPublic(album.getID(), e);
+
+		};
+
+		msg =	`
+				<p class='less'>This album will be shared with the following properties:</p>
+				<form>
+					<div class='choice'>
+						<label>
+							<input type='checkbox' name='listed' checked>
+							<span class='checkbox'>${ build.iconic('check') }</span>
+							<span class='label'>Visible</span>
+						</label>
+						<p>Listed to visitors of your Lychee.</p>
+					</div>
+					<div class='choice'>
+						<label>
+							<input type='checkbox' name='downloadable'>
+							<span class='checkbox'>${ build.iconic('check') }</span>
+							<span class='label'>Downloadable</span>
+						</label>
+						<p>Visitors of your Lychee can download this album.</p>
+					</div>
+					<div class='choice'>
+						<label>
+							<input type='checkbox' name='password'>
+							<span class='checkbox'>${ build.iconic('check') }</span>
+							<span class='label'>Password protected</span>
+						</label>
+						<p>Only accessible with a valid password.</p>
+						<input class='text' data-name='password' type='password' placeholder='password' value=''>
+					</div>
+				</form>
+				`
+
+		basicModal.show({
+			body: msg,
+			buttons: {
+				action: {
+					title: 'Share Album',
+					fn: action
+				},
+				cancel: {
+					title: 'Cancel',
+					fn: basicModal.close
+				}
+			}
+		});
+
+		$('.basicModal .choice input[name="password"]').on('change', function() {
+
+			if ($(this).prop('checked')===true)	$('.basicModal .choice input[data-name="password"]').show().focus();
+			else								$('.basicModal .choice input[data-name="password"]').hide();
 
 		});
 
@@ -331,23 +452,21 @@ album.setPublic = function(albumID, e) {
 
 	}
 
-	if (visible.message()) {
+	if (basicModal.visible()) {
 
-		if ($('.message .choice input[name="password"]:checked').val()==='password') {
+		if ($('.basicModal .choice input[name="password"]:checked').length===1) {
-			password			= md5($('.message input.text').val());
+			password			= $('.basicModal .choice input[data-name="password"]').val();
 			album.json.password	= 1;
 		} else {
 			password			= '';
 			album.json.password	= 0;
 		}
 
-		if ($('.message .choice input[name="listed"]:checked').val()==='listed')				listed = true;
+		if ($('.basicModal .choice input[name="listed"]:checked').length===1)		listed = true;
-		if ($('.message .choice input[name="downloadable"]:checked').val()==='downloadable')	downloadable = true;
+		if ($('.basicModal .choice input[name="downloadable"]:checked').length===1)	downloadable = true;
 
 	}
 
-	params = 'setAlbumPublic&albumID=' + albumID + '&password=' + password + '&visible=' + listed + '&downloadable=' + downloadable;
-
 	if (visible.album()) {
 
 		album.json.public	= (album.json.public==0) ? 1 : 0;
@@ -360,7 +479,14 @@ album.setPublic = function(albumID, e) {
 
 	}
 
-	lychee.api(params, function(data) {
+	params = {
+		albumID,
+		password,
+		visible: listed,
+		downloadable
+	}
+
+	api.post('Album::setPublic', params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
 
@@ -395,7 +521,7 @@ album.share = function(service) {
 album.getArchive = function(albumID) {
 
 	var link,
-		url = 'php/api.php?function=getAlbumArchive&albumID=' + albumID;
+		url = api.path + '?function=Album::getArchive&albumID=' + albumID;
 
 	if (location.href.indexOf('index.html')>0)	link = location.href.replace(location.hash, '').replace('index.html', url);
 	else										link = location.href.replace(location.hash, '') + url;

src/scripts/albums.js

@@ -1,6 +1,6 @@
 /**
  * @description	Takes care of every action albums can handle and execute.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 albums = {
@@ -22,7 +22,7 @@ albums.load = function() {
 
 	if (albums.json===null) {
 
-		lychee.api('getAlbums', function(data) {
+		api.post('Album::getAll', {}, function(data) {
 
 			/* Smart Albums */
 			data.unsortedAlbum = {
@@ -77,7 +77,7 @@ albums.load = function() {
 			if (visible.album()&&lychee.content.html()==='')			waitTime = 0;
 
 			setTimeout(function() {
-				view.header.mode('albums');
+				header.setMode('albums');
 				view.albums.init();
 				lychee.animate('.album, .photo', 'contentZoomIn');
 			}, waitTime);
@@ -86,7 +86,7 @@ albums.load = function() {
 	} else {
 
 		setTimeout(function() {
-			view.header.mode('albums');
+			header.setMode('albums');
 			view.albums.init();
 			lychee.animate('.album, .photo', 'contentZoomIn');
 		}, 300);

src/scripts/api.js

@@ -0,0 +1,63 @@
+/**
+ * @description	This module communicates with Lychee's API
+ * @copyright	2015 by Tobias Reich
+ */
+
+api = {
+
+	path: 'php/api.php'
+
+}
+
+api.post = function(fn, params, callback) {
+
+	var success,
+		error;
+
+	loadingBar.show();
+
+	params =  $.extend({function: fn}, params);
+
+	success = function(data) {
+
+		setTimeout(function() { loadingBar.hide() }, 100);
+
+		// Catch errors
+		if (typeof data==='string'&&
+			data.substring(0, 7)==='Error: ') {
+				lychee.error(data.substring(7, data.length), params, data);
+				return false;
+		}
+
+		// Convert 1 to true and an empty string to false
+		if (data==='1')		data = true;
+		else if (data==='')	data = false;
+
+		// Convert to JSON if string start with '{' and ends with '}'
+		if (typeof data==='string'&&
+			data.substring(0, 1)==='{'&&
+			data.substring(data.length-1, data.length)==='}') data = $.parseJSON(data);
+
+		// Output response when debug mode is enabled
+		if (lychee.debugMode) console.log(data);
+
+		callback(data);
+
+	}
+
+	error = function(jqXHR, textStatus, errorThrown) {
+
+		lychee.error('Server error or API not found.', params, errorThrown);
+
+	}
+
+	$.ajax({
+		type: 'POST',
+		url: api.path,
+		data: params,
+		dataType: 'text',
+		success,
+		error
+	});
+
+}

src/scripts/build.coffee

@@ -1,424 +0,0 @@
-###
-# @description	This module is used to generate HTML-Code.
-# @copyright	2014 by Tobias Reich
-###
-
-window.build = {}
-
-build.divider = (title) ->
-
-	"<div class='divider fadeIn'><h1>#{ title }</h1></div>"
-
-build.editIcon = (id) ->
-
-	"<div id='#{ id }' class='edit'><a class='icon-pencil'></a></div>"
-
-build.multiselect = (top, left) ->
-
-	"<div id='multiselect' style='top: #{ top }px; left: #{ left }px;'></div>"
-
-build.album = (data) ->
-
-	return '' if not data?
-
-	title		= data.title
-	longTitle	= ''
-	typeThumb	= ''
-
-	if title? and title.length > 18
-
-		title		= data.title.substr(0, 18) + '...'
-		longTitle	= data.title
-
-	if data.thumb0.split('.').pop() is 'svg' then typeThumb = 'nonretina'
-
-	html =	"""
-			<div  class='album' data-id='#{ data.id }' data-password='#{ data.password }'>
-				<img src='#{ data.thumb2 }' width='200' height='200' alt='thumb' data-type='nonretina'>
-				<img src='#{ data.thumb1 }' width='200' height='200' alt='thumb' data-type='nonretina'>
-				<img src='#{ data.thumb0 }' width='200' height='200' alt='thumb' data-type='#{ typeThumb }'>
-				<div class='overlay'>
-			"""
-
-	if data.password and lychee.publicMode is false
-		html += "<h1 title='#{ longTitle }'><span class='icon-lock'></span> #{ title }</h1>";
-	else
-		html += "<h1 title='#{ longTitle }'>#{ title }</h1>"
-
-	html +=	"""
-					<a>#{ data.sysdate }</a>
-				</div>
-			"""
-
-	if lychee.publicMode is false
-
-		if data.star is '1' then		html += "<a class='badge icon-star'></a>"
-		if data.public is '1' then		html += "<a class='badge icon-share'></a>"
-		if data.unsorted is '1' then	html += "<a class='badge icon-reorder'></a>"
-		if data.recent is '1' then		html += "<a class='badge icon-time'></a>"
-
-	html += "</div>"
-
-	return html
-
-build.photo = (data) ->
-
-	return '' if not data?
-
-	title		= data.title
-	longTitle	= ''
-
-	if title? and title.length > 18
-
-		title		= data.title.substr(0, 18) + '...'
-		longTitle	= data.title
-
-	html =	"""
-			<div class='photo' data-album-id='#{ data.album }' data-id='#{ data.id }'>
-				<img src='#{ data.thumbUrl }' width='200' height='200' alt='thumb'>
-				<div class='overlay'>
-					<h1 title='#{ longTitle }'>#{ title }</h1>
-			"""
-
-	if data.cameraDate is '1'
-		html += "<a><span class='icon-camera' title='Photo Date'></span>#{ data.sysdate }</a>"
-	else
-		html += "<a>#{ data.sysdate }</a>"
-
-	html += "</div>"
-
-	if data.star is '1' then html += "<a class='badge icon-star'></a>"
-	if lychee.publicMode is false and data.public is '1' and album.json.public isnt '1' then html += "<a class='badge icon-share'></a>"
-
-	html += "</div>"
-
-	return html
-
-build.imageview = (data, size, visibleControls) ->
-
-	return '' if not data?
-
-	html =	"""
-			<div class='arrow_wrapper previous'><a id='previous' class='icon-caret-left'></a></div>
-			<div class='arrow_wrapper next'><a id='next' class='icon-caret-right'></a></div>
-			"""
-
-	if size is 'big'
-
-		if visibleControls is true
-			html += "<div id='image' style='background-image: url(#{ data.url })'></div>"
-		else
-			html += "<div id='image' style='background-image: url(#{ data.url });' class='full'></div>"
-
-	else if size is 'medium'
-
-		if visibleControls is true
-			html += "<div id='image' style='background-image: url(#{ data.medium })'></div>"
-		else
-			html += "<div id='image' style='background-image: url(#{ data.medium });' class='full'></div>"
-
-	else if size is 'small'
-
-		if visibleControls is true
-			html += "<div id='image' class='small' style='background-image: url(#{ data.url }); width: #{ data.width }px; height: #{ data.height }px; margin-top: -#{ parseInt(data.height/2-20) }px; margin-left: -#{ data.width/2 }px;'></div>"
-		else
-			html += "<div id='image' class='small' style='background-image: url(#{ data.url }); width: #{ data.width }px; height: #{ data.height }px; margin-top: -#{ parseInt(data.height/2) }px; margin-left: -#{ data.width/2 }px;'></div>"
-
-	return html
-
-build.no_content = (typ) ->
-
-	html =	"""
-			<div class='no_content fadeIn'>
-				<a class='icon icon-#{ typ }'></a>
-			"""
-
-	switch typ
-		when 'search' then		html += "<p>No results</p>"
-		when 'share' then		html += "<p>No public albums</p>"
-		when 'cog' then			html += "<p>No configuration</p>"
-
-	html += "</div>"
-
-	return html
-
-build.modal = (title, text, button, marginTop, closeButton) ->
-
-	if marginTop? then	custom_style = "style='margin-top: #{ marginTop }px;'"
-	else				custom_style = ''
-
-	html =	"""
-			<div class='message_overlay fadeIn'>
-				<div class='message center' #{ custom_style }>
-					<h1>#{ title }</h1>
-			"""
-
-	if closeButton isnt false then html += "<a class='close icon-remove-sign'></a>"
-
-	html += "<p>#{ text }</p>"
-
-	$.each button, (index) ->
-
-		if this[0] isnt ''
-
-			if index is 0 then	html += "<a class='button active'>#{ this[0] }</a>"
-			else				html += "<a class='button'>#{ this[0] }</a>"
-
-	html +=	"""
-				</div>
-			</div>
-			"""
-
-	return html
-
-build.signInModal = ->
-
-	html =	"""
-			<div class='message_overlay'>
-				<div class='message center'>
-					<h1><a class='icon-lock'></a> Sign In</h1>
-					<a class='close icon-remove-sign'></a>
-					<div class='sign_in'>
-						<input id='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
-						<input id='password' type='password' value='' placeholder='password'>
-					</div>
-					<div id='version'>Version #{ lychee.version }<span> &#8211; <a target='_blank' href='#{ lychee.updateURL }'>Update available!</a><span></div>
-					<a onclick='lychee.login()' class='button active'>Sign in</a>
-				</div>
-			</div>
-			"""
-
-	return html
-
-build.uploadModal = (title, files) ->
-
-	html =	"""
-			<div class='upload_overlay fadeIn'>
-				<div class='upload_message center'>
-					<h1>#{ title }</h1>
-					<a class='close icon-remove-sign'></a>
-					<div class='rows'>
-			"""
-
-	i		= 0
-	file	= null
-
-	while i < files.length
-
-		file = files[i]
-
-		if file.name.length > 40
-			file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length-20, 20)
-
-		html +=	"""
-				<div class='row'>
-					<a class='name'>#{ lychee.escapeHTML(file.name) }</a>
-				"""
-
-		if file.supported is true then	html += "<a class='status'></a>"
-		else							html += "<a class='status error'>Not supported</a>"
-
-		html +=	"""
-					<p class='notice'></p>
-				</div>
-				"""
-
-		i++
-
-	html +=	"""
-					</div>
-				</div>
-			</div>
-			"""
-
-	return html
-
-build.tags = (tags, forView) ->
-
-	html = ''
-
-	if forView is true or lychee.publicMode is true then	editTagsHTML = ''
-	else													editTagsHTML = ' ' + build.editIcon('edit_tags')
-
-	if tags isnt ''
-
-		tags = tags.split ','
-
-		tags.forEach (tag, index, array) ->
-			html += "<a class='tag'>#{ tag }<span class='icon-remove' data-index='#{ index }'></span></a>"
-
-		html += editTagsHTML
-
-	else
-
-		html = "<div class='empty'>No Tags#{ editTagsHTML }</div>"
-
-	return html
-
-build.infoboxPhoto = (data, forView) ->
-
-	html =	"""
-			<div class='header'><h1>About</h1><a class='icon-remove-sign'></a></div>
-			<div class='wrapper'>
-			"""
-
-	switch data.public
-		when '0' then	visible = 'No'
-		when '1' then	visible = 'Yes'
-		when '2' then	visible = 'Yes (Album)'
-		else			visible = '-'
-
-	if forView is true or lychee.publicMode is true then	editTitleHTML = ''
-	else													editTitleHTML = ' ' + build.editIcon('edit_title')
-
-	if forView is true or lychee.publicMode is true then	editDescriptionHTML = ''
-	else													editDescriptionHTML = ' ' + build.editIcon('edit_description')
-
-	infos = [
-		['', 'Basics']
-		['Title', data.title + editTitleHTML]
-		['Uploaded', data.sysdate]
-		['Description', data.description + editDescriptionHTML]
-		['', 'Image']
-		['Size', data.size]
-		['Format', data.type]
-		['Resolution', data.width + ' x ' + data.height]
-		['Tags', build.tags(data.tags, forView)]
-	]
-
-	exifHash = data.takestamp+data.make+data.model+data.shutter+data.aperture+data.focal+data.iso
-
-	if exifHash isnt '0' or exifHash isnt '0'
-
-		infos = infos.concat [
-			['', 'Camera']
-			['Captured', data.takedate]
-			['Make', data.make]
-			['Type/Model', data.model]
-			['Shutter Speed', data.shutter]
-			['Aperture', data.aperture]
-			['Focal Length', data.focal]
-			['ISO', data.iso]
-		]
-
-	infos = infos.concat [
-		['', 'Share']
-		['Public', visible]
-	]
-
-	infos.forEach (info, i, items) ->
-
-		if	info[1] is '' or
-			not info[1]?
-
-				info[1] = '-'
-
-		switch info[0]
-
-			when ''
-
-				# Separator
-				html +=	"""
-						</table>
-						<div class='separator'><h1>#{ info[1] }</h1></div>
-						<table>
-						"""
-
-			when 'Tags'
-
-				# Tags
-				if forView isnt true and lychee.publicMode is false
-
-					html +=	"""
-							</table>
-							<div class='separator'><h1>#{ info[0] }</h1></div>
-							<div id='tags'>#{ info[1] }</div>
-							"""
-
-			else
-
-				# Item
-				html += """
-						<tr>
-							<td>#{ info[0] }</td>
-							<td class='attr_#{ info[0].toLowerCase() }'>#{ info[1] }</td>
-						</tr>
-						"""
-
-	html +=	"""
-			</table>
-			<div class='bumper'></div>
-			</div>
-			"""
-
-	return html
-
-build.infoboxAlbum = (data, forView) ->
-
-	html =	"""
-			<div class='header'><h1>About</h1><a class='icon-remove-sign'></a></div>
-			<div class='wrapper'>
-			"""
-
-	switch data.public
-		when '0' then	visible = 'No'
-		when '1' then	visible = 'Yes'
-		else			visible = '-'
-
-	switch data.password
-		when false then	password = 'No'
-		when true then	password = 'Yes'
-		else			password = '-'
-
-	switch data.downloadable
-		when '0' then	downloadable = 'No'
-		when '1' then	downloadable = 'Yes'
-		else			downloadable = '-'
-
-	if forView is true or lychee.publicMode is true then	editTitleHTML = ''
-	else													editTitleHTML = ' ' + build.editIcon('edit_title_album')
-
-	if forView is true or lychee.publicMode is true then	editDescriptionHTML = ''
-	else													editDescriptionHTML = ' ' + build.editIcon('edit_description_album')
-
-	infos = [
-		['', 'Basics']
-		['Title', data.title + editTitleHTML]
-		['Description', data.description + editDescriptionHTML]
-		['', 'Album']
-		['Created', data.sysdate]
-		['Images', data.num]
-		['', 'Share']
-		['Public', visible]
-		['Downloadable', downloadable]
-		['Password', password]
-	]
-
-	infos.forEach (info, i, items) ->
-
-		if info[0] is ''
-
-			# Separator
-			html +=	"""
-					</table>
-					<div class='separator'><h1>#{ info[1] }</h1></div>
-					<table id='infos'>
-					"""
-
-		else
-
-			# Item
-			html += """
-					<tr>
-						<td>#{ info[0] }</td>
-						<td class='attr_#{ info[0].toLowerCase() }'>#{ info[1] }</td>
-					</tr>
-					"""
-
-	html += """
-			</table>
-			<div class='bumper'></div>
-			</div>
-			"""
-
-	return html

src/scripts/build.js

@@ -0,0 +1,496 @@
+/**
+ * @description	This module is used to generate HTML-Code.
+ * @copyright	2015 by Tobias Reich
+ */
+
+window.build = {}
+
+build.iconic = function(icon, classes, file) {
+
+	var html	= '',
+		path	= 'src/images/';
+
+	file	= file		|| 'iconic';
+	classes	= classes	|| '';
+
+	html =	`
+			<svg viewBox='0 0 8 8' class='iconic ${ classes }'>
+				<use xlink:href='${ path }${ file }.svg#${ icon }' />
+			</svg>
+			`
+
+	return html;
+
+}
+
+build.divider = function(title) {
+
+	var html = '';
+
+	html =	`
+			<div class='divider fadeIn'>
+				<h1>${ title }</h1>
+			</div>
+			`
+
+	return html;
+
+}
+
+build.editIcon = function(id) {
+
+	var html = '';
+
+	html =	`<div id='${ id }' class='edit'>${ build.iconic('pencil') }</div>`
+
+	return html;
+
+}
+
+build.multiselect = function(top, left) {
+
+	var html = '';
+
+	html =	`<div id='multiselect' style='top: ${ top }px; left: ${ left }px;'></div>`
+
+	return html;
+
+}
+
+build.album = function(data) {
+
+	if (data===null||data===undefined) return '';
+
+	var html		= '',
+		title		= data.title,
+		longTitle	= '',
+		typeThumb	= '';
+
+	if (title!==null&&title.length>18) {
+
+		title		= data.title.substr(0, 18) + '...';
+		longTitle	= data.title;
+
+	}
+
+	if (data.thumb0.split('.').pop()==='svg') typeThumb = 'nonretina';
+
+	html =	`
+			<div class='album' data-id='${ data.id }' data-password='${ data.password }'>
+				<img src='${ data.thumb2 }' width='200' height='200' alt='thumb' data-type='nonretina'>
+				<img src='${ data.thumb1 }' width='200' height='200' alt='thumb' data-type='nonretina'>
+				<img src='${ data.thumb0 }' width='200' height='200' alt='thumb' data-type='${ typeThumb }'>
+				<div class='overlay'>
+					<h1 title='${ longTitle }'>${ title }</h1>
+					<a>${ data.sysdate }</a>
+				</div>
+			`
+
+	if (lychee.publicMode===false) {
+
+		if (data.star==='1')		html += `<a class='badge icn-star'>${ build.iconic('star') }</a>`;
+		if (data.public==='1')		html += `<a class='badge icn-share'>${ build.iconic('eye') }</a>`;
+		if (data.unsorted==='1')	html += `<a class='badge'>${ build.iconic('list') }</a>`;
+		if (data.recent==='1')		html += `<a class='badge'>${ build.iconic('clock') }</a>`;
+		if (data.password===true)	html += `<a class='badge'>${ build.iconic('lock-locked') }</a>`;
+
+	}
+
+	html += '</div>'
+
+	return html;
+
+}
+
+build.photo = function(data) {
+
+	if (data===null||data===undefined) return '';
+
+	var html		= '',
+		title		= data.title,
+		longTitle	= '';
+
+	if (title!==null&&title.length>18) {
+
+		title		= data.title.substr(0, 18) + '...';
+		longTitle	= data.title;
+
+	}
+
+	html =	`
+			<div class='photo' data-album-id='${ data.album }' data-id='${ data.id }'>
+				<img src='${ data.thumbUrl }' width='200' height='200' alt='thumb'>
+				<div class='overlay'>
+					<h1 title='${ longTitle }'>${ title }</h1>
+			`
+
+	if (data.cameraDate===1)	html += `<a><span title='Camera Date'>${ build.iconic('camera-slr') }</span>${ data.sysdate }</a>`;
+	else						html += `<a>${ data.sysdate }</a>`;
+
+	html += '</div>';
+
+	if (lychee.publicMode===false) {
+
+		if (data.star==='1') html += `<a class='badge iconic-star'>${ build.iconic('star') }</a>`;
+		if (data.public==='1'&&album.json.public!=='1') html += `<a class='badge iconic-share'>${ build.iconic('eye') }</a>`;
+
+	}
+
+	html += '</div>';
+
+	return html
+
+}
+
+build.imageview = function(data, size, visibleControls) {
+
+	if (data===null||data===undefined) return '';
+
+	var html = '';
+
+	html =	`
+			<div class='arrow_wrapper arrow_wrapper--previous'><a id='previous'>${ build.iconic('caret-left') }</a></div>
+			<div class='arrow_wrapper arrow_wrapper--next'><a id='next'>${ build.iconic('caret-right') }</a></div>
+			`
+
+	if (size==='big') {
+
+		if (visibleControls===true)
+			html += `<div id='image' style='background-image: url(${ data.url })'></div>`;
+		else
+			html += `<div id='image' style='background-image: url(${ data.url });' class='full'></div>`;
+
+	} else if (size==='medium') {
+
+		if (visibleControls===true)
+			html += `<div id='image' style='background-image: url(${ data.medium })'></div>`;
+		else
+			html += `<div id='image' style='background-image: url(${ data.medium });' class='full'></div>`;
+
+	} else if (size==='small') {
+
+		if (visibleControls===true)
+			html += `<div id='image' class='small' style='background-image: url(${ data.url }); width: ${ data.width }px; height: ${ data.height }px; margin-top: -${ parseInt(data.height/2-20) }px; margin-left: -${ data.width/2 }px;'></div>`;
+		else
+			html += `<div id='image' class='small' style='background-image: url(${ data.url }); width: ${ data.width }px; height: ${ data.height }px; margin-top: -${ parseInt(data.height/2) }px; margin-left: -${ data.width/2 }px;'></div>`;
+
+	}
+
+	return html;
+
+}
+
+build.no_content = function(typ) {
+
+	var html;
+
+	html =	`
+			<div class='no_content fadeIn'>
+				${ build.iconic(typ) }
+			`
+
+	switch (typ) {
+		case 'magnifying-glass':	html += '<p>No results</p>';
+									break;
+		case 'eye':					html += '<p>No public albums</p>';
+									break;
+		case 'cog':					html += '<p>No configuration</p>';
+									break;
+	}
+
+	html += '</div>';
+
+	return html;
+
+}
+
+build.uploadModal = function(title, files) {
+
+	var html	= '',
+		i		= 0,
+		file	= null;
+
+	html =	`
+			<h1>${ title }</h1>
+			<div class='rows'>
+			`
+
+	while (i<files.length) {
+
+		file = files[i];
+
+		if (file.name.length>40) file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length-20, 20);
+
+		html +=	`
+				<div class='row'>
+					<a class='name'>${ lychee.escapeHTML(file.name) }</a>
+				`
+
+		if (file.supported===true)	html += `<a class='status'></a>`;
+		else						html += `<a class='status error'>Not supported</a>`;
+
+		html +=	`
+					<p class='notice'></p>
+				</div>
+				`
+
+		i++;
+
+	}
+
+	html +=	'</div>';
+
+	return html;
+
+}
+
+build.tags = function(tags, forView) {
+
+	var html			= '',
+		editTagsHTML	= '';
+
+	if (forView!==true&&lychee.publicMode!==true) editTagsHTML = ' ' + build.editIcon('edit_tags');
+
+	if (tags!=='') {
+
+		tags = tags.split(',');
+
+		tags.forEach(function(tag, index, array) {
+			html += `<a class='tag'>${ tag }<span data-index='${ index }'>${ build.iconic('x') }</span></a>`
+		});
+
+		html += editTagsHTML;
+
+	} else {
+
+		html = `<div class='empty'>No Tags${ editTagsHTML }</div>`;
+
+	}
+
+	return html;
+
+}
+
+build.infoboxPhoto = function(data, forView) {
+
+	var html				= '',
+		visible				= '',
+		editTitleHTML		= '',
+		editDescriptionHTML	= '',
+		exifHash			= '',
+		info				= [];
+
+	switch (data.public) {
+
+		case '0':	visible = 'No';
+					break;
+		case '1':	visible = 'Yes';
+					break;
+		case '2':	visible = 'Yes (Album)';
+					break;
+		default:	visible = '-';
+					break;
+
+	}
+
+	if (forView!==true&&lychee.publicMode!==true) {
+		editTitleHTML		= ' ' + build.editIcon('edit_title');
+		editDescriptionHTML	= ' ' + build.editIcon('edit_description');
+	}
+
+	infos = [
+		['', 'Basics'],
+		['Title', data.title + editTitleHTML],
+		['Uploaded', data.sysdate],
+		['Description', data.description + editDescriptionHTML],
+		['', 'Image'],
+		['Size', data.size],
+		['Format', data.type],
+		['Resolution', data.width + ' x ' + data.height],
+		['Tags', build.tags(data.tags, forView)]
+	]
+
+	exifHash = data.takestamp+data.make+data.model+data.shutter+data.aperture+data.focal+data.iso;
+
+	if (exifHash!=='0') {
+
+		infos = infos.concat([
+			['', 'Camera'],
+			['Captured', data.takedate],
+			['Make', data.make],
+			['Type/Model', data.model],
+			['Shutter Speed', data.shutter],
+			['Aperture', data.aperture],
+			['Focal Length', data.focal],
+			['ISO', data.iso]
+		]);
+
+	}
+
+	infos = infos.concat([
+		['', 'Share'],
+		['Public', visible]
+	]);
+
+	infos.forEach(function(info, i, items) {
+
+		// Set default for empty values
+		if (info[1]===''||info[1]===null||info[1]===undefined) info[1] = '-';
+
+		switch (info[0]) {
+
+			case '':
+
+				// Divider
+				html +=	`
+						</table>
+						<div class='divider'>
+							<h1>${ info[1] }</h1>
+						</div>
+						<table>
+						`
+
+				break;
+
+			case 'Tags':
+
+				// Tags
+				if (forView!==true&&lychee.publicMode===false) {
+
+					html +=	`
+							</table>
+							<div class='divider'>
+								<h1>${ info[0] }</h1>
+							</div>
+							<div id='tags'>${ info[1] }</div>
+							`
+
+				}
+
+				break;
+
+			default:
+
+				// Item
+				html += `
+						<tr>
+							<td>${ info[0] }</td>
+							<td class='attr_${ info[0].toLowerCase() }'>${ info[1] }</td>
+						</tr>
+						`
+
+				break;
+
+		}
+
+
+	});
+
+	html +=	`
+			</table>
+			<div class='bumper'></div>
+			`
+
+	return html;
+
+}
+
+build.infoboxAlbum = function(data, forView) {
+
+	var html				= '',
+		visible				= '',
+		password			= '',
+		downloadable		= '',
+		editTitleHTML		= '',
+		editDescriptionHTML	= '',
+		infos				= [];
+
+	switch (data.public) {
+
+		case '0':	visible = 'No';
+					break;
+		case '1': 	visible = 'Yes';
+					break;
+		default:	visible = '-';
+					break;
+
+	}
+
+	switch (data.password) {
+
+		case false:	password = 'No';
+					break;
+		case true:	password = 'Yes';
+					break;
+		default:	password = '-';
+					break;
+
+	}
+
+	switch (data.downloadable) {
+
+		case '0':	downloadable = 'No';
+					break;
+		case '1':	downloadable = 'Yes';
+					break;
+		default:	downloadable = '-';
+					break;
+
+	}
+
+	if (forView!==true&&lychee.publicMode!==true) {
+		editTitleHTML		= ' ' + build.editIcon('edit_title_album');
+		editDescriptionHTML	= ' ' + build.editIcon('edit_description_album');
+	}
+
+	infos = [
+		['', 'Basics'],
+		['Title', data.title + editTitleHTML],
+		['Description', data.description + editDescriptionHTML],
+		['', 'Album'],
+		['Created', data.sysdate],
+		['Images', data.num],
+		['', 'Share'],
+		['Public', visible],
+		['Downloadable', downloadable],
+		['Password', password]
+	]
+
+	infos.forEach(function(info, i, items) {
+
+		// Set default for empty values
+		if (info[1]===''||info[1]===null||info[1]===undefined) info[1] = '-';
+
+		if (info[0]==='') {
+
+			// Divider
+			html +=	`
+					</table>
+					<div class='divider'>
+						<h1>${ info[1] }</h1>
+					</div>
+					<table id='infos'>
+					`
+
+		} else {
+
+			// Item
+			html += `
+					<tr>
+						<td>${ info[0] }</td>
+						<td class='attr_${ info[0].toLowerCase() }'>${ info[1] }</td>
+					</tr>
+					`
+
+		}
+
+	});
+
+	html += `
+			</table>
+			<div class='bumper'></div>
+			`
+
+	return html;
+
+}

src/scripts/contextMenu.js

@@ -1,6 +1,6 @@
 /**
  * @description	This module is used for the context menu.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 contextMenu = {}
@@ -8,13 +8,13 @@ contextMenu = {}
 contextMenu.add = function(e) {
 
 	var items = [
-		{ type: 'item', title: 'Upload Photo', icon: 'icon-picture', fn: function() { $('#upload_files').click() } },
+		{ type: 'item', title: build.iconic('image') + 'Upload Photo', fn: function() { $('#upload_files').click() } },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Import from Link', icon: 'icon-link', fn: upload.start.url },
+		{ type: 'item', title: build.iconic('link-intact') + 'Import from Link', fn: upload.start.url },
-		{ type: 'item', title: 'Import from Dropbox', icon: 'icon-folder-open', fn: upload.start.dropbox },
+		{ type: 'item', title: build.iconic('dropbox', 'ionicons', 'ionicons') + 'Import from Dropbox', fn: upload.start.dropbox },
-		{ type: 'item', title: 'Import from Server', icon: 'icon-hdd', fn: upload.start.server },
+		{ type: 'item', title: build.iconic('terminal') + 'Import from Server', fn: upload.start.server },
 		{ type: 'separator' },
-		{ type: 'item', title: 'New Album', icon: 'icon-folder-close', fn: album.add }
+		{ type: 'item', title: build.iconic('folder') + 'New Album', fn: album.add }
 	];
 
 	basicContext.show(items, e);
@@ -26,15 +26,15 @@ contextMenu.add = function(e) {
 contextMenu.settings = function(e) {
 
 	var items = [
-		{ type: 'item', title: 'Change Login', icon: 'icon-user', fn: settings.setLogin },
+		{ type: 'item', title: build.iconic('person') + 'Change Login', fn: settings.setLogin },
-		{ type: 'item', title: 'Change Sorting', icon: 'icon-sort', fn: settings.setSorting },
+		{ type: 'item', title: build.iconic('sort-ascending') + 'Change Sorting', fn: settings.setSorting },
-		{ type: 'item', title: 'Set Dropbox', icon: 'icon-folder-open', fn: settings.setDropboxKey },
+		{ type: 'item', title: build.iconic('dropbox', 'ionicons', 'ionicons') + 'Set Dropbox', fn: settings.setDropboxKey },
 		{ type: 'separator' },
-		{ type: 'item', title: 'About Lychee', icon: 'icon-info-sign', fn: function() { window.open(lychee.website) } },
+		{ type: 'item', title: build.iconic('info') + 'About Lychee', fn: function() { window.open(lychee.website) } },
-		{ type: 'item', title: 'Diagnostics', icon: 'icon-dashboard', fn: function() { window.open('plugins/check/') } },
+		{ type: 'item', title: build.iconic('wrench') + 'Diagnostics', fn: function() { window.open('plugins/check/') } },
-		{ type: 'item', title: 'Show Log', icon: 'icon-list', fn: function() { window.open('plugins/displaylog/') } },
+		{ type: 'item', title: build.iconic('align-left') + 'Show Log', fn: function() { window.open('plugins/displaylog/') } },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Sign Out', icon: 'icon-signout', fn: lychee.logout }
+		{ type: 'item', title: build.iconic('account-logout') + 'Sign Out', fn: lychee.logout }
 	];
 
 	basicContext.show(items, e);
@@ -46,8 +46,8 @@ contextMenu.album = function(albumID, e) {
 	if (albumID==='0'||albumID==='f'||albumID==='s'||albumID==='r') return false;
 
 	var items = [
-		{ type: 'item', title: 'Rename', icon: 'icon-edit', fn: function() { album.setTitle([albumID]) } },
+		{ type: 'item', title: build.iconic('pencil') + 'Rename', fn: function() { album.setTitle([albumID]) } },
-		{ type: 'item', title: 'Delete', icon: 'icon-trash', fn: function() { album.delete([albumID]) } }
+		{ type: 'item', title: build.iconic('trash') + 'Delete', fn: function() { album.delete([albumID]) } }
 	];
 
 	$('.album[data-id="' + albumID + '"]').addClass('active');
@@ -61,14 +61,48 @@ contextMenu.albumMulti = function(albumIDs, e) {
 	multiselect.stopResize();
 
 	var items = [
-		{ type: 'item', title: 'Rename All', icon: 'icon-edit', fn: function() { album.setTitle(albumIDs) } },
+		{ type: 'item', title: build.iconic('pencil') + 'Rename All', fn: function() { album.setTitle(albumIDs) } },
-		{ type: 'item', title: 'Delete All', icon: 'icon-trash', fn: function() { album.delete(albumIDs) } }
+		{ type: 'item', title: build.iconic('trash') + 'Delete All', fn: function() { album.delete(albumIDs) } }
 	];
 
 	basicContext.show(items, e, contextMenu.close);
 
 }
 
+contextMenu.albumTitle = function(albumID, e) {
+
+	var items = [
+		{ type: 'item', title: build.iconic('pencil') + 'Rename', fn: function() { album.setTitle([albumID]) } }
+	];
+
+	api.post('Album::getAll', {}, function(data) {
+
+		if (data.num>1) {
+
+			items.push({ type: 'separator' });
+
+			// Generate list of albums
+			$.each(data.content, function(index) {
+
+				var that	= this,
+					title	= '';
+
+				if (!that.thumb0) that.thumb0 = 'src/images/no_cover.svg';
+
+				title = "<img class='cover' width='16' height='16' src='" + that.thumb0 + "'><div class='title'>" + that.title + "</div>";
+
+				if (that.id!=albumID) items.push({ type: 'item', title, fn: function() { lychee.goto(that.id) } });
+
+			});
+
+		}
+
+		basicContext.show(items, e, contextMenu.close);
+
+	});
+
+}
+
 contextMenu.photo = function(photoID, e) {
 
 	// Notice for 'Move':
@@ -76,13 +110,13 @@ contextMenu.photo = function(photoID, e) {
 	// in order to keep the selection
 
 	var items = [
-		{ type: 'item', title: 'Star', icon: 'icon-star', fn: function() { photo.setStar([photoID]) } },
+		{ type: 'item', title: build.iconic('star') + 'Star', fn: function() { photo.setStar([photoID]) } },
-		{ type: 'item', title: 'Tags', icon: 'icon-tags', fn: function() { photo.editTags([photoID]) } },
+		{ type: 'item', title: build.iconic('tag') + 'Tags', fn: function() { photo.editTags([photoID]) } },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Rename', icon: 'icon-edit', fn: function() { photo.setTitle([photoID]) } },
+		{ type: 'item', title: build.iconic('pencil') + 'Rename', fn: function() { photo.setTitle([photoID]) } },
-		{ type: 'item', title: 'Duplicate', icon: 'icon-copy', fn: function() { photo.duplicate([photoID]) } },
+		{ type: 'item', title: build.iconic('layers') + 'Duplicate', fn: function() { photo.duplicate([photoID]) } },
-		{ type: 'item', title: 'Move', icon: 'icon-folder-open', fn: function() { basicContext.close(); contextMenu.move([photoID], e); } },
+		{ type: 'item', title: build.iconic('folder') + 'Move', fn: function() { basicContext.close(); contextMenu.move([photoID], e); } },
-		{ type: 'item', title: 'Delete', icon: 'icon-trash', fn: function() { photo.delete([photoID]) } }
+		{ type: 'item', title: build.iconic('trash') + 'Delete', fn: function() { photo.delete([photoID]) } }
 	];
 
 	$('.photo[data-id="' + photoID + '"]').addClass('active');
@@ -100,24 +134,54 @@ contextMenu.photoMulti = function(photoIDs, e) {
 	multiselect.stopResize();
 
 	var items = [
-		{ type: 'item', title: 'Star All', icon: 'icon-star', fn: function() { photo.setStar(photoIDs) } },
+		{ type: 'item', title: build.iconic('star') + 'Star All', fn: function() { photo.setStar(photoIDs) } },
-		{ type: 'item', title: 'Tag All', icon: 'icon-tags', fn: function() { photo.editTags(photoIDs) } },
+		{ type: 'item', title: build.iconic('tag') + 'Tag All', fn: function() { photo.editTags(photoIDs) } },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Rename All', icon: 'icon-edit', fn: function() { photo.setTitle(photoIDs) } },
+		{ type: 'item', title: build.iconic('pencil') + 'Rename All', fn: function() { photo.setTitle(photoIDs) } },
-		{ type: 'item', title: 'Duplicate All', icon: 'icon-copy', fn: function() { photo.duplicate(photoIDs) } },
+		{ type: 'item', title: build.iconic('layers') + 'Duplicate All', fn: function() { photo.duplicate(photoIDs) } },
-		{ type: 'item', title: 'Move All', icon: 'icon-folder-open', fn: function() { basicContext.close(); contextMenu.move(photoIDs, e); } },
+		{ type: 'item', title: build.iconic('folder') + 'Move All', fn: function() { basicContext.close(); contextMenu.move(photoIDs, e); } },
-		{ type: 'item', title: 'Delete All', icon: 'icon-trash', fn: function() { photo.delete(photoIDs) } }
+		{ type: 'item', title: build.iconic('trash') + 'Delete All', fn: function() { photo.delete(photoIDs) } }
 	];
 
 	basicContext.show(items, e, contextMenu.close);
 
 }
 
+contextMenu.photoTitle = function(albumID, photoID, e) {
+
+	var items = [
+		{ type: 'item', title: build.iconic('pencil') + 'Rename', fn: function() { photo.setTitle([photoID]) } }
+	];
+
+	var data = album.json;
+
+	if (data.num>1) {
+
+		items.push({ type: 'separator' });
+
+		// Generate list of albums
+		$.each(data.content, function(index) {
+
+			var that	= this,
+				title	= '';
+
+			title = "<img class='cover' width='16' height='16' src='" + that.thumbUrl + "'><div class='title'>" + that.title + "</div>";
+
+			if (that.id!=photoID) items.push({ type: 'item', title, fn: function() { lychee.goto(albumID + '/' + that.id) } });
+
+		});
+
+	}
+
+	basicContext.show(items, e, contextMenu.close);
+
+}
+
 contextMenu.photoMore = function(photoID, e) {
 
 	var items = [
-		{ type: 'item', title: 'Full Photo', icon: 'icon-resize-full', fn: function() { window.open(photo.getDirectLink()) } },
+		{ type: 'item', title: build.iconic('fullscreen-enter') + 'Full Photo', fn: function() { window.open(photo.getDirectLink()) } },
-		{ type: 'item', title: 'Download', icon: 'icon-circle-arrow-down', fn: function() { photo.getArchive(photoID) } }
+		{ type: 'item', title: build.iconic('cloud-download') + 'Download', fn: function() { photo.getArchive(photoID) } }
 	];
 
 	// Remove download-item when
@@ -144,7 +208,7 @@ contextMenu.move = function(photoIDs, e) {
 
 	}
 
-	lychee.api('getAlbums', function(data) {
+	api.post('Album::getAll', {}, function(data) {
 
 		if (data.num===0) {
 
@@ -177,19 +241,21 @@ contextMenu.move = function(photoIDs, e) {
 
 contextMenu.sharePhoto = function(photoID, e) {
 
-	var link = photo.getViewLink(photoID);
+	var link	= photo.getViewLink(photoID),
+		file	= 'ionicons';
+
 	if (photo.json.public==='2') link = location.href;
 
 	var items = [
 		{ type: 'item', title: '<input readonly id="link" value="' + link + '">', fn: function() {}, class: 'noHover' },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Make Private', icon: 'icon-eye-close', fn: function() { photo.setPublic(photoID) } },
+		{ type: 'item', title: build.iconic('twitter', file, file) + 'Twitter', fn: function() { photo.share(photoID, 0) } },
+		{ type: 'item', title: build.iconic('facebook', file, file) + 'Facebook', fn: function() { photo.share(photoID, 1) } },
+		{ type: 'item', title: build.iconic('envelope-closed') + 'Mail', fn: function() { photo.share(photoID, 2) } },
+		{ type: 'item', title: build.iconic('dropbox', file, file) + 'Dropbox', fn: function() { photo.share(photoID, 3) } },
+		{ type: 'item', title: build.iconic('link-intact') + 'Direct Link', fn: function() { window.open(photo.getDirectLink()) } },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Twitter', icon: 'icon-twitter', fn: function() { photo.share(photoID, 0) } },
+		{ type: 'item', title: build.iconic('ban') + 'Make Private', fn: function() { photo.setPublic(photoID) } }
-		{ type: 'item', title: 'Facebook', icon: 'icon-facebook', fn: function() { photo.share(photoID, 1) } },
-		{ type: 'item', title: 'Mail', icon: 'icon-envelope', fn: function() { photo.share(photoID, 2) } },
-		{ type: 'item', title: 'Dropbox', icon: 'icon-hdd', fn: function() { photo.share(photoID, 3) } },
-		{ type: 'item', title: 'Direct Link', icon: 'icon-link', fn: function() { window.open(photo.getDirectLink()) } }
 	];
 
 	basicContext.show(items, e);
@@ -199,14 +265,16 @@ contextMenu.sharePhoto = function(photoID, e) {
 
 contextMenu.shareAlbum = function(albumID, e) {
 
+	var file = 'ionicons';
+
 	var items = [
 		{ type: 'item', title: '<input readonly id="link" value="' + location.href + '">', fn: function() {}, class: 'noHover' },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Make Private', icon: 'icon-eye-close', fn: function() { album.setPublic(albumID) } },
+		{ type: 'item', title: build.iconic('twitter', file, file) + 'Twitter', fn: function() { album.share(0) } },
+		{ type: 'item', title: build.iconic('facebook', file, file) + 'Facebook', fn: function() { album.share(1) } },
+		{ type: 'item', title: build.iconic('envelope-closed') + 'Mail', fn: function() { album.share(2) } },
 		{ type: 'separator' },
-		{ type: 'item', title: 'Twitter', icon: 'icon-twitter', fn: function() { album.share(0) } },
+		{ type: 'item', title: build.iconic('ban') + 'Make Private', fn: function() { album.setPublic(albumID) } }
-		{ type: 'item', title: 'Facebook', icon: 'icon-facebook', fn: function() { album.share(1) } },
-		{ type: 'item', title: 'Mail', icon: 'icon-envelope', fn: function() { album.share(2) } }
 	];
 
 	basicContext.show(items, e);

src/scripts/header.js

@@ -0,0 +1,129 @@
+/**
+ * @description	This module takes care of the header.
+ * @copyright	2015 by Tobias Reich
+ */
+
+header = {
+
+	_dom: $('header')
+
+}
+
+header.dom = function(selector) {
+
+	if (selector===undefined||selector===null||selector==='') return header._dom;
+	return header._dom.find(selector);
+
+}
+
+header.show = function() {
+
+	var newMargin = -1*($('#imageview #image').height()/2)+20;
+
+	clearTimeout($(window).data('timeout'));
+
+	lychee.imageview.removeClass('full');
+	header.dom().removeClass('hidden');
+	lychee.loadingBar.css('opacity', 1);
+
+	// Adjust position or size of photo
+	if ($('#imageview #image.small').length>0)	$('#imageview #image').css('margin-top', newMargin);
+	else										$('#imageview #image').removeClass('full');
+
+}
+
+header.hide = function(e, delay) {
+
+	var newMargin = -1*($('#imageview #image').height()/2);
+
+	if (delay===undefined) delay = 500;
+
+	if (visible.photo()&&!visible.infobox()&&!visible.contextMenu()&&!visible.message()) {
+
+		clearTimeout($(window).data('timeout'));
+
+		$(window).data('timeout', setTimeout(function() {
+
+			lychee.imageview.addClass('full');
+			header.dom().addClass('hidden');
+			lychee.loadingBar.css('opacity', 0);
+
+			// Adjust position or size of photo
+			if ($('#imageview #image.small').length>0)	$('#imageview #image').css('margin-top', newMargin);
+			else										$('#imageview #image').addClass('full');
+
+		}, delay));
+
+	}
+
+}
+
+header.setTitle = function(title) {
+
+	var $title	= header.dom('#title'),
+		title	= title || 'Untitled';
+
+	$title.html(title + build.iconic('caret-bottom'));
+
+}
+
+header.setMode = function(mode) {
+
+	var albumID = album.getID();
+
+	switch (mode) {
+
+		case 'albums':
+
+			header.dom().removeClass('view');
+			$('#tools_album, #tools_photo').hide();
+			$('#tools_albums').show();
+
+			break;
+
+		case 'album':
+
+			header.dom().removeClass('view');
+			$('#tools_albums, #tools_photo').hide();
+			$('#tools_album').show();
+
+			// Hide download button when album empty
+			album.json.content === false ? $('#button_archive').hide() : $('#button_archive').show();
+
+			// Hide download button when not logged in and album not downloadable
+			if (lychee.publicMode&&album.json.downloadable==='0') $('#button_archive').hide();
+
+			if (albumID==='s'||albumID==='f'||albumID==='r') {
+				$('#button_info_album, #button_trash_album, #button_share_album').hide();
+			} else if (albumID==='0') {
+				$('#button_info_album, #button_share_album').hide();
+				$('#button_trash_album').show();
+			} else {
+				$('#button_info_album, #button_trash_album, #button_share_album').show();
+			}
+
+			break;
+
+		case 'photo':
+
+			header.dom().addClass('view');
+			$('#tools_albums, #tools_album').hide();
+			$('#tools_photo').show();
+
+			break;
+
+	}
+
+}
+
+header.setEditable = function(editable) {
+
+	var $title = header.dom('#title');
+
+	// Hide editable icon when not logged in
+	if (lychee.publicMode===true) editable = false;
+
+	if (editable)	$title.addClass('editable');
+	else			$title.removeClass('editable');
+
+}

src/scripts/init.js

@@ -1,97 +1,102 @@
 /**
  * @description	This module is used for bindings.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 $(document).ready(function() {
 
 	/* Event Name */
-	var event_name = (mobileBrowser()) ? 'touchend' : 'click';
+	var eventName = ('ontouchend' in document.documentElement) ? 'touchend' : 'click';
-
-	/* Disable ContextMenu */
-	$(document).bind('contextmenu', function(e) { e.preventDefault() });
 
 	/* Multiselect */
-	$('#content')	.on('mousedown',	multiselect.show);
+	$('#content')	.on('mousedown', 	function(e) { if (e.which===1) multiselect.show(e) });
-	$(document)		.on('mouseup',		multiselect.getSelection);
+	$(document)		.on('mouseup',		function(e) { if (e.which===1) multiselect.getSelection(e) });
 
 	/* Header */
-	$('#button_share').on(event_name, function(e) {
+	header.dom('#title').on(eventName, function(e) {
+		if (!$(this).hasClass('editable'))	return false;
+		if (visible.photo())				contextMenu.photoTitle(album.getID(), photo.getID(), e);
+		else								contextMenu.albumTitle(album.getID(), e);
+	});
+	header.dom('#button_share').on(eventName, function(e) {
 		if (photo.json.public==1||photo.json.public==2)	contextMenu.sharePhoto(photo.getID(), e);
 		else											photo.setPublic(photo.getID(), e);
 	});
-	$('#button_share_album').on(event_name, function(e) {
+	header.dom('#button_share_album').on(eventName, function(e) {
 		if (album.json.public==1)	contextMenu.shareAlbum(album.getID(), e);
 		else						album.setPublic(album.getID(), e);
 	});
-	$('#button_signin')			.on(event_name, lychee.loginDialog);
+	header.dom('#button_signin')		.on(eventName, lychee.loginDialog);
-	$('#button_settings')		.on(event_name, contextMenu.settings);
+	header.dom('#button_settings')		.on(eventName, contextMenu.settings);
-	$('#button_info_album')		.on(event_name, view.infobox.show);
+	header.dom('#button_info_album')	.on(eventName, view.infobox.show);
-	$('#button_info')			.on(event_name, view.infobox.show);
+	header.dom('#button_info')			.on(eventName, view.infobox.show);
-	$('#button_more')			.on(event_name, function(e) { contextMenu.photoMore(photo.getID(), e) });
+	header.dom('.button_add')			.on(eventName, contextMenu.add);
-	$('#button_move')			.on(event_name, function(e) { contextMenu.move([photo.getID()], e) });
+	header.dom('#button_more')			.on(eventName, function(e) { contextMenu.photoMore(photo.getID(), e) });
-	$('#hostedwith')			.on(event_name, function() { window.open(lychee.website) });
+	header.dom('#button_move')			.on(eventName, function(e) { contextMenu.move([photo.getID()], e) });
-	$('#button_trash_album')	.on(event_name, function() { album.delete([album.getID()]) });
+	header.dom('#hostedwith')			.on(eventName, function() { window.open(lychee.website) });
-	$('#button_trash')			.on(event_name, function() { photo.delete([photo.getID()]) });
+	header.dom('#button_trash_album')	.on(eventName, function() { album.delete([album.getID()]) });
-	$('#button_archive')		.on(event_name, function() { album.getArchive(album.getID()) });
+	header.dom('#button_trash')			.on(eventName, function() { photo.delete([photo.getID()]) });
-	$('#button_star')			.on(event_name, function() { photo.setStar([photo.getID()]) });
+	header.dom('#button_archive')		.on(eventName, function() { album.getArchive(album.getID()) });
-	$('#button_back_home')		.on(event_name, function() { lychee.goto('') });
+	header.dom('#button_star')			.on(eventName, function() { photo.setStar([photo.getID()]) });
-	$('#button_back')			.on(event_name, function() { lychee.goto(album.getID()) });
+	header.dom('#button_back_home')		.on(eventName, function() { lychee.goto('') });
+	header.dom('#button_back')			.on(eventName, function() { lychee.goto(album.getID()) });
 
 	/* Search */
-	$('#search').on('keyup click', function() { search.find($(this).val()) });
+	header.dom('#search').on('keyup click', function() { search.find($(this).val()) });
 
 	/* Clear Search */
-	$('#clearSearch').on(event_name, function () {
+	header.dom('#clearSearch').on(eventName, function () {
-		$('#search').focus();
+		header.dom('#search').focus();
 		search.reset();
 	});
 
+	/* Infobox */
+	lychee.infobox.find('.header .close').on(eventName, view.infobox.hide);
+
 	/* Image View */
 	lychee.imageview
-		.on(event_name, '.arrow_wrapper.previous',	photo.previous)
+		.on(eventName, '.arrow_wrapper--previous',	photo.previous)
-		.on(event_name, '.arrow_wrapper.next',		photo.next);
+		.on(eventName, '.arrow_wrapper--next',		photo.next);
 
 	/* Infobox */
-	$('#infobox')
+	lychee.infobox
-		.on(event_name, '.header a',				view.infobox.hide)
+		.on(eventName, '#edit_title_album',			function() { album.setTitle([album.getID()]) })
-		.on(event_name, '#edit_title_album',		function() { album.setTitle([album.getID()]) })
+		.on(eventName, '#edit_description_album',	function() { album.setDescription(album.getID()) })
-		.on(event_name, '#edit_description_album',	function() { album.setDescription(album.getID()) })
+		.on(eventName, '#edit_title',				function() { photo.setTitle([photo.getID()]) })
-		.on(event_name, '#edit_title',				function() { photo.setTitle([photo.getID()]) })
+		.on(eventName, '#edit_description',			function() { photo.setDescription(photo.getID()) })
-		.on(event_name, '#edit_description',		function() { photo.setDescription(photo.getID()) })
+		.on(eventName, '#edit_tags',				function() { photo.editTags([photo.getID()]) })
-		.on(event_name, '#edit_tags',				function() { photo.editTags([photo.getID()]) })
+		.on(eventName, '#tags .tag span',			function() { photo.deleteTag(photo.getID(), $(this).data('index')) });
-		.on(event_name, '#tags .tag span',			function() { photo.deleteTag(photo.getID(), $(this).data('index')) });
 
 	/* Keyboard */
 	Mousetrap
 		.bind('left',			function() { if (visible.photo()) $('#imageview a#previous').click() })
 		.bind('right',			function() { if (visible.photo()) $('#imageview a#next').click() })
-		.bind(['u', 'ctrl+u'],	function() { $('#upload_files').click() })
+		.bind('u',	function() { $('#upload_files').click() })
-		.bind(['s', 'ctrl+s', 'f', 'ctrl+f'], function(e) {
+		.bind(['s', 'f'], function(e) {
 			if (visible.photo()) {
-				$('#button_star').click();
+				header.dom('#button_star').click();
 			} else if (visible.albums()) {
 				e.preventDefault();
-				$('#search').focus();
+				header.dom('#search').focus();
 			}
 		})
-		.bind(['r', 'ctrl+r'], function(e) {
+		.bind('r', function(e) {
 			e.preventDefault();
 			if (visible.album())		album.setTitle(album.getID());
 			else if (visible.photo())	photo.setTitle([photo.getID()]);
 		})
-		.bind(['d', 'ctrl+d'], function(e) {
+		.bind('d', function(e) {
 			e.preventDefault();
 			if (visible.photo())		photo.setDescription(photo.getID());
 			else if (visible.album())	album.setDescription(album.getID());
 		})
-		.bind(['t', 'ctrl+t'], function(e) {
+		.bind('t', function(e) {
 			if (visible.photo()) {
 				e.preventDefault();
 				photo.editTags([photo.getID()]);
 			}
 		})
-		.bind(['i', 'ctrl+i'], function() {
+		.bind('i', function() {
 			if (visible.infobox())				view.infobox.hide();
 			else if (visible.multiselect())		return false;
 			else if (visible.infoboxbutton())	view.infobox.show();
@@ -106,12 +111,12 @@ $(document).ready(function() {
 		});
 
 	Mousetrap.bindGlobal('enter', function() {
-		if ($('.message .button.active').length) $('.message .button.active').addClass('pressed').click()
+		if (basicModal.visible()===true) basicModal.action();
 	});
 
 	Mousetrap.bindGlobal(['esc', 'command+up'], function(e) {
 		e.preventDefault();
-		if (visible.message()&&$('.message .close').length>0)		modal.close();
+		if (basicModal.visible()===true)							basicModal.cancel();
 		else if (visible.contextMenu())								contextMenu.close();
 		else if (visible.infobox())									view.infobox.hide();
 		else if (visible.photo())									lychee.goto(album.getID());
@@ -120,15 +125,15 @@ $(document).ready(function() {
 	});
 
 
-	if (mobileBrowser()) {
+	if ('ontouchend' in document.documentElement) {
 
 		$(document)
 
 			/* Fullscreen on mobile */
 			.on('touchend', '#image', function(e) {
 				if (swipe.obj===null||(swipe.offset>=-5&&swipe.offset<=5)) {
-					if (visible.controls())	view.header.hide(e, 0);
+					if (visible.controls())	header.hide(e, 0);
-					else					view.header.show();
+					else					header.show();
 				}
 			})
 
@@ -145,35 +150,19 @@ $(document).ready(function() {
 		/* Login */
 		.on('keyup', '#password', function() { if ($(this).val().length>0) $(this).removeClass('error') })
 
-		/* Header */
-		.on(event_name, '#title.editable', function() {
-			if (visible.photo())	photo.setTitle([photo.getID()]);
-			else					album.setTitle([album.getID()]);
-		})
-
 		/* Navigation */
 		.on('click', '.album', function() { lychee.goto($(this).attr('data-id')) })
 		.on('click', '.photo', function() { lychee.goto(album.getID() + '/' + $(this).attr('data-id')) })
 
-		/* Modal */
-		.on(event_name, '.message .close',			modal.close)
-		.on(event_name, '.message .button:first',	function() { if (modal.fns!==null) modal.fns[0](); if (!visible.signin()) modal.close() })
-		.on(event_name, '.message .button:last',	function() { if (modal.fns!==null) modal.fns[1](); if (!visible.signin()) modal.close() })
-
-		/* Add Dialog */
-		.on(event_name, '.button_add', contextMenu.add)
-
 		/* Context Menu */
-		.on('contextmenu', '.photo',			function(e) { contextMenu.photo(photo.getID(), e) })
+		.on('contextmenu', '.photo', function(e) { contextMenu.photo(photo.getID(), e) })
-		.on('contextmenu', '.album',			function(e) { contextMenu.album(album.getID(), e) })
+		.on('contextmenu', '.album', function(e) { contextMenu.album(album.getID(), e) })
-		.on(event_name, '.contextmenu_bg',		contextMenu.close)
 
 		/* Infobox */
-		.on(event_name, '#infobox_overlay', view.infobox.hide)
+		.on(eventName, '#infobox_overlay', view.infobox.hide)
 
 		/* Upload */
-		.on('change', '#upload_files',				function() { modal.close(); upload.start.local(this.files) })
+		.on('change', '#upload_files',				function() { basicModal.close(); upload.start.local(this.files) })
-		.on(event_name, '.upload_message a.close',	upload.close)
 		.on('dragover',								function(e) { e.preventDefault(); }, false)
 		.on('drop', function(e) {
 

src/scripts/loadingBar.js

@@ -1,6 +1,6 @@
 /**
  * @description	This module is used to show and hide the loading bar.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 loadingBar = {
@@ -21,7 +21,7 @@ loadingBar.show = function(status, errorText) {
 		if (!errorText)	errorText = 'Whoops, it looks like something went wrong. Please reload the site and try again!';
 
 		// Move header down
-		if (visible.controls()) lychee.header.addClass('error');
+		if (visible.controls()) header.dom().addClass('error');
 
 		// Modify loading
 		lychee.loadingBar
@@ -49,7 +49,7 @@ loadingBar.show = function(status, errorText) {
 		lychee.loadingBar.data('timeout', setTimeout(function() {
 
 			// Move header down
-			if (visible.controls()) lychee.header.addClass('loading');
+			if (visible.controls()) header.dom().addClass('loading');
 
 			// Modify loading
 			lychee.loadingBar
@@ -73,7 +73,7 @@ loadingBar.hide = function(force) {
 		loadingBar.status = null;
 
 		// Move header up
-		if (visible.controls()) lychee.header.removeClass('error loading');
+		if (visible.controls()) header.dom().removeClass('error loading');
 
 		// Modify loading
 		lychee.loadingBar

src/scripts/lychee.js

@@ -1,15 +1,14 @@
 /**
  * @description	This module provides the basic functions of Lychee.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 lychee = {
 
-	title:			'',
+	title:			document.title,
-	version:		'2.7.1',
+	version:		'3.0.0',
-	version_code:	'020701',
+	version_code:	'030000',
 
-	api_path:		'php/api.php',
 	update_path:	'http://lychee.electerious.com/version/index.php',
 	updateURL:		'https://github.com/electerious/Lychee',
 	website:		'http://lychee.electerious.com',
@@ -27,7 +26,6 @@ lychee = {
 	dropboxKey:		'',
 
 	loadingBar:		$('#loading'),
-	header:			$('header'),
 	content:		$('#content'),
 	imageview:		$('#imageview'),
 	infobox:		$('#infobox')
@@ -38,8 +36,11 @@ lychee.init = function() {
 
 	var params;
 
-	params = 'init&version=' + lychee.version_code;
+	params = {
-	lychee.api(params, function(data) {
+		version: lychee.version_code
+	}
+
+	api.post('Session::init', params, function(data) {
 
 		if (data.loggedIn!==true) {
 			lychee.setMode('public');
@@ -52,7 +53,7 @@ lychee.init = function() {
 
 		// No configuration
 		if (data==='Warning: No configuration!') {
-			lychee.header.hide();
+			header.dom().hide();
 			lychee.content.hide();
 			$('body').append(build.no_content('cog'));
 			settings.createConfig();
@@ -72,60 +73,18 @@ lychee.init = function() {
 
 }
 
-lychee.api = function(params, callback) {
+lychee.login = function(data) {
 
-	loadingBar.show();
+	var user		= data.username,
-
+		password	= data.password,
-	$.ajax({
-		type:		'POST',
-		url:		lychee.api_path,
-		data:		'function=' + params,
-		dataType:	'text',
-		success: function(data) {
-
-			setTimeout(function() { loadingBar.hide() }, 100);
-
-			// Catch errors
-			if (typeof data==='string'&&
-				data.substring(0, 7)==='Error: ') {
-					lychee.error(data.substring(7, data.length), params, data);
-					upload.close(true);
-					return false;
-			}
-
-			// Convert 1 to true and an empty string to false
-			if (data==='1')		data = true;
-			else if (data==='')	data = false;
-
-			// Convert to JSON if string start with '{' and ends with '}'
-			if (typeof data==='string'&&
-				data.substring(0, 1)==='{'&&
-				data.substring(data.length-1, data.length)==='}') data = $.parseJSON(data);
-
-			// Output response when debug mode is enabled
-			if (lychee.debugMode) console.log(data);
-
-			callback(data);
-
-		},
-		error: function(jqXHR, textStatus, errorThrown) {
-
-			lychee.error('Server error or API not found.', params, errorThrown);
-			upload.close(true);
-
-		}
-	});
-
-}
-
-lychee.login = function() {
-
-	var user		= $('input#username').val(),
-		password	= md5($('input#password').val()),
 		params;
 
-	params = 'login&user=' + user + '&password=' + password;
+	params = {
-	lychee.api(params, function(data) {
+		user,
+		password
+	}
+
+	api.post('Session::login', params, function(data) {
 
 		if (data===true) {
 
@@ -138,8 +97,7 @@ lychee.login = function() {
 		} else {
 
 			// Show error and reactive button
-			$('#password').val('').addClass('error').focus();
+			basicModal.error('password');
-			$('.message .button.active').removeClass('pressed');
 
 		}
 
@@ -149,16 +107,36 @@ lychee.login = function() {
 
 lychee.loginDialog = function() {
 
-	var local_username;
+	var localUsername,
+		msg = '';
 
-	$('body').append(build.signInModal());
+	msg =	`
-	$('#username').focus();
+			<p class='signIn'>
+				<input class='text' data-name='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
+				<input class='text' data-name='password' type='password' value='' placeholder='password'>
+			</p>
+			<p class='version'>Lychee ${ lychee.version }<span> &#8211; <a target='_blank' href='${ lychee.updateURL }'>Update available!</a><span></p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Sign In',
+				fn: lychee.login
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
+			}
+		}
+	});
 
 	if (localStorage) {
-		local_username = localStorage.getItem('lychee_username');
+		localUsername = localStorage.getItem('lychee_username');
-		if (local_username!==null) {
+		if (localUsername!==null) {
-			if (local_username.length>0) $('#username').val(local_username);
+			if (localUsername.length>0) $('.basicModal input[data-name="username"]').val(localUsername);
-			$('#password').focus();
+			$('.basicModal input[data-name="password"]').focus();
 		}
 	}
 
@@ -168,7 +146,7 @@ lychee.loginDialog = function() {
 
 lychee.logout = function() {
 
-	lychee.api('logout', function() {
+	api.post('Session::logout', {}, function() {
 		window.location.reload();
 	});
 
@@ -245,22 +223,17 @@ lychee.getUpdate = function() {
 
 	$.ajax({
 		url: lychee.update_path,
-		success: function(data) { if (parseInt(data)>parseInt(lychee.version_code)) $('#version span').show(); }
+		success: function(data) { if (parseInt(data)>parseInt(lychee.version_code)) $('.version span').show(); }
 	});
 
 }
 
 lychee.setTitle = function(title, editable) {
 
-	if (lychee.title==='')	lychee.title = document.title;
+	document.title = lychee.title + ' - ' + title;
 
-	if (title==='Albums')	document.title = lychee.title;
+	header.setEditable(editable);
-	else					document.title = lychee.title + ' - ' + title;
+	header.setTitle(title);
-
-	if (editable)	$('#title').addClass('editable');
-	else			$('#title').removeClass('editable');
-
-	$('#title').html(title);
 
 }
 
@@ -270,7 +243,6 @@ lychee.setMode = function(mode) {
 	$('#button_trash, #button_move, #button_share, #button_star').remove();
 
 	$(document)
-		.on('mouseenter',	'#title.editable', function() { $(this).removeClass('editable') })
 		.off('click',		'#title.editable')
 		.off('touchend',	'#title.editable')
 		.off('contextmenu',	'.photo')
@@ -278,23 +250,23 @@ lychee.setMode = function(mode) {
 		.off('drop');
 
 	Mousetrap
-		.unbind(['u', 'ctrl+u'])
+		.unbind('u')
-		.unbind(['s', 'ctrl+s'])
+		.unbind('s')
-		.unbind(['f', 'ctrl+f'])
+		.unbind('f')
-		.unbind(['r', 'ctrl+r'])
+		.unbind('r')
-		.unbind(['d', 'ctrl+d'])
+		.unbind('d')
-		.unbind(['t', 'ctrl+t'])
+		.unbind('t')
 		.unbind(['command+backspace', 'ctrl+backspace'])
 		.unbind(['command+a', 'ctrl+a']);
 
 	if (mode==='public') {
 
-		$('header #button_signin, header #hostedwith').show();
+		header.dom('#button_signin, #hostedwith').show();
 		lychee.publicMode = true;
 
 	} else if (mode==='view') {
 
-		Mousetrap.unbind('esc');
+		Mousetrap.unbind(['esc', 'command+up']);
 		$('#button_back, a#next, a#previous').remove();
 		$('.no_content').remove();
 

src/scripts/modal.js

@@ -1,34 +0,0 @@
-/**
- * @description	Build, show and hide a modal.
- * @copyright	2014 by Tobias Reich
- */
-
-modal = {
-
-	fns: null
-
-}
-
-modal.show = function(title, text, buttons, marginTop, closeButton) {
-
-	if (!buttons) {
-		buttons = [
-			['', function() {}],
-			['', function() {}]
-		];
-	}
-
-	modal.fns = [buttons[0][1], buttons[1][1]];
-
-	$('body').append(build.modal(title, text, buttons, marginTop, closeButton));
-	$('.message input:first-child').focus().select();
-
-}
-
-modal.close = function() {
-
-	modal.fns = null;
-	$('.message_overlay').removeClass('fadeIn').css('opacity', 0);
-	setTimeout(function() { $('.message_overlay').remove() }, 300);
-
-}

src/scripts/multiselect.js

@@ -1,6 +1,6 @@
 /**
  * @description	Select multiple albums or photos.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 multiselect = {}
@@ -16,7 +16,6 @@ multiselect.position = {
 
 multiselect.show = function(e) {
 
-	if (mobileBrowser())	return false;
 	if (lychee.publicMode)	return false;
 	if (visible.search())	return false;
 	if (visible.infobox())	return false;
@@ -40,7 +39,6 @@ multiselect.selectAll = function() {
 		newWidth,
 		newHeight;
 
-	if (mobileBrowser())		return false;
 	if (lychee.publicMode)		return false;
 	if (visible.search())		return false;
 	if (visible.infobox())		return false;

src/scripts/password.js

@@ -1,6 +1,6 @@
 /**
  * @description	Controls the access to password-protected albums and photos.
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 password = {
@@ -11,7 +11,7 @@ password = {
 
 password.get = function(albumID, callback) {
 
-	var passwd = $('.message input.text').val(),
+	var passwd = $('.basicModal input.text').val(),
 		params;
 
 	if (!lychee.publicMode)												callback();
@@ -31,15 +31,20 @@ password.get = function(albumID, callback) {
 	} else {
 
 		// Check password
-		params = 'checkAlbumAccess&albumID=' + albumID + '&password=' + md5(passwd);
+
-		lychee.api(params, function(data) {
+		params = {
+			albumID,
+			password: passwd
+		}
+
+		api.post('Album::getPublic', params, function(data) {
 
 			if (data===true) {
-				password.value = md5(passwd);
+				basicModal.close();
+				password.value = passwd;
 				callback();
 			} else {
-				lychee.goto('');
+				basicModal.error('password');
-				loadingBar.show('error', 'Access denied. Wrong password!');
 			}
 
 		});
@@ -50,12 +55,36 @@ password.get = function(albumID, callback) {
 
 password.getDialog = function(albumID, callback) {
 
-	var buttons;
+	var action,
+		cancel,
+		msg = '';
 
-	buttons = [
+	action = function() { password.get(albumID, callback) }
-		['Enter', function() { password.get(albumID, callback) }],
+
-		['Cancel', lychee.goto]
+	cancel = function() {
-	];
+		basicModal.close();
-	modal.show("<a class='icon-lock'></a> Enter Password", "This album is protected by a password. Enter the password below to view the photos of this album: <input class='text' type='password' placeholder='password' value=''>", buttons, -110, false);
+		lychee.goto();
+	}
+
+	msg =	`
+			<p>
+				This album is protected by a password. Enter the password below to view the photos of this album:
+				<input data-name='password' class='text' type='password' placeholder='password' value=''>
+			</p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Enter',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: cancel
+			}
+		}
+	});
 
 }

src/scripts/photo.js

@@ -1,6 +1,6 @@
 /**
  * @description	Takes care of every action a photo can handle and execute.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 photo = {
@@ -27,8 +27,13 @@ photo.load = function(photoID, albumID) {
 	var params,
 		checkPasswd;
 
-	params = 'getPhoto&photoID=' + photoID + '&albumID=' + albumID + '&password=' + password.value;
+	params = {
-	lychee.api(params, function(data) {
+		photoID,
+		albumID,
+		password: password.value
+	}
+
+	api.post('Photo::get', params, function(data) {
 
 		if (data==='Warning: Wrong password!') {
 			checkPasswd = function() {
@@ -61,7 +66,7 @@ photo.preloadNext = function(photoID) {
 
 	// Never preload on mobile devices with bare RAM and
 	// mostly mobile internet
-	if (mobileBrowser()) return false;
+	// {{ code }}
 
 	if (album.json &&
 	   album.json.content &&
@@ -156,8 +161,11 @@ photo.duplicate = function(photoIDs) {
 
 	albums.refresh();
 
-	params = 'duplicatePhoto&photoIDs=' + photoIDs;
+	params = {
-	lychee.api(params, function(data) {
+		photoIDs: photoIDs.join()
+	}
+
+	api.post('Photo::duplicate', params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
 		else album.load(album.getID());
@@ -168,9 +176,10 @@ photo.duplicate = function(photoIDs) {
 
 photo.delete = function(photoIDs) {
 
-	var params,
+	var action = {},
-		buttons,
+		cancel = {},
-		photoTitle;
+		msg = '',
+		photoTitle = '';
 
 	if (!photoIDs) return false;
 	if (photoIDs instanceof Array===false) photoIDs = [photoIDs];
@@ -186,72 +195,90 @@ photo.delete = function(photoIDs) {
 
 	}
 
-	buttons = [
+	action.fn = function() {
-		['', function() {
 
-			var nextPhoto		= '',
+		var params			= '',
-				previousPhoto	= '';
+			nextPhoto		= '',
+			previousPhoto	= '';
 
-			photoIDs.forEach(function(id, index, array) {
+		basicModal.close();
 
-				// Change reference for the next and previous photo
+		photoIDs.forEach(function(id, index, array) {
-				if (album.json.content[id].nextPhoto!==''||album.json.content[id].previousPhoto!=='') {
 
-					nextPhoto		= album.json.content[id].nextPhoto;
+			// Change reference for the next and previous photo
-					previousPhoto	= album.json.content[id].previousPhoto;
+			if (album.json.content[id].nextPhoto!==''||album.json.content[id].previousPhoto!=='') {
 
-					album.json.content[previousPhoto].nextPhoto = nextPhoto;
+				nextPhoto		= album.json.content[id].nextPhoto;
-					album.json.content[nextPhoto].previousPhoto = previousPhoto;
+				previousPhoto	= album.json.content[id].previousPhoto;
 
-				}
+				album.json.content[previousPhoto].nextPhoto = nextPhoto;
+				album.json.content[nextPhoto].previousPhoto = previousPhoto;
 
-				album.json.content[id] = null;
+			}
-				view.album.content.delete(id);
 
-			});
+			album.json.content[id] = null;
+			view.album.content.delete(id);
 
-			albums.refresh();
+		});
 
-			// Go to next photo if there is a next photo and
+		albums.refresh();
-			// next photo is not the current one. Show album otherwise.
-			if (visible.photo()&&nextPhoto!==''&&nextPhoto!==photo.getID()) lychee.goto(album.getID() + '/' + nextPhoto);
-			else if (!visible.albums()) lychee.goto(album.getID());
 
-			params = 'deletePhoto&photoIDs=' + photoIDs;
+		// Go to next photo if there is a next photo and
-			lychee.api(params, function(data) {
+		// next photo is not the current one. Show album otherwise.
+		if (visible.photo()&&nextPhoto!==''&&nextPhoto!==photo.getID()) lychee.goto(album.getID() + '/' + nextPhoto);
+		else if (!visible.albums()) lychee.goto(album.getID());
 
-				if (data!==true) lychee.error(null, params, data);
+		params = {
+			photoIDs: photoIDs.join()
+		}
 
-			});
+		api.post('Photo::delete', params, function(data) {
 
-		}],
+			if (data!==true) lychee.error(null, params, data);
-		['', function() {}]
+
-	];
+		});
+
+	}
 
 	if (photoIDs.length===1) {
 
-		buttons[0][0] = 'Delete Photo';
+		action.title = 'Delete Photo';
-		buttons[1][0] = 'Keep Photo';
+		cancel.title = 'Keep Photo';
 
-		modal.show('Delete Photo', "Are you sure you want to delete the photo '" + photoTitle + "'?<br>This action can't be undone!", buttons);
+		msg = "<p>Are you sure you want to delete the photo '" + photoTitle + "'?<br>This action can't be undone!</p>";
 
 	} else {
 
-		buttons[0][0] = 'Delete Photos';
+		action.title = 'Delete Photo';
-		buttons[1][0] = 'Keep Photos';
+		cancel.title = 'Keep Photo';
 
-		modal.show('Delete Photos', "Are you sure you want to delete all " + photoIDs.length + " selected photo?<br>This action can't be undone!", buttons);
+		msg = "<p>Are you sure you want to delete all " + photoIDs.length + " selected photo?<br>This action can't be undone!</p>";
 
 	}
 
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: action.title,
+				fn: action.fn,
+				class: 'red'
+			},
+			cancel: {
+				title: cancel.title,
+				fn: basicModal.close
+			}
+		}
+	});
+
 }
 
 photo.setTitle = function(photoIDs) {
 
 	var oldTitle = '',
-		newTitle,
+		input = '',
-		params,
+		msg = '',
-		buttons;
+		action;
 
 	if (!photoIDs) return false;
 	if (photoIDs instanceof Array===false) photoIDs = [photoIDs];
@@ -263,38 +290,57 @@ photo.setTitle = function(photoIDs) {
 		oldTitle = oldTitle.replace("'", '&apos;');
 	}
 
-	buttons = [
+	action = function(data) {
-		['Set Title', function() {
 
-			// Get input
+		var params,
-			newTitle = $('.message input.text').val();
+			newTitle = data.title;
 
-			// Remove html from input
+		basicModal.close();
-			newTitle = lychee.removeHTML(newTitle);
 
-			if (visible.photo()) {
+		// Remove html from input
-				photo.json.title = (newTitle==='') ? 'Untitled' : newTitle;
+		newTitle = lychee.removeHTML(newTitle);
-				view.photo.title();
+
+		if (visible.photo()) {
+			photo.json.title = (newTitle==='') ? 'Untitled' : newTitle;
+			view.photo.title();
+		}
+
+		photoIDs.forEach(function(id, index, array) {
+			album.json.content[id].title = newTitle;
+			view.album.content.title(id);
+		});
+
+		params = {
+			photoIDs: photoIDs.join(),
+			title: newTitle
+		}
+
+		api.post('Photo::setTitle', params, function(data) {
+
+			if (data!==true) lychee.error(null, params, data);
+
+		});
+
+	}
+
+	input = "<input class='text' data-name='title' type='text' maxlength='30' placeholder='Title' value='" + oldTitle + "'>";
+
+	if (photoIDs.length===1)	msg = "<p>Enter a new title for this photo: " + input + "</p>";
+	else						msg = "<p>Enter a title for all " + photoIDs.length + " selected photos: " + input + "</p>";
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Set title',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
 			}
-
+		}
-			photoIDs.forEach(function(id, index, array) {
+	});
-				album.json.content[id].title = newTitle;
-				view.album.content.title(id);
-			});
-
-			params = 'setPhotoTitle&photoIDs=' + photoIDs + '&title=' + escape(encodeURI(newTitle));
-			lychee.api(params, function(data) {
-
-				if (data!==true) lychee.error(null, params, data);
-
-			});
-
-		}],
-		['Cancel', function() {}]
-	];
-
-	if (photoIDs.length===1) modal.show('Set Title', "Enter a new title for this photo: <input class='text' type='text' maxlength='30' placeholder='Title' value='" + oldTitle + "'>", buttons);
-	else modal.show('Set Titles', "Enter a title for all " + photoIDs.length + " selected photos: <input class='text' type='text' maxlength='30' placeholder='Title' value=''>", buttons);
 
 }
 
@@ -328,8 +374,12 @@ photo.setAlbum = function(photoIDs, albumID) {
 
 	albums.refresh();
 
-	params = 'setPhotoAlbum&photoIDs=' + photoIDs + '&albumID=' + albumID;
+	params = {
-	lychee.api(params, function(data) {
+		photoIDs: photoIDs.join(),
+		albumID
+	}
+
+	api.post('Photo::setAlbum', params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
 
@@ -354,8 +404,11 @@ photo.setStar = function(photoIDs) {
 
 	albums.refresh();
 
-	params = 'setPhotoStar&photoIDs=' + photoIDs;
+	params = {
-	lychee.api(params, function(data) {
+		photoIDs: photoIDs.join()
+	}
+
+	api.post('Photo::setStar', params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
 
@@ -365,11 +418,31 @@ photo.setStar = function(photoIDs) {
 
 photo.setPublic = function(photoID, e) {
 
-	var params;
-
 	if (photo.json.public==2) {
 
-		modal.show('Public Album', "This photo is located in a public album. To make this photo private or public, edit the visibility of the associated album.", [['Show Album', function() { lychee.goto(photo.json.original_album) }], ['Close', function() {}]]);
+		var action;
+
+		action = function() {
+
+			basicModal.close();
+			lychee.goto(photo.json.original_album);
+
+		}
+
+		basicModal.show({
+			body: "<p>This photo is located in a public album. To make this photo private or public, edit the visibility of the associated album.</p>",
+			buttons: {
+				action: {
+					title: 'Show Album',
+					fn: action
+				},
+				cancel: {
+					title: 'Cancel',
+					fn: basicModal.close
+				}
+			}
+		});
+
 		return false;
 
 	}
@@ -387,8 +460,7 @@ photo.setPublic = function(photoID, e) {
 
 	albums.refresh();
 
-	params = 'setPhotoPublic&photoID=' + photoID;
+	api.post('Photo::setPublic', { photoID }, function(data) {
-	lychee.api(params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
 
@@ -399,44 +471,57 @@ photo.setPublic = function(photoID, e) {
 photo.setDescription = function(photoID) {
 
 	var oldDescription = photo.json.description.replace("'", '&apos;'),
-		description,
+		action;
-		params,
-		buttons;
 
-	buttons = [
+	action = function(data) {
-		['Set Description', function() {
 
-			// Get input
+		var params,
-			description = $('.message input.text').val();
+			description = data.description;
 
-			// Remove html from input
+		basicModal.close();
-			description = lychee.removeHTML(description);
 
-			if (visible.photo()) {
+		// Remove html from input
-				photo.json.description = description;
+		description = lychee.removeHTML(description);
-				view.photo.description();
+
+		if (visible.photo()) {
+			photo.json.description = description;
+			view.photo.description();
+		}
+
+		params = {
+			photoID,
+			description
+		}
+
+		api.post('Photo::setDescription', params, function(data) {
+
+			if (data!==true) lychee.error(null, params, data);
+
+		});
+
+	}
+
+	basicModal.show({
+		body: "<p>Enter a description for this photo: <input class='text' data-name='description' type='text' maxlength='800' placeholder='Description' value='" + oldDescription + "'></p>",
+		buttons: {
+			action: {
+				title: 'Set Description',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
 			}
-
+		}
-			params = 'setPhotoDescription&photoID=' + photoID + '&description=' + escape(encodeURI(description));
+	});
-			lychee.api(params, function(data) {
-
-				if (data!==true) lychee.error(null, params, data);
-
-			});
-
-		}],
-		['Cancel', function() {}]
-	];
-
-	modal.show('Set Description', "Enter a description for this photo: <input class='text' type='text' maxlength='800' placeholder='Description' value='" + oldDescription + "'>", buttons);
 
 }
 
 photo.editTags = function(photoIDs) {
 
 	var oldTags		= '',
-		tags		= '',
+		msg			= '',
-		buttons;
+		input		= '';
 
 	if (!photoIDs) return false;
 	if (photoIDs instanceof Array===false) photoIDs = [photoIDs];
@@ -456,19 +541,31 @@ photo.editTags = function(photoIDs) {
 	// Improve tags
 	oldTags = oldTags.replace(/,/g, ', ');
 
-	buttons = [
+	action = function(data) {
-		['Set Tags', function() {
 
-			tags = $('.message input.text').val();
+		basicModal.close();
+		photo.setTags(photoIDs, data.tags);
 
-			photo.setTags(photoIDs, tags);
+	}
 
-		}],
+	input = "<input class='text' data-name='tags' type='text' maxlength='800' placeholder='Tags' value='" + oldTags + "'>";
-		['Cancel', function() {}]
-	];
 
-	if (photoIDs.length===1) modal.show('Set Tags', "Enter your tags for this photo. You can add multiple tags by separating them with a comma: <input class='text' type='text' maxlength='800' placeholder='Tags' value='" + oldTags + "'>", buttons);
+	if (photoIDs.length===1)	msg = "<p>Enter your tags for this photo. You can add multiple tags by separating them with a comma: " + input + "</p>";
-	else modal.show('Set Tags', "Enter your tags for all " + photoIDs.length + " selected photos. Existing tags will be overwritten. You can add multiple tags by separating them with a comma: <input class='text' type='text' maxlength='800' placeholder='Tags' value='" + oldTags + "'>", buttons);
+	else						msg = "<p>Enter your tags for all " + photoIDs.length + " selected photos. Existing tags will be overwritten. You can add multiple tags by separating them with a comma: " + input + "</p>";
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Set Tags',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
+			}
+		}
+	});
 
 }
 
@@ -495,8 +592,12 @@ photo.setTags = function(photoIDs, tags) {
 		album.json.content[id].tags = tags;
 	});
 
-	params = 'setPhotoTags&photoIDs=' + photoIDs + '&tags=' + tags;
+	params = {
-	lychee.api(params, function(data) {
+		photoIDs: photoIDs.join(),
+		tags
+	}
+
+	api.post('Photo::setTags', params, function(data) {
 
 		if (data!==true) lychee.error(null, params, data);
 
@@ -592,7 +693,7 @@ photo.getSize = function() {
 photo.getArchive = function(photoID) {
 
 	var link,
-		url = 'php/api.php?function=getPhotoArchive&photoID=' + photoID;
+		url = api.path + '?function=Photo::getArchive&photoID=' + photoID;
 
 	if (location.href.indexOf('index.html')>0)	link = location.href.replace(location.hash, '').replace('index.html', url);
 	else										link = location.href.replace(location.hash, '') + url;

src/scripts/search.js

@@ -1,6 +1,6 @@
 /**
  * @description	Searches through your photos and albums.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 search = {
@@ -11,8 +11,7 @@ search = {
 
 search.find = function(term) {
 
-	var params,
+	var albumsData = '',
-		albumsData = '',
 		photosData = '',
 		code;
 
@@ -21,8 +20,7 @@ search.find = function(term) {
 
 		if ($('#search').val().length!==0) {
 
-			params = 'search&term=' + term;
+			api.post('search', { term }, function(data) {
-			lychee.api(params, function(data) {
 
 				// Build albums
 				if (data&&data.albums) {
@@ -64,7 +62,7 @@ search.find = function(term) {
 
 						if (code==='error') {
 							lychee.content.html('');
-							$('body').append(build.no_content('search'));
+							$('body').append(build.no_content('magnifying-glass'));
 						} else {
 							lychee.content.html(code);
 							lychee.animate('.album, .photo', 'contentZoomIn');

src/scripts/settings.js

@@ -1,259 +1,357 @@
 /**
  * @description	Lets you change settings.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 settings = {}
 
 settings.createConfig = function() {
 
-	var dbName,
+	var msg = '',
-		dbUser,
+		action;
-		dbPassword,
-		dbHost,
-		dbTablePrefix,
-		buttons,
-		params;
 
-	buttons = [
+	action = function(data) {
-		['Connect', function() {
 
-			dbHost			= $('.message input.text#dbHost').val();
+		var dbName			= data.dbName			|| '',
-			dbUser			= $('.message input.text#dbUser').val();
+			dbUser			= data.dbUser			|| '',
-			dbPassword		= $('.message input.text#dbPassword').val();
+			dbPassword		= data.dbPassword		|| '',
-			dbName			= $('.message input.text#dbName').val();
+			dbHost			= data.dbHost			|| '',
-			dbTablePrefix	= $('.message input.text#dbTablePrefix').val();
+			dbTablePrefix	= data.dbTablePrefix	|| '',
+			params;
 
-			if (dbHost.length<1) dbHost = 'localhost';
+		if (dbUser.length<1) {
-			if (dbName.length<1) dbName = 'lychee';
+			basicModal.error('dbUser');
+			return false;
+		}
 
-			params = 'dbCreateConfig&dbName=' + escape(dbName) + '&dbUser=' + escape(dbUser) + '&dbPassword=' + escape(dbPassword) + '&dbHost=' + escape(dbHost) + '&dbTablePrefix=' + escape(dbTablePrefix);
+		if (dbHost.length<1) dbHost = 'localhost';
-			lychee.api(params, function(data) {
+		if (dbName.length<1) dbName = 'lychee';
 
-				if (data!==true) {
+		params = {
+			dbName,
+			dbUser,
+			dbPassword,
+			dbHost,
+			dbTablePrefix
+		}
 
-					// Configuration failed
+		api.post('Database::createConfig', params, function(data) {
-					setTimeout(function() {
 
-						// Connection failed
+			if (data!==true) {
-						if (data.indexOf('Warning: Connection failed!')!==-1) {
 
-							buttons = [
+				// Connection failed
-								['Retry', function() { setTimeout(settings.createConfig, 400) }],
+				if (data.indexOf('Warning: Connection failed!')!==-1) {
-								['', function() {}]
-							];
-							modal.show('Connection Failed', 'Unable to connect to host database because access was denied. Double-check your host, username and password and ensure that access from your current location is permitted.', buttons, null, false);
-							return false;
 
+					basicModal.show({
+						body: '<p>Unable to connect to host database because access was denied. Double-check your host, username and password and ensure that access from your current location is permitted.</p>',
+						buttons: {
+							action: {
+								title: 'Retry',
+								fn: settings.createConfig
+							}
 						}
+					});
 
-						// Creation failed
+					return false;
-						if (data.indexOf('Warning: Creation failed!')!==-1) {
-
-							buttons = [
-								['Retry', function() { setTimeout(settings.createConfig, 400) }],
-								['', function() {}]
-							];
-							modal.show('Creation Failed', 'Unable to create the database. Double-check your host, username and password and ensure that the specified user has the rights to modify and add content to the database.', buttons, null, false);
-							return false;
-
-						}
-
-						// Could not create file
-						if (data.indexOf('Warning: Could not create file!')!==-1) {
-
-							buttons = [
-								['Retry', function() { setTimeout(settings.createConfig, 400) }],
-								['', function() {}]
-							];
-							modal.show('Saving Failed', "Unable to save this configuration. Permission denied in <b>'data/'</b>. Please set the read, write and execute rights for others in <b>'data/'</b> and <b>'uploads/'</b>. Take a look the readme for more information.", buttons, null, false);
-							return false;
-
-						}
-
-						// Something went wrong
-						buttons = [
-							['Retry', function() { setTimeout(settings.createConfig, 400) }],
-							['', function() {}]
-						];
-						modal.show('Configuration Failed', 'Something unexpected happened. Please try again and check your installation and server. Take a look the readme for more information.', buttons, null, false);
-						return false;
-
-					}, 400);
-
-				} else {
-
-					// Configuration successful
-					window.location.reload();
 
 				}
 
-			});
+				// Creation failed
+				if (data.indexOf('Warning: Creation failed!')!==-1) {
 
-		}],
+					basicModal.show({
-		['', function() {}]
+						body: '<p>Unable to create the database. Double-check your host, username and password and ensure that the specified user has the rights to modify and add content to the database.</p>',
-	];
+						buttons: {
+							action: {
+								title: 'Retry',
+								fn: settings.createConfig
+							}
+						}
+					});
 
-	modal.show('Configuration', "Enter your database connection details below: <input id='dbHost' class='text less' type='text' placeholder='Database Host (optional)' value=''><input id='dbUser' class='text less' type='text' placeholder='Database Username' value=''><input id='dbPassword' class='text more' type='password' placeholder='Database Password' value=''><br>Lychee will create its own database. If required, you can enter the name of an existing database instead:<input id='dbName' class='text less' type='text' placeholder='Database Name (optional)' value=''><input id='dbTablePrefix' class='text more' type='text' placeholder='Table prefix (optional)' value=''>", buttons, -235, false);
+					return false;
+
+				}
+
+				// Could not create file
+				if (data.indexOf('Warning: Could not create file!')!==-1) {
+
+					basicModal.show({
+						body: "<p>Unable to save this configuration. Permission denied in <b>'data/'</b>. Please set the read, write and execute rights for others in <b>'data/'</b> and <b>'uploads/'</b>. Take a look at the readme for more information.</p>",
+						buttons: {
+							action: {
+								title: 'Retry',
+								fn: settings.createConfig
+							}
+						}
+					});
+
+					return false;
+
+				}
+
+				// Something went wrong
+				basicModal.show({
+					body: '<p>Something unexpected happened. Please try again and check your installation and server. Take a look at the readme for more information.</p>',
+					buttons: {
+						action: {
+							title: 'Retry',
+							fn: settings.createConfig
+						}
+					}
+				});
+
+				return false;
+
+			} else {
+
+				// Configuration successful
+				window.location.reload();
+
+			}
+
+		});
+
+	}
+
+	msg =	`
+			<p>
+				Enter your database connection details below:
+				<input data-name='dbHost' class='text' type='text' placeholder='Database Host (optional)' value=''>
+				<input data-name='dbUser' class='text' type='text' placeholder='Database Username' value=''>
+				<input data-name='dbPassword' class='text' type='password' placeholder='Database Password' value=''>
+			</p>
+			<p>
+				Lychee will create its own database. If required, you can enter the name of an existing database instead:
+				<input data-name='dbName' class='text' type='text' placeholder='Database Name (optional)' value=''>
+				<input data-name='dbTablePrefix' class='text' type='text' placeholder='Table prefix (optional)' value=''>
+			</p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Connect',
+				fn: action
+			}
+		}
+	});
 
 }
 
 settings.createLogin = function() {
 
-	var username,
+	var action,
-		password,
+		msg = '';
-		params,
-		buttons;
 
-	buttons = [
+	action = function(data) {
-		['Create Login', function() {
 
-			username = $('.message input.text#username').val();
+		var params,
-			password = $('.message input.text#password').val();
+			username = data.username,
+			password = data.password;
 
-			if (username.length<1||password.length<1) {
+		if (username.length<1) {
+			basicModal.error('username');
+			return false;
+		}
 
-				setTimeout(function() {
+		if (password.length<1) {
+			basicModal.error('password');
+			return false;
+		}
 
-					buttons = [
+		basicModal.close();
-						['Retry', function() { setTimeout(settings.createLogin, 400) }],
-						['', function() {}]
-					];
-					modal.show('Wrong Input', 'The username or password you entered is not long enough. Please try again with another username and password!', buttons, null, false);
-					return false;
 
-				}, 400);
+		params = {
+			username,
+			password
+		}
 
-			} else {
+		api.post('Settings::setLogin', params, function(data) {
 
-				params = 'setLogin&username=' + escape(username) + '&password=' + md5(password);
+			if (data!==true) {
-				lychee.api(params, function(data) {
-
-					if (data!==true) {
-
-						setTimeout(function() {
-
-							buttons = [
-								['Retry', function() { setTimeout(settings.createLogin, 400) }],
-								['', function() {}]
-							];
-							modal.show('Creation Failed', 'Unable to save login. Please try again with another username and password!', buttons, null, false);
-							return false;
-
-						}, 400);
 
+				basicModal.show({
+					body: '<p>Unable to save login. Please try again with another username and password!</p>',
+					buttons: {
+						action: {
+							title: 'Retry',
+							fn: settings.createLogin
+						}
 					}
-
 				});
 
 			}
 
-		}],
+		});
-		['', function() {}]
-	];
 
-	modal.show('Create Login', "Enter a username and password for your installation: <input id='username' class='text less' type='text' placeholder='New Username' value=''><input id='password' class='text' type='password' placeholder='New Password' value=''>", buttons, -122, false);
+	}
+
+	msg =	`
+			<p>
+				Enter a username and password for your installation:
+				<input data-name='username' class='text' type='text' placeholder='New Username' value=''>
+				<input data-name='password' class='text' type='password' placeholder='New Password' value=''>
+			</p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Create Login',
+				fn: action
+			}
+		}
+	});
 
 }
 
 settings.setLogin = function() {
 
-	var old_password,
+	var msg = '',
-		username,
+		action;
-		password,
-		params,
-		buttons;
 
-	buttons = [
+	action = function(data) {
-		['Change Login', function() {
 
-			old_password	= $('.message input.text#old_password').val();
+		var oldPassword		= data.oldPassword	|| '',
-			username		= $('.message input.text#username').val();
+			username		= data.username		|| '',
-			password		= $('.message input.text#password').val();
+			password		= data.password		|| '',
+			params;
 
-			if (old_password.length<1) {
+		if (oldPassword.length<1) {
-				loadingBar.show('error', 'Your old password was entered incorrectly. Please try again!');
+			basicModal.error('oldPassword');
-				return false;
+			return false;
+		}
+
+		if (username.length<1) {
+			basicModal.error('username');
+			return false;
+		}
+
+		if (password.length<1) {
+			basicModal.error('password');
+			return false;
+		}
+
+		basicModal.close();
+
+		params = {
+			oldPassword,
+			username,
+			password
+		}
+
+		api.post('Settings::setLogin', params, function(data) {
+
+			if (data!==true) lychee.error(null, params, data);
+
+		});
+
+	}
+
+	msg =	`
+			<p>
+				Enter your current password:
+				<input data-name='oldPassword' class='text' type='password' placeholder='Current Password' value=''>
+			</p>
+			<p>
+				Your username and password will be changed to the following:
+				<input data-name='username' class='text' type='text' placeholder='New Username' value=''>
+				<input data-name='password' class='text' type='password' placeholder='New Password' value=''>
+			</p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Change Login',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
 			}
-
+		}
-			if (username.length<1) {
+	});
-				loadingBar.show('error', 'Your new username was entered incorrectly. Please try again!');
-				return false;
-			}
-
-			if (password.length<1) {
-				loadingBar.show('error', 'Your new password was entered incorrectly. Please try again!');
-				return false;
-			}
-
-			params = 'setLogin&oldPassword=' + md5(old_password) + '&username=' + escape(username) + '&password=' + md5(password);
-			lychee.api(params, function(data) {
-
-				if (data!==true) lychee.error(null, params, data);
-
-			});
-
-		}],
-		['Cancel', function() {}]
-	];
-
-	modal.show('Change Login', "Enter your current password: <input id='old_password' class='text more' type='password' placeholder='Current Password' value=''><br>Your username and password will be changed to the following: <input id='username' class='text less' type='text' placeholder='New Username' value=''><input id='password' class='text' type='password' placeholder='New Password' value=''>", buttons, -171);
 
 }
 
 settings.setSorting = function() {
 
-	var buttons,
+	var sorting = [],
-		sorting,
+		action,
-		params;
+		msg = '';
 
-	buttons = [
+	action = function() {
-		['Change Sorting', function() {
 
-			sorting[0] = $('select#settings_type').val();
+		var params;
-			sorting[1] = $('select#settings_order').val();
 
-			albums.refresh();
+		sorting[0] = $('.basicModal select#settings_type').val();
+		sorting[1] = $('.basicModal select#settings_order').val();
 
-			params = 'setSorting&type=' + sorting[0] + '&order=' + sorting[1];
+		basicModal.close();
-			lychee.api(params, function(data) {
+		albums.refresh();
 
-				if (data===true) {
+		params = {
-					lychee.sorting = 'ORDER BY ' + sorting[0] + ' ' + sorting[1];
+			type: sorting[0],
-					lychee.load();
+			order: sorting[1]
-				} else lychee.error(null, params, data);
+		}
 
-			});
+		api.post('Settings::setSorting', params, function(data) {
 
-		}],
+			if (data===true) {
-		['Cancel', function() {}]
+				lychee.sorting = 'ORDER BY ' + sorting[0] + ' ' + sorting[1];
-	];
+				lychee.load();
+			} else lychee.error(null, params, data);
 
-	modal.show('Change Sorting',
+		});
-		"Sort photos by \
+
-			<select id='settings_type'> \
+	}
-				<option value='id'>Upload Time</option> \
+
-				<option value='takestamp'>Take Date</option> \
+	msg =	`
-				<option value='title'>Title</option> \
+			<p>
-				<option value='description'>Description</option> \
+				Sort photos by
-				<option value='public'>Public</option> \
+				<select id='settings_type'>
-				<option value='star'>Star</option> \
+					<option value='id'>Upload Time</option>
-				<option value='type'>Photo Format</option> \
+					<option value='takestamp'>Take Date</option>
-			</select> \
+					<option value='title'>Title</option>
-			in an \
+					<option value='description'>Description</option>
-			<select id='settings_order'> \
+					<option value='public'>Public</option>
-				<option value='ASC'>Ascending</option> \
+					<option value='star'>Star</option>
-				<option value='DESC'>Descending</option> \
+					<option value='type'>Photo Format</option>
-			</select> \
+				</select>
-			order.\
+				in an
-		", buttons);
+				<select id='settings_order'>
+					<option value='ASC'>Ascending</option>
+					<option value='DESC'>Descending</option>
+				</select>
+				order.
+			</p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Change Sorting',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
+			}
+		}
+	});
 
 	if (lychee.sorting!=='') {
 
 		sorting = lychee.sorting.replace('ORDER BY ', '').split(' ');
 
-		$('select#settings_type').val(sorting[0]);
+		$('.basicModal select#settings_type').val(sorting[0]);
-		$('select#settings_order').val(sorting[1]);
+		$('.basicModal select#settings_order').val(sorting[1]);
 
 	}
 
@@ -261,29 +359,50 @@ settings.setSorting = function() {
 
 settings.setDropboxKey = function(callback) {
 
-	var buttons,
+	var action,
-		params,
+		msg = "";
-		key;
 
-	buttons = [
+	action = function(data) {
-		['Set Key', function() {
 
-			key = $('.message input.text#key').val();
+		var key = data.key;
 
-			params = 'setDropboxKey&key=' + key;
+		if (data.key.length<1) {
-			lychee.api(params, function(data) {
+			basicModal.error('key');
+			return false;
+		}
 
-				if (data===true) {
+		basicModal.close();
-					lychee.dropboxKey = key;
-					if (callback) lychee.loadDropbox(callback);
-				} else lychee.error(null, params, data);
 
-			});
+		api.post('Settings::setDropboxKey', { key }, function(data) {
 
-		}],
+			if (data===true) {
-		['Cancel', function() {}]
+				lychee.dropboxKey = key;
-	];
+				if (callback) lychee.loadDropbox(callback);
+			} else lychee.error(null, params, data);
 
-	modal.show('Set Dropbox Key', "In order to import photos from your Dropbox, you need a valid drop-ins app key from <a href='https://www.dropbox.com/developers/apps/create'>their website</a>. Generate yourself a personal key and enter it below: <input id='key' class='text' type='text' placeholder='Dropbox API Key' value='" + lychee.dropboxKey + "'>", buttons);
+		});
+
+	}
+
+	msg =	`
+			<p>
+				In order to import photos from your Dropbox, you need a valid drop-ins app key from <a href='https://www.dropbox.com/developers/apps/create'>their website</a>. Generate yourself a personal key and enter it below:
+				<input class='text' data-name='key' type='text' placeholder='Dropbox API Key' value='${ lychee.dropboxKey }'>
+			</p>
+			`
+
+	basicModal.show({
+		body: msg,
+		buttons: {
+			action: {
+				title: 'Set Dropbox Key',
+				fn: action
+			},
+			cancel: {
+				title: 'Cancel',
+				fn: basicModal.close
+			}
+		}
+	});
 
 }

src/scripts/swipe.js

@@ -1,6 +1,6 @@
 /**
  * @description	Swipes and moves an object.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 swipe = {

src/scripts/upload.js

@@ -1,17 +1,23 @@
 /**
  * @description	Takes care of every action an album can handle and execute.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 upload = {}
 
 upload.show = function(title, files, callback) {
 
-	upload.close(true);
+	basicModal.show({
-
+		body: build.uploadModal(title, files),
-	$('body').append(build.uploadModal(title, files));
+		buttons: {
-
+			action: {
-	if (callback!==null&&callback!==undefined) callback();
+				title: 'Close',
+				class: 'hidden',
+				fn: basicModal.close
+			}
+		},
+		callback
+	});
 
 }
 
@@ -53,13 +59,13 @@ upload.start = {
 						if (error===false) {
 
 							// Success
-							upload.close();
+							basicModal.close();
 							upload.notify('Upload complete');
 
 						} else {
 
 							// Error
-							$('.upload_message a.close').show();
+							$('.basicModal #basicModal__action.hidden').show();
 							upload.notify('Upload complete', 'Failed to upload one or more photos.');
 
 						}
@@ -100,12 +106,12 @@ upload.start = {
 
 				}
 
-				formData.append('function', 'upload');
+				formData.append('function', 'Photo::add');
 				formData.append('albumID', albumID);
 				formData.append('tags', '');
 				formData.append(0, file);
 
-				xhr.open('POST', lychee.api_path);
+				xhr.open('POST', api.path);
 
 				xhr.onload = function() {
 
@@ -118,21 +124,21 @@ upload.start = {
 					if (xhr.status===200&&xhr.responseText==='1') {
 
 						// Success
-						$('.upload_message .rows .row:nth-child(' + (file.num+1) + ') .status')
+						$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
 							.html('Finished')
 							.addClass('success');
 
 					} else {
 
 						// Error
-						$('.upload_message .rows .row:nth-child(' + (file.num+1) + ') .status')
+						$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
 							.html('Error')
 							.addClass('error');
 
 						if (xhr.responseText.substr(0, 6)==='Error:') errorText = xhr.responseText.substr(6) + ' Please take a look at the console of your browser for further details.';
 						else errorText = 'Server returned an unknown response. Please take a look at the console of your browser for further details.';
 
-						$('.upload_message .rows .row:nth-child(' + (file.num+1) + ') p.notice')
+						$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') p.notice')
 							.html(errorText)
 							.show();
 
@@ -168,7 +174,7 @@ upload.start = {
 
 						// Set progress when progress has changed
 						if (progress>pre_progress) {
-							$('.upload_message .rows .row:nth-child(' + (file.num+1) + ') .status').html(progress + '%');
+							$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html(progress + '%');
 							pre_progress = progress;
 						}
 
@@ -177,10 +183,10 @@ upload.start = {
 							// Scroll to the uploading file
 							var scrollPos = 0;
 							if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
-							$('.upload_message .rows').scrollTop(scrollPos);
+							$('.basicModal .rows').scrollTop(scrollPos);
 
 							// Set status to processing
-							$('.upload_message .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing');
+							$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing');
 
 							// Upload next file
 							if (file.next!==null) process(files, file.next);
@@ -219,50 +225,56 @@ upload.start = {
 
 		window.onbeforeunload = function() { return 'Lychee is currently uploading!'; };
 
-		upload.show('Uploading', files);
+		upload.show('Uploading', files, function() {
 
-		// Upload first file
+			// Upload first file
-		process(files, files[0]);
+			process(files, files[0]);
+
+		});
 
 	},
 
 	url: function() {
 
 		var albumID = album.getID(),
-			params,
+			action;
-			extension,
-			buttons,
-			link,
-			files = [];
 
 		if (albumID===false) albumID = 0;
 
-		buttons = [
+		action = function(data) {
-			['Import', function() {
 
-				link = $('.message input.text').val();
+			var extension,
+				files = [];
 
-				if (link&&link.length>3) {
+			if (data.link&&data.link.length>3) {
 
-					extension = link.split('.').pop();
+				basicModal.close();
-					if (extension!=='jpeg'&&extension!=='jpg'&&extension!=='png'&&extension!=='gif'&&extension!=='webp') {
+
-						loadingBar.show('error', 'The file format of this link is not supported.');
+				extension = data.link.split('.').pop();
-						return false;
+				if (extension!=='jpeg'&&extension!=='jpg'&&extension!=='png'&&extension!=='gif'&&extension!=='webp') {
+					loadingBar.show('error', 'The file format of this link is not supported.');
+					return false;
+				}
+
+				files[0] = {
+					name:		data.link,
+					supported:	true
+				}
+
+				upload.show('Importing URL', files, function() {
+
+					var params;
+
+					$('.basicModal .rows .row .status').html('Importing');
+
+					params = {
+						url: data.link,
+						albumID
 					}
 
-					files[0] = {
+					api.post('Import::url', params, function(data) {
-						name:		link,
-						supported:	true
-					}
 
-					upload.show('Importing URL', files, function() {
+						basicModal.close();
-						$('.upload_message .rows .row .status').html('Importing');
-					});
-
-					params = 'importUrl&url=' + escape(encodeURI(link)) + '&albumID=' + albumID;
-					lychee.api(params, function(data) {
-
-						upload.close();
 						upload.notify('Import complete');
 
 						albums.refresh();
@@ -274,44 +286,58 @@ upload.start = {
 
 					});
 
-				} else loadingBar.show('error', 'Link to short or too long. Please try another one!');
+				});
 
-			}],
+			} else basicModal.error('link');
-			['Cancel', function() {}]
-		];
 
-		modal.show('Import from Link', "Please enter the direct link to a photo to import it: <input class='text' type='text' placeholder='http://' value='http://'>", buttons);
+		}
+
+		basicModal.show({
+			body: "<p>Please enter the direct link to a photo to import it: <input class='text' data-name='link' type='text' placeholder='http://' value=''></p>",
+			buttons: {
+				action: {
+					title: 'Import',
+					fn: action
+				},
+				cancel: {
+					title: 'Cancel',
+					fn: basicModal.close
+				}
+			}
+		});
 
 	},
 
 	server: function() {
 
 		var albumID = album.getID(),
-			params,
+			action;
-			buttons,
-			files = [],
-			path;
 
 		if (albumID===false) albumID = 0;
 
-		buttons = [
+		action = function(data) {
-			['Import', function() {
 
-				path = $('.message input.text').val();
+			var files = [];
 
-				files[0] = {
+			files[0] = {
-					name:		path,
+				name:		data.path,
-					supported:	true
+				supported:	true
-				};
+			};
 
-				upload.show('Importing from server', files, function() {
+			upload.show('Importing from server', files, function() {
-					$('.upload_message .rows .row .status').html('Importing');
-				});
 
-				params = 'importServer&albumID=' + albumID + '&path=' + escape(encodeURI(path));
+				var params;
-				lychee.api(params, function(data) {
 
-					upload.close();
+				$('.basicModal .rows .row .status').html('Importing');
+
+				params = {
+					albumID,
+					path: data.path
+				}
+
+				api.post('Import::server', params, function(data) {
+
+					basicModal.close();
 					upload.notify('Import complete');
 
 					albums.refresh();
@@ -329,76 +355,87 @@ upload.start = {
 
 				});
 
-			}],
+			});
-			['Cancel', function() {}]
-		];
 
-		modal.show('Import from Server', "This action will import all photos, folders and sub-folders which are located in the following directory. The <b>original files will be deleted</b> after the import when possible. <input class='text' type='text' maxlength='100' placeholder='Absolute path to directory' value='" + lychee.location + "uploads/import/'>", buttons);
+		}
+
+		basicModal.show({
+			body: "<p>This action will import all photos, folders and sub-folders which are located in the following directory. The <b>original files will be deleted</b> after the import when possible. <input class='text' data-name='path' type='text' maxlength='100' placeholder='Absolute path to directory' value='" + lychee.location + "uploads/import/'></p>",
+			buttons: {
+				action: {
+					title: 'Import',
+					fn: action
+				},
+				cancel: {
+					title: 'Cancel',
+					fn: basicModal.close
+				}
+			}
+		});
 
 	},
 
 	dropbox: function() {
 
 		var albumID = album.getID(),
-			params,
+			links = '',
-			links = '';
+			success;
 
 		if (albumID===false) albumID = 0;
 
+		success = function(files) {
+
+			for (var i = 0; i < files.length; i++) {
+
+				links += files[i].link + ',';
+
+				files[i] = {
+					name:		files[i].link,
+					supported:	true
+				};
+
+			}
+
+			// Remove last comma
+			links = links.substr(0, links.length-1);
+
+			upload.show('Importing from Dropbox', files, function() {
+
+				var params;
+
+				$('.basicModal .rows .row .status').html('Importing');
+
+				params = {
+					url: links,
+					albumID
+				}
+
+				api.post('Import::url', params, function(data) {
+
+					basicModal.close();
+					upload.notify('Import complete');
+
+					albums.refresh();
+
+					if (album.getID()===false) lychee.goto('0');
+					else album.load(albumID);
+
+					if (data!==true) lychee.error(null, params, data);
+
+				});
+
+			});
+
+		}
+
 		lychee.loadDropbox(function() {
 			Dropbox.choose({
 				linkType: 'direct',
 				multiselect: true,
-				success: function(files) {
+				success
-
-					for (var i = 0; i < files.length; i++) {
-
-						links += files[i].link + ',';
-
-						files[i] = {
-							name:		files[i].link,
-							supported:	true
-						};
-
-					}
-
-					// Remove last comma
-					links = links.substr(0, links.length-1);
-
-					upload.show('Importing from Dropbox', files, function() {
-						$('.upload_message .rows .row .status').html('Importing');
-					});
-
-					params = 'importUrl&url=' + escape(links) + '&albumID=' + albumID;
-					lychee.api(params, function(data) {
-
-						upload.close();
-						upload.notify('Import complete');
-
-						albums.refresh();
-
-						if (album.getID()===false) lychee.goto('0');
-						else album.load(albumID);
-
-						if (data!==true) lychee.error(null, params, data);
-
-					});
-
-				}
 			});
 		});
 
 	}
 
 }
-
-upload.close = function(force) {
-
-	if (force===true) {
-		$('.upload_overlay').remove();
-	} else {
-		$('.upload_overlay').removeClass('fadeIn').css('opacity', 0);
-		setTimeout(function() { $('.upload_overlay').remove() }, 300);
-	}
-
-}

src/scripts/view.js

@@ -1,105 +1,10 @@
 /**
  * @description	Responsible to reflect data changes to the UI.
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 view = {}
 
-view.header = {
-
-	show: function() {
-
-		var newMargin = -1*($('#imageview #image').height()/2)+20;
-
-		clearTimeout($(window).data('timeout'));
-
-		lychee.imageview.removeClass('full');
-		lychee.header.removeClass('hidden');
-		lychee.loadingBar.css('opacity', 1);
-
-		// Adjust position or size of photo
-		if ($('#imageview #image.small').length>0)	$('#imageview #image').css('margin-top', newMargin);
-		else										$('#imageview #image').removeClass('full');
-
-	},
-
-	hide: function(e, delay) {
-
-		var newMargin = -1*($('#imageview #image').height()/2);
-
-		if (delay===undefined) delay = 500;
-
-		if (visible.photo()&&!visible.infobox()&&!visible.contextMenu()&&!visible.message()) {
-
-			clearTimeout($(window).data('timeout'));
-
-			$(window).data('timeout', setTimeout(function() {
-
-				lychee.imageview.addClass('full');
-				lychee.header.addClass('hidden');
-				lychee.loadingBar.css('opacity', 0);
-
-				// Adjust position or size of photo
-				if ($('#imageview #image.small').length>0)	$('#imageview #image').css('margin-top', newMargin);
-				else										$('#imageview #image').addClass('full');
-
-			}, delay));
-
-		}
-
-	},
-
-	mode: function(mode) {
-
-		var albumID = album.getID();
-
-		switch (mode) {
-
-			case 'albums':
-
-				lychee.header.removeClass('view');
-				$('#tools_album, #tools_photo').hide();
-				$('#tools_albums').show();
-
-				break;
-
-			case 'album':
-
-				lychee.header.removeClass('view');
-				$('#tools_albums, #tools_photo').hide();
-				$('#tools_album').show();
-
-				// Hide download button when album empty
-				album.json.content === false ? $('#button_archive').hide() : $('#button_archive').show();
-
-				// Hide download button when not logged in and album not downloadable
-				if (lychee.publicMode&&album.json.downloadable==='0') $('#button_archive').hide();
-
-				if (albumID==='s'||albumID==='f'||albumID==='r') {
-					$('#button_info_album, #button_trash_album, #button_share_album').hide();
-				} else if (albumID==='0') {
-					$('#button_info_album, #button_share_album').hide();
-					$('#button_trash_album').show();
-				} else {
-					$('#button_info_album, #button_trash_album, #button_share_album').show();
-				}
-
-				break;
-
-			case 'photo':
-
-				lychee.header.addClass('view');
-				$('#tools_albums, #tools_album').hide();
-				$('#tools_photo').show();
-
-				break;
-
-		}
-
-	}
-
-}
-
 view.infobox = {
 
 	show: function() {
@@ -166,7 +71,7 @@ view.albums = {
 
 			if (smartData===''&&albumsData==='') {
 				lychee.content.html('');
-				$('body').append(build.no_content('share'));
+				$('body').append(build.no_content('eye'));
 			} else {
 				lychee.content.html(smartData + albumsData);
 			}
@@ -182,19 +87,16 @@ view.albums = {
 
 		title: function(albumID) {
 
-			var prefix		= '',
+			var longTitle	= '',
-				longTitle	= '',
 				title		= albums.json.content[albumID].title;
 
-			if (albums.json.content[albumID].password) prefix = "<span class='icon-lock'></span> ";
-
 			if (title!==null&&title.length>18) {
 				longTitle	= title;
 				title		= title.substr(0, 18) + '...';
 			}
 
 			$('.album[data-id="' + albumID + '"] .overlay h1')
-				.html(prefix + title)
+				.html(title)
 				.attr('title', longTitle);
 
 		},
@@ -300,15 +202,15 @@ view.album = {
 
 		star: function(photoID) {
 
-			$('.photo[data-id="' + photoID + '"] .icon-star').remove();
+			$('.photo[data-id="' + photoID + '"] .iconic-star').remove();
-			if (album.json.content[photoID].star==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge red icon-star'></a>");
+			if (album.json.content[photoID].star==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-star'>" + build.iconic('star') + "</a>");
 
 		},
 
 		public: function(photoID) {
 
-			$('.photo[data-id="' + photoID + '"] .icon-share').remove();
+			$('.photo[data-id="' + photoID + '"] .iconic-share').remove();
-			if (album.json.content[photoID].public==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge red icon-share'></a>");
+			if (album.json.content[photoID].public==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-share'>" + build.iconic('eye') + "</a>");
 
 		},
 
@@ -346,13 +248,21 @@ view.album = {
 	public: function() {
 
 		if (album.json.public==1) {
-			$('#button_share_album a').addClass('active');
+
-			$('#button_share_album').attr('title', 'Share Album');
+			$('#button_share_album')
-			$('.photo .icon-share').remove();
+				.addClass('active')
+				.attr('title', 'Share Album');
+
+			$('.photo .iconic-share').remove();
+
 			if (album.json.init) $('#infobox .attr_visibility').html('Public');
+
 		} else {
-			$('#button_share_album a').removeClass('active');
+
-			$('#button_share_album').attr('title', 'Make Public');
+			$('#button_share_album')
+				.removeClass('active')
+				.attr('title', 'Make Public');
+
 			if (album.json.init) $('#infobox .attr_visibility').html('Private');
 		}
 
@@ -360,14 +270,14 @@ view.album = {
 
 	password: function() {
 
-		if (album.json.password==1) $('#infobox .attr_password').html('Yes');
+		if (album.json.password==1)	$('#infobox .attr_password').html('Yes');
-		else $('#infobox .attr_password').html('No');
+		else						$('#infobox .attr_password').html('No');
 
 	},
 
 	infobox: function() {
 
-		if ((visible.album()||!album.json.init)&&!visible.photo()) lychee.infobox.html(build.infoboxAlbum(album.json)).show();
+		if ((visible.album()||!album.json.init)&&!visible.photo()) lychee.infobox.find('.wrapper').html(build.infoboxAlbum(album.json));
 
 	}
 
@@ -393,15 +303,15 @@ view.photo = {
 
 		// Change header
 		lychee.content.addClass('view');
-		view.header.mode('photo');
+		header.setMode('photo');
 
 		// Make body not scrollable
 		$('body').css('overflow', 'hidden');
 
 		// Fullscreen
 		$(document)
-			.bind('mouseenter', view.header.show)
+			.bind('mouseenter', header.show)
-			.bind('mouseleave', view.header.hide);
+			.bind('mouseleave', header.hide);
 
 		lychee.animate(lychee.imageview, 'fadeIn');
 
@@ -409,11 +319,11 @@ view.photo = {
 
 	hide: function() {
 
-		view.header.show();
+		header.show();
 		if (visible.infobox) view.infobox.hide();
 
 		lychee.content.removeClass('view');
-		view.header.mode('album');
+		header.setMode('album');
 
 		// Make body scrollable
 		$('body').css('overflow', 'auto');
@@ -447,14 +357,14 @@ view.photo = {
 
 	star: function() {
 
-		$('#button_star a').removeClass('icon-star-empty icon-star');
 		if (photo.json.star==1) {
 			// Starred
-			$('#button_star a').addClass('icon-star');
+			$('#button_star')
-			$('#button_star').attr('title', 'Unstar Photo');
+				.addClass('active')
+				.attr('title', 'Unstar Photo');
 		} else {
 			// Unstarred
-			$('#button_star a').addClass('icon-star-empty');
+			$('#button_star').removeClass('active');
 			$('#button_star').attr('title', 'Star Photo');
 		}
 
@@ -464,13 +374,15 @@ view.photo = {
 
 		if (photo.json.public==1||photo.json.public==2) {
 			// Photo public
-			$('#button_share a').addClass('active');
+			$('#button_share')
-			$('#button_share').attr('title', 'Share Photo');
+				.addClass('active')
+				.attr('title', 'Share Photo');
 			if (photo.json.init) $('#infobox .attr_visibility').html('Public');
 		} else {
 			// Photo private
-			$('#button_share a').removeClass('active');
+			$('#button_share')
-			$('#button_share').attr('title', 'Make Public');
+				.removeClass('active')
+				.attr('title', 'Make Public');
 			if (photo.json.init) $('#infobox .attr_visibility').html('Private');
 		}
 
@@ -486,14 +398,36 @@ view.photo = {
 
 		lychee.imageview.html(build.imageview(photo.json, photo.getSize(), visible.controls()));
 
-		if ((album.json&&album.json.content&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].nextPhoto==='')||lychee.viewMode) $('a#next').hide();
+		var $nextArrow		= lychee.imageview.find('a#next'),
-		if ((album.json&&album.json.content&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].previousPhoto==='')||lychee.viewMode) $('a#previous').hide();
+			$previousArrow	= lychee.imageview.find('a#previous'),
+			hasNext			= album.json&&album.json.content&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].nextPhoto==='',
+			hasPrevious		= album.json&&album.json.content&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].previousPhoto==='';
+
+		if (hasNext||lychee.viewMode) { $nextArrow.hide(); }
+		else {
+
+			var nextPhotoID	= album.json.content[photo.getID()].nextPhoto,
+				nextPhoto	= album.json.content[nextPhotoID];
+
+			$nextArrow.css('background-image', 'linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url("' + nextPhoto.thumbUrl + '")');
+
+		}
+
+		if (hasPrevious||lychee.viewMode) { $previousArrow.hide(); }
+		else {
+
+			var previousPhotoID	= album.json.content[photo.getID()].previousPhoto,
+				previousPhoto	= album.json.content[previousPhotoID];
+
+			$previousArrow.css('background-image', 'linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url("' + previousPhoto.thumbUrl + '")');
+
+		};
 
 	},
 
 	infobox: function() {
 
-		lychee.infobox.html(build.infoboxPhoto(photo.json)).show();
+		lychee.infobox.find('.wrapper').html(build.infoboxPhoto(photo.json));
 
 	}
 

src/scripts/view/main.js

@@ -1,6 +1,6 @@
 /**
  * @description	Used to view single photos with view.php
- * @copyright	2014 by Tobias Reich
+ * @copyright	2015 by Tobias Reich
  */
 
 var header		= $('header'),
@@ -12,19 +12,19 @@ var header		= $('header'),
 $(document).ready(function(){
 
 	/* Event Name */
-	if (mobileBrowser())	event_name = 'touchend';
+	if ('ontouchend' in document.documentElement)	eventName = 'touchend';
-	else					event_name = 'click';
+	else											eventName = 'click';
 
 	/* Window */
 	$(window).keydown(key);
 
 	/* Infobox */
-	$(document)			.on(event_name, '#infobox .header a', hideInfobox);
+	infobox.find('.header .close').on(eventName, hideInfobox);
-	$(document)			.on(event_name, '#infobox_overlay', hideInfobox);
+	$(document)			.on(eventName, '#infobox_overlay', hideInfobox);
-	$('#button_info')	.on(event_name, showInfobox);
+	$('#button_info')	.on(eventName, showInfobox);
 
 	/* Direct Link */
-	$('#button_direct').on(event_name, function() {
+	$('#button_direct').on(eventName, function() {
 
 		var link = $('#imageview #image').css('background-image').replace(/"/g,'').replace(/url\(|\)$/ig, '');
 		window.open(link, '_newtab');
@@ -123,7 +123,7 @@ loadPhotoInfo = function(photoID) {
 			.addClass('fadeIn')
 			.show();
 
-		infobox.html(build.infoboxPhoto(data, true)).show();
+		infobox.find('.wrapper').html(build.infoboxPhoto(data, true));
 
 	}, error: ajaxError });
 

src/scripts/visible.js

@@ -1,8 +1,6 @@
 /**
- * @name        Visible Module
  * @description	This module is used to check if elements are visible or not.
- * @author		Tobias Reich
+ * @copyright	2015 by Tobias Reich
- * @copyright	2014 by Tobias Reich
  */
 
 visible = {}

src/styles/_animations.scss

@@ -1,5 +1,5 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 /* Animation Setter ------------------------------------------------*/
@@ -7,28 +7,28 @@
 	animation-name: fadeIn;
 	animation-duration: .3s;
 	animation-fill-mode: forwards;
-	animation-timing-function: cubic-bezier(0.51,.92,.24,1.15);
+	animation-timing-function: $timingBounce;
 }
 
 .fadeOut {
 	animation-name: fadeOut;
 	animation-duration: .3s;
 	animation-fill-mode: forwards;
-	animation-timing-function: cubic-bezier(0.51,.92,.24,1.15);
+	animation-timing-function: $timingBounce;
 }
 
 .contentZoomIn {
 	animation-name: zoomIn;
 	animation-duration: .2s;
 	animation-fill-mode: forwards;
-	animation-timing-function: cubic-bezier(0.51,.92,.24,1);
+	animation-timing-function: $timing;
 }
 
 .contentZoomOut {
 	animation-name: zoomOut;
 	animation-duration: .2s;
 	animation-fill-mode: forwards;
-	animation-timing-function: cubic-bezier(0.51,.92,.24,1);
+	animation-timing-function: $timing;
 }
 
 /* moveUp ------------------------------------------------*/
@@ -115,7 +115,7 @@
 		opacity: 1;
 	}
 	50% {
-		opacity: 0.3;
+		opacity: .3;
 	}
 	100% {
 		opacity: 1;

src/styles/_content.scss

@@ -1,37 +1,30 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 #content {
+
 	position: absolute;
-	padding: 50px 0px 33px 0px;
+	padding: 50px 0 33px;
 	width: 100%;
-	min-height: calc(100% - 90px);
+	min-height: calc(100% - 83px);
 	-webkit-overflow-scrolling: touch;
 
- 	// Adds a gradient to the top
 	&::before {
 		content: '';
 		position: absolute;
-		left: 0px;
 		width: 100%;
-		height: 20px;
+		height: 1px;
-		background: linear-gradient(to bottom, #262626, #222);
+		border-top: 1px solid white(.02);
-		border-top: 1px solid #333;
 	}
 
-	// Removes the gradient when using the view
+	/* Albums and Photos ------------------------------------------------*/
-	&.view::before {
+	.album,
-		display: none;
+	.photo {
-	}
-}
-
-	/* Photo ------------------------------------------------*/
-	.photo  {
 		float: left;
-		display: inline-block;
+		position: relative;
-		width: 206px;
+		width: 202px;
-		height: 206px;
+		height: 202px;
 		margin: 30px 0 0 30px;
 		cursor: pointer;
 
@@ -40,79 +33,56 @@
 			width: 200px;
 			height: 200px;
 			background-color: #222;
-			border-radius: 2px;
+			box-shadow: 0 2px 5px black(.5);
-			border: 2px solid #ccc;
+			border: 1px solid white(.5);
+			transition: opacity .3s ease-out, transform .3s ease-out, border-color .3s ease-out;
 		}
 
 		&:hover img,
 		&.active img {
-			box-shadow: 0 0 5px #005ecc;
+			border-color: $colorBlue;
-		}
-
-		&:active {
-			transition-duration: .1s;
-			transform: scale(.98);
 		}
 	}
 
 	/* Album ------------------------------------------------*/
 	.album  {
-		float: left;
+		img:first-child,
-		display: inline-block;
+		img:nth-child(2) {
-		width: 204px;
+			transform: rotate(0) translateY(0) translateX(0);
-		height: 204px;
+			opacity: 0;
-		margin: 30px 0px 0px 30px;
-		cursor: pointer;
-
-		img {
-			position: absolute;
-			width: 200px;
-			height: 200px;
-			background-color: #222;
-			border-radius: 2px;
-			border: 2px solid #ccc;
-
-			&:first-child,
-			&:nth-child(2) {
-				transform: rotate(0) translateY(0) translateX(0);
-				opacity: 0;
-			}
 		}
 
-		&:hover img:first-child {
+		&:hover img:nth-child(1),
-			transform: rotate(-2deg) translateY(10px) translateX(-12px);
+		&:hover img:nth-child(2) { opacity: 1; }
-			opacity: 1;
-		}
 
-		&:hover img:nth-child(2) {
+		&:hover img:nth-child(1) { transform: rotate(-2deg) translateY(10px) translateX(-12px); }
-			transform: rotate(5deg) translateY(-8px) translateX(12px);
-			opacity: 1;
-		}
 
-		&:hover img,
+		&:hover img:nth-child(2) { transform: rotate(5deg) translateY(-8px) translateX(12px); }
-		&.active img {
+	}
-			box-shadow: 0 0 5px #005ecc;
+
-		}
+	/* Photo ------------------------------------------------*/
+	.photo:active  {
+		transition-duration: .1s;
+		transform: scale(.98);
 	}
 
 	/* Album/Photo Overlay ------------------------------------------------*/
 	.album .overlay,
 	.photo .overlay {
 		position: absolute;
+		margin: 0 1px;
 		width: 200px;
-		height: 200px;
+		background: black(.6);
-		margin: 2px;
+		background: linear-gradient(to bottom, black(0), black(.6));
-		background: linear-gradient(to bottom, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 60%, rgba(0,0,0,0.5) 80%, rgba(0,0,0,0.9) 100%);
+		bottom: 1px;
 	}
 
 	// No overlay for empty albums
 	.album img[data-type^='nonretina'] + .overlay {
-		background: rgba(0, 0, 0, 0.2);
+		background: none;
 	}
 
-	.photo .overlay {
+	.photo .overlay { opacity: 0; }
-		opacity: 0;
-	}
 
 	.photo:hover .overlay,
 	.photo.active .overlay {
@@ -123,8 +93,9 @@
 	.photo .overlay h1 {
 		min-height: 19px;
 		width: 185px;
-		margin: 152px 0 3px 15px;
+		margin: 12px 0 5px 15px;
 		color: #fff;
+		text-shadow: 0 1px 3px black(.4);
 		font-size: 16px;
 		font-weight: bold;
 		overflow: hidden;
@@ -132,122 +103,95 @@
 
 	.album .overlay a,
 	.photo .overlay a {
+		display: block;
+		margin: 0 0 12px 15px;
 		font-size: 11px;
-		color: #aaa;
+		color: #bbb;
+		text-shadow: 0 1px 3px black(.4);
 	}
 
-	.album .overlay a {
+	.photo .overlay a .iconic {
-		margin-left: 15px;
+		fill: #bbb;
+		margin: 0 5px 0 0;
+		width: 8px;
+		filter: drop-shadow(0 1px 3px black(.4));
 	}
 
-	.photo .overlay a {
+	.album img[data-type^='nonretina'] + .overlay h1,
-		margin: 155px 0 5px 15px;
+	.album img[data-type^='nonretina'] + .overlay a  { text-shadow: none; }
-
-		span { margin: 0 5px 0 0; }
-	}
 
 	/* Badges ------------------------------------------------*/
 	.album .badge,
 	.photo .badge {
 		position: absolute;
-		margin-top: -1px;
+		margin: -1px 0 0 12px;
-		margin-left: 12px;
+		padding: 12px 8px 6px;
-		padding: 12px 7px 3px 7px;
+		box-shadow: 0 0 2px black(.6);
-		background: linear-gradient(to bottom, #d64b4b 0%, #ab2c2c 100%);
+		background: $colorRed;
-		box-shadow: 0 0 3px rgba(0, 0, 0, .8);
+		border-radius: 0 0 5px 5px;
-		border-radius: 0 0 3px 3px;
 		border: 1px solid #fff;
 		border-top: none;
 		color: #fff;
-		font-size: 24px;
+		text-shadow: 0 1px 0 black(.4);
-		text-shadow: 0 1px 0 rgba(0, 0, 0, .4);
 		opacity: .9;
 
-		&::after {
+		&:nth-child(2n) { margin-left: 54px; }
-			content: '';
+
-			position: absolute;
+		.iconic {
-			margin-top: -12px;
+			fill: #fff;
-			margin-left: -26px;
+			width: 16px;
-			width: 38px;
+			filter: drop-shadow($shadowLight);
-			height: 5px;
-			background: linear-gradient(to bottom, rgba(0,0,0,1) 0%,rgba(0,0,0,0) 100%);
-			opacity: .4;
 		}
-
-		&:nth-child(2n) {
-			margin-left: 57px;
-		}
-	}
-
-	.album .badge.icon-star,
-	.photo .badge.icon-star {
-		padding: 12px 8px 3px 8px;
-
-		&::after { margin-left: -29px; }
-	}
-
-	.album .badge.icon-share,
-	.photo .badge.icon-share {
-		padding: 12px 6px 3px 8px;
-
-		&::after { margin-left: -31px; }
-	}
-
-	.album .badge.icon-time,
-	.photo .badge.icon-time {
-		padding: 12px 8px 3px 9px;
-
-		::after { margin-left: -29px; }
-	}
-
-	.album .badge.icon-reorder::after {
-		margin-left: -30px;
 	}
 
 	/* Divider ------------------------------------------------*/
 	.divider {
 		float: left;
+		margin: 50px 0 0;
+		padding: 10px 0 0;
 		width: 100%;
-		margin-top: 50px;
 		opacity: 0;
-		border-top: 1px solid rgba(255, 255, 255, .03);
+		border-top: 1px solid white(.02);
-		box-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
+		box-shadow: $shadow;
 
 		&:first-child {
-			margin-top: 0;
+			margin-top: 10px;
-			border-top: none;
+			border-top: 0;
+			box-shadow: none;
 		}
 
 		h1 {
 			float: left;
-			margin: 20px 0 0 30px;
+			margin: 0 0 0 30px;
-			color: #fff;
+			color: white(.6);
 			font-size: 14px;
 			font-weight: bold;
-			text-shadow: 0 -1px 0 rgba(0, 0, 0, .5);
+			text-shadow: $shadow;
 		}
 	}
 
-	/* No Content ------------------------------------------------*/
+}
-	.no_content {
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		height: 160px;
-		width: 180px;
-		margin-top: -60px;
-		margin-left: -90px;
-		padding-top: 20px;
-		color: rgba(20, 20, 20, 1);
-		text-shadow: 0px 1px 0px rgba(255, 255, 255, .05);
-		text-align: center;
 
-		.icon {
+/* No Content ------------------------------------------------*/
-			font-size: 80px;
+.no_content {
-		}
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	padding-top: 20px;
+	color: black(.9);
+	text-shadow: 0 1px 0 white(.03);
+	text-align: center;
+	transform: translateX(-50%) translateY(-50%);
 
-		p {
+	.iconic {
-			font-size: 18px;
+		fill: black(.9);
-			font-weight: bold;
+		margin: 0 0 10px;
-		}
+		width: 60px;
+		filter: drop-shadow(0 1px 0 white(.03));
 	}
+
+	p {
+		font-size: 18px;
+		font-weight: bold;
+	}
+}

src/styles/_contextmenu.scss

@@ -1,62 +1,76 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 /* Context ------------------------------------------------*/
 .basicContext {
 
 	padding: 5px 0 6px;
-	background: linear-gradient(to bottom, #444 0%, #2f2f2f 100%);
+	background: linear-gradient(to bottom, #333, #252525);
-	border: 1px solid rgba(0, 0, 0, .5);
+	border: 1px solid black(.7);
-	border-bottom: 1px solid rgba(0, 0, 0, .6);
+	border-bottom: 1px solid black(.8);
 	border-radius: 5px;
-	box-shadow: 0 1px 4px rgba(0, 0, 0, .15), inset 0px 1px 0px rgba(255, 255, 255, .08);
+	box-shadow: 0 1px 4px black(.2), inset 0 1px 0 white(.05);
 
 	/* Item ------------------------------------------------*/
 	tr {
 		margin-bottom: 2px;
-		color: #eee;
+		color: white(.9);
 		font-size: 14px;
-		text-shadow: 0 -1px 0px rgba(0, 0, 0, .2);
+		text-shadow: $shadowLight;
 
 		&.separator {
-			background-color: rgba(0, 0, 0, .2);
+			background: black(.2);
-			border-bottom: 1px solid rgba(255, 255, 255, .1);
+			border-bottom: 1px solid white(.06);
 		}
 	}
 
 		tr td {
-			padding: 7px 25px 6px 12px;
+			padding: 6px 25px 7px 12px;
 			min-width: auto;
-			color: #fff;
+			color: white(1);
 			border-radius: 0;
 			transition: none;
 
-			&:hover {
+			&:hover { background: linear-gradient(to bottom, $colorBlue, darken($colorBlue, 5%)); }
-				background: linear-gradient(to bottom, #6a84f2, #4967F0);
-			}
 		}
 
-			tr td .albumCover {
+			tr td .cover {
+				background-color: #222;
 				border-radius: 2px;
-				box-shadow: 0 0 0 1px rgba(0,0,0,.5);
+				box-shadow: 0 0 0 1px black(.5);
 				position: absolute;
 			}
 
-			tr td .albumTitle {
+			tr td .title {
 				display: inline-block;
 				margin: 0 0 3px 26px;
 			}
 
+			tr td .iconic {
+				display: inline-block;
+				margin: 0 10px 0 1px;
+				width: 11px;
+				height: 10px;
+				fill: white(1);
+				filter: drop-shadow($shadow);
+			}
+
+			tr td .iconic.ionicons {
+				margin: 0 8px -2px 0;
+				width: 14px;
+				height: 14px;
+			}
+
 	/* Link ------------------------------------------------*/
 	input#link {
 		width: 100%;
 		margin: -2px 0 -1px -2px;
 		padding: 5px 7px 6px 7px;
-		background-color: #444;
+		background: #333;
 		color: #fff;
-		border: 1px solid rgba(0, 0, 0, .4);
+		border: 1px solid black(.4);
-		box-shadow: 0px 1px 0px rgba(255, 255, 255, .05);
+		box-shadow: 0px 1px 0px white(.05);
 		outline: none;
 		border-radius: 3px;
 	}

src/styles/_etc.scss

@@ -0,0 +1,25 @@
+/**
+ * @copyright   2015 by Tobias Reich
+ */
+
+/* Functions ------------------------------------------------*/
+@function black($opacity) {
+	@return rgba(0, 0, 0, $opacity);
+}
+
+@function white($opacity) {
+	@return rgba(255, 255, 255, $opacity);
+}
+
+/* Vars ------------------------------------------------*/
+// Properties
+$shadowLight:	0 -1px 0 black(.1);
+$shadow:		0 -1px 0 black(.2);
+
+// Colors
+$colorBlue:		#2293EC;
+$colorRed:		#d92c34;
+
+// Animations
+$timing:		cubic-bezier(.51, .92, .24, 1);
+$timingBounce:	cubic-bezier(.51, .92, .24, 1.15);

src/styles/_font.scss

@@ -1,303 +0,0 @@
-/*  Font Awesome
-    the iconic font designed for use with Twitter Bootstrap
-    -------------------------------------------------------
-    The full suite of pictographic icons, examples, and documentation
-    can be found at: http://fortawesome.github.com/Font-Awesome/
-
-    License
-    -------------------------------------------------------
-    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
-    http://creativecommons.org/licenses/by/3.0/ A mention of
-    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
-    source code is considered acceptable attribution (most common on the web).
-    If human readable source code is not available to the end user, a mention in
-    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
-    or mobile software).
-
-    Contact
-    -------------------------------------------------------
-    Email: dave@davegandy.com
-    Twitter: http://twitter.com/fortaweso_me
-    Work: http://lemonwi.se co-founder
-
-    */
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('../src/fonts/fontawesome-webfont.eot');
-  src: url('../src/fonts/fontawesome-webfont.eot?#iefix') format('eot'), url('../src/fonts/fontawesome-webfont.woff') format('woff'), url('../src/fonts/fontawesome-webfont.ttf') format('truetype'), url('../src/fonts/fontawesome-webfont.svg#FontAwesome') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-/*  Font Awesome styles
-    ------------------------------------------------------- */
-[class^="icon-"]:before, [class*=" icon-"]:before {
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  display: inline-block;
-  text-decoration: inherit;
-}
-a [class^="icon-"], a [class*=" icon-"] {
-  display: inline-block;
-  text-decoration: inherit;
-}
-/* makes the font 33% larger relative to the icon container */
-.icon-large:before {
-  vertical-align: top;
-  font-size: 1.3333333333333333em;
-}
-.btn [class^="icon-"], .btn [class*=" icon-"] {
-  /* keeps button heights with and without icons the same */
-
-  line-height: .9em;
-}
-li [class^="icon-"], li [class*=" icon-"] {
-  display: inline-block;
-  width: 1.25em;
-  text-align: center;
-}
-li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
-  /* 1.5 increased font size for icon-large * 1.25 width */
-
-  width: 1.875em;
-}
-li[class^="icon-"], li[class*=" icon-"] {
-  margin-left: 0;
-  list-style-type: none;
-}
-li[class^="icon-"]:before, li[class*=" icon-"]:before {
-  text-indent: -2em;
-  text-align: center;
-}
-li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
-  text-indent: -1.3333333333333333em;
-}
-/*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
-    readers do not read off random characters that represent icons */
-.icon-glass:before                { content: "\f000"; }
-.icon-music:before                { content: "\f001"; }
-.icon-search:before               { content: "\f002"; }
-.icon-envelope:before             { content: "\f003"; }
-.icon-heart:before                { content: "\f004"; }
-.icon-star:before                 { content: "\f005"; }
-.icon-star-empty:before           { content: "\f006"; }
-.icon-user:before                 { content: "\f007"; }
-.icon-film:before                 { content: "\f008"; }
-.icon-th-large:before             { content: "\f009"; }
-.icon-th:before                   { content: "\f00a"; }
-.icon-th-list:before              { content: "\f00b"; }
-.icon-ok:before                   { content: "\f00c"; }
-.icon-remove:before               { content: "\f00d"; }
-.icon-zoom-in:before              { content: "\f00e"; }
-
-.icon-zoom-out:before             { content: "\f010"; }
-.icon-off:before                  { content: "\f011"; }
-.icon-signal:before               { content: "\f012"; }
-.icon-cog:before                  { content: "\f013"; }
-.icon-trash:before                { content: "\f014"; }
-.icon-home:before                 { content: "\f015"; }
-.icon-file:before                 { content: "\f016"; }
-.icon-time:before                 { content: "\f017"; }
-.icon-road:before                 { content: "\f018"; }
-.icon-download-alt:before         { content: "\f019"; }
-.icon-download:before             { content: "\f01a"; }
-.icon-upload:before               { content: "\f01b"; }
-.icon-inbox:before                { content: "\f01c"; }
-.icon-play-circle:before          { content: "\f01d"; }
-.icon-repeat:before               { content: "\f01e"; }
-
-/* \f020 doesn't work in Safari. all shifted one down */
-.icon-refresh:before              { content: "\f021"; }
-.icon-list-alt:before             { content: "\f022"; }
-.icon-lock:before                 { content: "\f023"; }
-.icon-flag:before                 { content: "\f024"; }
-.icon-headphones:before           { content: "\f025"; }
-.icon-volume-off:before           { content: "\f026"; }
-.icon-volume-down:before          { content: "\f027"; }
-.icon-volume-up:before            { content: "\f028"; }
-.icon-qrcode:before               { content: "\f029"; }
-.icon-barcode:before              { content: "\f02a"; }
-.icon-tag:before                  { content: "\f02b"; }
-.icon-tags:before                 { content: "\f02c"; }
-.icon-book:before                 { content: "\f02d"; }
-.icon-bookmark:before             { content: "\f02e"; }
-.icon-print:before                { content: "\f02f"; }
-
-.icon-camera:before               { content: "\f030"; }
-.icon-font:before                 { content: "\f031"; }
-.icon-bold:before                 { content: "\f032"; }
-.icon-italic:before               { content: "\f033"; }
-.icon-text-height:before          { content: "\f034"; }
-.icon-text-width:before           { content: "\f035"; }
-.icon-align-left:before           { content: "\f036"; }
-.icon-align-center:before         { content: "\f037"; }
-.icon-align-right:before          { content: "\f038"; }
-.icon-align-justify:before        { content: "\f039"; }
-.icon-list:before                 { content: "\f03a"; }
-.icon-indent-left:before          { content: "\f03b"; }
-.icon-indent-right:before         { content: "\f03c"; }
-.icon-facetime-video:before       { content: "\f03d"; }
-.icon-picture:before              { content: "\f03e"; }
-
-.icon-pencil:before               { content: "\f040"; }
-.icon-map-marker:before           { content: "\f041"; }
-.icon-adjust:before               { content: "\f042"; }
-.icon-tint:before                 { content: "\f043"; }
-.icon-edit:before                 { content: "\f044"; }
-.icon-share:before                { content: "\f045"; }
-.icon-check:before                { content: "\f046"; }
-.icon-move:before                 { content: "\f047"; }
-.icon-step-backward:before        { content: "\f048"; }
-.icon-fast-backward:before        { content: "\f049"; }
-.icon-backward:before             { content: "\f04a"; }
-.icon-play:before                 { content: "\f04b"; }
-.icon-pause:before                { content: "\f04c"; }
-.icon-stop:before                 { content: "\f04d"; }
-.icon-forward:before              { content: "\f04e"; }
-
-.icon-fast-forward:before         { content: "\f050"; }
-.icon-step-forward:before         { content: "\f051"; }
-.icon-eject:before                { content: "\f052"; }
-.icon-chevron-left:before         { content: "\f053"; }
-.icon-chevron-right:before        { content: "\f054"; }
-.icon-plus-sign:before            { content: "\f055"; }
-.icon-minus-sign:before           { content: "\f056"; }
-.icon-remove-sign:before          { content: "\f057"; }
-.icon-ok-sign:before              { content: "\f058"; }
-.icon-question-sign:before        { content: "\f059"; }
-.icon-info-sign:before            { content: "\f05a"; }
-.icon-screenshot:before           { content: "\f05b"; }
-.icon-remove-circle:before        { content: "\f05c"; }
-.icon-ok-circle:before            { content: "\f05d"; }
-.icon-ban-circle:before           { content: "\f05e"; }
-
-.icon-arrow-left:before           { content: "\f060"; }
-.icon-arrow-right:before          { content: "\f061"; }
-.icon-arrow-up:before             { content: "\f062"; }
-.icon-arrow-down:before           { content: "\f063"; }
-.icon-share-alt:before            { content: "\f064"; }
-.icon-resize-full:before          { content: "\f065"; }
-.icon-resize-small:before         { content: "\f066"; }
-.icon-plus:before                 { content: "\f067"; }
-.icon-minus:before                { content: "\f068"; }
-.icon-asterisk:before             { content: "\f069"; }
-.icon-exclamation-sign:before     { content: "\f06a"; }
-.icon-gift:before                 { content: "\f06b"; }
-.icon-leaf:before                 { content: "\f06c"; }
-.icon-fire:before                 { content: "\f06d"; }
-.icon-eye-open:before             { content: "\f06e"; }
-
-.icon-eye-close:before            { content: "\f070"; }
-.icon-warning-sign:before         { content: "\f071"; }
-.icon-plane:before                { content: "\f072"; }
-.icon-calendar:before             { content: "\f073"; }
-.icon-random:before               { content: "\f074"; }
-.icon-comment:before              { content: "\f075"; }
-.icon-magnet:before               { content: "\f076"; }
-.icon-chevron-up:before           { content: "\f077"; }
-.icon-chevron-down:before         { content: "\f078"; }
-.icon-retweet:before              { content: "\f079"; }
-.icon-shopping-cart:before        { content: "\f07a"; }
-.icon-folder-close:before         { content: "\f07b"; }
-.icon-folder-open:before          { content: "\f07c"; }
-.icon-resize-vertical:before      { content: "\f07d"; }
-.icon-resize-horizontal:before    { content: "\f07e"; }
-
-.icon-bar-chart:before            { content: "\f080"; }
-.icon-twitter-sign:before         { content: "\f081"; }
-.icon-facebook-sign:before        { content: "\f082"; }
-.icon-camera-retro:before         { content: "\f083"; }
-.icon-key:before                  { content: "\f084"; }
-.icon-cogs:before                 { content: "\f085"; }
-.icon-comments:before             { content: "\f086"; }
-.icon-thumbs-up:before            { content: "\f087"; }
-.icon-thumbs-down:before          { content: "\f088"; }
-.icon-star-half:before            { content: "\f089"; }
-.icon-heart-empty:before          { content: "\f08a"; }
-.icon-signout:before              { content: "\f08b"; }
-.icon-linkedin-sign:before        { content: "\f08c"; }
-.icon-pushpin:before              { content: "\f08d"; }
-.icon-external-link:before        { content: "\f08e"; }
-
-.icon-signin:before               { content: "\f090"; }
-.icon-trophy:before               { content: "\f091"; }
-.icon-github-sign:before          { content: "\f092"; }
-.icon-upload-alt:before           { content: "\f093"; }
-.icon-lemon:before                { content: "\f094"; }
-.icon-phone:before                { content: "\f095"; }
-.icon-check-empty:before          { content: "\f096"; }
-.icon-bookmark-empty:before       { content: "\f097"; }
-.icon-phone-sign:before           { content: "\f098"; }
-.icon-twitter:before              { content: "\f099"; }
-.icon-facebook:before             { content: "\f09a"; }
-.icon-github:before               { content: "\f09b"; }
-.icon-unlock:before               { content: "\f09c"; }
-.icon-credit-card:before          { content: "\f09d"; }
-.icon-rss:before                  { content: "\f09e"; }
-
-.icon-hdd:before                  { content: "\f0a0"; }
-.icon-bullhorn:before             { content: "\f0a1"; }
-.icon-bell:before                 { content: "\f0a2"; }
-.icon-certificate:before          { content: "\f0a3"; }
-.icon-hand-right:before           { content: "\f0a4"; }
-.icon-hand-left:before            { content: "\f0a5"; }
-.icon-hand-up:before              { content: "\f0a6"; }
-.icon-hand-down:before            { content: "\f0a7"; }
-.icon-circle-arrow-left:before    { content: "\f0a8"; }
-.icon-circle-arrow-right:before   { content: "\f0a9"; }
-.icon-circle-arrow-up:before      { content: "\f0aa"; }
-.icon-circle-arrow-down:before    { content: "\f0ab"; }
-.icon-globe:before                { content: "\f0ac"; }
-.icon-wrench:before               { content: "\f0ad"; }
-.icon-tasks:before                { content: "\f0ae"; }
-
-.icon-filter:before               { content: "\f0b0"; }
-.icon-briefcase:before            { content: "\f0b1"; }
-.icon-fullscreen:before           { content: "\f0b2"; }
-
-.icon-group:before                { content: "\f0c0"; }
-.icon-link:before                 { content: "\f0c1"; }
-.icon-cloud:before                { content: "\f0c2"; }
-.icon-beaker:before               { content: "\f0c3"; }
-.icon-cut:before                  { content: "\f0c4"; }
-.icon-copy:before                 { content: "\f0c5"; }
-.icon-paper-clip:before           { content: "\f0c6"; }
-.icon-save:before                 { content: "\f0c7"; }
-.icon-sign-blank:before           { content: "\f0c8"; }
-.icon-reorder:before              { content: "\f0c9"; }
-.icon-list-ul:before              { content: "\f0ca"; }
-.icon-list-ol:before              { content: "\f0cb"; }
-.icon-strikethrough:before        { content: "\f0cc"; }
-.icon-underline:before            { content: "\f0cd"; }
-.icon-table:before                { content: "\f0ce"; }
-
-.icon-magic:before                { content: "\f0d0"; }
-.icon-truck:before                { content: "\f0d1"; }
-.icon-pinterest:before            { content: "\f0d2"; }
-.icon-pinterest-sign:before       { content: "\f0d3"; }
-.icon-google-plus-sign:before     { content: "\f0d4"; }
-.icon-google-plus:before          { content: "\f0d5"; }
-.icon-money:before                { content: "\f0d6"; }
-.icon-caret-down:before           { content: "\f0d7"; }
-.icon-caret-up:before             { content: "\f0d8"; }
-.icon-caret-left:before           { content: "\f0d9"; }
-.icon-caret-right:before          { content: "\f0da"; }
-.icon-columns:before              { content: "\f0db"; }
-.icon-sort:before                 { content: "\f0dc"; }
-.icon-sort-down:before            { content: "\f0dd"; }
-.icon-sort-up:before              { content: "\f0de"; }
-
-.icon-envelope-alt:before         { content: "\f0e0"; }
-.icon-linkedin:before             { content: "\f0e1"; }
-.icon-undo:before                 { content: "\f0e2"; }
-.icon-legal:before                { content: "\f0e3"; }
-.icon-dashboard:before            { content: "\f0e4"; }
-.icon-comment-alt:before          { content: "\f0e5"; }
-.icon-comments-alt:before         { content: "\f0e6"; }
-.icon-bolt:before                 { content: "\f0e7"; }
-.icon-sitemap:before              { content: "\f0e8"; }
-.icon-umbrella:before             { content: "\f0e9"; }
-.icon-paste:before                { content: "\f0ea"; }
-
-.icon-user-md:before              { content: "\f200"; }

src/styles/_header.scss

@@ -1,5 +1,5 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 header {
@@ -7,37 +7,23 @@ header {
 	position: fixed;
 	height: 49px;
 	width: 100%;
-	background: linear-gradient(to bottom, #3E3E3E, #282828);
+	background: linear-gradient(to bottom, #222222, #1a1a1a);
-	border-bottom: 1px solid #161616;
+	border-bottom: 1px solid #0f0f0f;
 	z-index: 1;
 	transition: transform .3s ease-out;
 
 	/* Modes ------------------------------------------------*/
-	&.hidden {
+	&.hidden { transform: translateY(-60px); }
-		transform: translateY(-60px);
-	}
 
-	&.loading {
+	&.loading { transform: translateY(2px); }
-		transform: translateY(2px);
-	}
 
-	&.error {
+	&.error { transform: translateY(40px); }
-		transform: translateY(40px);
-	}
 
 	&.view {
 		background: none;
 		border-bottom: none;
 
-		&.error {
+		&.error { background-color: rgba(10, 10, 10, .99); }
-			background-color: rgba(10, 10, 10, .99);
-		}
-
-		.button,
-		#title,
-		.tools {
-			text-shadow: none !important;
-		}
 	}
 
 	/* Title ------------------------------------------------*/
@@ -50,43 +36,60 @@ header {
 		font-size: 16px;
 		font-weight: bold;
 		text-align: center;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
+		text-shadow: $shadow;
+		z-index: 1;
+
+		.iconic {
+			display: none;
+			margin: 0 0 0 5px;
+			width: 10px;
+			fill: white(.5);
+			filter: drop-shadow($shadow);
+			transition: fill .2s ease-out;
+		}
+
+		&:hover .iconic { fill: white(1); }
 
 		&.editable { cursor: pointer; }
+
+		&.editable .iconic { display: inline-block; }
+	}
+
+	/* Toolbars ------------------------------------------------*/
+	.toolbar {
+		display: none;
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		padding: 0 10px;
 	}
 
 	/* Button ------------------------------------------------*/
 	.button {
-		color: #888;
+		display: inline-block;
-		font-family: 'FontAwesome';
+		padding: 17px 8px 15px;
-		font-size: 21px;
+		width: 15px;
-		font-weight: bold;
-		text-decoration: none !important;
 		cursor: pointer;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
 
-		&:hover {
+		&--left { float: left; }
-			color: #fff;
+
+		&--right { float: right; }
+
+		.iconic {
+			fill: white(.5);
+			filter: drop-shadow($shadow);
+			transition: fill .2s ease-out;
 		}
 
-		&.left {
+		&:hover .iconic { fill: white(1); }
-			float: left;
-			position: absolute;
-			padding: 16px 10px 8px 18px;
-		}
 
-		&.right {
+		&--star.active .iconic { fill: #f0ef77; }
-			float: right;
+
-			position: relative;
+		&--eye.active .iconic { fill: #ff9737; }
-			padding: 16px 19px 13px 11px;
+
-		}
+		&#button_signin { display: none; }
-	}
 
-	#tools_albums,
-	#tools_album,
-	#tools_photo,
-	#button_signin {
-		display: none;
 	}
 
 	/* Button Divider ------------------------------------------------*/
@@ -103,14 +106,13 @@ header {
 		width: 80px;
 		margin: 12px 12px 0 0;
 		padding: 5px 12px 6px 12px;
-		background-color: #383838;
+		background-color: #222;
 		color: #fff;
-		border: 1px solid rgba(0, 0, 0, .6);
+		border: 0;
-		box-shadow: 0 1px 0 rgba(255, 255, 255, .06);
 		outline: none;
 		border-radius: 50px;
 		opacity: .6;
-		transition: opacity .3s ease-out, transform .3s ease-out, box-shadow .3s, width .2s ease-out;
+		transition: opacity .3s ease-out, transform .3s ease-out, box-shadow .3s ease-out, width .2s ease-out;
 
 		&:focus { width: 140px; }
 
@@ -119,32 +121,19 @@ header {
 
 	#clearSearch {
 		position: absolute;
-		top: 15px;
+		top: 13px;
-		right: 81px;
+		right: 78px;
 		padding: 0;
+		color: #888;
 		font-size: 20px;
 		opacity: 0;
-		transition: opacity .2s ease-out;
+		transition: opacity .2s ease-out, color .2s ease-out;
-
-		&:hover { opacity: 1; }
-	}
-
-	/* Tools ------------------------------------------------*/
-	.tools {
-		float: right;
-		padding: 14px 8px;
-		color: #888;
-		font-size: 21px;
-		text-shadow: 0 -1px 0 #222;
 		cursor: pointer;
 
-		&:first-of-type { margin-right: 6px; }
+		&:hover {
-
+			color: #fff;
-		&:hover a { color: #fff; }
+			opacity: 1;
-
+		}
-		.icon-star { color: #f0ef77; }
-
-		.icon-share.active { color: #ff9737; }
 	}
 
 	/* Hosted with Lychee ------------------------------------------------*/
@@ -154,14 +143,12 @@ header {
 		margin: 13px 9px;
 		color: #888;
 		font-size: 13px;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
+		text-shadow: $shadow;
+		border-radius: 100px;
 		display: none;
 		cursor: pointer;
 
-		&:hover {
+		&:hover { background-color: black(.3); }
-			background-color: rgba(0, 0, 0, .2);
-			border-radius: 100px;
-		}
 	}
 
 }

src/styles/_imageview.scss

@@ -1,5 +1,5 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 #imageview {
@@ -14,7 +14,7 @@
 	/* Modes ------------------------------------------------*/
 	&.view { background-color: inherit; }
 
-	&.full { background-color: rgba(0, 0, 0, 1); }
+	&.full { background-color: black(1); }
 
 	/* ImageView ------------------------------------------------*/
 	#image {
@@ -26,10 +26,10 @@
 		background-repeat: no-repeat;
 		background-position: 50% 50%;
 		background-size: contain;
-		transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, opacity .2s, transform .3s cubic-bezier(.51, .92, .24, 1.15);
+		transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, opacity .2s, transform .3s $timingBounce;
 		animation-name: zoomIn;
 		animation-duration: .3s;
-		animation-timing-function: cubic-bezier(.51, .92, .24, 1.15);
+		animation-timing-function: $timingBounce;
 
 		&.small {
 			top: 50%;
@@ -49,33 +49,51 @@
 	/* Previous/Next Buttons ------------------------------------------------*/
 	.arrow_wrapper {
 		position: fixed;
-		width: 20%;
+		width: 15%;
 		height: calc(100% - 60px);
 		top: 60px;
 		z-index: 1;
 
-		&.previous { left: 0; }
+		&--previous { left: 0; }
 
-		&.next { right: 0; }
+		&--next { right: 0; }
-
-		a#previous { left: 20px; }
-
-		a#next { right: 20px; }
 
 		a {
 			position: fixed;
 			top: 50%;
-			margin-top: -10px;
+			margin: -19px 0 0;
-			color: #fff;
+			padding: 8px 12px;
-			font-size: 50px;
+			width: 16px;
-			text-shadow: 0 1px 2px #000;
+			height: 22px;
+			// The background-image will be styled dynamically via JS
+			// background-image: linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url('');
+			background-size: 100% 100%;
+			border: 1px solid white(.8);
 			cursor: pointer;
-			opacity: 0;
+			opacity: .6;
 			z-index: 2;
-			transition: opacity .2s;
+			transition: transform .2s ease-out, opacity .2s ease-out;
+
+			&#previous {
+				left: -1px;
+				transform: translateX(-100%);
+			}
+
+			&#next {
+				right: -1px;
+				transform: translateX(100%);
+			}
 		}
 
-		&:hover a { opacity: .2; }
+		&:hover a#previous,
+		&:hover a#next { transform: translateX(0); }
+
+		a:hover { opacity: 1; }
+
+		.iconic {
+			fill: white(.8);
+			filter: drop-shadow(0 1px 0 black(.4));
+		}
 	}
 
 }

src/styles/_infobox.scss

@@ -1,5 +1,5 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 #infobox_overlay {
@@ -7,25 +7,24 @@
 	position: fixed;
 	width: 100%;
 	height: 100%;
-	top: 0px;
+	top: 0;
-	left: 0px;
+	left: 0;
-	background-color: rgba(0, 0, 0, .8);
+	background-color: black(.8);
 }
 
 #infobox {
 
 	z-index: 4;
 	position: fixed;
-	right: 0px;
+	right: -370px;
 	width: 350px;
 	height: 100%;
-	background-color: rgba(20, 20, 20, .98);
+	background-color: rgba(30, 30, 30, .98);
-	box-shadow: -1px 0 2px rgba(0, 0, 0, .8);
+	box-shadow: -1px 0 2px black(.7);
-	display: none;
+	transform: translateX(0);
-	transform: translateX(370px);
+	transition: transform .3s $timingBounce;
-	transition: transform .3s cubic-bezier(.51, .92, .24, 1.15);
 
-	&.active { transform: translateX(50px); }
+	&.active { transform: translateX(-92%); }
 
 	/* Misc ------------------------------------------------*/
 	.wrapper {
@@ -37,11 +36,18 @@
 	}
 
 	.edit {
-		display: inline;
+		display: inline-block;
 		margin-left: 3px;
-		width: 20px;
+		width: 10px;
-		height: 5px;
 		cursor: pointer;
+
+		.iconic {
+			fill: white(.5);
+			filter: drop-shadow($shadow);
+			transition: fill .2s ease-out;
+		}
+
+		&:hover .iconic { fill: white(1); }
 	}
 
 	.bumper {
@@ -55,7 +61,8 @@
 		float: left;
 		height: 49px;
 		width: 100%;
-		background-image: linear-gradient(to bottom, #2A2A2A, #131313);
+		background: linear-gradient(to bottom, #1f1f1f, #1a1a1a);
+		border-bottom: 1px solid #0f0f0f;
 	}
 
 	.header h1 {
@@ -66,40 +73,37 @@
 		font-size: 16px;
 		font-weight: bold;
 		text-align: center;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
+		text-shadow: $shadow;
 	}
 
-	.header a {
+	.header .close {
 		float: right;
-		padding: 15px 65px 15px 15px;
+		padding: 16px 65px 12px 15px;
-		color: #fff;
+		width: 15px;
-		font-size: 20px;
-		font-weight: bold;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
-		opacity: .5;
 		cursor: pointer;
 
-		&:hover { opacity: 1; }
+		.iconic {
-	}
+			fill: #888;
-
+			filter: drop-shadow($shadow);
-	/* Seperator ------------------------------------------------*/
+			transition: fill .2s ease-out;
-	.separator {
-		float: left;
-		width: 100%;
-		border-top: 1px solid rgba(255, 255, 255, .02);
-		box-shadow: 0 -1px 0 rgba(0, 0, 0, .5);
-
-		&:first-child {
-			border: none;
-			box-shadow: none;
 		}
 
+		&:hover .iconic { fill: #fff; }
+	}
+
+	/* Divider ------------------------------------------------*/
+	.divider {
+		float: left;
+		padding: 12px 0 8px;
+		width: 100%;
+		border-top: 1px solid white(.02);
+		box-shadow: $shadow;
+
 		h1 {
-			margin: 20px 0 5px 20px;
+			margin: 0 0 0 20px;
-			color: #fff;
+			color: white(.6);
 			font-size: 14px;
 			font-weight: bold;
-			text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
 		}
 	}
 
@@ -137,43 +141,42 @@
 		margin-bottom: 8px;
 	}
 
-	#tags .edit {
+	#tags .edit { margin-top: 6px; }
-		display: inline-block;
-	}
 
-	#tags .empty .edit {
+	#tags .empty .edit { margin-top: 0; }
-		display: inline;
-	}
 
 	#tags .tag {
-		float: left;
+		display: inline-block;
-		padding: 4px 7px;
+		padding: 6px 10px;
 		margin: 0 6px 8px 0;
-		background-color: rgba(0, 0, 0, .5);
+		background-color: black(.5);
-		border: 2px solid rgba(255, 255, 255, .3);
 		border-radius: 100px;
 		font-size: 12px;
-		transition: border .3s;
+		transition: background-color .3s;
 
-		&:hover { border: 2px solid #aaa; }
+		&:hover { background-color: black(.3); }
 	}
 
 	#tags .tag span {
 		float: right;
-		width: 0;
 		padding: 0;
 		margin: 0 0 -2px 0;
-		color: red;
+		width: 0;
-		font-size: 11px;
 		cursor: pointer;
 		overflow: hidden;
 		transform: scale(0);
 		transition: width .3s, margin .3s, transform .3s;
+
+		.iconic {
+			fill: $colorRed;
+			width: 8px;
+			filter: drop-shadow($shadowLight);
+		}
 	}
 
 	#tags .tag:hover span {
-		width: 10px;
+		width: 9px;
-		margin: 0 0 -2px 6px;
+		margin: 0 0 -2px 5px;
 		transform: scale(1);
 	}
 

src/styles/_loading.scss

@@ -1,5 +1,5 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 #loading {
@@ -9,7 +9,7 @@
 	height: 3px;
 	background-size: 100px 3px;
 	background-repeat: repeat-x;
-	border-bottom: 1px solid rgba(0, 0, 0, .3);
+	border-bottom: 1px solid black(.3);
 	display: none;
 	animation-name: moveBackground;
 	animation-duration: .3s;
@@ -29,11 +29,11 @@
 
 	/* Content ------------------------------------------------*/
 	h1 {
-		margin: 13px 13px 0px 13px;
+		margin: 13px 13px 0 13px;
 		color: #ddd;
 		font-size: 14px;
 		font-weight: bold;
-		text-shadow: 0px 1px 0px #000;
+		text-shadow: 0 1px 0 black(1);
 		text-transform: capitalize;
 
 		span {

src/styles/_mediaquery.scss

@@ -1,20 +1,18 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 @media only screen and (max-width: 900px) {
 
 	#title {
-		margin: 0px 20% !important;
+		margin: 0 20% !important;
 		width: 40% !important;
 	}
+
 	#title.view {
-		margin: 0px 20% !important;
+		margin: 0 20% !important;
 		width: 60% !important;
 	}
-	#title span {
-		display: none !important;
-	}
 
 }
 @media only screen and (max-width: 640px) {
@@ -22,43 +20,19 @@
 	#title {
 		display: none !important;
 	}
+
 	#title.view {
 		display: block !important;
 		width: 70% !important;
-		margin: 0px 20% 0px 10% !important;
+		margin: 0 20% 0 10% !important;
-	}
-	#button_move {
-		display: none !important;
-	}
-
-	.center {
-		top: 0px !important;
-		left: 0px !important;
 	}
 
 	.album, .photo {
-		margin: 40px 0px 0px 50px !important;
+		margin: 40px 0 0 50px !important;
 	}
 
 	#imageview .arrow_wrapper {
 		display: none !important;
 	}
 
-	.message {
-		position: fixed !important;
-		width: 100% !important;
-		height: 100% !important;
-		margin: 1px 0px 0px 0px !important;
-		border-radius: 0px !important;
-
-		/* Animation */
-		animation: moveUp .3s !important;
-	}
-
-	.upload_message {
-		margin-top: 0px !important;
-		margin-left: 0px !important;
-		width: 100% !important;
-	}
-
 }

src/styles/_message.scss

@@ -1,34 +1,186 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
-.message_overlay {
+.basicModalContainer {
-	position: fixed;
+	background-color: black(.85);
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	background-color: rgba(0, 0, 0, .85);
-	z-index: 1000;
 }
 
-.message {
+.basicModal {
 
-	position: absolute;
+	background: linear-gradient(to bottom, #444, #333);
-	display: inline-block;
+	border: 1px solid black(.7);
-	width: 500px;
+	border-bottom: 1px solid black(.8);
-	margin-left: -250px;
+	box-shadow: 0 1px 4px black(.2), inset 0 1px 0 white(.05);
-	margin-top: -95px;
-	background-image: linear-gradient(to bottom, rgb(75, 75, 75), rgb(45, 45, 45));
-	border-radius: 5px;
-	box-shadow: 0 0 5px #000, inset 0 1px 0 rgba(255, 255, 255, .08);
 
-	/* Animation */
+	p {
-	animation-name: moveUp;
+		display: block;
-	animation-duration: .3s;
+		padding: 10px 30px;
-	animation-timing-function: cubic-bezier(.51, .92, .24, 1.15);
+		color: white(.9);
+		font-size: 14px;
+		text-align: left;
+		text-shadow: $shadow;
+		line-height: 20px;
 
-	/* Header ------------------------------------------------*/
+		b {
+			font-weight: bold;
+			color: white(1);
+		}
+
+		a {
+			color: white(.9);
+			text-decoration: none;
+			border-bottom: 1px dashed #888;
+		}
+
+		&:first-of-type { padding-top: 42px; }
+
+		&:last-of-type { padding-bottom: 40px; }
+
+		&.signIn:first-of-type { padding-top: 30px; }
+
+		&.signIn:last-of-type { padding-bottom: 30px; }
+
+		&.less { padding-bottom: 30px; }
+	}
+
+	/* Buttons ------------------------------------------------*/
+	.basicModal__button {
+		padding: 13px 0 15px;
+		background: black(.02);
+		color: white(.5);
+		text-shadow: $shadow;
+		border-top: 1px solid black(.2);
+		box-shadow: inset 0 1px 0 white(.02);
+
+		&:hover { background: white(.02); }
+
+		&:active,
+		&--active { background: black(.1); }
+
+		&#basicModal__action {
+			color: $colorBlue;
+			box-shadow: inset 0 1px 0 white(.02), inset 1px 0 0 black(.2);
+		}
+
+		&#basicModal__action.red { color: $colorRed; }
+
+		&.hidden { display: none; }
+
+	}
+
+	/* Inputs ------------------------------------------------*/
+	input.text {
+		width: calc(100% - 4px);
+		padding: 9px 2px;
+		background-color: transparent;
+		color: #fff;
+		text-shadow: $shadow;
+		border: none;
+		// Do not use rgba() for border-bottom
+		// to avoid a blurry line in Safari on non-retina screens
+		border-bottom: 1px solid #222;
+		border-radius: 0;
+		box-shadow: 0 1px 0 white(.05);
+		outline: none;
+
+		&:focus { border-bottom-color: $colorBlue; }
+
+		&.error { border-bottom-color: $colorRed; }
+
+		&:first-child { margin-top: 10px; }
+
+		&:last-child { margin-bottom: 10px; }
+	}
+
+	/* Radio Buttons ------------------------------------------------*/
+	.choice {
+		padding: 0 30px 15px;
+		width: calc(100% - 60px);
+		color: #fff;
+
+		&:last-child { padding-bottom: 40px; }
+
+		label {
+			float: left;
+			color: white(1);
+			font-size: 14px;
+			font-weight: 700;
+			text-shadow: $shadow;
+		}
+
+		label input {
+			position: absolute;
+			margin: 0;
+			opacity: 0;
+		}
+
+		label .checkbox {
+			float: left;
+			display: block;
+			width: 16px;
+			height: 16px;
+			background: black(.5);
+			border-radius: 3px;
+			box-shadow: 0 0 0 1px black(.7);
+
+			.iconic {
+				box-sizing: border-box;
+				fill: $colorBlue;
+				padding: 2px;
+				opacity: 0;
+				transform: scale(0);
+				transition: opacity .2s $timing, transform .2s $timing;
+			}
+		}
+
+		/* Checked */
+		label input:checked ~ .checkbox {
+			background: black(.5);
+			.iconic {
+				opacity: 1;
+				transform: scale(1);
+			}
+		}
+
+		/* Active */
+		label input:active ~ .checkbox {
+			background: black(.3);
+			.iconic { opacity: .8; }
+		}
+
+		label .label { margin: 0 0 0 18px; }
+
+		p {
+			clear: both;
+			padding: 2px 0 0 35px;
+			margin: 0;
+			width: calc(100% - 35px);
+			color: white(.6);
+			font-size: 13px;
+		}
+
+		input.text {
+			display: none;
+			margin-top: 5px;
+			margin-left: 35px;
+			width: calc(100% - 39px);
+		}
+	}
+
+	/* Version ------------------------------------------------*/
+	.version {
+		padding: 0px 30px 20px;
+		color: #888;
+		font-size: 12px;
+		text-align: left;
+
+		span { display: none; }
+
+		span a { color: #888; }
+	}
+
+	/* Title ------------------------------------------------*/
 	h1 {
 		float: left;
 		width: 100%;
@@ -36,173 +188,72 @@
 		color: #fff;
 		font-size: 16px;
 		font-weight: bold;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
+		text-shadow: $shadow;
 		text-align: center;
 	}
 
-	.close {
+	/* Rows ------------------------------------------------*/
-		position: absolute;
+	.rows {
-		top: 0;
+		margin: 0 8px 8px;
-		right: 0;
+		width: calc(100% - 16px);
-		padding: 12px 14px 6px 7px;
+		height: 300px;
-		color: #aaa;
+		background-color: black(.4);
-		font-size: 20px;
+		overflow: hidden;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
+		overflow-y: scroll;
-		cursor: pointer;
+		border-radius: 3px;
-
+		box-shadow: inset 0 0 3px black(.4);
-		&:hover { color: #fff; }
 	}
 
-	/* Text ------------------------------------------------*/
+	/* Row ------------------------------------------------*/
-	p {
+	.rows .row {
 		float: left;
-		width: 90%;
+		padding: 8px 0;
-		margin-top: 1px;
+		width: 100%;
-		padding: 12px 5% 15px 5%;
+		background-color: white(.02);
-		color: #eee;
-		font-size: 14px;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
-		line-height: 20px;
 
-		b {
+		&:nth-child(2n) { background-color: white(0); }
-			font-weight: bold;
-			color: #fff;
-		}
 
-		a {
+		a.name {
-			color: #eee;
-			text-decoration: none;
-			border-bottom: 1px dashed #888;
-		}
-	}
-
-	/* Button ------------------------------------------------*/
-	.button {
-		float: right;
-		margin: 15px 15px 15px 0;
-		padding: 7px 10px 8px 10px;
-		color: #ccc;
-		font-size: 14px;
-		font-weight: bold;
-		text-align: center;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
-		border-radius: 5px;
-		border: 1px solid rgba(0,0,0,.4);
-		box-shadow: inset 0 1px 0 rgba(255, 255, 255, .08), 0 1px 0 rgba(255, 255, 255, .05);
-		cursor: pointer;
-
-		&:first-of-type { margin: 15px 5% 18px 0; }
-
-		&.active {
-			color: #fff;
-			box-shadow: inset 0 1px 0 rgba(255, 255, 255, .08), 0 1px 0 rgba(255, 255, 255, .1), 0 0 4px #005ecc;
-		}
-
-		&:hover { background-image: linear-gradient(to bottom, rgb(60, 60, 60), rgb(57, 57, 57)); }
-
-		&:active,
-		&.pressed { background-image: linear-gradient(to bottom, rgb(57, 57, 57), rgb(60, 60, 60)); }
-	}
-
-	/* Input ------------------------------------------------*/
-	input.text {
-		float: left;
-		width: calc(100% - 10px);
-		padding: 17px 5px 9px 5px;
-		margin-top: 10px;
-		background-color: transparent;
-		color: #fff;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
-		border: none;
-		box-shadow: 0 1px 0 rgba(255, 255, 255, .1);
-		border-bottom: 1px solid #222;
-		border-radius: 0px;
-		outline: none;
-	}
-
-	input.less { margin-bottom: -10px; }
-
-	input.more { margin-bottom: 30px; }
-
-	.copylink { margin-bottom: 20px; }
-
-	/* Radio Buttons ------------------------------------------------*/
-	.choice {
-		float: left;
-		margin: 12px 5%;
-		width: 90%;
-		color: #fff;
-
-		input { float: left; }
-
-		h2 {
 			float: left;
-			margin: 1px 0 0 8px;
+			padding: 5px 10px;
+			width: calc(70% - 20px);
 			color: #fff;
 			font-size: 14px;
-			font-weight: 700;
+			white-space: nowrap;
-			text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
+			overflow: hidden;
 		}
 
-		p {
+		a.status {
-			margin-top: 2px;
+			float: left;
-			padding: 0 5% 0 25px;
+			padding: 5px 10px;
-			color: #aaa;
+			width: calc(30% - 20px);
-			font-size: 13px;
+			color: white(.5);
+			font-size: 14px;
+			text-align: right;
+
+			animation-name: pulse;
+			animation-duration: 2s;
+			animation-timing-function: ease-in-out;
+			animation-iteration-count: infinite;
+
+			&.error,
+			&.success { animation: none; }
+
+			&.error { color: rgb(213, 24, 24); }
+
+			&.success { color: rgb(42, 213, 0); }
 		}
 
-		p input {
+		p.notice {
-			width: 100%;
+			display: none;
-			padding: 10px 1px 9px;
+			float: left;
-			margin-top: 10px;
+			padding: 2px 10px 5px;
+			width: calc(100% - 20px);
+			color: white(.5);
+			font-size: 12px;
+			overflow: hidden;
+			line-height: 16px;
 		}
 	}
 
-	/* Version ------------------------------------------------*/
-	#version {
-		display: inline-block;
-		margin-top: 23px;
-		margin-left: 5%;
-		color: #888;
-		text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
-
-		span { display: none; }
-
-		span a { color: #888; }
-	}
-
-}
-
-/* Sign in ------------------------------------------------*/
-.sign_in {
-
-	float: left;
-	width: 100%;
-	margin-top: 1px;
-	padding: 5px 0;
-	color: #eee;
-	font-size: 14px;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, .3);
-	line-height: 20px;
-
-	/* Input ------------------------------------------------*/
-	input {
-		float: left;
-		width: 88%;
-		padding: 7px 1% 9px 1%;
-		margin: 0 5%;
-		background-color: transparent;
-		color: #fff;
-		text-shadow: 0 -1px 0 #222;
-		border: none;
-		border-bottom: 1px solid #222;
-		box-shadow: 0 1px 0 rgba(255,255,255,.1);
-		border-radius: 0;
-		outline: none;
-
-		&:first-of-type { margin-bottom: 10px; }
-
-		&.error:focus { box-shadow: 0 1px 0 rgba(204, 0, 7, .6); }
-	}
-
 }

src/styles/_multiselect.scss

@@ -1,5 +1,5 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
 #multiselect {

src/styles/_upload.scss

@@ -1,125 +0,0 @@
-/**
- * @copyright   2014 by Tobias Reich
- */
-
-#upload {
-	display: none;
-}
-
-.upload_overlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	background-color: rgba(0, 0, 0, .85);
-	z-index: 1000;
-}
-
-.upload_message {
-
-	position: absolute;
-	display: inline-block;
-	width: 450px;
-	margin-left: -225px;
-	margin-top: -170px;
-	background-image: linear-gradient(to bottom, rgb(75, 75, 75), rgb(45, 45, 45));
-	border-radius: 5px;
-	box-shadow: 0 0 5px #000, inset 0 1px 0 rgba(255, 255, 255, .08);
-	animation-name: moveUp;
-	animation-duration: .3s;
-	animation-timing-function: cubic-bezier(0.51,.92,.24,1.15);
-
-	/* Header ------------------------------------------------*/
-	h1 {
-		float: left;
-		width: 100%;
-		padding: 12px 0;
-		color: #fff;
-		font-size: 16px;
-		font-weight: bold;
-		text-shadow: 0px -1px 0px rgba(0, 0, 0, .3);
-		text-align: center;
-	}
-
-	.close {
-		display: none;
-		position: absolute;
-		top: 0;
-		right: 0;
-		padding: 11px 14px 6px 7px;
-		color: #aaa;
-		font-size: 20px;
-		text-shadow: 0px -1px 0px rgba(0, 0, 0, .3);
-		cursor: pointer;
-
-		&:hover { color: #fff; }
-	}
-
-	/* Rows ------------------------------------------------*/
-	.rows {
-		float: left;
-		margin: 3px 8px 8px 8px;
-		width: calc(100% - 16px);
-		height: 300px;
-		background-color: rgba(0, 0, 0, .5);
-		overflow: hidden;
-		overflow-y: scroll;
-		border-radius: 3px;
-		box-shadow: inset 0 0 3px rgba(0, 0, 0, .8);
-	}
-
-	/* Row ------------------------------------------------*/
-	.rows .row {
-		float: left;
-		display: inline-block;
-		padding: 8px 0;
-		width: 100%;
-		background-color: rgba(255, 255, 255, .02);
-
-		&:nth-child(2n) { background-color: rgba(255, 255, 255, 0); }
-
-		a.name {
-			float: left;
-			padding: 5px 10px;
-			width: calc(70% - 20px);
-			color: #fff;
-			font-size: 14px;
-			white-space: nowrap;
-			overflow: hidden;
-		}
-
-		a.status {
-			float: left;
-			padding: 5px 10px;
-			width: calc(30% - 20px);
-			color: rgba(255, 255, 255, .5);
-			font-size: 14px;
-			text-align: right;
-
-			animation-name: pulse;
-			animation-duration: 2s;
-			animation-timing-function: ease-in-out;
-			animation-iteration-count: infinite;
-
-			&.error,
-			&.success { animation: none; }
-
-			&.error { color: rgb(213, 24, 24); }
-
-			&.success { color: rgb(42, 213, 0); }
-		}
-
-		p.notice {
-			display: none;
-			float: left;
-			padding: 2px 10px 5px;
-			width: calc(100% - 20px);
-			color: rgba(255, 255, 255, .5);
-			font-size: 12px;
-			overflow: hidden;
-			line-height: 16px;
-		}
-	}
-
-}

src/styles/main.scss

@@ -1,7 +1,8 @@
 /**
- * @copyright   2014 by Tobias Reich
+ * @copyright   2015 by Tobias Reich
  */
 
+@import 'etc';
 @import 'reset';
 
 * {
@@ -17,7 +18,7 @@ body {
 }
 
 body {
-	background-color: #222;
+	background-color: #1d1d1d;
 	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 	font-size: 12px;
 	-webkit-font-smoothing: antialiased;
@@ -25,15 +26,7 @@ body {
 	-moz-osx-font-smoothing: grayscale;
 	font-smoothing: antialiased;
 
-	&.view {
+	&.view { background-color: #0f0f0f; }
-		background-color: #0f0f0f;
-	}
-}
-
-.center {
-	position: absolute;
-	left: 50%;
-	top:50%;
 }
 
 input {
@@ -42,15 +35,20 @@ input {
 	user-select: text !important;
 }
 
+.iconic {
+	width: 100%;
+	height: 100%;
+}
+
+#upload { display: none; }
+
 @import 'animations';
 @import 'content';
 @import 'contextmenu';
-@import 'font';
 @import 'header';
 @import 'imageview';
 @import 'infobox';
 @import 'loading';
 @import 'message';
 @import 'multiselect';
-@import 'upload';
 @import 'mediaquery';

view.php

@@ -48,9 +48,12 @@
 	<!-- Header -->
 	<header class="view">
 
-		<!-- Buttons -->
+		<a class="button button--right" id="button_info" title="About Photo">
-		<div class="tools" id="button_direct" title="Direct Link"><a class="icon-link"></a></div>
+			<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#info"></use></svg>
-		<div class="tools" id="button_info" title="Show Info"><a class="icon-info-sign"></a></div>
+		</a>
+		<a class="button button--right" id="button_direct" title="Direct Link">
+			<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#link-intact"></use></svg>
+		</a>
 
 		<a id="title" class="view"></a>
 
@@ -60,7 +63,16 @@
 	<div id="imageview" class="view"></div>
 
 	<!-- Infobox -->
-	<div id="infobox"></div>
+	<div id="infobox">
+		<div class='header'>
+			<h1>About</h1>
+			<a class='close' title='Close About'>
+				<svg viewBox="0 0 8 8" class="iconic"><use xlink:href="src/images/iconic.svg#circle-x"></use></svg>
+			</a>
+		</div>
+		<div class='wrapper'>
+		</div>
+	</div>
 
 	<!-- JS -->
 	<script type="text/javascript" src="dist/view.js"></script>