.
*
* @return bool true
*/
@@ -110,7 +107,7 @@ class IngDescription implements SpecificInterface
}
/**
- * Remove name from the description (Remove everything before the description incl the word 'Omschrijving' )
+ * Remove name from the description (Remove everything before the description incl the word 'Omschrijving' ).
*
* @return bool true
*/
@@ -121,5 +118,4 @@ class IngDescription implements SpecificInterface
return true;
}
-
}
diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php
index 11203ba03c..1c0d5ca1ba 100644
--- a/app/Import/Specifics/PresidentsChoice.php
+++ b/app/Import/Specifics/PresidentsChoice.php
@@ -18,19 +18,15 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see %s ', $result);
}
@@ -153,8 +144,6 @@ class Amount
}
return sprintf('%s ', $result);
-
-
}
return $result;
@@ -173,7 +162,6 @@ class Amount
*/
public function getCurrencyCode(): string
{
-
$cache = new CacheProperties;
$cache->addProperty('getCurrencyCode');
if ($cache->has()) {
@@ -183,7 +171,6 @@ class Amount
$currency = TransactionCurrency::where('code', $currencyPreference->data)->first();
if ($currency) {
-
$cache->store($currency->code);
return $currency->code;
@@ -214,6 +201,7 @@ class Amount
/**
* @return \FireflyIII\Models\TransactionCurrency
+ *
* @throws FireflyException
*/
public function getDefaultCurrency(): TransactionCurrency
@@ -227,6 +215,7 @@ class Amount
* @param User $user
*
* @return \FireflyIII\Models\TransactionCurrency
+ *
* @throws FireflyException
*/
public function getDefaultCurrencyByUser(User $user): TransactionCurrency
@@ -239,7 +228,7 @@ class Amount
}
$currencyPreference = Prefs::getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR'));
$currency = TransactionCurrency::where('code', $currencyPreference->data)->first();
- if (is_null($currency)) {
+ if (null === $currency) {
throw new FireflyException(sprintf('No currency found with code "%s"', $currencyPreference->data));
}
$cache->store($currency);
@@ -257,8 +246,8 @@ class Amount
*/
public function getJsConfig(array $config): array
{
- $negative = self::getAmountJsConfig($config['n_sep_by_space'] === 1, $config['n_sign_posn'], $config['negative_sign'], $config['n_cs_precedes'] === 1);
- $positive = self::getAmountJsConfig($config['p_sep_by_space'] === 1, $config['p_sign_posn'], $config['positive_sign'], $config['p_cs_precedes'] === 1);
+ $negative = self::getAmountJsConfig(1 === $config['n_sep_by_space'], $config['n_sign_posn'], $config['negative_sign'], 1 === $config['n_cs_precedes']);
+ $positive = self::getAmountJsConfig(1 === $config['p_sep_by_space'], $config['p_sign_posn'], $config['positive_sign'], 1 === $config['p_cs_precedes']);
return [
'pos' => $positive,
@@ -266,141 +255,4 @@ class Amount
'zero' => $positive,
];
}
-
- /**
- * @param TransactionJournal $journal
- * @param bool $coloured
- *
- * @return string
- */
- public function journalAmount(TransactionJournal $journal, bool $coloured = true): string
- {
- $amounts = [];
- $transactions = $journal->transactions()->where('amount', '>', 0)->get();
- /** @var TransactionModel $transaction */
- foreach ($transactions as $transaction) {
- // model some fields to fit "transactionAmount()":
- $transaction->transaction_amount = $transaction->amount;
- $transaction->transaction_foreign_amount = $transaction->foreign_amount;
- $transaction->transaction_type_type = $journal->transactionType->type;
- $transaction->transaction_currency_symbol = $transaction->transactionCurrency->symbol;
- $transaction->transaction_currency_dp = $transaction->transactionCurrency->decimal_places;
- if (!is_null($transaction->foreign_currency_id)) {
- $transaction->foreign_currency_symbol = $transaction->foreignCurrency->symbol;
- $transaction->foreign_currency_dp = $transaction->foreignCurrency->decimal_places;
- }
-
- $amounts[] = $this->transactionAmount($transaction, $coloured);
- }
-
- return join(' / ', $amounts);
-
- }
-
- /**
- * @param TransactionJournal $journal
- * @param bool $coloured
- *
- * @return string
- */
- public function journalTotalAmount(TransactionJournal $journal, bool $coloured = true): string
- {
- $transactions = $journal->transactions()->where('amount', '>', 0)->get();
- $totals = [];
- $type = $journal->transactionType->type;
- /** @var TransactionModel $transaction */
- foreach ($transactions as $transaction) {
- // model some fields to fit "transactionAmount()":
- $currencyId = $transaction->transaction_currency_id;
-
- if (!isset($totals[$currencyId])) {
- $totals[$currencyId] = [
- 'amount' => '0',
- 'symbol' => $transaction->transactionCurrency->symbol,
- 'dp' => $transaction->transactionCurrency->decimal_places,
- ];
- }
- $totals[$currencyId]['amount'] = bcadd($transaction->amount, $totals[$currencyId]['amount']);
-
- if (!is_null($transaction->foreign_currency_id)) {
- $foreignId = $transaction->foreign_currency_id;
- if (!isset($totals[$foreignId])) {
- $totals[$foreignId] = [
- 'amount' => '0',
- 'symbol' => $transaction->foreignCurrency->symbol,
- 'dp' => $transaction->foreignCurrency->decimal_places,
- ];
- }
- $totals[$foreignId]['amount'] = bcadd($transaction->foreign_amount, $totals[$foreignId]['amount']);
- }
- }
- $array = [];
- foreach ($totals as $total) {
- $currency = new TransactionCurrency;
- $currency->symbol = $total['symbol'];
- $currency->decimal_places = $total['dp'];
- if ($type === TransactionType::WITHDRAWAL) {
- $total['amount'] = bcmul($total['amount'], '-1');
- }
- $array[] = $this->formatAnything($currency, $total['amount']);
- }
-
- return join(' / ', $array);
-
- }
-
- /**
- * This formats a transaction, IF that transaction has been "collected" using the JournalCollector.
- *
- * @param TransactionModel $transaction
- * @param bool $coloured
- *
- * @return string
- */
- public function transactionAmount(TransactionModel $transaction, bool $coloured = true): string
- {
- $amount = bcmul(app('steam')->positive(strval($transaction->transaction_amount)), '-1');
-
- $format = '%s';
-
- if ($transaction->transaction_type_type === TransactionType::DEPOSIT) {
- $amount = bcmul($amount, '-1');
- }
-
- if ($transaction->transaction_type_type === TransactionType::TRANSFER) {
- $amount = app('steam')->positive($amount);
- $coloured = false;
- $format = '%s ';
- }
- if ($transaction->transaction_type_type === TransactionType::OPENING_BALANCE) {
- $amount = strval($transaction->transaction_amount);
- }
-
- $currency = new TransactionCurrency;
- $currency->symbol = $transaction->transaction_currency_symbol;
- $currency->decimal_places = $transaction->transaction_currency_dp;
- $str = sprintf($format, $this->formatAnything($currency, $amount, $coloured));
-
-
- if (!is_null($transaction->transaction_foreign_amount)) {
- $amount = bcmul(app('steam')->positive(strval($transaction->transaction_foreign_amount)), '-1');
- if ($transaction->transaction_type_type === TransactionType::DEPOSIT) {
- $amount = bcmul($amount, '-1');
- }
-
-
- if ($transaction->transaction_type_type === TransactionType::TRANSFER) {
- $amount = app('steam')->positive($amount);
- $coloured = false;
- $format = '%s ';
- }
-
- $currency = new TransactionCurrency;
- $currency->symbol = $transaction->foreign_currency_symbol;
- $currency->decimal_places = $transaction->foreign_currency_dp;
- $str .= ' (' . sprintf($format, $this->formatAnything($currency, $amount, $coloured)) . ')';
- }
-
- return $str;
- }
}
diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php
index 9a5e786baf..d048a0f666 100644
--- a/app/Support/Binder/AccountList.php
+++ b/app/Support/Binder/AccountList.php
@@ -18,24 +18,19 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see %s ';
+ }
+ if (TransactionType::OPENING_BALANCE === $transaction->transaction_type_type) {
+ $amount = strval($transaction->transaction_amount);
+ }
+
+ $currency = new TransactionCurrency;
+ $currency->symbol = $transaction->transaction_currency_symbol;
+ $currency->decimal_places = $transaction->transaction_currency_dp;
+ $str = sprintf($format, app('amount')->formatAnything($currency, $amount, $coloured));
+
+ if (null !== $transaction->transaction_foreign_amount) {
+ $amount = bcmul(app('steam')->positive(strval($transaction->transaction_foreign_amount)), '-1');
+ if (TransactionType::DEPOSIT === $transaction->transaction_type_type) {
+ $amount = bcmul($amount, '-1');
+ }
+
+ if (TransactionType::TRANSFER === $transaction->transaction_type_type) {
+ $amount = app('steam')->positive($amount);
+ $coloured = false;
+ $format = '%s ';
+ }
+
+ $currency = new TransactionCurrency;
+ $currency->symbol = $transaction->foreign_currency_symbol;
+ $currency->decimal_places = $transaction->foreign_currency_dp;
+ $str .= ' (' . sprintf($format, app('amount')->formatAnything($currency, $amount, $coloured)) . ')';
+ }
+ $cache->store($str);
+
+ return $str;
+ }
+
+ /**
+ * @param array $transaction
+ *
+ * @return string
+ */
+ public function amountArray(array $transaction): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('transaction-array-amount');
+ $cache->addProperty($transaction['source_id']);
+ $cache->addProperty($transaction['destination_id']);
+ $cache->addProperty($transaction['updated_at']);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+
+ // first display amount:
+ $amount = TransactionType::WITHDRAWAL === $transaction['journal_type'] ? $transaction['source_amount']
+ : $transaction['destination_amount'];
+ $fakeCurrency = new TransactionCurrency;
+ $fakeCurrency->decimal_places = $transaction['transaction_currency_dp'];
+ $fakeCurrency->symbol = $transaction['transaction_currency_symbol'];
+ $string = app('amount')->formatAnything($fakeCurrency, $amount, true);
+
+ // then display (if present) the foreign amount:
+ if (null !== $transaction['foreign_source_amount']) {
+ $amount = TransactionType::WITHDRAWAL === $transaction['journal_type'] ? $transaction['foreign_source_amount']
+ : $transaction['foreign_destination_amount'];
+ $fakeCurrency = new TransactionCurrency;
+ $fakeCurrency->decimal_places = $transaction['foreign_currency_dp'];
+ $fakeCurrency->symbol = $transaction['foreign_currency_symbol'];
+ $string .= ' (' . app('amount')->formatAnything($fakeCurrency, $amount, true) . ')';
+ }
+ $cache->store($string);
+
+ return $string;
+ }
+
+ /**
+ * @param TransactionModel $transaction
+ *
+ * @return string
+ */
+ public function budgets(TransactionModel $transaction): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('transaction-budgets');
+ $cache->addProperty($transaction->id);
+ $cache->addProperty($transaction->updated_at);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+
+ // journal has a budget:
+ if (isset($transaction->transaction_journal_budget_id)) {
+ $name = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name);
+ $txt = sprintf('%s ', route('budgets.show', [$transaction->transaction_journal_budget_id]), $name, $name);
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ // transaction has a budget
+ if (isset($transaction->transaction_budget_id)) {
+ $name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
+ $txt = sprintf('%s ', route('budgets.show', [$transaction->transaction_budget_id]), $name, $name);
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ // see if the transaction has a budget:
+ $budgets = $transaction->budgets()->get();
+ if (0 === $budgets->count()) {
+ $budgets = $transaction->transactionJournal()->first()->budgets()->get();
+ }
+ if ($budgets->count() > 0) {
+ $str = [];
+ foreach ($budgets as $budget) {
+ $str[] = sprintf('%s ', route('budgets.show', [$budget->id]), $budget->name, $budget->name);
+ }
+
+ $txt = join(', ', $str);
+ $cache->store($txt);
+
+ return $txt;
+ }
+ $txt = '';
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ /**
+ * @param TransactionModel $transaction
+ *
+ * @return string
+ */
+ public function categories(TransactionModel $transaction): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('transaction-categories');
+ $cache->addProperty($transaction->id);
+ $cache->addProperty($transaction->updated_at);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+
+ // journal has a category:
+ if (isset($transaction->transaction_journal_category_id)) {
+ $name = app('steam')->tryDecrypt($transaction->transaction_journal_category_name);
+ $txt = sprintf('%s ', route('categories.show', [$transaction->transaction_journal_category_id]), $name, $name);
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ // transaction has a category:
+ if (isset($transaction->transaction_category_id)) {
+ $name = app('steam')->tryDecrypt($transaction->transaction_category_name);
+ $txt = sprintf('%s ', route('categories.show', [$transaction->transaction_category_id]), $name, $name);
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ // see if the transaction has a category:
+ $categories = $transaction->categories()->get();
+ if (0 === $categories->count()) {
+ $categories = $transaction->transactionJournal()->first()->categories()->get();
+ }
+ if ($categories->count() > 0) {
+ $str = [];
+ foreach ($categories as $category) {
+ $str[] = sprintf('%s ', route('categories.show', [$category->id]), $category->name, $category->name);
+ }
+
+ $txt = join(', ', $str);
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ $txt = '';
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ /**
+ * @param TransactionModel $transaction
+ *
+ * @return string
+ */
+ public function description(TransactionModel $transaction): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('description');
+ $cache->addProperty($transaction->id);
+ $cache->addProperty($transaction->updated_at);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+ $description = $transaction->description;
+ if (strlen(strval($transaction->transaction_description)) > 0) {
+ $description = $transaction->transaction_description . '(' . $transaction->description . ')';
+ }
+
+ $cache->store($description);
+
+ return $description;
+ }
+
+ /**
+ * @param TransactionModel $transaction
+ *
+ * @return string
+ */
+ public function destinationAccount(TransactionModel $transaction): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('transaction-destination');
+ $cache->addProperty($transaction->id);
+ $cache->addProperty($transaction->updated_at);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+
+ if (TransactionType::RECONCILIATION === $transaction->transaction_type_type) {
+ return '—';
+ }
+
+ $name = app('steam')->tryDecrypt($transaction->account_name);
+ $transactionId = intval($transaction->account_id);
+ $type = $transaction->account_type;
+
+ // name is present in object, use that one:
+ if (bccomp($transaction->transaction_amount, '0') === -1 && null !== $transaction->opposing_account_id) {
+ $name = $transaction->opposing_account_name;
+ $transactionId = intval($transaction->opposing_account_id);
+ $type = $transaction->opposing_account_type;
+ }
+
+ // Find the opposing account and use that one:
+ if (bccomp($transaction->transaction_amount, '0') === -1 && null === $transaction->opposing_account_id) {
+ // if the amount is negative, find the opposing account and use that one:
+ $journalId = $transaction->journal_id;
+ /** @var TransactionModel $other */
+ $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
+ ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where(
+ 'identifier',
+ $transaction->identifier
+ )
+ ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+ ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+ ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']);
+ $name = app('steam')->tryDecrypt($other->name);
+ $transactionId = $other->account_id;
+ $type = $other->type;
+ }
+
+ if (AccountType::CASH === $type) {
+ $txt = '(' . trans('firefly.cash') . ') ';
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ $txt = sprintf('%1$s ', e($name), route('accounts.show', [$transactionId]));
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ /**
+ * @param TransactionModel $transaction
+ *
+ * @return string
+ */
+ public function hasAttachments(TransactionModel $transaction): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('attachments');
+ $cache->addProperty($transaction->id);
+ $cache->addProperty($transaction->updated_at);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+ $journalId = intval($transaction->journal_id);
+ $count = Attachment::whereNull('deleted_at')
+ ->where('attachable_type', 'FireflyIII\Models\TransactionJournal')
+ ->where('attachable_id', $journalId)
+ ->count();
+ if ($count > 0) {
+ $res = sprintf('(' . trans('firefly.cash') . ') ';
+ $cache->store($txt);
+
+ return $txt;
+ }
+
+ $txt = sprintf('%1$s ', e($name), route('accounts.show', [$transactionId]));
+ $cache->store($txt);
+
+ return $txt;
+ }
+}
diff --git a/app/Support/Twig/Extension/TransactionJournal.php b/app/Support/Twig/Extension/TransactionJournal.php
new file mode 100644
index 0000000000..66affea81b
--- /dev/null
+++ b/app/Support/Twig/Extension/TransactionJournal.php
@@ -0,0 +1,88 @@
+.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Twig\Extension;
+
+use FireflyIII\Models\Transaction as TransactionModel;
+use FireflyIII\Models\TransactionJournal as JournalModel;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\SingleCacheProperties;
+use Twig_Extension;
+
+class TransactionJournal extends Twig_Extension
+{
+ /**
+ * @param JournalModel $journal
+ *
+ * @return string
+ */
+ public function totalAmount(JournalModel $journal): string
+ {
+ $cache = new SingleCacheProperties;
+ $cache->addProperty('total-amount');
+ $cache->addProperty($journal->id);
+ $cache->addProperty($journal->updated_at);
+ if ($cache->has()) {
+ return $cache->get();
+ }
+
+ $transactions = $journal->transactions()->where('amount', '>', 0)->get();
+ $totals = [];
+ $type = $journal->transactionType->type;
+ /** @var TransactionModel $transaction */
+ foreach ($transactions as $transaction) {
+ $currencyId = $transaction->transaction_currency_id;
+ $currency = $transaction->transactionCurrency;
+
+ if (!isset($totals[$currencyId])) {
+ $totals[$currencyId] = [
+ 'amount' => '0',
+ 'currency' => $currency,
+ ];
+ }
+ $totals[$currencyId]['amount'] = bcadd($transaction->amount, $totals[$currencyId]['amount']);
+
+ if (null !== $transaction->foreign_currency_id) {
+ $foreignId = $transaction->foreign_currency_id;
+ $foreign = $transaction->foreignCurrency;
+ if (!isset($totals[$foreignId])) {
+ $totals[$foreignId] = [
+ 'amount' => '0',
+ 'currency' => $foreign,
+ ];
+ }
+ $totals[$foreignId]['amount'] = bcadd($transaction->foreign_amount, $totals[$foreignId]['amount']);
+ }
+ }
+ $array = [];
+ foreach ($totals as $total) {
+ if (TransactionType::WITHDRAWAL === $type) {
+ $total['amount'] = bcmul($total['amount'], '-1');
+ }
+ $array[] = app('amount')->formatAnything($total['currency'], $total['amount']);
+ }
+ $txt = join(' / ', $array);
+ $cache->store($txt);
+
+ return $txt;
+ }
+}
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index 6e3b303bab..754972cd4a 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see (cash) ';
- continue;
+ 'destinationAccount',
+ function (TransactionJournal $journal) {
+ $cache = new CacheProperties;
+ $cache->addProperty($journal->id);
+ $cache->addProperty('transaction-journal');
+ $cache->addProperty('destination-account-string');
+ if ($cache->has()) {
+ return $cache->get(); // @codeCoverageIgnore
}
- $array[] = sprintf('%1$s ', e($entry->name), route('accounts.show', $entry->id));
- }
- $array = array_unique($array);
- $result = join(', ', $array);
- $cache->store($result);
- return $result;
- }
+ $list = $journal->destinationAccountList();
+ $array = [];
+ /** @var Account $entry */
+ foreach ($list as $entry) {
+ if (AccountType::CASH === $entry->accountType->type) {
+ $array[] = '(cash) ';
+ continue;
+ }
+ $array[] = sprintf('%1$s ', e($entry->name), route('accounts.show', $entry->id));
+ }
+ $array = array_unique($array);
+ $result = join(', ', $array);
+ $cache->store($result);
+
+ return $result;
+ }
);
}
@@ -82,7 +78,7 @@ class Journal extends Twig_Extension
public function getFilters(): array
{
$filters = [
- $this->typeIcon(),
+ new Twig_SimpleFilter('journalTotalAmount', [TransactionJournalExtension::class, 'totalAmount'], ['is_safe' => ['html']]),
];
return $filters;
@@ -119,34 +115,32 @@ class Journal extends Twig_Extension
public function getSourceAccount(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
- 'sourceAccount', function (TransactionJournal $journal): string {
-
- $cache = new CacheProperties;
- $cache->addProperty($journal->id);
- $cache->addProperty('transaction-journal');
- $cache->addProperty('source-account-string');
- if ($cache->has()) {
- return $cache->get(); // @codeCoverageIgnore
- }
-
- $list = $journal->sourceAccountList();
- $array = [];
- /** @var Account $entry */
- foreach ($list as $entry) {
- if ($entry->accountType->type === AccountType::CASH) {
- $array[] = '(cash) ';
- continue;
+ 'sourceAccount',
+ function (TransactionJournal $journal): string {
+ $cache = new CacheProperties;
+ $cache->addProperty($journal->id);
+ $cache->addProperty('transaction-journal');
+ $cache->addProperty('source-account-string');
+ if ($cache->has()) {
+ return $cache->get(); // @codeCoverageIgnore
}
- $array[] = sprintf('%1$s ', e($entry->name), route('accounts.show', $entry->id));
+
+ $list = $journal->sourceAccountList();
+ $array = [];
+ /** @var Account $entry */
+ foreach ($list as $entry) {
+ if (AccountType::CASH === $entry->accountType->type) {
+ $array[] = '(cash) ';
+ continue;
+ }
+ $array[] = sprintf('%1$s ', e($entry->name), route('accounts.show', $entry->id));
+ }
+ $array = array_unique($array);
+ $result = join(', ', $array);
+ $cache->store($result);
+
+ return $result;
}
- $array = array_unique($array);
- $result = join(', ', $array);
- $cache->store($result);
-
- return $result;
-
-
- }
);
}
@@ -156,34 +150,32 @@ class Journal extends Twig_Extension
public function journalBudgets(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
- 'journalBudgets', function (TransactionJournal $journal): string {
- $cache = new CacheProperties;
- $cache->addProperty($journal->id);
- $cache->addProperty('transaction-journal');
- $cache->addProperty('budget-string');
- if ($cache->has()) {
- return $cache->get(); // @codeCoverageIgnore
- }
+ 'journalBudgets',
+ function (TransactionJournal $journal): string {
+ $cache = new CacheProperties;
+ $cache->addProperty($journal->id);
+ $cache->addProperty('transaction-journal');
+ $cache->addProperty('budget-string');
+ if ($cache->has()) {
+ return $cache->get(); // @codeCoverageIgnore
+ }
-
- $budgets = [];
- // get all budgets:
- foreach ($journal->budgets as $budget) {
- $budgets[] = sprintf('%1$s ', e($budget->name), route('budgets.show', $budget->id));
- }
- // and more!
- foreach ($journal->transactions as $transaction) {
- foreach ($transaction->budgets as $budget) {
+ $budgets = [];
+ // get all budgets:
+ foreach ($journal->budgets as $budget) {
$budgets[] = sprintf('%1$s ', e($budget->name), route('budgets.show', $budget->id));
}
+ // and more!
+ foreach ($journal->transactions as $transaction) {
+ foreach ($transaction->budgets as $budget) {
+ $budgets[] = sprintf('%1$s ', e($budget->name), route('budgets.show', $budget->id));
+ }
+ }
+ $string = join(', ', array_unique($budgets));
+ $cache->store($string);
+
+ return $string;
}
- $string = join(', ', array_unique($budgets));
- $cache->store($string);
-
- return $string;
-
-
- }
);
}
@@ -193,71 +185,38 @@ class Journal extends Twig_Extension
public function journalCategories(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
- 'journalCategories', function (TransactionJournal $journal): string {
- $cache = new CacheProperties;
- $cache->addProperty($journal->id);
- $cache->addProperty('transaction-journal');
- $cache->addProperty('category-string');
- if ($cache->has()) {
- return $cache->get(); // @codeCoverageIgnore
- }
- $categories = [];
- // get all categories for the journal itself (easy):
- foreach ($journal->categories as $category) {
- $categories[] = sprintf('%1$s ', e($category->name), route('categories.show', $category->id));
- }
- if (count($categories) === 0) {
- $set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id')
- ->leftJoin('transactions', 'category_transaction.transaction_id', '=', 'transactions.id')
- ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
- ->where('categories.user_id', $journal->user_id)
- ->where('transaction_journals.id', $journal->id)
- ->get(['categories.*']);
- /** @var Category $category */
- foreach ($set as $category) {
+ 'journalCategories',
+ function (TransactionJournal $journal): string {
+ $cache = new CacheProperties;
+ $cache->addProperty($journal->id);
+ $cache->addProperty('transaction-journal');
+ $cache->addProperty('category-string');
+ if ($cache->has()) {
+ return $cache->get(); // @codeCoverageIgnore
+ }
+ $categories = [];
+ // get all categories for the journal itself (easy):
+ foreach ($journal->categories as $category) {
$categories[] = sprintf('%1$s ', e($category->name), route('categories.show', $category->id));
}
+ if (0 === count($categories)) {
+ $set = Category::distinct()->leftJoin('category_transaction', 'categories.id', '=', 'category_transaction.category_id')
+ ->leftJoin('transactions', 'category_transaction.transaction_id', '=', 'transactions.id')
+ ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+ ->where('categories.user_id', $journal->user_id)
+ ->where('transaction_journals.id', $journal->id)
+ ->get(['categories.*']);
+ /** @var Category $category */
+ foreach ($set as $category) {
+ $categories[] = sprintf('%1$s ', e($category->name), route('categories.show', $category->id));
+ }
+ }
+
+ $string = join(', ', array_unique($categories));
+ $cache->store($string);
+
+ return $string;
}
-
- $string = join(', ', array_unique($categories));
- $cache->store($string);
-
- return $string;
- }
);
}
-
- /**
- * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 5.
- *
- * @return Twig_SimpleFilter
- */
- protected function typeIcon(): Twig_SimpleFilter
- {
- return new Twig_SimpleFilter(
- 'typeIcon', function (TransactionJournal $journal): string {
-
- switch (true) {
- case $journal->isWithdrawal():
- $txt = sprintf('(cash) ';
- }
-
- return sprintf('%1$s ', e($name), route('accounts.show', [$transactionId]));
-
- }, ['is_safe' => ['html']]
- );
- }
-
- /**
- * @return Twig_SimpleFunction
- */
- public function transactionIdBudgets(): Twig_SimpleFunction
- {
- return new Twig_SimpleFunction(
- 'transactionIdBudgets', function (int $transactionId): string {
- $transaction = TransactionModel::find($transactionId);
-
- return $this->getTransactionBudgets($transaction);
- }, ['is_safe' => ['html']]
- );
- }
-
- /**
- * @return Twig_SimpleFunction
- */
- public function transactionIdCategories(): Twig_SimpleFunction
- {
- return new Twig_SimpleFunction(
- 'transactionIdCategories', function (int $transactionId): string {
- $transaction = TransactionModel::find($transactionId);
-
- return $this->getTransactionCategories($transaction);
- }, ['is_safe' => ['html']]
- );
- }
-
- /**
- * @return Twig_SimpleFunction
- */
- public function transactionSourceAccount(): Twig_SimpleFunction
- {
- return new Twig_SimpleFunction(
- 'transactionSourceAccount', function (TransactionModel $transaction): string {
-
- // if the amount is negative, assume that the current account (the one in $transaction) is indeed the source account.
- $name = Steam::decrypt(intval($transaction->account_encrypted), $transaction->account_name);
- $transactionId = intval($transaction->account_id);
- $type = $transaction->account_type;
-
- // name is present in object, use that one:
- if (bccomp($transaction->transaction_amount, '0') === 1 && !is_null($transaction->opposing_account_id)) {
- $name = $transaction->opposing_account_name;
- $transactionId = intval($transaction->opposing_account_id);
- $type = $transaction->opposing_account_type;
- }
- // Find the opposing account and use that one:
- if (bccomp($transaction->transaction_amount, '0') === 1 && is_null($transaction->opposing_account_id)) {
- $journalId = $transaction->journal_id;
- /** @var TransactionModel $other */
- $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
- ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where(
- 'identifier', $transaction->identifier
- )
- ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
- ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
- ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']);
- $name = Steam::decrypt(intval($other->encrypted), $other->name);
- $transactionId = $other->account_id;
- $type = $other->type;
- }
-
- if ($type === AccountType::CASH) {
- return '(cash) ';
- }
-
- return sprintf('%1$s ', e($name), route('accounts.show', [$transactionId]));
-
- }, ['is_safe' => ['html']]
- );
- }
-
- /**
- * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 5.
- *
- * @return Twig_SimpleFilter
- */
- public function typeIconTransaction(): Twig_SimpleFilter
- {
- return new Twig_SimpleFilter(
- 'typeIconTransaction', function (TransactionModel $transaction): string {
-
- switch ($transaction->transaction_type_type) {
- case TransactionType::WITHDRAWAL:
- $txt = sprintf('%s ', route('budgets.show', [$transaction->transaction_journal_budget_id]), $name, $name);
- }
-
- // transaction has a budget
- if (isset($transaction->transaction_budget_id)) {
- $name = Steam::decrypt(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name);
-
- return sprintf('%s ', route('budgets.show', [$transaction->transaction_budget_id]), $name, $name);
- }
-
- // see if the transaction has a budget:
- $budgets = $transaction->budgets()->get();
- if ($budgets->count() === 0) {
- $budgets = $transaction->transactionJournal()->first()->budgets()->get();
- }
- if ($budgets->count() > 0) {
- $str = [];
- foreach ($budgets as $budget) {
- $str[] = sprintf('%s ', route('budgets.show', [$budget->id]), $budget->name, $budget->name);
- }
-
- return join(', ', $str);
- }
-
-
- return '';
- }
-
- /**
- * @param TransactionModel $transaction
- *
- * @return string
- */
- private function getTransactionCategories(TransactionModel $transaction): string
- {
- // journal has a category:
- if (isset($transaction->transaction_journal_category_id)) {
- $name = Steam::decrypt(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name);
-
- return sprintf('%s ', route('categories.show', [$transaction->transaction_journal_category_id]), $name, $name);
- }
-
- // transaction has a category:
- if (isset($transaction->transaction_category_id)) {
- $name = Steam::decrypt(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name);
-
- return sprintf('%s ', route('categories.show', [$transaction->transaction_category_id]), $name, $name);
- }
-
- // see if the transaction has a category:
- $categories = $transaction->categories()->get();
- if ($categories->count() === 0) {
- $categories = $transaction->transactionJournal()->first()->categories()->get();
- }
- if ($categories->count() > 0) {
- $str = [];
- foreach ($categories as $category) {
- $str[] = sprintf('%s ', route('categories.show', [$category->id]), $category->name, $category->name);
- }
-
- return join(', ', $str);
- }
-
- return '';
- }
}
diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php
index 95c1456315..fd4ffe1852 100644
--- a/app/Support/Twig/Translation.php
+++ b/app/Support/Twig/Translation.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see ').addClass('text-center').html('' + amountLeftString + ' ');
- }
- if (newAmountLeft > 0) {
- leftCell.html('' + amountLeftString + ' ');
- }
- if (newAmountLeft === 0.0) {
- leftCell.html('' + amountLeftString + ' ');
- }
+ // disable input
+ target.prop('disabled', true);
- if (difference !== 0) {
- // add difference to 'budgeted' var
+ // replace link (for now)
+ link.attr('href','#');
+
+ // replace "left" with spinner.
+ leftCell.empty().html('OpenStreetMap contributors, CC-BY-SA , Imagery © Mapbox ',
@@ -40,7 +47,7 @@ $(function () {
accessToken: mapboxToken
}).addTo(mymap);
- if(doPlaceMarker) {
+ if (doPlaceMarker) {
var marker = L.marker([latitude, longitude]).addTo(mymap);
}
}
diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js
index 58729480ef..8d6b67152c 100644
--- a/public/js/ff/transactions/list.js
+++ b/public/js/ff/transactions/list.js
@@ -20,6 +20,9 @@
/** global: edit_selected_txt, delete_selected_txt */
+/**
+ *
+ */
$(document).ready(function () {
"use strict";
$('.mass_edit_all').show();
@@ -44,8 +47,43 @@ $(document).ready(function () {
$('.mass_edit').click(goToMassEdit);
// click the delete button:
$('.mass_delete').click(goToMassDelete);
+ // click reconcile button
+ // $('.mass_reconcile').click(goToReconcile);
});
+/**
+ *
+ * @returns {boolean}
+ */
+function goToReconcile() {
+
+ var checked = $('.select_all_single:checked');
+ var ids = [];
+ $.each(checked, function (i, v) {
+ ids.push(parseInt($(v).data('transaction')));
+ });
+
+ // go to specially crafted URL:
+ var bases = document.getElementsByTagName('base');
+ var baseHref = null;
+
+ if (bases.length > 0) {
+ baseHref = bases[0].href;
+ }
+
+ $.post(baseHref + 'transactions/reconcile', {transactions: ids}).done(function () {
+ window.location.reload(true);
+ }).fail(function () {
+ alert('Could not reconcile transactions: please check the logs and try again later.');
+ });
+
+ return false;
+}
+
+/**
+ *
+ * @returns {boolean}
+ */
function goToMassEdit() {
"use strict";
var checkedArray = getCheckboxes();
@@ -62,6 +100,10 @@ function goToMassEdit() {
return false;
}
+/**
+ *
+ * @returns {boolean}
+ */
function goToMassDelete() {
"use strict";
var checkedArray = getCheckboxes();
@@ -77,6 +119,10 @@ function goToMassDelete() {
return false;
}
+/**
+ *
+ * @returns {Array}
+ */
function getCheckboxes() {
"use strict";
var list = [];
@@ -90,13 +136,19 @@ function getCheckboxes() {
return list;
}
-
+/**
+ *
+ */
function countChecked() {
"use strict";
var checked = $('.select_all_single:checked').length;
if (checked > 0) {
$('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')');
$('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')');
+
+ // get amount for the transactions:
+ //getAmounts();
+
$('.mass_button_options').show();
} else {
@@ -104,17 +156,26 @@ function countChecked() {
}
}
-
+/**
+ *
+ */
function checkAll() {
"use strict";
$('.select_all_single').prop('checked', true);
}
+/**
+ *
+ */
function uncheckAll() {
"use strict";
$('.select_all_single').prop('checked', false);
}
+/**
+ *
+ * @returns {boolean}
+ */
function stopMassSelect() {
"use strict";
@@ -142,9 +203,16 @@ function stopMassSelect() {
// hide the stop button
$('.mass_stop_select').hide();
+ // show reconcile account button, if present
+ $('.mass_reconcile').show();
+
return false;
}
+/**
+ *
+ * @returns {boolean}
+ */
function startMassSelect() {
"use strict";
// show "select all" box in table header.
@@ -165,5 +233,8 @@ function startMassSelect() {
// show the stop button
$('.mass_stop_select').show();
+ // hide reconcile account button, if present
+ $('.mass_reconcile').hide();
+
return false;
}
\ No newline at end of file
diff --git a/public/js/ff/transactions/show.js b/public/js/ff/transactions/show.js
index f3dfc8cb31..093703bcdb 100644
--- a/public/js/ff/transactions/show.js
+++ b/public/js/ff/transactions/show.js
@@ -30,7 +30,7 @@ $(function () {
source: data,
autoSelect: true
});
- $input.change(function() {
+ $input.change(function () {
var current = $input.typeahead("getActive");
if (current) {
// Some item from your model is active!
diff --git a/public/js/ff/transactions/single/common.js b/public/js/ff/transactions/single/common.js
index 61599512ad..eed4fbea7c 100644
--- a/public/js/ff/transactions/single/common.js
+++ b/public/js/ff/transactions/single/common.js
@@ -107,6 +107,10 @@ function selectsForeignCurrency() {
if (foreignCurrencyId === nativeCurrencyId) {
$('#exchange_rate_instruction_holder').hide();
$('#native_amount_holder').hide();
+
+ // make all other inputs empty
+ $('input[name="destination_amount"]').val("");
+ $('input[name="native_amount"]').val("");
}
return false;
diff --git a/public/lib/adminlte/css/AdminLTE.css b/public/lib/adminlte/css/AdminLTE.css
index c8158d0d10..1b9c78398d 100755
--- a/public/lib/adminlte/css/AdminLTE.css
+++ b/public/lib/adminlte/css/AdminLTE.css
@@ -1,178 +1,181 @@
-@import url('../../../css/google-fonts.css');
+/*
+ * AdminLTE.css
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see
+ * Website: Almsaeed Studio
* License: Open source - MIT
* Please visit http://opensource.org/licenses/MIT for more information
-!*/
+ */
/*
* Core: General Layout Style
* -------------------------
*/
+
+@import url('../../../css/google-fonts.css');
+
html,
body {
- min-height: 100%;
+ height: 100%;
}
-
.layout-boxed html,
.layout-boxed body {
- height: 100%;
+ height: 100%;
}
-
body {
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
- font-weight: 400;
- overflow-x: hidden;
- overflow-y: auto;
+ font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-weight: 400;
+ overflow-x: hidden;
+ overflow-y: auto;
}
-
/* Layout */
.wrapper {
- min-height: 100%;
- position: relative;
- overflow: hidden;
+ height: 100%;
+ position: relative;
+ overflow-x: hidden;
+ overflow-y: auto;
}
-
.wrapper:before,
.wrapper:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.wrapper:after {
- clear: both;
+ clear: both;
+}
+.wrapper:before,
+.wrapper:after {
+ content: " ";
+ display: table;
+}
+.wrapper:after {
+ clear: both;
}
-
.layout-boxed .wrapper {
- max-width: 1250px;
- margin: 0 auto;
- min-height: 100%;
- box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
- position: relative;
+ max-width: 1250px;
+ margin: 0 auto;
+ min-height: 100%;
+ box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+ position: relative;
}
-
.layout-boxed {
- background: url('../img/boxed-bg.jpg') repeat fixed;
+ background: url('../img/boxed-bg.jpg') repeat fixed;
}
-
/*
* Content Wrapper - contains the main content
- * ```.right-side has been deprecated as of v2.0.0 in favor of .content-wrapper ```
*/
.content-wrapper,
-.right-side,
.main-footer {
- -webkit-transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
- -moz-transition: -moz-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
- -o-transition: -o-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
- transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
- margin-left: 230px;
- z-index: 820;
+ -webkit-transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
+ -moz-transition: -moz-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
+ -o-transition: -o-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
+ transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
+ margin-left: 230px;
+ z-index: 820;
}
-
.layout-top-nav .content-wrapper,
-.layout-top-nav .right-side,
.layout-top-nav .main-footer {
+ margin-left: 0;
+}
+@media (max-width: 767px) {
+ .content-wrapper,
+ .main-footer {
margin-left: 0;
+ }
}
-
-@media (max-width: 767px) {
- .content-wrapper,
- .right-side,
- .main-footer {
- margin-left: 0;
- }
-}
-
@media (min-width: 768px) {
- .sidebar-collapse .content-wrapper,
- .sidebar-collapse .right-side,
- .sidebar-collapse .main-footer {
- margin-left: 0;
- }
+ .sidebar-collapse .content-wrapper,
+ .sidebar-collapse .main-footer {
+ margin-left: 0;
+ }
}
-
@media (max-width: 767px) {
- .sidebar-open .content-wrapper,
- .sidebar-open .right-side,
- .sidebar-open .main-footer {
- -webkit-transform: translate(230px, 0);
- -ms-transform: translate(230px, 0);
- -o-transform: translate(230px, 0);
- transform: translate(230px, 0);
- }
+ .sidebar-open .content-wrapper,
+ .sidebar-open .main-footer {
+ -webkit-transform: translate(230px, 0);
+ -ms-transform: translate(230px, 0);
+ -o-transform: translate(230px, 0);
+ transform: translate(230px, 0);
+ }
}
-
-.content-wrapper,
-.right-side {
- min-height: 100%;
- background-color: #ecf0f5;
- z-index: 800;
+.content-wrapper {
+ min-height: 100%;
+ background-color: #ecf0f5;
+ z-index: 800;
}
-
.main-footer {
- background: #fff;
- padding: 15px;
- color: #444;
- border-top: 1px solid #d2d6de;
+ background: #fff;
+ padding: 15px;
+ color: #444;
+ border-top: 1px solid #d2d6de;
}
-
/* Fixed layout */
.fixed .main-header,
.fixed .main-sidebar,
.fixed .left-side {
- position: fixed;
+ position: fixed;
}
-
.fixed .main-header {
- top: 0;
- right: 0;
- left: 0;
+ top: 0;
+ right: 0;
+ left: 0;
}
-
.fixed .content-wrapper,
.fixed .right-side {
- padding-top: 50px;
+ padding-top: 50px;
}
-
@media (max-width: 767px) {
- .fixed .content-wrapper,
- .fixed .right-side {
- padding-top: 100px;
- }
+ .fixed .content-wrapper,
+ .fixed .right-side {
+ padding-top: 100px;
+ }
}
-
.fixed.layout-boxed .wrapper {
- max-width: 100%;
+ max-width: 100%;
}
-
-body.hold-transition .content-wrapper,
-body.hold-transition .right-side,
-body.hold-transition .main-footer,
-body.hold-transition .main-sidebar,
-body.hold-transition .left-side,
-body.hold-transition .main-header .navbar,
-body.hold-transition .main-header .logo {
- /* Fix for IE */
- -webkit-transition: none;
- -o-transition: none;
- transition: none;
+.fixed .wrapper {
+ overflow: hidden;
+}
+.hold-transition .content-wrapper,
+.hold-transition .right-side,
+.hold-transition .main-footer,
+.hold-transition .main-sidebar,
+.hold-transition .left-side,
+.hold-transition .main-header .navbar,
+.hold-transition .main-header .logo,
+.hold-transition .menu-open .fa-angle-left {
+ /* Fix for IE */
+ -webkit-transition: none;
+ -o-transition: none;
+ transition: none;
}
-
/* Content */
.content {
- min-height: 250px;
- padding: 15px;
- margin-right: auto;
- margin-left: auto;
- padding-left: 15px;
- padding-right: 15px;
+ min-height: 250px;
+ padding: 15px;
+ margin-right: auto;
+ margin-left: auto;
+ padding-left: 15px;
+ padding-right: 15px;
}
-
/* H1 - H6 font */
h1,
h2,
@@ -186,2710 +189,2373 @@ h6,
.h4,
.h5,
.h6 {
- font-family: 'Source Sans Pro', sans-serif;
+ font-family: 'Source Sans Pro', sans-serif;
}
-
/* General Links */
a {
- color: #3c8dbc;
+ color: #337ab7;
}
-
a:hover,
a:active,
a:focus {
- outline: none;
- text-decoration: none;
- color: #72afd2;
+ outline: none;
+ text-decoration: none;
+ color: #23527c;
}
-
/* Page Header */
.page-header {
- margin: 10px 0 20px 0;
- font-size: 22px;
+ margin: 10px 0 20px 0;
+ font-size: 22px;
}
-
.page-header > small {
- color: #666;
- display: block;
- margin-top: 5px;
+ color: #666;
+ display: block;
+ margin-top: 5px;
}
-
/*
* Component: Main Header
* ----------------------
*/
.main-header {
- position: relative;
- max-height: 100px;
- z-index: 1030;
+ position: relative;
+ max-height: 100px;
+ z-index: 1030;
}
-
.main-header .navbar {
- -webkit-transition: margin-left 0.3s ease-in-out;
- -o-transition: margin-left 0.3s ease-in-out;
- transition: margin-left 0.3s ease-in-out;
- margin-bottom: 0;
- margin-left: 230px;
- border: none;
- min-height: 50px;
- border-radius: 0;
+ -webkit-transition: margin-left 0.3s ease-in-out;
+ -o-transition: margin-left 0.3s ease-in-out;
+ transition: margin-left 0.3s ease-in-out;
+ margin-bottom: 0;
+ margin-left: 230px;
+ border: none;
+ min-height: 50px;
+ border-radius: 0;
}
-
.layout-top-nav .main-header .navbar {
- margin-left: 0;
+ margin-left: 0;
}
-
.main-header #navbar-search-input.form-control {
- background: rgba(255, 255, 255, 0.2);
- border-color: transparent;
+ background: rgba(255, 255, 255, 0.2);
+ border-color: transparent;
}
-
.main-header #navbar-search-input.form-control:focus,
.main-header #navbar-search-input.form-control:active {
- border-color: rgba(0, 0, 0, 0.1);
- background: rgba(255, 255, 255, 0.9);
+ border-color: rgba(0, 0, 0, 0.1);
+ background: rgba(255, 255, 255, 0.9);
}
-
.main-header #navbar-search-input.form-control::-moz-placeholder {
- color: #ccc;
- opacity: 1;
+ color: #ccc;
+ opacity: 1;
}
-
.main-header #navbar-search-input.form-control:-ms-input-placeholder {
- color: #ccc;
+ color: #ccc;
}
-
.main-header #navbar-search-input.form-control::-webkit-input-placeholder {
- color: #ccc;
+ color: #ccc;
}
-
.main-header .navbar-custom-menu,
.main-header .navbar-right {
- float: right;
+ float: right;
}
-
@media (max-width: 991px) {
- .main-header .navbar-custom-menu a,
- .main-header .navbar-right a {
- color: inherit;
- background: transparent;
- }
+ .main-header .navbar-custom-menu a,
+ .main-header .navbar-right a {
+ color: inherit;
+ background: transparent;
+ }
}
-
@media (max-width: 767px) {
- .main-header .navbar-right {
- float: none;
- }
-
- .navbar-collapse .main-header .navbar-right {
- margin: 7.5px -15px;
- }
-
- .main-header .navbar-right > li {
- color: inherit;
- border: 0;
- }
+ .main-header .navbar-right {
+ float: none;
+ }
+ .navbar-collapse .main-header .navbar-right {
+ margin: 7.5px -15px;
+ }
+ .main-header .navbar-right > li {
+ color: inherit;
+ border: 0;
+ }
}
-
.main-header .sidebar-toggle {
- float: left;
- background-color: transparent;
- background-image: none;
- padding: 15px 15px;
- font-family: fontAwesome;
+ float: left;
+ background-color: transparent;
+ background-image: none;
+ padding: 15px 15px;
+ font-family: fontAwesome;
}
-
.main-header .sidebar-toggle:before {
- content: "\f0c9";
+ content: "\f0c9";
}
-
.main-header .sidebar-toggle:hover {
- color: #fff;
+ color: #fff;
}
-
.main-header .sidebar-toggle:focus,
.main-header .sidebar-toggle:active {
- background: transparent;
+ background: transparent;
}
-
.main-header .sidebar-toggle .icon-bar {
- display: none;
+ display: none;
}
-
.main-header .navbar .nav > li.user > a > .fa,
.main-header .navbar .nav > li.user > a > .glyphicon,
.main-header .navbar .nav > li.user > a > .ion {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.main-header .navbar .nav > li > a > .label {
- position: absolute;
- top: 9px;
- right: 7px;
- text-align: center;
- font-size: 9px;
- padding: 2px 3px;
- line-height: .9;
+ position: absolute;
+ top: 9px;
+ right: 7px;
+ text-align: center;
+ font-size: 9px;
+ padding: 2px 3px;
+ line-height: .9;
}
-
.main-header .logo {
- -webkit-transition: width 0.3s ease-in-out;
- -o-transition: width 0.3s ease-in-out;
- transition: width 0.3s ease-in-out;
- display: block;
- float: left;
- height: 50px;
- font-size: 20px;
- line-height: 50px;
- text-align: center;
- width: 230px;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- padding: 0 15px;
- font-weight: 300;
- overflow: hidden;
+ -webkit-transition: width 0.3s ease-in-out;
+ -o-transition: width 0.3s ease-in-out;
+ transition: width 0.3s ease-in-out;
+ display: block;
+ float: left;
+ height: 50px;
+ font-size: 20px;
+ line-height: 50px;
+ text-align: center;
+ width: 230px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ padding: 0 15px;
+ font-weight: 300;
+ overflow: hidden;
}
-
.main-header .logo .logo-lg {
- display: block;
+ display: block;
}
-
.main-header .logo .logo-mini {
- display: none;
+ display: none;
}
-
.main-header .navbar-brand {
- color: #fff;
+ color: #fff;
}
-
.content-header {
- position: relative;
- padding: 15px 15px 0 15px;
+ position: relative;
+ padding: 15px 15px 0 15px;
}
-
.content-header > h1 {
- margin: 0;
- font-size: 24px;
+ margin: 0;
+ font-size: 24px;
}
-
.content-header > h1 > small {
- font-size: 15px;
- display: inline-block;
- padding-left: 4px;
- font-weight: 300;
+ font-size: 15px;
+ display: inline-block;
+ padding-left: 4px;
+ font-weight: 300;
}
-
.content-header > .breadcrumb {
- float: right;
- background: transparent;
- margin-top: 0;
- margin-bottom: 0;
- font-size: 12px;
- padding: 7px 5px;
- position: absolute;
- top: 15px;
- right: 10px;
- border-radius: 2px;
+ float: right;
+ background: transparent;
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 12px;
+ padding: 7px 5px;
+ position: absolute;
+ top: 15px;
+ right: 10px;
+ border-radius: 2px;
}
-
.content-header > .breadcrumb > li > a {
- color: #444;
- text-decoration: none;
- display: inline-block;
+ color: #444;
+ text-decoration: none;
+ display: inline-block;
}
-
.content-header > .breadcrumb > li > a > .fa,
.content-header > .breadcrumb > li > a > .glyphicon,
.content-header > .breadcrumb > li > a > .ion {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.content-header > .breadcrumb > li + li:before {
- content: '>\00a0';
+ content: '>\00a0';
}
-
@media (max-width: 991px) {
- .content-header > .breadcrumb {
- position: relative;
- margin-top: 5px;
- top: 0;
- right: 0;
- float: none;
- background: #d2d6de;
- padding-left: 10px;
- }
-
- .content-header > .breadcrumb li:before {
- color: #97a0b3;
- }
+ .content-header > .breadcrumb {
+ position: relative;
+ margin-top: 5px;
+ top: 0;
+ right: 0;
+ float: none;
+ background: #d2d6de;
+ padding-left: 10px;
+ }
+ .content-header > .breadcrumb li:before {
+ color: #97a0b3;
+ }
}
-
.navbar-toggle {
- color: #fff;
- border: 0;
+ color: #fff;
+ border: 0;
+ margin: 0;
+ padding: 15px 15px;
+}
+@media (max-width: 991px) {
+ .navbar-custom-menu .navbar-nav > li {
+ float: left;
+ }
+ .navbar-custom-menu .navbar-nav {
margin: 0;
- padding: 15px 15px;
+ float: left;
+ }
+ .navbar-custom-menu .navbar-nav > li > a {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ line-height: 20px;
+ }
}
-
-@media (max-width: 991px) {
- .navbar-custom-menu .navbar-nav > li {
- float: left;
- }
-
- .navbar-custom-menu .navbar-nav {
- margin: 0;
- float: left;
- }
-
- .navbar-custom-menu .navbar-nav > li > a {
- padding-top: 15px;
- padding-bottom: 15px;
- line-height: 20px;
- }
-}
-
@media (max-width: 767px) {
- .main-header {
- position: relative;
- }
-
- .main-header .logo,
- .main-header .navbar {
- width: 100%;
- float: none;
- }
-
- .main-header .navbar {
- margin: 0;
- }
-
- .main-header .navbar-custom-menu {
- float: right;
- }
+ .main-header {
+ position: relative;
+ }
+ .main-header .logo,
+ .main-header .navbar {
+ width: 100%;
+ float: none;
+ }
+ .main-header .navbar {
+ margin: 0;
+ }
+ .main-header .navbar-custom-menu {
+ float: right;
+ }
}
-
@media (max-width: 991px) {
- .navbar-collapse.pull-left {
- float: none !important;
- }
-
- .navbar-collapse.pull-left + .navbar-custom-menu {
- display: block;
- position: absolute;
- top: 0;
- right: 40px;
- }
+ .navbar-collapse.pull-left {
+ float: none !important;
+ }
+ .navbar-collapse.pull-left + .navbar-custom-menu {
+ display: block;
+ position: absolute;
+ top: 0;
+ right: 40px;
+ }
}
-
/*
* Component: Sidebar
* ------------------
*/
-.main-sidebar,
-.left-side {
- position: absolute;
- top: 0;
- left: 0;
- padding-top: 50px;
- min-height: 100%;
- width: 230px;
- z-index: 810;
- -webkit-transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
- -moz-transition: -moz-transform 0.3s ease-in-out, width 0.3s ease-in-out;
- -o-transition: -o-transform 0.3s ease-in-out, width 0.3s ease-in-out;
- transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
+.main-sidebar {
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding-top: 50px;
+ min-height: 100%;
+ width: 230px;
+ z-index: 810;
+ -webkit-transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
+ -moz-transition: -moz-transform 0.3s ease-in-out, width 0.3s ease-in-out;
+ -o-transition: -o-transform 0.3s ease-in-out, width 0.3s ease-in-out;
+ transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
}
-
@media (max-width: 767px) {
- .main-sidebar,
- .left-side {
- padding-top: 100px;
- }
+ .main-sidebar {
+ padding-top: 100px;
+ }
}
-
@media (max-width: 767px) {
- .main-sidebar,
- .left-side {
- -webkit-transform: translate(-230px, 0);
- -ms-transform: translate(-230px, 0);
- -o-transform: translate(-230px, 0);
- transform: translate(-230px, 0);
- }
+ .main-sidebar {
+ -webkit-transform: translate(-230px, 0);
+ -ms-transform: translate(-230px, 0);
+ -o-transform: translate(-230px, 0);
+ transform: translate(-230px, 0);
+ }
}
-
@media (min-width: 768px) {
- .sidebar-collapse .main-sidebar,
- .sidebar-collapse .left-side {
- -webkit-transform: translate(-230px, 0);
- -ms-transform: translate(-230px, 0);
- -o-transform: translate(-230px, 0);
- transform: translate(-230px, 0);
- }
+ .sidebar-collapse .main-sidebar {
+ -webkit-transform: translate(-230px, 0);
+ -ms-transform: translate(-230px, 0);
+ -o-transform: translate(-230px, 0);
+ transform: translate(-230px, 0);
+ }
}
-
@media (max-width: 767px) {
- .sidebar-open .main-sidebar,
- .sidebar-open .left-side {
- -webkit-transform: translate(0, 0);
- -ms-transform: translate(0, 0);
- -o-transform: translate(0, 0);
- transform: translate(0, 0);
- }
+ .sidebar-open .main-sidebar {
+ -webkit-transform: translate(0, 0);
+ -ms-transform: translate(0, 0);
+ -o-transform: translate(0, 0);
+ transform: translate(0, 0);
+ }
}
-
.sidebar {
- padding-bottom: 10px;
+ padding-bottom: 10px;
}
-
.sidebar-form input:focus {
- border-color: transparent;
+ border-color: transparent;
}
-
.user-panel {
- position: relative;
- width: 100%;
- padding: 10px;
- overflow: hidden;
+ position: relative;
+ width: 100%;
+ padding: 10px;
+ overflow: hidden;
}
-
.user-panel:before,
.user-panel:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.user-panel:after {
- clear: both;
+ clear: both;
+}
+.user-panel:before,
+.user-panel:after {
+ content: " ";
+ display: table;
+}
+.user-panel:after {
+ clear: both;
}
-
.user-panel > .image > img {
- width: 100%;
- max-width: 45px;
- height: auto;
+ width: 100%;
+ max-width: 45px;
+ height: auto;
}
-
.user-panel > .info {
- padding: 5px 5px 5px 15px;
- line-height: 1;
- position: absolute;
- left: 55px;
+ padding: 5px 5px 5px 15px;
+ line-height: 1;
+ position: absolute;
+ left: 55px;
}
-
.user-panel > .info > p {
- font-weight: 600;
- margin-bottom: 9px;
+ font-weight: 600;
+ margin-bottom: 9px;
}
-
.user-panel > .info > a {
- text-decoration: none;
- padding-right: 5px;
- margin-top: 3px;
- font-size: 11px;
+ text-decoration: none;
+ padding-right: 5px;
+ margin-top: 3px;
+ font-size: 11px;
}
-
.user-panel > .info > a > .fa,
.user-panel > .info > a > .ion,
.user-panel > .info > a > .glyphicon {
- margin-right: 3px;
+ margin-right: 3px;
}
-
.sidebar-menu {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
-
.sidebar-menu > li {
- position: relative;
- margin: 0;
- padding: 0;
+ position: relative;
+ margin: 0;
+ padding: 0;
}
-
.sidebar-menu > li > a {
- padding: 12px 5px 12px 15px;
- display: block;
+ padding: 12px 5px 12px 15px;
+ display: block;
}
-
.sidebar-menu > li > a > .fa,
.sidebar-menu > li > a > .glyphicon,
.sidebar-menu > li > a > .ion {
- width: 20px;
+ width: 20px;
}
-
.sidebar-menu > li .label,
.sidebar-menu > li .badge {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.sidebar-menu > li .badge {
- margin-top: 3px;
+ margin-top: 3px;
}
-
.sidebar-menu li.header {
- padding: 10px 25px 10px 15px;
- font-size: 12px;
+ padding: 10px 25px 10px 15px;
+ font-size: 12px;
}
-
.sidebar-menu li > a > .fa-angle-left,
.sidebar-menu li > a > .pull-right-container > .fa-angle-left {
- width: auto;
- height: auto;
- padding: 0;
- margin-right: 10px;
+ width: auto;
+ height: auto;
+ padding: 0;
+ margin-right: 10px;
+ -webkit-transition: transform 0.5s ease;
+ -o-transition: transform 0.5s ease;
+ transition: transform 0.5s ease;
}
-
-.sidebar-menu li.active > a > .fa-angle-left,
-.sidebar-menu li.active > a > .pull-right-container > .fa-angle-left {
- -webkit-transform: rotate(-90deg);
- -ms-transform: rotate(-90deg);
- -o-transform: rotate(-90deg);
- transform: rotate(-90deg);
+.sidebar-menu li > a > .fa-angle-left {
+ position: absolute;
+ top: 50%;
+ right: 10px;
+ margin-top: -8px;
}
-
-.sidebar-menu li.active > .treeview-menu {
- display: block;
+.sidebar-menu .menu-open > a > .fa-angle-left,
+.sidebar-menu .menu-open > a > .pull-right-container > .fa-angle-left {
+ -webkit-transform: rotate(-90deg);
+ -ms-transform: rotate(-90deg);
+ -o-transform: rotate(-90deg);
+ transform: rotate(-90deg);
}
-
-.sidebar-menu .treeview-menu {
- display: none;
- list-style: none;
- padding: 0;
- margin: 0;
- padding-left: 5px;
+.sidebar-menu .active > .treeview-menu {
+ display: block;
}
-
-.sidebar-menu .treeview-menu .treeview-menu {
- padding-left: 20px;
-}
-
-.sidebar-menu .treeview-menu > li {
- margin: 0;
-}
-
-.sidebar-menu .treeview-menu > li > a {
- padding: 5px 5px 5px 15px;
- display: block;
- font-size: 14px;
-}
-
-.sidebar-menu .treeview-menu > li > a > .fa,
-.sidebar-menu .treeview-menu > li > a > .glyphicon,
-.sidebar-menu .treeview-menu > li > a > .ion {
- width: 20px;
-}
-
-.sidebar-menu .treeview-menu > li > a > .pull-right-container > .fa-angle-left,
-.sidebar-menu .treeview-menu > li > a > .pull-right-container > .fa-angle-down,
-.sidebar-menu .treeview-menu > li > a > .fa-angle-left,
-.sidebar-menu .treeview-menu > li > a > .fa-angle-down {
- width: auto;
-}
-
/*
* Component: Sidebar Mini
*/
@media (min-width: 768px) {
- .sidebar-mini.sidebar-collapse .content-wrapper,
- .sidebar-mini.sidebar-collapse .right-side,
- .sidebar-mini.sidebar-collapse .main-footer {
- margin-left: 50px !important;
- z-index: 840;
- }
-
- .sidebar-mini.sidebar-collapse .main-sidebar {
- -webkit-transform: translate(0, 0);
- -ms-transform: translate(0, 0);
- -o-transform: translate(0, 0);
- transform: translate(0, 0);
- width: 50px !important;
- z-index: 850;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li {
- position: relative;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li > a {
- margin-right: 0;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span {
- border-top-right-radius: 4px;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:not(.treeview) > a > span {
- border-bottom-right-radius: 4px;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
- padding-top: 5px;
- padding-bottom: 5px;
- border-bottom-right-radius: 4px;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
- display: block !important;
- position: absolute;
- width: 180px;
- left: 50px;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > span {
- top: 0;
- margin-left: -3px;
- padding: 12px 5px 12px 20px;
- background-color: inherit;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
- float: right;
- width: auto !important;
- left: 200px !important;
- top: 10px !important;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
- display: none;
- }
-
- .sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
- top: 44px;
- margin-left: 0;
- }
-
- .sidebar-mini.sidebar-collapse .main-sidebar .user-panel > .info,
- .sidebar-mini.sidebar-collapse .sidebar-form,
- .sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span,
- .sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu,
- .sidebar-mini.sidebar-collapse .sidebar-menu > li > a > .pull-right,
- .sidebar-mini.sidebar-collapse .sidebar-menu li.header {
- display: none !important;
- -webkit-transform: translateZ(0);
- }
-
- .sidebar-mini.sidebar-collapse .main-header .logo {
- width: 50px;
- }
-
- .sidebar-mini.sidebar-collapse .main-header .logo > .logo-mini {
- display: block;
- margin-left: -15px;
- margin-right: -15px;
- font-size: 18px;
- }
-
- .sidebar-mini.sidebar-collapse .main-header .logo > .logo-lg {
- display: none;
- }
-
- .sidebar-mini.sidebar-collapse .main-header .navbar {
- margin-left: 50px;
- }
+ .sidebar-mini.sidebar-collapse .content-wrapper,
+ .sidebar-mini.sidebar-collapse .right-side,
+ .sidebar-mini.sidebar-collapse .main-footer {
+ margin-left: 50px !important;
+ z-index: 840;
+ }
+ .sidebar-mini.sidebar-collapse .main-sidebar {
+ -webkit-transform: translate(0, 0);
+ -ms-transform: translate(0, 0);
+ -o-transform: translate(0, 0);
+ transform: translate(0, 0);
+ width: 50px !important;
+ z-index: 850;
+ }
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li {
+ position: relative;
+ }
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li > a {
+ margin-right: 0;
+ }
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span {
+ border-top-right-radius: 4px;
+ }
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li:not(.treeview) > a > span {
+ border-bottom-right-radius: 4px;
+ }
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border-bottom-right-radius: 4px;
+ }
+ .sidebar-mini.sidebar-collapse .main-sidebar .user-panel > .info,
+ .sidebar-mini.sidebar-collapse .sidebar-form,
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span,
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu,
+ .sidebar-mini.sidebar-collapse .sidebar-menu > li > a > .pull-right,
+ .sidebar-mini.sidebar-collapse .sidebar-menu li.header {
+ display: none !important;
+ -webkit-transform: translateZ(0);
+ }
+ .sidebar-mini.sidebar-collapse .main-header .logo {
+ width: 50px;
+ }
+ .sidebar-mini.sidebar-collapse .main-header .logo > .logo-mini {
+ display: block;
+ margin-left: -15px;
+ margin-right: -15px;
+ font-size: 18px;
+ }
+ .sidebar-mini.sidebar-collapse .main-header .logo > .logo-lg {
+ display: none;
+ }
+ .sidebar-mini.sidebar-collapse .main-header .navbar {
+ margin-left: 50px;
+ }
+}
+.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
+.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
+ display: block !important;
+ position: absolute;
+ width: 180px;
+ left: 50px;
+}
+.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
+ top: 0;
+ margin-left: -3px;
+ padding: 12px 5px 12px 20px;
+ background-color: inherit;
+}
+.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
+ position: relative !important;
+ float: right;
+ width: auto !important;
+ left: 180px !important;
+ top: -22px !important;
+ z-index: 900;
+}
+.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
+ display: none;
+}
+.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
+ top: 44px;
+ margin-left: 0;
+}
+.sidebar-expanded-on-hover .main-footer,
+.sidebar-expanded-on-hover .content-wrapper {
+ margin-left: 50px;
+}
+.sidebar-expanded-on-hover .main-sidebar {
+ box-shadow: 3px 0 8px rgba(0, 0, 0, 0.125);
}
-
.sidebar-menu,
.main-sidebar .user-panel,
.sidebar-menu > li.header {
- white-space: nowrap;
- overflow: hidden;
+ white-space: nowrap;
+ overflow: hidden;
}
-
.sidebar-menu:hover {
- overflow: visible;
+ overflow: visible;
}
-
.sidebar-form,
.sidebar-menu > li.header {
- overflow: hidden;
- text-overflow: clip;
+ overflow: hidden;
+ text-overflow: clip;
}
-
.sidebar-menu li > a {
- position: relative;
+ position: relative;
}
-
.sidebar-menu li > a > .pull-right-container {
- position: absolute;
- right: 10px;
- top: 50%;
- margin-top: -7px;
+ position: absolute;
+ right: 10px;
+ top: 50%;
+ margin-top: -7px;
}
-
/*
* Component: Control sidebar. By default, this is the right sidebar.
*/
.control-sidebar-bg {
- position: fixed;
- z-index: 1000;
- bottom: 0;
+ position: fixed;
+ z-index: 1000;
+ bottom: 0;
}
-
.control-sidebar-bg,
.control-sidebar {
- top: 0;
- right: -230px;
- width: 230px;
- -webkit-transition: right 0.3s ease-in-out;
- -o-transition: right 0.3s ease-in-out;
- transition: right 0.3s ease-in-out;
+ top: 0;
+ right: -230px;
+ width: 230px;
+ -webkit-transition: right 0.3s ease-in-out;
+ -o-transition: right 0.3s ease-in-out;
+ transition: right 0.3s ease-in-out;
}
-
.control-sidebar {
- position: absolute;
- padding-top: 50px;
- z-index: 1010;
+ position: absolute;
+ padding-top: 50px;
+ z-index: 1010;
}
-
@media (max-width: 768px) {
- .control-sidebar {
- padding-top: 100px;
- }
+ .control-sidebar {
+ padding-top: 100px;
+ }
}
-
.control-sidebar > .tab-content {
- padding: 10px 15px;
+ padding: 10px 15px;
}
-
.control-sidebar.control-sidebar-open,
.control-sidebar.control-sidebar-open + .control-sidebar-bg {
- right: 0;
+ right: 0;
}
-
.control-sidebar-open .control-sidebar-bg,
.control-sidebar-open .control-sidebar {
- right: 0;
+ right: 0;
}
-
@media (min-width: 768px) {
- .control-sidebar-open .content-wrapper,
- .control-sidebar-open .right-side,
- .control-sidebar-open .main-footer {
- margin-right: 230px;
- }
+ .control-sidebar-open .content-wrapper,
+ .control-sidebar-open .right-side,
+ .control-sidebar-open .main-footer {
+ margin-right: 230px;
+ }
+}
+.fixed .control-sidebar {
+ position: fixed;
+ height: 100%;
+ overflow-y: auto;
+ padding-bottom: 50px;
}
-
.nav-tabs.control-sidebar-tabs > li:first-of-type > a,
.nav-tabs.control-sidebar-tabs > li:first-of-type > a:hover,
.nav-tabs.control-sidebar-tabs > li:first-of-type > a:focus {
- border-left-width: 0;
+ border-left-width: 0;
}
-
.nav-tabs.control-sidebar-tabs > li > a {
- border-radius: 0;
+ border-radius: 0;
}
-
.nav-tabs.control-sidebar-tabs > li > a,
.nav-tabs.control-sidebar-tabs > li > a:hover {
- border-top: none;
- border-right: none;
- border-left: 1px solid transparent;
- border-bottom: 1px solid transparent;
+ border-top: none;
+ border-right: none;
+ border-left: 1px solid transparent;
+ border-bottom: 1px solid transparent;
}
-
.nav-tabs.control-sidebar-tabs > li > a .icon {
- font-size: 16px;
+ font-size: 16px;
}
-
.nav-tabs.control-sidebar-tabs > li.active > a,
.nav-tabs.control-sidebar-tabs > li.active > a:hover,
.nav-tabs.control-sidebar-tabs > li.active > a:focus,
.nav-tabs.control-sidebar-tabs > li.active > a:active {
- border-top: none;
- border-right: none;
- border-bottom: none;
+ border-top: none;
+ border-right: none;
+ border-bottom: none;
}
-
@media (max-width: 768px) {
- .nav-tabs.control-sidebar-tabs {
- display: table;
- }
-
- .nav-tabs.control-sidebar-tabs > li {
- display: table-cell;
- }
+ .nav-tabs.control-sidebar-tabs {
+ display: table;
+ }
+ .nav-tabs.control-sidebar-tabs > li {
+ display: table-cell;
+ }
}
-
.control-sidebar-heading {
- font-weight: 400;
- font-size: 16px;
- padding: 10px 0;
- margin-bottom: 10px;
+ font-weight: 400;
+ font-size: 16px;
+ padding: 10px 0;
+ margin-bottom: 10px;
}
-
.control-sidebar-subheading {
- display: block;
- font-weight: 400;
- font-size: 14px;
+ display: block;
+ font-weight: 400;
+ font-size: 14px;
}
-
.control-sidebar-menu {
- list-style: none;
- padding: 0;
- margin: 0 -15px;
+ list-style: none;
+ padding: 0;
+ margin: 0 -15px;
}
-
.control-sidebar-menu > li > a {
- display: block;
- padding: 10px 15px;
+ display: block;
+ padding: 10px 15px;
}
-
.control-sidebar-menu > li > a:before,
.control-sidebar-menu > li > a:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.control-sidebar-menu > li > a:after {
- clear: both;
+ clear: both;
+}
+.control-sidebar-menu > li > a:before,
+.control-sidebar-menu > li > a:after {
+ content: " ";
+ display: table;
+}
+.control-sidebar-menu > li > a:after {
+ clear: both;
}
-
.control-sidebar-menu > li > a > .control-sidebar-subheading {
- margin-top: 0;
+ margin-top: 0;
}
-
.control-sidebar-menu .menu-icon {
- float: left;
- width: 35px;
- height: 35px;
- border-radius: 50%;
- text-align: center;
- line-height: 35px;
+ float: left;
+ width: 35px;
+ height: 35px;
+ border-radius: 50%;
+ text-align: center;
+ line-height: 35px;
}
-
.control-sidebar-menu .menu-info {
- margin-left: 45px;
- margin-top: 3px;
+ margin-left: 45px;
+ margin-top: 3px;
}
-
.control-sidebar-menu .menu-info > .control-sidebar-subheading {
- margin: 0;
+ margin: 0;
}
-
.control-sidebar-menu .menu-info > p {
- margin: 0;
- font-size: 11px;
+ margin: 0;
+ font-size: 11px;
}
-
.control-sidebar-menu .progress {
- margin: 0;
+ margin: 0;
}
-
.control-sidebar-dark {
- color: #b8c7ce;
+ color: #b8c7ce;
}
-
.control-sidebar-dark,
.control-sidebar-dark + .control-sidebar-bg {
- background: #222d32;
+ background: #222d32;
}
-
.control-sidebar-dark .nav-tabs.control-sidebar-tabs {
- border-bottom: #1c2529;
+ border-bottom: #1c2529;
}
-
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a {
- background: #181f23;
- color: #b8c7ce;
+ background: #181f23;
+ color: #b8c7ce;
}
-
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a:hover,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a:focus {
- border-left-color: #141a1d;
- border-bottom-color: #141a1d;
+ border-left-color: #141a1d;
+ border-bottom-color: #141a1d;
}
-
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a:hover,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a:focus,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a:active {
- background: #1c2529;
+ background: #1c2529;
}
-
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li > a:hover {
- color: #fff;
+ color: #fff;
}
-
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li.active > a,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li.active > a:hover,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li.active > a:focus,
.control-sidebar-dark .nav-tabs.control-sidebar-tabs > li.active > a:active {
- background: #222d32;
- color: #fff;
+ background: #222d32;
+ color: #fff;
}
-
.control-sidebar-dark .control-sidebar-heading,
.control-sidebar-dark .control-sidebar-subheading {
- color: #fff;
+ color: #fff;
}
-
.control-sidebar-dark .control-sidebar-menu > li > a:hover {
- background: #1e282c;
+ background: #1e282c;
}
-
.control-sidebar-dark .control-sidebar-menu > li > a .menu-info > p {
- color: #b8c7ce;
+ color: #b8c7ce;
}
-
.control-sidebar-light {
- color: #5e5e5e;
+ color: #5e5e5e;
}
-
.control-sidebar-light,
.control-sidebar-light + .control-sidebar-bg {
- background: #f9fafc;
- border-left: 1px solid #d2d6de;
+ background: #f9fafc;
+ border-left: 1px solid #d2d6de;
}
-
.control-sidebar-light .nav-tabs.control-sidebar-tabs {
- border-bottom: #d2d6de;
+ border-bottom: #d2d6de;
}
-
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a {
- background: #e8ecf4;
- color: #444444;
+ background: #e8ecf4;
+ color: #444444;
}
-
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a:hover,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a:focus {
- border-left-color: #d2d6de;
- border-bottom-color: #d2d6de;
+ border-left-color: #d2d6de;
+ border-bottom-color: #d2d6de;
}
-
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a:hover,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a:focus,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li > a:active {
- background: #eff1f7;
+ background: #eff1f7;
}
-
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li.active > a,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li.active > a:hover,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li.active > a:focus,
.control-sidebar-light .nav-tabs.control-sidebar-tabs > li.active > a:active {
- background: #f9fafc;
- color: #111;
+ background: #f9fafc;
+ color: #111;
}
-
.control-sidebar-light .control-sidebar-heading,
.control-sidebar-light .control-sidebar-subheading {
- color: #111;
+ color: #111;
}
-
.control-sidebar-light .control-sidebar-menu {
- margin-left: -14px;
+ margin-left: -14px;
}
-
.control-sidebar-light .control-sidebar-menu > li > a:hover {
- background: #f4f4f5;
+ background: #f4f4f5;
}
-
.control-sidebar-light .control-sidebar-menu > li > a .menu-info > p {
- color: #5e5e5e;
+ color: #5e5e5e;
}
-
/*
* Component: Dropdown menus
* -------------------------
*/
/*Dropdowns in general*/
.dropdown-menu {
- box-shadow: none;
- border-color: #eee;
+ box-shadow: none;
+ border-color: #eee;
}
-
.dropdown-menu > li > a {
- color: #777;
+ color: #777;
}
-
.dropdown-menu > li > a > .glyphicon,
.dropdown-menu > li > a > .fa,
.dropdown-menu > li > a > .ion {
- margin-right: 10px;
+ margin-right: 10px;
}
-
.dropdown-menu > li > a:hover {
- background-color: #e1e3e9;
- color: #333;
+ background-color: #e1e3e9;
+ color: #333;
}
-
.dropdown-menu > .divider {
- background-color: #eee;
+ background-color: #eee;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu,
.navbar-nav > .messages-menu > .dropdown-menu,
.navbar-nav > .tasks-menu > .dropdown-menu {
- width: 280px;
- padding: 0 0 0 0;
- margin: 0;
- top: 100%;
+ width: 280px;
+ padding: 0 0 0 0;
+ margin: 0;
+ top: 100%;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li,
.navbar-nav > .messages-menu > .dropdown-menu > li,
.navbar-nav > .tasks-menu > .dropdown-menu > li {
- position: relative;
+ position: relative;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li.header,
.navbar-nav > .messages-menu > .dropdown-menu > li.header,
.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
- background-color: #ffffff;
- padding: 7px 10px;
- border-bottom: 1px solid #f4f4f4;
- color: #444444;
- font-size: 14px;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+ background-color: #ffffff;
+ padding: 7px 10px;
+ border-bottom: 1px solid #f4f4f4;
+ color: #444444;
+ font-size: 14px;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li.footer > a,
.navbar-nav > .messages-menu > .dropdown-menu > li.footer > a,
.navbar-nav > .tasks-menu > .dropdown-menu > li.footer > a {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 4px;
- border-bottom-left-radius: 4px;
- font-size: 12px;
- background-color: #fff;
- padding: 7px 10px;
- border-bottom: 1px solid #eeeeee;
- color: #444 !important;
- text-align: center;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 4px;
+ font-size: 12px;
+ background-color: #fff;
+ padding: 7px 10px;
+ border-bottom: 1px solid #eeeeee;
+ color: #444 !important;
+ text-align: center;
}
-
@media (max-width: 991px) {
- .navbar-nav > .notifications-menu > .dropdown-menu > li.footer > a,
- .navbar-nav > .messages-menu > .dropdown-menu > li.footer > a,
- .navbar-nav > .tasks-menu > .dropdown-menu > li.footer > a {
- background: #fff !important;
- color: #444 !important;
- }
+ .navbar-nav > .notifications-menu > .dropdown-menu > li.footer > a,
+ .navbar-nav > .messages-menu > .dropdown-menu > li.footer > a,
+ .navbar-nav > .tasks-menu > .dropdown-menu > li.footer > a {
+ background: #fff !important;
+ color: #444 !important;
+ }
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li.footer > a:hover,
.navbar-nav > .messages-menu > .dropdown-menu > li.footer > a:hover,
.navbar-nav > .tasks-menu > .dropdown-menu > li.footer > a:hover {
- text-decoration: none;
- font-weight: normal;
+ text-decoration: none;
+ font-weight: normal;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu,
.navbar-nav > .messages-menu > .dropdown-menu > li .menu,
.navbar-nav > .tasks-menu > .dropdown-menu > li .menu {
- max-height: 200px;
- margin: 0;
- padding: 0;
- list-style: none;
- overflow-x: hidden;
+ max-height: 200px;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ overflow-x: hidden;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a,
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a,
.navbar-nav > .tasks-menu > .dropdown-menu > li .menu > li > a {
- display: block;
- white-space: nowrap;
- /* Prevent text from breaking */
- border-bottom: 1px solid #f4f4f4;
+ display: block;
+ white-space: nowrap;
+ /* Prevent text from breaking */
+ border-bottom: 1px solid #f4f4f4;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a:hover,
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:hover,
.navbar-nav > .tasks-menu > .dropdown-menu > li .menu > li > a:hover {
- background: #f4f4f4;
- text-decoration: none;
+ background: #f4f4f4;
+ text-decoration: none;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a {
- color: #444444;
- overflow: hidden;
- text-overflow: ellipsis;
- padding: 10px;
+ color: #444444;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ padding: 10px;
}
-
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a > .glyphicon,
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a > .fa,
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a > .ion {
- width: 20px;
+ width: 20px;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a {
- margin: 0;
- padding: 10px 10px;
+ margin: 0;
+ padding: 10px 10px;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a > div > img {
- margin: auto 10px auto auto;
- width: 40px;
- height: 40px;
+ margin: auto 10px auto auto;
+ width: 40px;
+ height: 40px;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a > h4 {
- padding: 0;
- margin: 0 0 0 45px;
- color: #444444;
- font-size: 15px;
- position: relative;
+ padding: 0;
+ margin: 0 0 0 45px;
+ color: #444444;
+ font-size: 15px;
+ position: relative;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a > h4 > small {
- color: #999999;
- font-size: 10px;
- position: absolute;
- top: 0;
- right: 0;
+ color: #999999;
+ font-size: 10px;
+ position: absolute;
+ top: 0;
+ right: 0;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a > p {
- margin: 0 0 0 45px;
- font-size: 12px;
- color: #888888;
+ margin: 0 0 0 45px;
+ font-size: 12px;
+ color: #888888;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:before,
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:after {
- clear: both;
+ clear: both;
+}
+.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:before,
+.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:after {
+ content: " ";
+ display: table;
+}
+.navbar-nav > .messages-menu > .dropdown-menu > li .menu > li > a:after {
+ clear: both;
}
-
.navbar-nav > .tasks-menu > .dropdown-menu > li .menu > li > a {
- padding: 10px;
+ padding: 10px;
}
-
.navbar-nav > .tasks-menu > .dropdown-menu > li .menu > li > a > h3 {
- font-size: 14px;
- padding: 0;
- margin: 0 0 10px 0;
- color: #666666;
+ font-size: 14px;
+ padding: 0;
+ margin: 0 0 10px 0;
+ color: #666666;
}
-
.navbar-nav > .tasks-menu > .dropdown-menu > li .menu > li > a > .progress {
- padding: 0;
- margin: 0;
+ padding: 0;
+ margin: 0;
}
-
.navbar-nav > .user-menu > .dropdown-menu {
- border-top-right-radius: 0;
- border-top-left-radius: 0;
- padding: 1px 0 0 0;
- border-top-width: 0;
- width: 280px;
+ border-top-right-radius: 0;
+ border-top-left-radius: 0;
+ padding: 1px 0 0 0;
+ border-top-width: 0;
+ width: 280px;
}
-
.navbar-nav > .user-menu > .dropdown-menu,
.navbar-nav > .user-menu > .dropdown-menu > .user-body {
- border-bottom-right-radius: 4px;
- border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 4px;
}
-
.navbar-nav > .user-menu > .dropdown-menu > li.user-header {
- height: 175px;
- padding: 10px;
- text-align: center;
+ height: 175px;
+ padding: 10px;
+ text-align: center;
}
-
.navbar-nav > .user-menu > .dropdown-menu > li.user-header > img {
- z-index: 5;
- height: 90px;
- width: 90px;
- border: 3px solid;
- border-color: transparent;
- border-color: rgba(255, 255, 255, 0.2);
+ z-index: 5;
+ height: 90px;
+ width: 90px;
+ border: 3px solid;
+ border-color: transparent;
+ border-color: rgba(255, 255, 255, 0.2);
}
-
.navbar-nav > .user-menu > .dropdown-menu > li.user-header > p {
- z-index: 5;
- color: #fff;
- color: rgba(255, 255, 255, 0.8);
- font-size: 17px;
- margin-top: 10px;
+ z-index: 5;
+ color: #fff;
+ color: rgba(255, 255, 255, 0.8);
+ font-size: 17px;
+ margin-top: 10px;
}
-
.navbar-nav > .user-menu > .dropdown-menu > li.user-header > p > small {
- display: block;
- font-size: 12px;
+ display: block;
+ font-size: 12px;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-body {
- padding: 15px;
- border-bottom: 1px solid #f4f4f4;
- border-top: 1px solid #dddddd;
+ padding: 15px;
+ border-bottom: 1px solid #f4f4f4;
+ border-top: 1px solid #dddddd;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-body:before,
.navbar-nav > .user-menu > .dropdown-menu > .user-body:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-body:after {
- clear: both;
+ clear: both;
+}
+.navbar-nav > .user-menu > .dropdown-menu > .user-body:before,
+.navbar-nav > .user-menu > .dropdown-menu > .user-body:after {
+ content: " ";
+ display: table;
+}
+.navbar-nav > .user-menu > .dropdown-menu > .user-body:after {
+ clear: both;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-body a {
- color: #444 !important;
+ color: #444 !important;
}
-
@media (max-width: 991px) {
- .navbar-nav > .user-menu > .dropdown-menu > .user-body a {
- background: #fff !important;
- color: #444 !important;
- }
+ .navbar-nav > .user-menu > .dropdown-menu > .user-body a {
+ background: #fff !important;
+ color: #444 !important;
+ }
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-footer {
- background-color: #f9f9f9;
- padding: 10px;
+ background-color: #f9f9f9;
+ padding: 10px;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-footer:before,
.navbar-nav > .user-menu > .dropdown-menu > .user-footer:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-footer:after {
- clear: both;
+ clear: both;
+}
+.navbar-nav > .user-menu > .dropdown-menu > .user-footer:before,
+.navbar-nav > .user-menu > .dropdown-menu > .user-footer:after {
+ content: " ";
+ display: table;
+}
+.navbar-nav > .user-menu > .dropdown-menu > .user-footer:after {
+ clear: both;
}
-
.navbar-nav > .user-menu > .dropdown-menu > .user-footer .btn-default {
- color: #666666;
+ color: #666666;
}
-
@media (max-width: 991px) {
- .navbar-nav > .user-menu > .dropdown-menu > .user-footer .btn-default:hover {
- background-color: #f9f9f9;
- }
+ .navbar-nav > .user-menu > .dropdown-menu > .user-footer .btn-default:hover {
+ background-color: #f9f9f9;
+ }
}
-
.navbar-nav > .user-menu .user-image {
- float: left;
- width: 25px;
- height: 25px;
- border-radius: 50%;
- margin-right: 10px;
- margin-top: -2px;
+ float: left;
+ width: 25px;
+ height: 25px;
+ border-radius: 50%;
+ margin-right: 10px;
+ margin-top: -2px;
}
-
@media (max-width: 767px) {
- .navbar-nav > .user-menu .user-image {
- float: none;
- margin-right: 0;
- margin-top: -8px;
- line-height: 10px;
- }
+ .navbar-nav > .user-menu .user-image {
+ float: none;
+ margin-right: 0;
+ margin-top: -8px;
+ line-height: 10px;
+ }
}
-
/* Add fade animation to dropdown menus by appending
the class .animated-dropdown-menu to the .dropdown-menu ul (or ol)*/
.open:not(.dropup) > .animated-dropdown-menu {
- backface-visibility: visible !important;
- -webkit-animation: flipInX 0.7s both;
- -o-animation: flipInX 0.7s both;
- animation: flipInX 0.7s both;
+ backface-visibility: visible !important;
+ -webkit-animation: flipInX 0.7s both;
+ -o-animation: flipInX 0.7s both;
+ animation: flipInX 0.7s both;
}
-
@keyframes flipInX {
- 0% {
- transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
- transition-timing-function: ease-in;
- opacity: 0;
- }
- 40% {
- transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
- transition-timing-function: ease-in;
- }
- 60% {
- transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
- opacity: 1;
- }
- 80% {
- transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
- }
- 100% {
- transform: perspective(400px);
- }
+ 0% {
+ transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+ transition-timing-function: ease-in;
+ opacity: 0;
+ }
+ 40% {
+ transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+ transition-timing-function: ease-in;
+ }
+ 60% {
+ transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+ opacity: 1;
+ }
+ 80% {
+ transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+ }
+ 100% {
+ transform: perspective(400px);
+ }
}
-
@-webkit-keyframes flipInX {
- 0% {
- -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
- -webkit-transition-timing-function: ease-in;
- opacity: 0;
- }
- 40% {
- -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
- -webkit-transition-timing-function: ease-in;
- }
- 60% {
- -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
- opacity: 1;
- }
- 80% {
- -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
- }
- 100% {
- -webkit-transform: perspective(400px);
- }
+ 0% {
+ -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+ -webkit-transition-timing-function: ease-in;
+ opacity: 0;
+ }
+ 40% {
+ -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+ -webkit-transition-timing-function: ease-in;
+ }
+ 60% {
+ -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+ opacity: 1;
+ }
+ 80% {
+ -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+ }
+ 100% {
+ -webkit-transform: perspective(400px);
+ }
}
-
/* Fix dropdown menu in navbars */
.navbar-custom-menu > .navbar-nav > li {
- position: relative;
+ position: relative;
}
-
.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
- position: absolute;
- right: 0;
- left: auto;
+ position: absolute;
+ right: 0;
+ left: auto;
}
-
@media (max-width: 991px) {
- .navbar-custom-menu > .navbar-nav {
- float: right;
- }
-
- .navbar-custom-menu > .navbar-nav > li {
- position: static;
- }
-
- .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
- position: absolute;
- right: 5%;
- left: auto;
- border: 1px solid #ddd;
- background: #fff;
- }
+ .navbar-custom-menu > .navbar-nav {
+ float: right;
+ }
+ .navbar-custom-menu > .navbar-nav > li {
+ position: static;
+ }
+ .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+ position: absolute;
+ right: 5%;
+ left: auto;
+ border: 1px solid #ddd;
+ background: #fff;
+ }
}
-
/*
* Component: Form
* ---------------
*/
.form-control {
- border-radius: 0;
- box-shadow: none;
- border-color: #d2d6de;
+ border-radius: 0;
+ box-shadow: none;
+ border-color: #d2d6de;
}
-
.form-control:focus {
- border-color: #3c8dbc;
- box-shadow: none;
+ border-color: #3c8dbc;
+ box-shadow: none;
}
-
.form-control::-moz-placeholder,
.form-control:-ms-input-placeholder,
.form-control::-webkit-input-placeholder {
- color: #bbb;
- opacity: 1;
+ color: #bbb;
+ opacity: 1;
}
-
.form-control:not(select) {
- -webkit-appearance: none;
- -moz-appearance: none;
- appearance: none;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
}
-
.form-group.has-success label {
- color: #00a65a;
+ color: #00a65a;
}
-
.form-group.has-success .form-control,
.form-group.has-success .input-group-addon {
- border-color: #00a65a;
- box-shadow: none;
+ border-color: #00a65a;
+ box-shadow: none;
}
-
.form-group.has-success .help-block {
- color: #00a65a;
+ color: #00a65a;
}
-
.form-group.has-warning label {
- color: #f39c12;
+ color: #f39c12;
}
-
.form-group.has-warning .form-control,
.form-group.has-warning .input-group-addon {
- border-color: #f39c12;
- box-shadow: none;
+ border-color: #f39c12;
+ box-shadow: none;
}
-
.form-group.has-warning .help-block {
- color: #f39c12;
+ color: #f39c12;
}
-
.form-group.has-error label {
- color: #dd4b39;
+ color: #dd4b39;
}
-
.form-group.has-error .form-control,
.form-group.has-error .input-group-addon {
- border-color: #dd4b39;
- box-shadow: none;
+ border-color: #dd4b39;
+ box-shadow: none;
}
-
.form-group.has-error .help-block {
- color: #dd4b39;
+ color: #dd4b39;
}
-
/* Input group */
.input-group .input-group-addon {
- border-radius: 0;
- border-color: #d2d6de;
- background-color: #fff;
+ border-radius: 0;
+ border-color: #d2d6de;
+ background-color: #fff;
}
-
/* button groups */
.btn-group-vertical .btn.btn-flat:first-of-type,
.btn-group-vertical .btn.btn-flat:last-of-type {
- border-radius: 0;
+ border-radius: 0;
}
-
.icheck > label {
- padding-left: 0;
+ padding-left: 0;
}
-
/* support Font Awesome icons in form-control */
.form-control-feedback.fa {
- line-height: 34px;
+ line-height: 34px;
}
-
.input-lg + .form-control-feedback.fa,
.input-group-lg + .form-control-feedback.fa,
.form-group-lg .form-control + .form-control-feedback.fa {
- line-height: 46px;
+ line-height: 46px;
}
-
.input-sm + .form-control-feedback.fa,
.input-group-sm + .form-control-feedback.fa,
.form-group-sm .form-control + .form-control-feedback.fa {
- line-height: 30px;
+ line-height: 30px;
}
-
/*
* Component: Progress Bar
* -----------------------
*/
.progress,
.progress > .progress-bar {
- -webkit-box-shadow: none;
- box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
}
-
.progress,
.progress > .progress-bar,
.progress .progress-bar,
.progress > .progress-bar .progress-bar {
- border-radius: 1px;
+ border-radius: 1px;
}
-
/* size variation */
.progress.sm,
.progress-sm {
- height: 10px;
+ height: 10px;
}
-
.progress.sm,
.progress-sm,
.progress.sm .progress-bar,
.progress-sm .progress-bar {
- border-radius: 1px;
+ border-radius: 1px;
}
-
.progress.xs,
.progress-xs {
- height: 7px;
+ height: 7px;
}
-
.progress.xs,
.progress-xs,
.progress.xs .progress-bar,
.progress-xs .progress-bar {
- border-radius: 1px;
+ border-radius: 1px;
}
-
.progress.xxs,
.progress-xxs {
- height: 3px;
+ height: 3px;
}
-
.progress.xxs,
.progress-xxs,
.progress.xxs .progress-bar,
.progress-xxs .progress-bar {
- border-radius: 1px;
+ border-radius: 1px;
}
-
/* Vertical bars */
.progress.vertical {
- position: relative;
- width: 30px;
- height: 200px;
- display: inline-block;
- margin-right: 10px;
+ position: relative;
+ width: 30px;
+ height: 200px;
+ display: inline-block;
+ margin-right: 10px;
}
-
.progress.vertical > .progress-bar {
- width: 100%;
- position: absolute;
- bottom: 0;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
}
-
.progress.vertical.sm,
.progress.vertical.progress-sm {
- width: 20px;
+ width: 20px;
}
-
.progress.vertical.xs,
.progress.vertical.progress-xs {
- width: 10px;
+ width: 10px;
}
-
.progress.vertical.xxs,
.progress.vertical.progress-xxs {
- width: 3px;
+ width: 3px;
}
-
.progress-group .progress-text {
- font-weight: 600;
+ font-weight: 600;
}
-
.progress-group .progress-number {
- float: right;
+ float: right;
}
-
/* Remove margins from progress bars when put in a table */
.table tr > td .progress {
- margin: 0;
+ margin: 0;
}
-
.progress-bar-light-blue,
.progress-bar-primary {
- background-color: #3c8dbc;
+ background-color: #3c8dbc;
}
-
.progress-striped .progress-bar-light-blue,
.progress-striped .progress-bar-primary {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-striped .progress-bar-light-blue,
+.progress-striped .progress-bar-primary {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
-
.progress-bar-green,
.progress-bar-success {
- background-color: #00a65a;
+ background-color: #00a65a;
}
-
.progress-striped .progress-bar-green,
.progress-striped .progress-bar-success {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-striped .progress-bar-green,
+.progress-striped .progress-bar-success {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
-
.progress-bar-aqua,
.progress-bar-info {
- background-color: #00c0ef;
+ background-color: #00c0ef;
}
-
.progress-striped .progress-bar-aqua,
.progress-striped .progress-bar-info {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-striped .progress-bar-aqua,
+.progress-striped .progress-bar-info {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
-
.progress-bar-yellow,
.progress-bar-warning {
- background-color: #f39c12;
+ background-color: #f39c12;
}
-
.progress-striped .progress-bar-yellow,
.progress-striped .progress-bar-warning {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-striped .progress-bar-yellow,
+.progress-striped .progress-bar-warning {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
-
.progress-bar-red,
.progress-bar-danger {
- background-color: #dd4b39;
+ background-color: #dd4b39;
}
-
.progress-striped .progress-bar-red,
.progress-striped .progress-bar-danger {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-striped .progress-bar-red,
+.progress-striped .progress-bar-danger {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
-
/*
* Component: Small Box
* --------------------
*/
.small-box {
- border-radius: 2px;
- position: relative;
- display: block;
- margin-bottom: 20px;
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ border-radius: 2px;
+ position: relative;
+ display: block;
+ margin-bottom: 20px;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
}
-
.small-box > .inner {
- padding: 10px;
+ padding: 10px;
}
-
.small-box > .small-box-footer {
- position: relative;
- text-align: center;
- padding: 3px 0;
- color: #fff;
- color: rgba(255, 255, 255, 0.8);
- display: block;
- z-index: 10;
- background: rgba(0, 0, 0, 0.1);
- text-decoration: none;
+ position: relative;
+ text-align: center;
+ padding: 3px 0;
+ color: #fff;
+ color: rgba(255, 255, 255, 0.8);
+ display: block;
+ z-index: 10;
+ background: rgba(0, 0, 0, 0.1);
+ text-decoration: none;
}
-
.small-box > .small-box-footer:hover {
- color: #fff;
- background: rgba(0, 0, 0, 0.15);
+ color: #fff;
+ background: rgba(0, 0, 0, 0.15);
}
-
.small-box h3 {
- font-size: 38px;
- font-weight: bold;
- margin: 0 0 10px 0;
- white-space: nowrap;
- padding: 0;
+ font-size: 38px;
+ font-weight: bold;
+ margin: 0 0 10px 0;
+ white-space: nowrap;
+ padding: 0;
}
-
.small-box p {
- font-size: 15px;
+ font-size: 15px;
}
-
.small-box p > small {
- display: block;
- color: #f9f9f9;
- font-size: 13px;
- margin-top: 5px;
+ display: block;
+ color: #f9f9f9;
+ font-size: 13px;
+ margin-top: 5px;
}
-
.small-box h3,
.small-box p {
- z-index: 5;
+ z-index: 5;
}
-
.small-box .icon {
- -webkit-transition: all 0.3s linear;
- -o-transition: all 0.3s linear;
- transition: all 0.3s linear;
- position: absolute;
- top: -10px;
- right: 10px;
- z-index: 0;
- font-size: 90px;
- color: rgba(0, 0, 0, 0.15);
+ -webkit-transition: all 0.3s linear;
+ -o-transition: all 0.3s linear;
+ transition: all 0.3s linear;
+ position: absolute;
+ top: -10px;
+ right: 10px;
+ z-index: 0;
+ font-size: 90px;
+ color: rgba(0, 0, 0, 0.15);
}
-
.small-box:hover {
- text-decoration: none;
- color: #f9f9f9;
+ text-decoration: none;
+ color: #f9f9f9;
}
-
.small-box:hover .icon {
- font-size: 95px;
+ font-size: 95px;
}
-
@media (max-width: 767px) {
- .small-box {
- text-align: center;
- }
-
- .small-box .icon {
- display: none;
- }
-
- .small-box p {
- font-size: 12px;
- }
+ .small-box {
+ text-align: center;
+ }
+ .small-box .icon {
+ display: none;
+ }
+ .small-box p {
+ font-size: 12px;
+ }
}
-
/*
* Component: Box
* --------------
*/
.box {
- position: relative;
- border-radius: 3px;
- background: #ffffff;
- border-top: 3px solid #d2d6de;
- margin-bottom: 20px;
- width: 100%;
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ position: relative;
+ border-radius: 3px;
+ background: #ffffff;
+ border-top: 3px solid #d2d6de;
+ margin-bottom: 20px;
+ width: 100%;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
}
-
.box.box-primary {
- border-top-color: #3c8dbc;
+ border-top-color: #3c8dbc;
}
-
.box.box-info {
- border-top-color: #00c0ef;
+ border-top-color: #00c0ef;
}
-
.box.box-danger {
- border-top-color: #dd4b39;
+ border-top-color: #dd4b39;
}
-
.box.box-warning {
- border-top-color: #f39c12;
+ border-top-color: #f39c12;
}
-
.box.box-success {
- border-top-color: #00a65a;
+ border-top-color: #00a65a;
}
-
.box.box-default {
- border-top-color: #d2d6de;
+ border-top-color: #d2d6de;
}
-
.box.collapsed-box .box-body,
.box.collapsed-box .box-footer {
- display: none;
+ display: none;
}
-
.box .nav-stacked > li {
- border-bottom: 1px solid #f4f4f4;
- margin: 0;
+ border-bottom: 1px solid #f4f4f4;
+ margin: 0;
}
-
.box .nav-stacked > li:last-of-type {
- border-bottom: none;
+ border-bottom: none;
}
-
.box.height-control .box-body {
- max-height: 300px;
- overflow: auto;
+ max-height: 300px;
+ overflow: auto;
}
-
.box .border-right {
- border-right: 1px solid #f4f4f4;
+ border-right: 1px solid #f4f4f4;
}
-
.box .border-left {
- border-left: 1px solid #f4f4f4;
+ border-left: 1px solid #f4f4f4;
}
-
.box.box-solid {
- border-top: 0;
+ border-top: 0;
}
-
.box.box-solid > .box-header .btn.btn-default {
- background: transparent;
+ background: transparent;
}
-
.box.box-solid > .box-header .btn:hover,
.box.box-solid > .box-header a:hover {
- background: rgba(0, 0, 0, 0.1);
+ background: rgba(0, 0, 0, 0.1);
}
-
.box.box-solid.box-default {
- border: 1px solid #d2d6de;
+ border: 1px solid #d2d6de;
}
-
.box.box-solid.box-default > .box-header {
- color: #444444;
- background: #d2d6de;
- background-color: #d2d6de;
+ color: #444444;
+ background: #d2d6de;
+ background-color: #d2d6de;
}
-
.box.box-solid.box-default > .box-header a,
.box.box-solid.box-default > .box-header .btn {
- color: #444444;
+ color: #444444;
}
-
.box.box-solid.box-primary {
- border: 1px solid #3c8dbc;
+ border: 1px solid #3c8dbc;
}
-
.box.box-solid.box-primary > .box-header {
- color: #ffffff;
- background: #3c8dbc;
- background-color: #3c8dbc;
+ color: #ffffff;
+ background: #3c8dbc;
+ background-color: #3c8dbc;
}
-
.box.box-solid.box-primary > .box-header a,
.box.box-solid.box-primary > .box-header .btn {
- color: #ffffff;
+ color: #ffffff;
}
-
.box.box-solid.box-info {
- border: 1px solid #00c0ef;
+ border: 1px solid #00c0ef;
}
-
.box.box-solid.box-info > .box-header {
- color: #ffffff;
- background: #00c0ef;
- background-color: #00c0ef;
+ color: #ffffff;
+ background: #00c0ef;
+ background-color: #00c0ef;
}
-
.box.box-solid.box-info > .box-header a,
.box.box-solid.box-info > .box-header .btn {
- color: #ffffff;
+ color: #ffffff;
}
-
.box.box-solid.box-danger {
- border: 1px solid #dd4b39;
+ border: 1px solid #dd4b39;
}
-
.box.box-solid.box-danger > .box-header {
- color: #ffffff;
- background: #dd4b39;
- background-color: #dd4b39;
+ color: #ffffff;
+ background: #dd4b39;
+ background-color: #dd4b39;
}
-
.box.box-solid.box-danger > .box-header a,
.box.box-solid.box-danger > .box-header .btn {
- color: #ffffff;
+ color: #ffffff;
}
-
.box.box-solid.box-warning {
- border: 1px solid #f39c12;
+ border: 1px solid #f39c12;
}
-
.box.box-solid.box-warning > .box-header {
- color: #ffffff;
- background: #f39c12;
- background-color: #f39c12;
+ color: #ffffff;
+ background: #f39c12;
+ background-color: #f39c12;
}
-
.box.box-solid.box-warning > .box-header a,
.box.box-solid.box-warning > .box-header .btn {
- color: #ffffff;
+ color: #ffffff;
}
-
.box.box-solid.box-success {
- border: 1px solid #00a65a;
+ border: 1px solid #00a65a;
}
-
.box.box-solid.box-success > .box-header {
- color: #ffffff;
- background: #00a65a;
- background-color: #00a65a;
+ color: #ffffff;
+ background: #00a65a;
+ background-color: #00a65a;
}
-
.box.box-solid.box-success > .box-header a,
.box.box-solid.box-success > .box-header .btn {
- color: #ffffff;
+ color: #ffffff;
}
-
.box.box-solid > .box-header > .box-tools .btn {
- border: 0;
- box-shadow: none;
+ border: 0;
+ box-shadow: none;
}
-
.box.box-solid[class*='bg'] > .box-header {
- color: #fff;
+ color: #fff;
}
-
.box .box-group > .box {
- margin-bottom: 5px;
+ margin-bottom: 5px;
}
-
.box .knob-label {
- text-align: center;
- color: #333;
- font-weight: 100;
- font-size: 12px;
- margin-bottom: 0.3em;
+ text-align: center;
+ color: #333;
+ font-weight: 100;
+ font-size: 12px;
+ margin-bottom: 0.3em;
}
-
.box > .overlay,
.overlay-wrapper > .overlay,
.box > .loading-img,
.overlay-wrapper > .loading-img {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
}
-
.box .overlay,
.overlay-wrapper .overlay {
- z-index: 50;
- background: rgba(255, 255, 255, 0.7);
- border-radius: 3px;
+ z-index: 50;
+ background: rgba(255, 255, 255, 0.7);
+ border-radius: 3px;
}
-
.box .overlay > .fa,
.overlay-wrapper .overlay > .fa {
- position: absolute;
- top: 50%;
- left: 50%;
- margin-left: -15px;
- margin-top: -15px;
- color: #000;
- font-size: 30px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-left: -15px;
+ margin-top: -15px;
+ color: #000;
+ font-size: 30px;
}
-
.box .overlay.dark,
.overlay-wrapper .overlay.dark {
- background: rgba(0, 0, 0, 0.5);
+ background: rgba(0, 0, 0, 0.5);
}
-
.box-header:before,
.box-body:before,
.box-footer:before,
.box-header:after,
.box-body:after,
.box-footer:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.box-header:after,
.box-body:after,
.box-footer:after {
- clear: both;
+ clear: both;
+}
+.box-header:before,
+.box-body:before,
+.box-footer:before,
+.box-header:after,
+.box-body:after,
+.box-footer:after {
+ content: " ";
+ display: table;
+}
+.box-header:after,
+.box-body:after,
+.box-footer:after {
+ clear: both;
}
-
.box-header {
- color: #444;
- display: block;
- padding: 10px;
- position: relative;
+ color: #444;
+ display: block;
+ padding: 10px;
+ position: relative;
}
-
.box-header.with-border {
- border-bottom: 1px solid #f4f4f4;
+ border-bottom: 1px solid #f4f4f4;
}
-
.collapsed-box .box-header.with-border {
- border-bottom: none;
+ border-bottom: none;
}
-
.box-header > .fa,
.box-header > .glyphicon,
.box-header > .ion,
.box-header .box-title {
- display: inline-block;
- font-size: 18px;
- margin: 0;
- line-height: 1;
+ display: inline-block;
+ font-size: 18px;
+ margin: 0;
+ line-height: 1;
}
-
.box-header > .fa,
.box-header > .glyphicon,
.box-header > .ion {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.box-header > .box-tools {
- position: absolute;
- right: 10px;
- top: 5px;
+ position: absolute;
+ right: 10px;
+ top: 5px;
}
-
.box-header > .box-tools [data-toggle="tooltip"] {
- position: relative;
+ position: relative;
}
-
.box-header > .box-tools.pull-right .dropdown-menu {
- right: 0;
- left: auto;
+ right: 0;
+ left: auto;
+}
+.box-header > .box-tools .dropdown-menu > li > a {
+ color: #444!important;
}
-
.btn-box-tool {
- padding: 5px;
- font-size: 12px;
- background: transparent;
- color: #97a0b3;
+ padding: 5px;
+ font-size: 12px;
+ background: transparent;
+ color: #97a0b3;
}
-
.open .btn-box-tool,
.btn-box-tool:hover {
- color: #606c84;
+ color: #606c84;
}
-
.btn-box-tool.btn:active {
- box-shadow: none;
+ box-shadow: none;
}
-
.box-body {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
- padding: 10px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ padding: 10px;
}
-
.no-header .box-body {
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
}
-
.box-body > .table {
- margin-bottom: 0;
+ margin-bottom: 0;
}
-
.box-body .fc {
- margin-top: 5px;
+ margin-top: 5px;
}
-
.box-body .full-width-chart {
- margin: -19px;
+ margin: -19px;
}
-
.box-body.no-padding .full-width-chart {
- margin: -9px;
+ margin: -9px;
}
-
.box-body .box-pane {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 3px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 3px;
}
-
.box-body .box-pane-right {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 0;
}
-
.box-footer {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
- border-top: 1px solid #f4f4f4;
- padding: 10px;
- background-color: #ffffff;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ border-top: 1px solid #f4f4f4;
+ padding: 10px;
+ background-color: #ffffff;
}
-
.chart-legend {
- margin: 10px 0;
+ margin: 10px 0;
}
-
@media (max-width: 991px) {
- .chart-legend > li {
- float: left;
- margin-right: 10px;
- }
+ .chart-legend > li {
+ float: left;
+ margin-right: 10px;
+ }
}
-
.box-comments {
- background: #f7f7f7;
+ background: #f7f7f7;
}
-
.box-comments .box-comment {
- padding: 8px 0;
- border-bottom: 1px solid #eee;
+ padding: 8px 0;
+ border-bottom: 1px solid #eee;
}
-
.box-comments .box-comment:before,
.box-comments .box-comment:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.box-comments .box-comment:after {
- clear: both;
+ clear: both;
+}
+.box-comments .box-comment:before,
+.box-comments .box-comment:after {
+ content: " ";
+ display: table;
+}
+.box-comments .box-comment:after {
+ clear: both;
}
-
.box-comments .box-comment:last-of-type {
- border-bottom: 0;
+ border-bottom: 0;
}
-
.box-comments .box-comment:first-of-type {
- padding-top: 0;
+ padding-top: 0;
}
-
.box-comments .box-comment img {
- float: left;
+ float: left;
}
-
.box-comments .comment-text {
- margin-left: 40px;
- color: #555;
+ margin-left: 40px;
+ color: #555;
}
-
.box-comments .username {
- color: #444;
- display: block;
- font-weight: 600;
+ color: #444;
+ display: block;
+ font-weight: 600;
}
-
.box-comments .text-muted {
- font-weight: 400;
- font-size: 12px;
+ font-weight: 400;
+ font-size: 12px;
}
-
/* Widget: TODO LIST */
.todo-list {
- margin: 0;
- padding: 0;
- list-style: none;
- overflow: auto;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ overflow: auto;
}
-
.todo-list > li {
- border-radius: 2px;
- padding: 10px;
- background: #f4f4f4;
- margin-bottom: 2px;
- border-left: 2px solid #e6e7e8;
- color: #444;
+ border-radius: 2px;
+ padding: 10px;
+ background: #f4f4f4;
+ margin-bottom: 2px;
+ border-left: 2px solid #e6e7e8;
+ color: #444;
}
-
.todo-list > li:last-of-type {
- margin-bottom: 0;
+ margin-bottom: 0;
}
-
.todo-list > li > input[type='checkbox'] {
- margin: 0 10px 0 5px;
+ margin: 0 10px 0 5px;
}
-
.todo-list > li .text {
- display: inline-block;
- margin-left: 5px;
- font-weight: 600;
+ display: inline-block;
+ margin-left: 5px;
+ font-weight: 600;
}
-
.todo-list > li .label {
- margin-left: 10px;
- font-size: 9px;
+ margin-left: 10px;
+ font-size: 9px;
}
-
.todo-list > li .tools {
- display: none;
- float: right;
- color: #dd4b39;
+ display: none;
+ float: right;
+ color: #dd4b39;
}
-
.todo-list > li .tools > .fa,
.todo-list > li .tools > .glyphicon,
.todo-list > li .tools > .ion {
- margin-right: 5px;
- cursor: pointer;
+ margin-right: 5px;
+ cursor: pointer;
}
-
.todo-list > li:hover .tools {
- display: inline-block;
+ display: inline-block;
}
-
.todo-list > li.done {
- color: #999;
+ color: #999;
}
-
.todo-list > li.done .text {
- text-decoration: line-through;
- font-weight: 500;
+ text-decoration: line-through;
+ font-weight: 500;
}
-
.todo-list > li.done .label {
- background: #d2d6de !important;
+ background: #d2d6de !important;
}
-
.todo-list .danger {
- border-left-color: #dd4b39;
+ border-left-color: #dd4b39;
}
-
.todo-list .warning {
- border-left-color: #f39c12;
+ border-left-color: #f39c12;
}
-
.todo-list .info {
- border-left-color: #00c0ef;
+ border-left-color: #00c0ef;
}
-
.todo-list .success {
- border-left-color: #00a65a;
+ border-left-color: #00a65a;
}
-
.todo-list .primary {
- border-left-color: #3c8dbc;
+ border-left-color: #3c8dbc;
}
-
.todo-list .handle {
- display: inline-block;
- cursor: move;
- margin: 0 5px;
+ display: inline-block;
+ cursor: move;
+ margin: 0 5px;
}
-
/* Chat widget (DEPRECATED - this will be removed in the next major release. Use Direct Chat instead)*/
.chat {
- padding: 5px 20px 5px 10px;
+ padding: 5px 20px 5px 10px;
}
-
.chat .item {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
-
.chat .item:before,
.chat .item:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.chat .item:after {
- clear: both;
+ clear: both;
+}
+.chat .item:before,
+.chat .item:after {
+ content: " ";
+ display: table;
+}
+.chat .item:after {
+ clear: both;
}
-
.chat .item > img {
- width: 40px;
- height: 40px;
- border: 2px solid transparent;
- border-radius: 50%;
+ width: 40px;
+ height: 40px;
+ border: 2px solid transparent;
+ border-radius: 50%;
}
-
.chat .item > .online {
- border: 2px solid #00a65a;
+ border: 2px solid #00a65a;
}
-
.chat .item > .offline {
- border: 2px solid #dd4b39;
+ border: 2px solid #dd4b39;
}
-
.chat .item > .message {
- margin-left: 55px;
- margin-top: -40px;
+ margin-left: 55px;
+ margin-top: -40px;
}
-
.chat .item > .message > .name {
- display: block;
- font-weight: 600;
+ display: block;
+ font-weight: 600;
}
-
.chat .item > .attachment {
- border-radius: 3px;
- background: #f4f4f4;
- margin-left: 65px;
- margin-right: 15px;
- padding: 10px;
+ border-radius: 3px;
+ background: #f4f4f4;
+ margin-left: 65px;
+ margin-right: 15px;
+ padding: 10px;
}
-
.chat .item > .attachment > h4 {
- margin: 0 0 5px 0;
- font-weight: 600;
- font-size: 14px;
+ margin: 0 0 5px 0;
+ font-weight: 600;
+ font-size: 14px;
}
-
.chat .item > .attachment > p,
.chat .item > .attachment > .filename {
- font-weight: 600;
- font-size: 13px;
- font-style: italic;
- margin: 0;
+ font-weight: 600;
+ font-size: 13px;
+ font-style: italic;
+ margin: 0;
}
-
.chat .item > .attachment:before,
.chat .item > .attachment:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.chat .item > .attachment:after {
- clear: both;
+ clear: both;
+}
+.chat .item > .attachment:before,
+.chat .item > .attachment:after {
+ content: " ";
+ display: table;
+}
+.chat .item > .attachment:after {
+ clear: both;
}
-
.box-input {
- max-width: 200px;
+ max-width: 200px;
}
-
.modal .panel-body {
- color: #444;
+ color: #444;
}
-
/*
* Component: Info Box
* -------------------
*/
.info-box {
- display: block;
- min-height: 90px;
- background: #fff;
- width: 100%;
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- border-radius: 2px;
- margin-bottom: 15px;
+ display: block;
+ min-height: 90px;
+ background: #fff;
+ width: 100%;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ border-radius: 2px;
+ margin-bottom: 15px;
}
-
.info-box small {
- font-size: 14px;
+ font-size: 14px;
}
-
.info-box .progress {
- background: rgba(0, 0, 0, 0.2);
- margin: 5px -10px 5px -10px;
- height: 2px;
+ background: rgba(0, 0, 0, 0.2);
+ margin: 5px -10px 5px -10px;
+ height: 2px;
}
-
.info-box .progress,
.info-box .progress .progress-bar {
- border-radius: 0;
+ border-radius: 0;
}
-
.info-box .progress .progress-bar {
- background: #fff;
+ background: #fff;
}
-
.info-box-icon {
- border-top-left-radius: 2px;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 2px;
- display: block;
- float: left;
- height: 90px;
- width: 90px;
- text-align: center;
- font-size: 45px;
- line-height: 90px;
- background: rgba(0, 0, 0, 0.2);
+ border-top-left-radius: 2px;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 2px;
+ display: block;
+ float: left;
+ height: 90px;
+ width: 90px;
+ text-align: center;
+ font-size: 45px;
+ line-height: 90px;
+ background: rgba(0, 0, 0, 0.2);
}
-
.info-box-icon > img {
- max-width: 100%;
+ max-width: 100%;
}
-
.info-box-content {
- padding: 5px 10px;
- margin-left: 90px;
+ padding: 5px 10px;
+ margin-left: 90px;
}
-
.info-box-number {
- display: block;
- font-weight: bold;
- font-size: 18px;
+ display: block;
+ font-weight: bold;
+ font-size: 18px;
}
-
.progress-description,
.info-box-text {
- display: block;
- font-size: 14px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ display: block;
+ font-size: 14px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
-
.info-box-text {
- text-transform: uppercase;
+ text-transform: uppercase;
}
-
.info-box-more {
- display: block;
+ display: block;
}
-
.progress-description {
- margin: 0;
+ margin: 0;
}
-
/*
* Component: Timeline
* -------------------
*/
.timeline {
- position: relative;
- margin: 0 0 30px 0;
- padding: 0;
- list-style: none;
+ position: relative;
+ margin: 0 0 30px 0;
+ padding: 0;
+ list-style: none;
}
-
.timeline:before {
- content: '';
- position: absolute;
- top: 0;
- bottom: 0;
- width: 4px;
- background: #ddd;
- left: 31px;
- margin: 0;
- border-radius: 2px;
+ content: '';
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 4px;
+ background: #ddd;
+ left: 31px;
+ margin: 0;
+ border-radius: 2px;
}
-
.timeline > li {
- position: relative;
- margin-right: 10px;
- margin-bottom: 15px;
+ position: relative;
+ margin-right: 10px;
+ margin-bottom: 15px;
}
-
.timeline > li:before,
.timeline > li:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.timeline > li:after {
- clear: both;
+ clear: both;
+}
+.timeline > li:before,
+.timeline > li:after {
+ content: " ";
+ display: table;
+}
+.timeline > li:after {
+ clear: both;
}
-
.timeline > li > .timeline-item {
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- border-radius: 3px;
- margin-top: 0;
- background: #fff;
- color: #444;
- margin-left: 60px;
- margin-right: 15px;
- padding: 0;
- position: relative;
+ -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ border-radius: 3px;
+ margin-top: 0;
+ background: #fff;
+ color: #444;
+ margin-left: 60px;
+ margin-right: 15px;
+ padding: 0;
+ position: relative;
}
-
.timeline > li > .timeline-item > .time {
- color: #999;
- float: right;
- padding: 10px;
- font-size: 12px;
+ color: #999;
+ float: right;
+ padding: 10px;
+ font-size: 12px;
}
-
.timeline > li > .timeline-item > .timeline-header {
- margin: 0;
- color: #555;
- border-bottom: 1px solid #f4f4f4;
- padding: 10px;
- font-size: 16px;
- line-height: 1.1;
+ margin: 0;
+ color: #555;
+ border-bottom: 1px solid #f4f4f4;
+ padding: 10px;
+ font-size: 16px;
+ line-height: 1.1;
}
-
.timeline > li > .timeline-item > .timeline-header > a {
- font-weight: 600;
+ font-weight: 600;
}
-
.timeline > li > .timeline-item > .timeline-body,
.timeline > li > .timeline-item > .timeline-footer {
- padding: 10px;
+ padding: 10px;
}
-
.timeline > li > .fa,
.timeline > li > .glyphicon,
.timeline > li > .ion {
- width: 30px;
- height: 30px;
- font-size: 15px;
- line-height: 30px;
- position: absolute;
- color: #666;
- background: #d2d6de;
- border-radius: 50%;
- text-align: center;
- left: 18px;
- top: 0;
+ width: 30px;
+ height: 30px;
+ font-size: 15px;
+ line-height: 30px;
+ position: absolute;
+ color: #666;
+ background: #d2d6de;
+ border-radius: 50%;
+ text-align: center;
+ left: 18px;
+ top: 0;
}
-
.timeline > .time-label > span {
- font-weight: 600;
- padding: 5px;
- display: inline-block;
- background-color: #fff;
- border-radius: 4px;
+ font-weight: 600;
+ padding: 5px;
+ display: inline-block;
+ background-color: #fff;
+ border-radius: 4px;
}
-
.timeline-inverse > li > .timeline-item {
- background: #f0f0f0;
- border: 1px solid #ddd;
- -webkit-box-shadow: none;
- box-shadow: none;
+ background: #f0f0f0;
+ border: 1px solid #ddd;
+ -webkit-box-shadow: none;
+ box-shadow: none;
}
-
.timeline-inverse > li > .timeline-item > .timeline-header {
- border-bottom-color: #ddd;
+ border-bottom-color: #ddd;
}
-
/*
* Component: Button
* -----------------
*/
.btn {
- border-radius: 3px;
- -webkit-box-shadow: none;
- box-shadow: none;
- border: 1px solid transparent;
+ border-radius: 3px;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border: 1px solid transparent;
}
-
.btn.uppercase {
- text-transform: uppercase;
+ text-transform: uppercase;
}
-
.btn.btn-flat {
- border-radius: 0;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
- border-width: 1px;
+ border-radius: 0;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ border-width: 1px;
}
-
.btn:active {
- -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
- -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
- box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
-
.btn:focus {
- outline: none;
+ outline: none;
}
-
.btn.btn-file {
- position: relative;
- overflow: hidden;
+ position: relative;
+ overflow: hidden;
}
-
.btn.btn-file > input[type='file'] {
- position: absolute;
- top: 0;
- right: 0;
- min-width: 100%;
- min-height: 100%;
- font-size: 100px;
- text-align: right;
- opacity: 0;
- filter: alpha(opacity=0);
- outline: none;
- background: white;
- cursor: inherit;
- display: block;
+ position: absolute;
+ top: 0;
+ right: 0;
+ min-width: 100%;
+ min-height: 100%;
+ font-size: 100px;
+ text-align: right;
+ opacity: 0;
+ filter: alpha(opacity=0);
+ outline: none;
+ background: white;
+ cursor: inherit;
+ display: block;
}
-
.btn-default {
- background-color: #f4f4f4;
- color: #444;
- border-color: #ddd;
+ background-color: #f4f4f4;
+ color: #444;
+ border-color: #ddd;
}
-
.btn-default:hover,
.btn-default:active,
.btn-default.hover {
- background-color: #e7e7e7;
+ background-color: #e7e7e7;
}
-
.btn-primary {
- background-color: #3c8dbc;
- border-color: #367fa9;
+ background-color: #3c8dbc;
+ border-color: #367fa9;
}
-
.btn-primary:hover,
.btn-primary:active,
.btn-primary.hover {
- background-color: #367fa9;
+ background-color: #367fa9;
}
-
.btn-success {
- background-color: #00a65a;
- border-color: #008d4c;
+ background-color: #00a65a;
+ border-color: #008d4c;
}
-
.btn-success:hover,
.btn-success:active,
.btn-success.hover {
- background-color: #008d4c;
+ background-color: #008d4c;
}
-
.btn-info {
- background-color: #00c0ef;
- border-color: #00acd6;
+ background-color: #00c0ef;
+ border-color: #00acd6;
}
-
.btn-info:hover,
.btn-info:active,
.btn-info.hover {
- background-color: #00acd6;
+ background-color: #00acd6;
}
-
.btn-danger {
- background-color: #dd4b39;
- border-color: #d73925;
+ background-color: #dd4b39;
+ border-color: #d73925;
}
-
.btn-danger:hover,
.btn-danger:active,
.btn-danger.hover {
- background-color: #d73925;
+ background-color: #d73925;
}
-
.btn-warning {
- background-color: #f39c12;
- border-color: #e08e0b;
+ background-color: #f39c12;
+ border-color: #e08e0b;
}
-
.btn-warning:hover,
.btn-warning:active,
.btn-warning.hover {
- background-color: #e08e0b;
+ background-color: #e08e0b;
}
-
.btn-outline {
- border: 1px solid #fff;
- background: transparent;
- color: #fff;
+ border: 1px solid #fff;
+ background: transparent;
+ color: #fff;
}
-
.btn-outline:hover,
.btn-outline:focus,
.btn-outline:active {
- color: rgba(255, 255, 255, 0.7);
- border-color: rgba(255, 255, 255, 0.7);
+ color: rgba(255, 255, 255, 0.7);
+ border-color: rgba(255, 255, 255, 0.7);
}
-
.btn-link {
- -webkit-box-shadow: none;
- box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
}
-
.btn[class*='bg-']:hover {
- -webkit-box-shadow: inset 0 0 100px rgba(0, 0, 0, 0.2);
- box-shadow: inset 0 0 100px rgba(0, 0, 0, 0.2);
+ -webkit-box-shadow: inset 0 0 100px rgba(0, 0, 0, 0.2);
+ box-shadow: inset 0 0 100px rgba(0, 0, 0, 0.2);
}
-
.btn-app {
- border-radius: 3px;
- position: relative;
- padding: 15px 5px;
- margin: 0 0 10px 10px;
- min-width: 80px;
- height: 60px;
- text-align: center;
- color: #666;
- border: 1px solid #ddd;
- background-color: #f4f4f4;
- font-size: 12px;
+ border-radius: 3px;
+ position: relative;
+ padding: 15px 5px;
+ margin: 0 0 10px 10px;
+ min-width: 80px;
+ height: 60px;
+ text-align: center;
+ color: #666;
+ border: 1px solid #ddd;
+ background-color: #f4f4f4;
+ font-size: 12px;
}
-
.btn-app > .fa,
.btn-app > .glyphicon,
.btn-app > .ion {
- font-size: 20px;
- display: block;
+ font-size: 20px;
+ display: block;
}
-
.btn-app:hover {
- background: #f4f4f4;
- color: #444;
- border-color: #aaa;
+ background: #f4f4f4;
+ color: #444;
+ border-color: #aaa;
}
-
.btn-app:active,
.btn-app:focus {
- -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
- -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
- box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
-
.btn-app > .badge {
- position: absolute;
- top: -3px;
- right: -10px;
- font-size: 10px;
- font-weight: 400;
+ position: absolute;
+ top: -3px;
+ right: -10px;
+ font-size: 10px;
+ font-weight: 400;
}
-
/*
* Component: Callout
* ------------------
*/
.callout {
- border-radius: 3px;
- margin: 0 0 20px 0;
- padding: 15px 30px 15px 15px;
- border-left: 5px solid #eee;
+ border-radius: 3px;
+ margin: 0 0 20px 0;
+ padding: 15px 30px 15px 15px;
+ border-left: 5px solid #eee;
}
-
.callout a {
- color: #fff;
- text-decoration: underline;
+ color: #fff;
+ text-decoration: underline;
}
-
.callout a:hover {
- color: #eee;
+ color: #eee;
}
-
.callout h4 {
- margin-top: 0;
- font-weight: 600;
+ margin-top: 0;
+ font-weight: 600;
}
-
.callout p:last-child {
- margin-bottom: 0;
+ margin-bottom: 0;
}
-
.callout code,
.callout .highlight {
- background-color: #fff;
+ background-color: #fff;
}
-
.callout.callout-danger {
- border-color: #c23321;
+ border-color: #c23321;
}
-
.callout.callout-warning {
- border-color: #c87f0a;
+ border-color: #c87f0a;
}
-
.callout.callout-info {
- border-color: #0097bc;
+ border-color: #0097bc;
}
-
.callout.callout-success {
- border-color: #00733e;
+ border-color: #00733e;
}
-
/*
* Component: alert
* ----------------
*/
.alert {
- border-radius: 3px;
+ border-radius: 3px;
}
-
.alert h4 {
- font-weight: 600;
+ font-weight: 600;
}
-
.alert .icon {
- margin-right: 10px;
+ margin-right: 10px;
}
-
.alert .close {
- color: #000;
- opacity: 0.2;
- filter: alpha(opacity=20);
+ color: #000;
+ opacity: 0.2;
+ filter: alpha(opacity=20);
}
-
.alert .close:hover {
- opacity: 0.5;
- filter: alpha(opacity=50);
+ opacity: 0.5;
+ filter: alpha(opacity=50);
}
-
.alert a {
- color: #fff;
- text-decoration: underline;
+ color: #fff;
+ text-decoration: underline;
}
-
.alert-success {
- border-color: #008d4c;
+ border-color: #008d4c;
}
-
.alert-danger,
.alert-error {
- border-color: #d73925;
+ border-color: #d73925;
}
-
.alert-warning {
- border-color: #e08e0b;
+ border-color: #e08e0b;
}
-
.alert-info {
- border-color: #00acd6;
+ border-color: #00acd6;
}
-
/*
* Component: Nav
* --------------
@@ -2897,272 +2563,234 @@ a:focus {
.nav > li > a:hover,
.nav > li > a:active,
.nav > li > a:focus {
- color: #444;
- background: #f7f7f7;
+ color: #444;
+ background: #f7f7f7;
}
-
/* NAV PILLS */
.nav-pills > li > a {
- border-radius: 0;
- border-top: 3px solid transparent;
- color: #444;
+ border-radius: 0;
+ border-top: 3px solid transparent;
+ color: #444;
}
-
.nav-pills > li > a > .fa,
.nav-pills > li > a > .glyphicon,
.nav-pills > li > a > .ion {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.nav-pills > li.active > a,
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
- border-top-color: #3c8dbc;
+ border-top-color: #3c8dbc;
}
-
.nav-pills > li.active > a {
- font-weight: 600;
+ font-weight: 600;
}
-
/* NAV STACKED */
.nav-stacked > li > a {
- border-radius: 0;
- border-top: 0;
- border-left: 3px solid transparent;
- color: #444;
+ border-radius: 0;
+ border-top: 0;
+ border-left: 3px solid transparent;
+ color: #444;
}
-
.nav-stacked > li.active > a,
.nav-stacked > li.active > a:hover {
- background: transparent;
- color: #444;
- border-top: 0;
- border-left-color: #3c8dbc;
+ background: transparent;
+ color: #444;
+ border-top: 0;
+ border-left-color: #3c8dbc;
}
-
.nav-stacked > li.header {
- border-bottom: 1px solid #ddd;
- color: #777;
- margin-bottom: 10px;
- padding: 5px 10px;
- text-transform: uppercase;
+ border-bottom: 1px solid #ddd;
+ color: #777;
+ margin-bottom: 10px;
+ padding: 5px 10px;
+ text-transform: uppercase;
}
-
/* NAV TABS */
.nav-tabs-custom {
- margin-bottom: 20px;
- background: #fff;
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- border-radius: 3px;
+ margin-bottom: 20px;
+ background: #fff;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ border-radius: 3px;
}
-
.nav-tabs-custom > .nav-tabs {
- margin: 0;
- border-bottom-color: #f4f4f4;
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
+ margin: 0;
+ border-bottom-color: #f4f4f4;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
}
-
.nav-tabs-custom > .nav-tabs > li {
- border-top: 3px solid transparent;
- margin-bottom: -2px;
- margin-right: 5px;
+ border-top: 3px solid transparent;
+ margin-bottom: -2px;
+ margin-right: 5px;
+}
+.nav-tabs-custom > .nav-tabs > li.disabled > a {
+ color: #777;
}
-
.nav-tabs-custom > .nav-tabs > li > a {
- color: #444;
- border-radius: 0;
+ color: #444;
+ border-radius: 0;
}
-
.nav-tabs-custom > .nav-tabs > li > a.text-muted {
- color: #999;
+ color: #999;
}
-
.nav-tabs-custom > .nav-tabs > li > a,
.nav-tabs-custom > .nav-tabs > li > a:hover {
- background: transparent;
- margin: 0;
+ background: transparent;
+ margin: 0;
}
-
.nav-tabs-custom > .nav-tabs > li > a:hover {
- color: #999;
+ color: #999;
}
-
.nav-tabs-custom > .nav-tabs > li:not(.active) > a:hover,
.nav-tabs-custom > .nav-tabs > li:not(.active) > a:focus,
.nav-tabs-custom > .nav-tabs > li:not(.active) > a:active {
- border-color: transparent;
+ border-color: transparent;
}
-
.nav-tabs-custom > .nav-tabs > li.active {
- border-top-color: #3c8dbc;
+ border-top-color: #3c8dbc;
}
-
.nav-tabs-custom > .nav-tabs > li.active > a,
.nav-tabs-custom > .nav-tabs > li.active:hover > a {
- background-color: #fff;
- color: #444;
+ background-color: #fff;
+ color: #444;
}
-
.nav-tabs-custom > .nav-tabs > li.active > a {
- border-top-color: transparent;
- border-left-color: #f4f4f4;
- border-right-color: #f4f4f4;
+ border-top-color: transparent;
+ border-left-color: #f4f4f4;
+ border-right-color: #f4f4f4;
}
-
.nav-tabs-custom > .nav-tabs > li:first-of-type {
- margin-left: 0;
+ margin-left: 0;
}
-
.nav-tabs-custom > .nav-tabs > li:first-of-type.active > a {
- border-left-color: transparent;
+ border-left-color: transparent;
}
-
.nav-tabs-custom > .nav-tabs.pull-right {
- float: none !important;
+ float: none !important;
}
-
.nav-tabs-custom > .nav-tabs.pull-right > li {
- float: right;
+ float: right;
}
-
.nav-tabs-custom > .nav-tabs.pull-right > li:first-of-type {
- margin-right: 0;
+ margin-right: 0;
}
-
.nav-tabs-custom > .nav-tabs.pull-right > li:first-of-type > a {
- border-left-width: 1px;
+ border-left-width: 1px;
}
-
.nav-tabs-custom > .nav-tabs.pull-right > li:first-of-type.active > a {
- border-left-color: #f4f4f4;
- border-right-color: transparent;
+ border-left-color: #f4f4f4;
+ border-right-color: transparent;
}
-
.nav-tabs-custom > .nav-tabs > li.header {
- line-height: 35px;
- padding: 0 10px;
- font-size: 20px;
- color: #444;
+ line-height: 35px;
+ padding: 0 10px;
+ font-size: 20px;
+ color: #444;
}
-
.nav-tabs-custom > .nav-tabs > li.header > .fa,
.nav-tabs-custom > .nav-tabs > li.header > .glyphicon,
.nav-tabs-custom > .nav-tabs > li.header > .ion {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.nav-tabs-custom > .tab-content {
- background: #fff;
- padding: 10px;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
+ background: #fff;
+ padding: 10px;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
}
-
.nav-tabs-custom .dropdown.open > a:active,
.nav-tabs-custom .dropdown.open > a:focus {
- background: transparent;
- color: #999;
+ background: transparent;
+ color: #999;
}
-
.nav-tabs-custom.tab-primary > .nav-tabs > li.active {
- border-top-color: #3c8dbc;
+ border-top-color: #3c8dbc;
}
-
.nav-tabs-custom.tab-info > .nav-tabs > li.active {
- border-top-color: #00c0ef;
+ border-top-color: #00c0ef;
}
-
.nav-tabs-custom.tab-danger > .nav-tabs > li.active {
- border-top-color: #dd4b39;
+ border-top-color: #dd4b39;
}
-
.nav-tabs-custom.tab-warning > .nav-tabs > li.active {
- border-top-color: #f39c12;
+ border-top-color: #f39c12;
}
-
.nav-tabs-custom.tab-success > .nav-tabs > li.active {
- border-top-color: #00a65a;
+ border-top-color: #00a65a;
}
-
.nav-tabs-custom.tab-default > .nav-tabs > li.active {
- border-top-color: #d2d6de;
+ border-top-color: #d2d6de;
}
-
/* PAGINATION */
.pagination > li > a {
- background: #fafafa;
- color: #666;
+ background: #fafafa;
+ color: #666;
}
-
.pagination.pagination-flat > li > a {
- border-radius: 0 !important;
+ border-radius: 0 !important;
}
-
/*
* Component: Products List
* ------------------------
*/
.products-list {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
-
.products-list > .item {
- border-radius: 3px;
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- padding: 10px 0;
- background: #fff;
+ border-radius: 3px;
+ -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ padding: 10px 0;
+ background: #fff;
}
-
.products-list > .item:before,
.products-list > .item:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.products-list > .item:after {
- clear: both;
+ clear: both;
+}
+.products-list > .item:before,
+.products-list > .item:after {
+ content: " ";
+ display: table;
+}
+.products-list > .item:after {
+ clear: both;
}
-
.products-list .product-img {
- float: left;
+ float: left;
}
-
.products-list .product-img img {
- width: 50px;
- height: 50px;
+ width: 50px;
+ height: 50px;
}
-
.products-list .product-info {
- margin-left: 60px;
+ margin-left: 60px;
}
-
.products-list .product-title {
- font-weight: 600;
+ font-weight: 600;
}
-
.products-list .product-description {
- display: block;
- color: #999;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ display: block;
+ color: #999;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
-
.product-list-in-box > .item {
- -webkit-box-shadow: none;
- box-shadow: none;
- border-radius: 0;
- border-bottom: 1px solid #f4f4f4;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border-radius: 0;
+ border-bottom: 1px solid #f4f4f4;
}
-
.product-list-in-box > .item:last-of-type {
- border-bottom-width: 0;
+ border-bottom-width: 0;
}
-
/*
* Component: Table
* ----------------
@@ -3173,1841 +2801,2125 @@ a:focus {
.table > thead > tr > td,
.table > tbody > tr > td,
.table > tfoot > tr > td {
- border-top: 1px solid #f4f4f4;
+ border-top: 1px solid #f4f4f4;
}
-
.table > thead > tr > th {
- border-bottom: 2px solid #f4f4f4;
+ border-bottom: 2px solid #f4f4f4;
}
-
.table tr td .progress {
- margin-top: 5px;
+ margin-top: 5px;
}
-
.table-bordered {
- border: 1px solid #f4f4f4;
+ border: 1px solid #f4f4f4;
}
-
.table-bordered > thead > tr > th,
.table-bordered > tbody > tr > th,
.table-bordered > tfoot > tr > th,
.table-bordered > thead > tr > td,
.table-bordered > tbody > tr > td,
.table-bordered > tfoot > tr > td {
- border: 1px solid #f4f4f4;
+ border: 1px solid #f4f4f4;
}
-
.table-bordered > thead > tr > th,
.table-bordered > thead > tr > td {
- border-bottom-width: 2px;
+ border-bottom-width: 2px;
}
-
.table.no-border,
.table.no-border td,
.table.no-border th {
- border: 0;
+ border: 0;
}
-
/* .text-center in tables */
table.text-center,
table.text-center td,
table.text-center th {
- text-align: center;
+ text-align: center;
}
-
.table.align th {
- text-align: left;
+ text-align: left;
}
-
.table.align td {
- text-align: right;
+ text-align: right;
}
-
/*
* Component: Label
* ----------------
*/
.label-default {
- background-color: #d2d6de;
- color: #444;
+ background-color: #d2d6de;
+ color: #444;
}
-
/*
* Component: Direct Chat
* ----------------------
*/
.direct-chat .box-body {
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
- position: relative;
- overflow-x: hidden;
- padding: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+ position: relative;
+ overflow-x: hidden;
+ padding: 0;
}
-
.direct-chat.chat-pane-open .direct-chat-contacts {
- -webkit-transform: translate(0, 0);
- -ms-transform: translate(0, 0);
- -o-transform: translate(0, 0);
- transform: translate(0, 0);
+ -webkit-transform: translate(0, 0);
+ -ms-transform: translate(0, 0);
+ -o-transform: translate(0, 0);
+ transform: translate(0, 0);
}
-
.direct-chat-messages {
- -webkit-transform: translate(0, 0);
- -ms-transform: translate(0, 0);
- -o-transform: translate(0, 0);
- transform: translate(0, 0);
- padding: 10px;
- height: 250px;
- overflow: auto;
+ -webkit-transform: translate(0, 0);
+ -ms-transform: translate(0, 0);
+ -o-transform: translate(0, 0);
+ transform: translate(0, 0);
+ padding: 10px;
+ height: 250px;
+ overflow: auto;
}
-
.direct-chat-msg,
.direct-chat-text {
- display: block;
+ display: block;
}
-
.direct-chat-msg {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
-
.direct-chat-msg:before,
.direct-chat-msg:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.direct-chat-msg:after {
- clear: both;
+ clear: both;
+}
+.direct-chat-msg:before,
+.direct-chat-msg:after {
+ content: " ";
+ display: table;
+}
+.direct-chat-msg:after {
+ clear: both;
}
-
.direct-chat-messages,
.direct-chat-contacts {
- -webkit-transition: -webkit-transform 0.5s ease-in-out;
- -moz-transition: -moz-transform 0.5s ease-in-out;
- -o-transition: -o-transform 0.5s ease-in-out;
- transition: transform 0.5s ease-in-out;
+ -webkit-transition: -webkit-transform 0.5s ease-in-out;
+ -moz-transition: -moz-transform 0.5s ease-in-out;
+ -o-transition: -o-transform 0.5s ease-in-out;
+ transition: transform 0.5s ease-in-out;
}
-
.direct-chat-text {
- border-radius: 5px;
- position: relative;
- padding: 5px 10px;
- background: #d2d6de;
- border: 1px solid #d2d6de;
- margin: 5px 0 0 50px;
- color: #444444;
+ border-radius: 5px;
+ position: relative;
+ padding: 5px 10px;
+ background: #d2d6de;
+ border: 1px solid #d2d6de;
+ margin: 5px 0 0 50px;
+ color: #444444;
}
-
.direct-chat-text:after,
.direct-chat-text:before {
- position: absolute;
- right: 100%;
- top: 15px;
- border: solid transparent;
- border-right-color: #d2d6de;
- content: ' ';
- height: 0;
- width: 0;
- pointer-events: none;
+ position: absolute;
+ right: 100%;
+ top: 15px;
+ border: solid transparent;
+ border-right-color: #d2d6de;
+ content: ' ';
+ height: 0;
+ width: 0;
+ pointer-events: none;
}
-
.direct-chat-text:after {
- border-width: 5px;
- margin-top: -5px;
+ border-width: 5px;
+ margin-top: -5px;
}
-
.direct-chat-text:before {
- border-width: 6px;
- margin-top: -6px;
+ border-width: 6px;
+ margin-top: -6px;
}
-
.right .direct-chat-text {
- margin-right: 50px;
- margin-left: 0;
+ margin-right: 50px;
+ margin-left: 0;
}
-
.right .direct-chat-text:after,
.right .direct-chat-text:before {
- right: auto;
- left: 100%;
- border-right-color: transparent;
- border-left-color: #d2d6de;
+ right: auto;
+ left: 100%;
+ border-right-color: transparent;
+ border-left-color: #d2d6de;
}
-
.direct-chat-img {
- border-radius: 50%;
- float: left;
- width: 40px;
- height: 40px;
+ border-radius: 50%;
+ float: left;
+ width: 40px;
+ height: 40px;
}
-
.right .direct-chat-img {
- float: right;
+ float: right;
}
-
.direct-chat-info {
- display: block;
- margin-bottom: 2px;
- font-size: 12px;
+ display: block;
+ margin-bottom: 2px;
+ font-size: 12px;
}
-
.direct-chat-name {
- font-weight: 600;
+ font-weight: 600;
}
-
.direct-chat-timestamp {
- color: #999;
+ color: #999;
}
-
.direct-chat-contacts-open .direct-chat-contacts {
- -webkit-transform: translate(0, 0);
- -ms-transform: translate(0, 0);
- -o-transform: translate(0, 0);
- transform: translate(0, 0);
+ -webkit-transform: translate(0, 0);
+ -ms-transform: translate(0, 0);
+ -o-transform: translate(0, 0);
+ transform: translate(0, 0);
}
-
.direct-chat-contacts {
- -webkit-transform: translate(101%, 0);
- -ms-transform: translate(101%, 0);
- -o-transform: translate(101%, 0);
- transform: translate(101%, 0);
- position: absolute;
- top: 0;
- bottom: 0;
- height: 250px;
- width: 100%;
- background: #222d32;
- color: #fff;
- overflow: auto;
+ -webkit-transform: translate(101%, 0);
+ -ms-transform: translate(101%, 0);
+ -o-transform: translate(101%, 0);
+ transform: translate(101%, 0);
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ height: 250px;
+ width: 100%;
+ background: #222d32;
+ color: #fff;
+ overflow: auto;
}
-
.contacts-list > li {
- border-bottom: 1px solid rgba(0, 0, 0, 0.2);
- padding: 10px;
- margin: 0;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+ padding: 10px;
+ margin: 0;
}
-
.contacts-list > li:before,
.contacts-list > li:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.contacts-list > li:after {
- clear: both;
+ clear: both;
+}
+.contacts-list > li:before,
+.contacts-list > li:after {
+ content: " ";
+ display: table;
+}
+.contacts-list > li:after {
+ clear: both;
}
-
.contacts-list > li:last-of-type {
- border-bottom: none;
+ border-bottom: none;
}
-
.contacts-list-img {
- border-radius: 50%;
- width: 40px;
- float: left;
+ border-radius: 50%;
+ width: 40px;
+ float: left;
}
-
.contacts-list-info {
- margin-left: 45px;
- color: #fff;
+ margin-left: 45px;
+ color: #fff;
}
-
.contacts-list-name,
.contacts-list-status {
- display: block;
+ display: block;
}
-
.contacts-list-name {
- font-weight: 600;
+ font-weight: 600;
}
-
.contacts-list-status {
- font-size: 12px;
+ font-size: 12px;
}
-
.contacts-list-date {
- color: #aaa;
- font-weight: normal;
+ color: #aaa;
+ font-weight: normal;
}
-
.contacts-list-msg {
- color: #999;
+ color: #999;
}
-
.direct-chat-danger .right > .direct-chat-text {
- background: #dd4b39;
- border-color: #dd4b39;
- color: #ffffff;
+ background: #dd4b39;
+ border-color: #dd4b39;
+ color: #ffffff;
}
-
.direct-chat-danger .right > .direct-chat-text:after,
.direct-chat-danger .right > .direct-chat-text:before {
- border-left-color: #dd4b39;
+ border-left-color: #dd4b39;
}
-
.direct-chat-primary .right > .direct-chat-text {
- background: #3c8dbc;
- border-color: #3c8dbc;
- color: #ffffff;
+ background: #3c8dbc;
+ border-color: #3c8dbc;
+ color: #ffffff;
}
-
.direct-chat-primary .right > .direct-chat-text:after,
.direct-chat-primary .right > .direct-chat-text:before {
- border-left-color: #3c8dbc;
+ border-left-color: #3c8dbc;
}
-
.direct-chat-warning .right > .direct-chat-text {
- background: #f39c12;
- border-color: #f39c12;
- color: #ffffff;
+ background: #f39c12;
+ border-color: #f39c12;
+ color: #ffffff;
}
-
.direct-chat-warning .right > .direct-chat-text:after,
.direct-chat-warning .right > .direct-chat-text:before {
- border-left-color: #f39c12;
+ border-left-color: #f39c12;
}
-
.direct-chat-info .right > .direct-chat-text {
- background: #00c0ef;
- border-color: #00c0ef;
- color: #ffffff;
+ background: #00c0ef;
+ border-color: #00c0ef;
+ color: #ffffff;
}
-
.direct-chat-info .right > .direct-chat-text:after,
.direct-chat-info .right > .direct-chat-text:before {
- border-left-color: #00c0ef;
+ border-left-color: #00c0ef;
}
-
.direct-chat-success .right > .direct-chat-text {
- background: #00a65a;
- border-color: #00a65a;
- color: #ffffff;
+ background: #00a65a;
+ border-color: #00a65a;
+ color: #ffffff;
}
-
.direct-chat-success .right > .direct-chat-text:after,
.direct-chat-success .right > .direct-chat-text:before {
- border-left-color: #00a65a;
+ border-left-color: #00a65a;
}
-
/*
* Component: Users List
* ---------------------
*/
.users-list > li {
- width: 25%;
- float: left;
- padding: 10px;
- text-align: center;
+ width: 25%;
+ float: left;
+ padding: 10px;
+ text-align: center;
}
-
.users-list > li img {
- border-radius: 50%;
- max-width: 100%;
- height: auto;
+ border-radius: 50%;
+ max-width: 100%;
+ height: auto;
}
-
.users-list > li > a:hover,
.users-list > li > a:hover .users-list-name {
- color: #999;
+ color: #999;
}
-
.users-list-name,
.users-list-date {
- display: block;
+ display: block;
}
-
.users-list-name {
- font-weight: 600;
- color: #444;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ font-weight: 600;
+ color: #444;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
-
.users-list-date {
- color: #999;
- font-size: 12px;
+ color: #999;
+ font-size: 12px;
}
-
/*
* Component: Carousel
* -------------------
*/
.carousel-control.left,
.carousel-control.right {
- background-image: none;
+ background-image: none;
}
-
.carousel-control > .fa {
- font-size: 40px;
- position: absolute;
- top: 50%;
- z-index: 5;
- display: inline-block;
- margin-top: -20px;
+ font-size: 40px;
+ position: absolute;
+ top: 50%;
+ z-index: 5;
+ display: inline-block;
+ margin-top: -20px;
}
-
/*
* Component: modal
* ----------------
*/
.modal {
- background: rgba(0, 0, 0, 0.3);
+ background: rgba(0, 0, 0, 0.3);
}
-
.modal-content {
- border-radius: 0;
+ border-radius: 0;
+ -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
+ border: 0;
+}
+@media (min-width: 768px) {
+ .modal-content {
-webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
- border: 0;
+ }
}
-
-@media (min-width: 768px) {
- .modal-content {
- -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
- box-shadow: 0 2px 3px rgba(0, 0, 0, 0.125);
- }
-}
-
.modal-header {
- border-bottom-color: #f4f4f4;
+ border-bottom-color: #f4f4f4;
}
-
.modal-footer {
- border-top-color: #f4f4f4;
+ border-top-color: #f4f4f4;
}
-
.modal-primary .modal-header,
.modal-primary .modal-footer {
- border-color: #307095;
+ border-color: #307095;
}
-
.modal-warning .modal-header,
.modal-warning .modal-footer {
- border-color: #c87f0a;
+ border-color: #c87f0a;
}
-
.modal-info .modal-header,
.modal-info .modal-footer {
- border-color: #0097bc;
+ border-color: #0097bc;
}
-
.modal-success .modal-header,
.modal-success .modal-footer {
- border-color: #00733e;
+ border-color: #00733e;
}
-
.modal-danger .modal-header,
.modal-danger .modal-footer {
- border-color: #c23321;
+ border-color: #c23321;
}
-
/*
* Component: Social Widgets
* -------------------------
*/
.box-widget {
- border: none;
- position: relative;
+ border: none;
+ position: relative;
}
-
.widget-user .widget-user-header {
- padding: 20px;
- height: 120px;
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
+ padding: 20px;
+ height: 120px;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
}
-
.widget-user .widget-user-username {
- margin-top: 0;
- margin-bottom: 5px;
- font-size: 25px;
- font-weight: 300;
- text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+ margin-top: 0;
+ margin-bottom: 5px;
+ font-size: 25px;
+ font-weight: 300;
+ text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
-
.widget-user .widget-user-desc {
- margin-top: 0;
+ margin-top: 0;
}
-
.widget-user .widget-user-image {
- position: absolute;
- top: 65px;
- left: 50%;
- margin-left: -45px;
+ position: absolute;
+ top: 65px;
+ left: 50%;
+ margin-left: -45px;
}
-
.widget-user .widget-user-image > img {
- width: 90px;
- height: auto;
- border: 3px solid #fff;
+ width: 90px;
+ height: auto;
+ border: 3px solid #fff;
}
-
.widget-user .box-footer {
- padding-top: 30px;
+ padding-top: 30px;
}
-
.widget-user-2 .widget-user-header {
- padding: 20px;
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
+ padding: 20px;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
}
-
.widget-user-2 .widget-user-username {
- margin-top: 5px;
- margin-bottom: 5px;
- font-size: 25px;
- font-weight: 300;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ font-size: 25px;
+ font-weight: 300;
}
-
.widget-user-2 .widget-user-desc {
- margin-top: 0;
+ margin-top: 0;
}
-
.widget-user-2 .widget-user-username,
.widget-user-2 .widget-user-desc {
- margin-left: 75px;
+ margin-left: 75px;
}
-
.widget-user-2 .widget-user-image > img {
- width: 65px;
- height: auto;
- float: left;
+ width: 65px;
+ height: auto;
+ float: left;
+}
+.treeview-menu {
+ display: none;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ padding-left: 5px;
+}
+.treeview-menu .treeview-menu {
+ padding-left: 20px;
+}
+.treeview-menu > li {
+ margin: 0;
+}
+.treeview-menu > li > a {
+ padding: 5px 5px 5px 15px;
+ display: block;
+ font-size: 14px;
+}
+.treeview-menu > li > a > .fa,
+.treeview-menu > li > a > .glyphicon,
+.treeview-menu > li > a > .ion {
+ width: 20px;
+}
+.treeview-menu > li > a > .pull-right-container > .fa-angle-left,
+.treeview-menu > li > a > .pull-right-container > .fa-angle-down,
+.treeview-menu > li > a > .fa-angle-left,
+.treeview-menu > li > a > .fa-angle-down {
+ width: auto;
}
-
/*
* Page: Mailbox
* -------------
*/
.mailbox-messages > .table {
- margin: 0;
+ margin: 0;
}
-
.mailbox-controls {
- padding: 5px;
+ padding: 5px;
}
-
.mailbox-controls.with-border {
- border-bottom: 1px solid #f4f4f4;
+ border-bottom: 1px solid #f4f4f4;
}
-
.mailbox-read-info {
- border-bottom: 1px solid #f4f4f4;
- padding: 10px;
+ border-bottom: 1px solid #f4f4f4;
+ padding: 10px;
}
-
.mailbox-read-info h3 {
- font-size: 20px;
- margin: 0;
+ font-size: 20px;
+ margin: 0;
}
-
.mailbox-read-info h5 {
- margin: 0;
- padding: 5px 0 0 0;
+ margin: 0;
+ padding: 5px 0 0 0;
}
-
.mailbox-read-time {
- color: #999;
- font-size: 13px;
+ color: #999;
+ font-size: 13px;
}
-
.mailbox-read-message {
- padding: 10px;
+ padding: 10px;
}
-
.mailbox-attachments li {
- float: left;
- width: 200px;
- border: 1px solid #eee;
- margin-bottom: 10px;
- margin-right: 10px;
+ float: left;
+ width: 200px;
+ border: 1px solid #eee;
+ margin-bottom: 10px;
+ margin-right: 10px;
}
-
.mailbox-attachment-name {
- font-weight: bold;
- color: #666;
+ font-weight: bold;
+ color: #666;
}
-
.mailbox-attachment-icon,
.mailbox-attachment-info,
.mailbox-attachment-size {
- display: block;
+ display: block;
}
-
.mailbox-attachment-info {
- padding: 10px;
- background: #f4f4f4;
+ padding: 10px;
+ background: #f4f4f4;
}
-
.mailbox-attachment-size {
- color: #999;
- font-size: 12px;
+ color: #999;
+ font-size: 12px;
}
-
.mailbox-attachment-icon {
- text-align: center;
- font-size: 65px;
- color: #666;
- padding: 20px 10px;
+ text-align: center;
+ font-size: 65px;
+ color: #666;
+ padding: 20px 10px;
}
-
.mailbox-attachment-icon.has-img {
- padding: 0;
+ padding: 0;
}
-
.mailbox-attachment-icon.has-img > img {
- max-width: 100%;
- height: auto;
+ max-width: 100%;
+ height: auto;
}
-
/*
* Page: Lock Screen
* -----------------
*/
/* ADD THIS CLASS TO THE TAG */
.lockscreen {
- background: #d2d6de;
+ background: #d2d6de;
}
-
.lockscreen-logo {
- font-size: 35px;
- text-align: center;
- margin-bottom: 25px;
- font-weight: 300;
+ font-size: 35px;
+ text-align: center;
+ margin-bottom: 25px;
+ font-weight: 300;
}
-
.lockscreen-logo a {
- color: #444;
+ color: #444;
}
-
.lockscreen-wrapper {
- max-width: 400px;
- margin: 0 auto;
- margin-top: 10%;
+ max-width: 400px;
+ margin: 0 auto;
+ margin-top: 10%;
}
-
/* User name [optional] */
.lockscreen .lockscreen-name {
- text-align: center;
- font-weight: 600;
+ text-align: center;
+ font-weight: 600;
}
-
/* Will contain the image and the sign in form */
.lockscreen-item {
- border-radius: 4px;
- padding: 0;
- background: #fff;
- position: relative;
- margin: 10px auto 30px auto;
- width: 290px;
+ border-radius: 4px;
+ padding: 0;
+ background: #fff;
+ position: relative;
+ margin: 10px auto 30px auto;
+ width: 290px;
}
-
/* User image */
.lockscreen-image {
- border-radius: 50%;
- position: absolute;
- left: -10px;
- top: -25px;
- background: #fff;
- padding: 5px;
- z-index: 10;
+ border-radius: 50%;
+ position: absolute;
+ left: -10px;
+ top: -25px;
+ background: #fff;
+ padding: 5px;
+ z-index: 10;
}
-
.lockscreen-image > img {
- border-radius: 50%;
- width: 70px;
- height: 70px;
+ border-radius: 50%;
+ width: 70px;
+ height: 70px;
}
-
/* Contains the password input and the login button */
.lockscreen-credentials {
- margin-left: 70px;
+ margin-left: 70px;
}
-
.lockscreen-credentials .form-control {
- border: 0;
+ border: 0;
}
-
.lockscreen-credentials .btn {
- background-color: #fff;
- border: 0;
- padding: 0 10px;
+ background-color: #fff;
+ border: 0;
+ padding: 0 10px;
}
-
.lockscreen-footer {
- margin-top: 10px;
+ margin-top: 10px;
}
-
/*
* Page: Login & Register
* ----------------------
*/
.login-logo,
.register-logo {
- font-size: 35px;
- text-align: center;
- margin-bottom: 25px;
- font-weight: 300;
+ font-size: 35px;
+ text-align: center;
+ margin-bottom: 25px;
+ font-weight: 300;
}
-
.login-logo a,
.register-logo a {
- color: #444;
+ color: #444;
}
-
.login-page,
.register-page {
- background: #d2d6de;
+ background: #d2d6de;
}
-
.login-box,
.register-box {
- width: 360px;
- margin: 7% auto;
+ width: 360px;
+ margin: 7% auto;
}
-
@media (max-width: 768px) {
- .login-box,
- .register-box {
- width: 90%;
- margin-top: 20px;
- }
+ .login-box,
+ .register-box {
+ width: 90%;
+ margin-top: 20px;
+ }
}
-
.login-box-body,
.register-box-body {
- background: #fff;
- padding: 20px;
- border-top: 0;
- color: #666;
+ background: #fff;
+ padding: 20px;
+ border-top: 0;
+ color: #666;
}
-
.login-box-body .form-control-feedback,
.register-box-body .form-control-feedback {
- color: #777;
+ color: #777;
}
-
.login-box-msg,
.register-box-msg {
- margin: 0;
- text-align: center;
- padding: 0 20px 20px 20px;
+ margin: 0;
+ text-align: center;
+ padding: 0 20px 20px 20px;
}
-
.social-auth-links {
- margin: 10px 0;
+ margin: 10px 0;
}
-
/*
* Page: 400 and 500 error pages
* ------------------------------
*/
.error-page {
- width: 600px;
- margin: 20px auto 0 auto;
+ width: 600px;
+ margin: 20px auto 0 auto;
}
-
@media (max-width: 991px) {
- .error-page {
- width: 100%;
- }
+ .error-page {
+ width: 100%;
+ }
}
-
.error-page > .headline {
- float: left;
- font-size: 100px;
- font-weight: 300;
+ float: left;
+ font-size: 100px;
+ font-weight: 300;
}
-
@media (max-width: 991px) {
- .error-page > .headline {
- float: none;
- text-align: center;
- }
+ .error-page > .headline {
+ float: none;
+ text-align: center;
+ }
}
-
.error-page > .error-content {
- margin-left: 190px;
- display: block;
+ margin-left: 190px;
+ display: block;
}
-
@media (max-width: 991px) {
- .error-page > .error-content {
- margin-left: 0;
- }
+ .error-page > .error-content {
+ margin-left: 0;
+ }
}
-
.error-page > .error-content > h3 {
- font-weight: 300;
- font-size: 25px;
+ font-weight: 300;
+ font-size: 25px;
}
-
@media (max-width: 991px) {
- .error-page > .error-content > h3 {
- text-align: center;
- }
+ .error-page > .error-content > h3 {
+ text-align: center;
+ }
}
-
/*
* Page: Invoice
* -------------
*/
.invoice {
- position: relative;
- background: #fff;
- border: 1px solid #f4f4f4;
- padding: 20px;
- margin: 10px 25px;
+ position: relative;
+ background: #fff;
+ border: 1px solid #f4f4f4;
+ padding: 20px;
+ margin: 10px 25px;
}
-
.invoice-title {
- margin-top: 0;
+ margin-top: 0;
}
-
/*
* Page: Profile
* -------------
*/
.profile-user-img {
- margin: 0 auto;
- width: 100px;
- padding: 3px;
- border: 3px solid #d2d6de;
+ margin: 0 auto;
+ width: 100px;
+ padding: 3px;
+ border: 3px solid #d2d6de;
}
-
.profile-username {
- font-size: 21px;
- margin-top: 5px;
+ font-size: 21px;
+ margin-top: 5px;
}
-
.post {
- border-bottom: 1px solid #d2d6de;
- margin-bottom: 15px;
- padding-bottom: 15px;
- color: #666;
+ border-bottom: 1px solid #d2d6de;
+ margin-bottom: 15px;
+ padding-bottom: 15px;
+ color: #666;
}
-
.post:last-of-type {
- border-bottom: 0;
- margin-bottom: 0;
- padding-bottom: 0;
+ border-bottom: 0;
+ margin-bottom: 0;
+ padding-bottom: 0;
}
-
.post .user-block {
- margin-bottom: 15px;
+ margin-bottom: 15px;
}
-
-/*
- * Social Buttons for Bootstrap
- *
- * Copyright 2013-2015 Panayiotis Lipiridis
- * Licensed under the MIT License
- *
- * https://github.com/lipis/bootstrap-social
- */
.btn-social {
- position: relative;
- padding-left: 44px;
- text-align: left;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ position: relative;
+ padding-left: 44px;
+ text-align: left;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
-
.btn-social > :first-child {
- position: absolute;
- left: 0;
- top: 0;
- bottom: 0;
- width: 32px;
- line-height: 34px;
- font-size: 1.6em;
- text-align: center;
- border-right: 1px solid rgba(0, 0, 0, 0.2);
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ width: 32px;
+ line-height: 34px;
+ font-size: 1.6em;
+ text-align: center;
+ border-right: 1px solid rgba(0, 0, 0, 0.2);
}
-
.btn-social.btn-lg {
- padding-left: 61px;
+ padding-left: 61px;
}
-
.btn-social.btn-lg > :first-child {
- line-height: 45px;
- width: 45px;
- font-size: 1.8em;
+ line-height: 45px;
+ width: 45px;
+ font-size: 1.8em;
}
-
.btn-social.btn-sm {
- padding-left: 38px;
+ padding-left: 38px;
}
-
.btn-social.btn-sm > :first-child {
- line-height: 28px;
- width: 28px;
- font-size: 1.4em;
+ line-height: 28px;
+ width: 28px;
+ font-size: 1.4em;
}
-
.btn-social.btn-xs {
- padding-left: 30px;
+ padding-left: 30px;
}
-
.btn-social.btn-xs > :first-child {
- line-height: 20px;
- width: 20px;
- font-size: 1.2em;
+ line-height: 20px;
+ width: 20px;
+ font-size: 1.2em;
}
-
.btn-social-icon {
- position: relative;
- padding-left: 44px;
- text-align: left;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- height: 34px;
- width: 34px;
- padding: 0;
+ position: relative;
+ padding-left: 44px;
+ text-align: left;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ height: 34px;
+ width: 34px;
+ padding: 0;
}
-
.btn-social-icon > :first-child {
- position: absolute;
- left: 0;
- top: 0;
- bottom: 0;
- width: 32px;
- line-height: 34px;
- font-size: 1.6em;
- text-align: center;
- border-right: 1px solid rgba(0, 0, 0, 0.2);
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ width: 32px;
+ line-height: 34px;
+ font-size: 1.6em;
+ text-align: center;
+ border-right: 1px solid rgba(0, 0, 0, 0.2);
}
-
.btn-social-icon.btn-lg {
- padding-left: 61px;
+ padding-left: 61px;
}
-
.btn-social-icon.btn-lg > :first-child {
- line-height: 45px;
- width: 45px;
- font-size: 1.8em;
+ line-height: 45px;
+ width: 45px;
+ font-size: 1.8em;
}
-
.btn-social-icon.btn-sm {
- padding-left: 38px;
+ padding-left: 38px;
}
-
.btn-social-icon.btn-sm > :first-child {
- line-height: 28px;
- width: 28px;
- font-size: 1.4em;
+ line-height: 28px;
+ width: 28px;
+ font-size: 1.4em;
}
-
.btn-social-icon.btn-xs {
- padding-left: 30px;
+ padding-left: 30px;
}
-
.btn-social-icon.btn-xs > :first-child {
- line-height: 20px;
- width: 20px;
- font-size: 1.2em;
+ line-height: 20px;
+ width: 20px;
+ font-size: 1.2em;
}
-
.btn-social-icon > :first-child {
- border: none;
- text-align: center;
- width: 100%;
+ border: none;
+ text-align: center;
+ width: 100%;
}
-
.btn-social-icon.btn-lg {
- height: 45px;
- width: 45px;
- padding-left: 0;
- padding-right: 0;
+ height: 45px;
+ width: 45px;
+ padding-left: 0;
+ padding-right: 0;
}
-
.btn-social-icon.btn-sm {
- height: 30px;
- width: 30px;
- padding-left: 0;
- padding-right: 0;
+ height: 30px;
+ width: 30px;
+ padding-left: 0;
+ padding-right: 0;
}
-
.btn-social-icon.btn-xs {
- height: 22px;
- width: 22px;
- padding-left: 0;
- padding-right: 0;
+ height: 22px;
+ width: 22px;
+ padding-left: 0;
+ padding-right: 0;
}
-
.btn-adn {
- color: #ffffff;
- background-color: #d87a68;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #d87a68;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-adn:focus,
.btn-adn.focus {
- color: #ffffff;
- background-color: #ce563f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #ce563f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-adn:hover {
- color: #ffffff;
- background-color: #ce563f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #ce563f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-adn:active,
.btn-adn.active,
.open > .dropdown-toggle.btn-adn {
- color: #ffffff;
- background-color: #ce563f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #ce563f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-adn:active,
.btn-adn.active,
.open > .dropdown-toggle.btn-adn {
- background-image: none;
+ background-image: none;
}
-
.btn-adn .badge {
- color: #d87a68;
- background-color: #ffffff;
+ color: #d87a68;
+ background-color: #ffffff;
+}
+.btn-adn:focus,
+.btn-adn.focus {
+ color: #ffffff;
+ background-color: #ce563f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-adn:hover {
+ color: #ffffff;
+ background-color: #ce563f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-adn:active,
+.btn-adn.active,
+.open > .dropdown-toggle.btn-adn {
+ color: #ffffff;
+ background-color: #ce563f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-adn:active,
+.btn-adn.active,
+.open > .dropdown-toggle.btn-adn {
+ background-image: none;
+}
+.btn-adn .badge {
+ color: #d87a68;
+ background-color: #ffffff;
}
-
.btn-bitbucket {
- color: #ffffff;
- background-color: #205081;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #205081;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-bitbucket:focus,
.btn-bitbucket.focus {
- color: #ffffff;
- background-color: #163758;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #163758;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-bitbucket:hover {
- color: #ffffff;
- background-color: #163758;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #163758;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-bitbucket:active,
.btn-bitbucket.active,
.open > .dropdown-toggle.btn-bitbucket {
- color: #ffffff;
- background-color: #163758;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #163758;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-bitbucket:active,
.btn-bitbucket.active,
.open > .dropdown-toggle.btn-bitbucket {
- background-image: none;
+ background-image: none;
}
-
.btn-bitbucket .badge {
- color: #205081;
- background-color: #ffffff;
+ color: #205081;
+ background-color: #ffffff;
+}
+.btn-bitbucket:focus,
+.btn-bitbucket.focus {
+ color: #ffffff;
+ background-color: #163758;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-bitbucket:hover {
+ color: #ffffff;
+ background-color: #163758;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-bitbucket:active,
+.btn-bitbucket.active,
+.open > .dropdown-toggle.btn-bitbucket {
+ color: #ffffff;
+ background-color: #163758;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-bitbucket:active,
+.btn-bitbucket.active,
+.open > .dropdown-toggle.btn-bitbucket {
+ background-image: none;
+}
+.btn-bitbucket .badge {
+ color: #205081;
+ background-color: #ffffff;
}
-
.btn-dropbox {
- color: #ffffff;
- background-color: #1087dd;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1087dd;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-dropbox:focus,
.btn-dropbox.focus {
- color: #ffffff;
- background-color: #0d6aad;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #0d6aad;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-dropbox:hover {
- color: #ffffff;
- background-color: #0d6aad;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #0d6aad;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-dropbox:active,
.btn-dropbox.active,
.open > .dropdown-toggle.btn-dropbox {
- color: #ffffff;
- background-color: #0d6aad;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #0d6aad;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-dropbox:active,
.btn-dropbox.active,
.open > .dropdown-toggle.btn-dropbox {
- background-image: none;
+ background-image: none;
}
-
.btn-dropbox .badge {
- color: #1087dd;
- background-color: #ffffff;
+ color: #1087dd;
+ background-color: #ffffff;
+}
+.btn-dropbox:focus,
+.btn-dropbox.focus {
+ color: #ffffff;
+ background-color: #0d6aad;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-dropbox:hover {
+ color: #ffffff;
+ background-color: #0d6aad;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-dropbox:active,
+.btn-dropbox.active,
+.open > .dropdown-toggle.btn-dropbox {
+ color: #ffffff;
+ background-color: #0d6aad;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-dropbox:active,
+.btn-dropbox.active,
+.open > .dropdown-toggle.btn-dropbox {
+ background-image: none;
+}
+.btn-dropbox .badge {
+ color: #1087dd;
+ background-color: #ffffff;
}
-
.btn-facebook {
- color: #ffffff;
- background-color: #3b5998;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #3b5998;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-facebook:focus,
.btn-facebook.focus {
- color: #ffffff;
- background-color: #2d4373;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2d4373;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-facebook:hover {
- color: #ffffff;
- background-color: #2d4373;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2d4373;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-facebook:active,
.btn-facebook.active,
.open > .dropdown-toggle.btn-facebook {
- color: #ffffff;
- background-color: #2d4373;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2d4373;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-facebook:active,
.btn-facebook.active,
.open > .dropdown-toggle.btn-facebook {
- background-image: none;
+ background-image: none;
}
-
.btn-facebook .badge {
- color: #3b5998;
- background-color: #ffffff;
+ color: #3b5998;
+ background-color: #ffffff;
+}
+.btn-facebook:focus,
+.btn-facebook.focus {
+ color: #ffffff;
+ background-color: #2d4373;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-facebook:hover {
+ color: #ffffff;
+ background-color: #2d4373;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-facebook:active,
+.btn-facebook.active,
+.open > .dropdown-toggle.btn-facebook {
+ color: #ffffff;
+ background-color: #2d4373;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-facebook:active,
+.btn-facebook.active,
+.open > .dropdown-toggle.btn-facebook {
+ background-image: none;
+}
+.btn-facebook .badge {
+ color: #3b5998;
+ background-color: #ffffff;
}
-
.btn-flickr {
- color: #ffffff;
- background-color: #ff0084;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #ff0084;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-flickr:focus,
.btn-flickr.focus {
- color: #ffffff;
- background-color: #cc006a;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cc006a;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-flickr:hover {
- color: #ffffff;
- background-color: #cc006a;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cc006a;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-flickr:active,
.btn-flickr.active,
.open > .dropdown-toggle.btn-flickr {
- color: #ffffff;
- background-color: #cc006a;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cc006a;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-flickr:active,
.btn-flickr.active,
.open > .dropdown-toggle.btn-flickr {
- background-image: none;
+ background-image: none;
}
-
.btn-flickr .badge {
- color: #ff0084;
- background-color: #ffffff;
+ color: #ff0084;
+ background-color: #ffffff;
+}
+.btn-flickr:focus,
+.btn-flickr.focus {
+ color: #ffffff;
+ background-color: #cc006a;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-flickr:hover {
+ color: #ffffff;
+ background-color: #cc006a;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-flickr:active,
+.btn-flickr.active,
+.open > .dropdown-toggle.btn-flickr {
+ color: #ffffff;
+ background-color: #cc006a;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-flickr:active,
+.btn-flickr.active,
+.open > .dropdown-toggle.btn-flickr {
+ background-image: none;
+}
+.btn-flickr .badge {
+ color: #ff0084;
+ background-color: #ffffff;
}
-
.btn-foursquare {
- color: #ffffff;
- background-color: #f94877;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #f94877;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-foursquare:focus,
.btn-foursquare.focus {
- color: #ffffff;
- background-color: #f71752;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #f71752;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-foursquare:hover {
- color: #ffffff;
- background-color: #f71752;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #f71752;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-foursquare:active,
.btn-foursquare.active,
.open > .dropdown-toggle.btn-foursquare {
- color: #ffffff;
- background-color: #f71752;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #f71752;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-foursquare:active,
.btn-foursquare.active,
.open > .dropdown-toggle.btn-foursquare {
- background-image: none;
+ background-image: none;
}
-
.btn-foursquare .badge {
- color: #f94877;
- background-color: #ffffff;
+ color: #f94877;
+ background-color: #ffffff;
+}
+.btn-foursquare:focus,
+.btn-foursquare.focus {
+ color: #ffffff;
+ background-color: #f71752;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-foursquare:hover {
+ color: #ffffff;
+ background-color: #f71752;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-foursquare:active,
+.btn-foursquare.active,
+.open > .dropdown-toggle.btn-foursquare {
+ color: #ffffff;
+ background-color: #f71752;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-foursquare:active,
+.btn-foursquare.active,
+.open > .dropdown-toggle.btn-foursquare {
+ background-image: none;
+}
+.btn-foursquare .badge {
+ color: #f94877;
+ background-color: #ffffff;
}
-
.btn-github {
- color: #ffffff;
- background-color: #444444;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #444444;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-github:focus,
.btn-github.focus {
- color: #ffffff;
- background-color: #2b2b2b;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2b2b2b;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-github:hover {
- color: #ffffff;
- background-color: #2b2b2b;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2b2b2b;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-github:active,
.btn-github.active,
.open > .dropdown-toggle.btn-github {
- color: #ffffff;
- background-color: #2b2b2b;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2b2b2b;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-github:active,
.btn-github.active,
.open > .dropdown-toggle.btn-github {
- background-image: none;
+ background-image: none;
}
-
.btn-github .badge {
- color: #444444;
- background-color: #ffffff;
+ color: #444444;
+ background-color: #ffffff;
+}
+.btn-github:focus,
+.btn-github.focus {
+ color: #ffffff;
+ background-color: #2b2b2b;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-github:hover {
+ color: #ffffff;
+ background-color: #2b2b2b;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-github:active,
+.btn-github.active,
+.open > .dropdown-toggle.btn-github {
+ color: #ffffff;
+ background-color: #2b2b2b;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-github:active,
+.btn-github.active,
+.open > .dropdown-toggle.btn-github {
+ background-image: none;
+}
+.btn-github .badge {
+ color: #444444;
+ background-color: #ffffff;
}
-
.btn-google {
- color: #ffffff;
- background-color: #dd4b39;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #dd4b39;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-google:focus,
.btn-google.focus {
- color: #ffffff;
- background-color: #c23321;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #c23321;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-google:hover {
- color: #ffffff;
- background-color: #c23321;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #c23321;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-google:active,
.btn-google.active,
.open > .dropdown-toggle.btn-google {
- color: #ffffff;
- background-color: #c23321;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #c23321;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-google:active,
.btn-google.active,
.open > .dropdown-toggle.btn-google {
- background-image: none;
+ background-image: none;
}
-
.btn-google .badge {
- color: #dd4b39;
- background-color: #ffffff;
+ color: #dd4b39;
+ background-color: #ffffff;
+}
+.btn-google:focus,
+.btn-google.focus {
+ color: #ffffff;
+ background-color: #c23321;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-google:hover {
+ color: #ffffff;
+ background-color: #c23321;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-google:active,
+.btn-google.active,
+.open > .dropdown-toggle.btn-google {
+ color: #ffffff;
+ background-color: #c23321;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-google:active,
+.btn-google.active,
+.open > .dropdown-toggle.btn-google {
+ background-image: none;
+}
+.btn-google .badge {
+ color: #dd4b39;
+ background-color: #ffffff;
}
-
.btn-instagram {
- color: #ffffff;
- background-color: #3f729b;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #3f729b;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-instagram:focus,
.btn-instagram.focus {
- color: #ffffff;
- background-color: #305777;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #305777;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-instagram:hover {
- color: #ffffff;
- background-color: #305777;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #305777;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-instagram:active,
.btn-instagram.active,
.open > .dropdown-toggle.btn-instagram {
- color: #ffffff;
- background-color: #305777;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #305777;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-instagram:active,
.btn-instagram.active,
.open > .dropdown-toggle.btn-instagram {
- background-image: none;
+ background-image: none;
}
-
.btn-instagram .badge {
- color: #3f729b;
- background-color: #ffffff;
+ color: #3f729b;
+ background-color: #ffffff;
+}
+.btn-instagram:focus,
+.btn-instagram.focus {
+ color: #ffffff;
+ background-color: #305777;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-instagram:hover {
+ color: #ffffff;
+ background-color: #305777;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-instagram:active,
+.btn-instagram.active,
+.open > .dropdown-toggle.btn-instagram {
+ color: #ffffff;
+ background-color: #305777;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-instagram:active,
+.btn-instagram.active,
+.open > .dropdown-toggle.btn-instagram {
+ background-image: none;
+}
+.btn-instagram .badge {
+ color: #3f729b;
+ background-color: #ffffff;
}
-
.btn-linkedin {
- color: #ffffff;
- background-color: #007bb6;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #007bb6;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-linkedin:focus,
.btn-linkedin.focus {
- color: #ffffff;
- background-color: #005983;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #005983;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-linkedin:hover {
- color: #ffffff;
- background-color: #005983;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #005983;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-linkedin:active,
.btn-linkedin.active,
.open > .dropdown-toggle.btn-linkedin {
- color: #ffffff;
- background-color: #005983;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #005983;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-linkedin:active,
.btn-linkedin.active,
.open > .dropdown-toggle.btn-linkedin {
- background-image: none;
+ background-image: none;
}
-
.btn-linkedin .badge {
- color: #007bb6;
- background-color: #ffffff;
+ color: #007bb6;
+ background-color: #ffffff;
+}
+.btn-linkedin:focus,
+.btn-linkedin.focus {
+ color: #ffffff;
+ background-color: #005983;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-linkedin:hover {
+ color: #ffffff;
+ background-color: #005983;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-linkedin:active,
+.btn-linkedin.active,
+.open > .dropdown-toggle.btn-linkedin {
+ color: #ffffff;
+ background-color: #005983;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-linkedin:active,
+.btn-linkedin.active,
+.open > .dropdown-toggle.btn-linkedin {
+ background-image: none;
+}
+.btn-linkedin .badge {
+ color: #007bb6;
+ background-color: #ffffff;
}
-
.btn-microsoft {
- color: #ffffff;
- background-color: #2672ec;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2672ec;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-microsoft:focus,
.btn-microsoft.focus {
- color: #ffffff;
- background-color: #125acd;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #125acd;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-microsoft:hover {
- color: #ffffff;
- background-color: #125acd;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #125acd;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-microsoft:active,
.btn-microsoft.active,
.open > .dropdown-toggle.btn-microsoft {
- color: #ffffff;
- background-color: #125acd;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #125acd;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-microsoft:active,
.btn-microsoft.active,
.open > .dropdown-toggle.btn-microsoft {
- background-image: none;
+ background-image: none;
}
-
.btn-microsoft .badge {
- color: #2672ec;
- background-color: #ffffff;
+ color: #2672ec;
+ background-color: #ffffff;
+}
+.btn-microsoft:focus,
+.btn-microsoft.focus {
+ color: #ffffff;
+ background-color: #125acd;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-microsoft:hover {
+ color: #ffffff;
+ background-color: #125acd;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-microsoft:active,
+.btn-microsoft.active,
+.open > .dropdown-toggle.btn-microsoft {
+ color: #ffffff;
+ background-color: #125acd;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-microsoft:active,
+.btn-microsoft.active,
+.open > .dropdown-toggle.btn-microsoft {
+ background-image: none;
+}
+.btn-microsoft .badge {
+ color: #2672ec;
+ background-color: #ffffff;
}
-
.btn-openid {
- color: #ffffff;
- background-color: #f7931e;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #f7931e;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-openid:focus,
.btn-openid.focus {
- color: #ffffff;
- background-color: #da7908;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #da7908;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-openid:hover {
- color: #ffffff;
- background-color: #da7908;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #da7908;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-openid:active,
.btn-openid.active,
.open > .dropdown-toggle.btn-openid {
- color: #ffffff;
- background-color: #da7908;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #da7908;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-openid:active,
.btn-openid.active,
.open > .dropdown-toggle.btn-openid {
- background-image: none;
+ background-image: none;
}
-
.btn-openid .badge {
- color: #f7931e;
- background-color: #ffffff;
+ color: #f7931e;
+ background-color: #ffffff;
+}
+.btn-openid:focus,
+.btn-openid.focus {
+ color: #ffffff;
+ background-color: #da7908;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-openid:hover {
+ color: #ffffff;
+ background-color: #da7908;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-openid:active,
+.btn-openid.active,
+.open > .dropdown-toggle.btn-openid {
+ color: #ffffff;
+ background-color: #da7908;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-openid:active,
+.btn-openid.active,
+.open > .dropdown-toggle.btn-openid {
+ background-image: none;
+}
+.btn-openid .badge {
+ color: #f7931e;
+ background-color: #ffffff;
}
-
.btn-pinterest {
- color: #ffffff;
- background-color: #cb2027;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cb2027;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-pinterest:focus,
.btn-pinterest.focus {
- color: #ffffff;
- background-color: #9f191f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #9f191f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-pinterest:hover {
- color: #ffffff;
- background-color: #9f191f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #9f191f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-pinterest:active,
.btn-pinterest.active,
.open > .dropdown-toggle.btn-pinterest {
- color: #ffffff;
- background-color: #9f191f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #9f191f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-pinterest:active,
.btn-pinterest.active,
.open > .dropdown-toggle.btn-pinterest {
- background-image: none;
+ background-image: none;
}
-
.btn-pinterest .badge {
- color: #cb2027;
- background-color: #ffffff;
+ color: #cb2027;
+ background-color: #ffffff;
+}
+.btn-pinterest:focus,
+.btn-pinterest.focus {
+ color: #ffffff;
+ background-color: #9f191f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-pinterest:hover {
+ color: #ffffff;
+ background-color: #9f191f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-pinterest:active,
+.btn-pinterest.active,
+.open > .dropdown-toggle.btn-pinterest {
+ color: #ffffff;
+ background-color: #9f191f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-pinterest:active,
+.btn-pinterest.active,
+.open > .dropdown-toggle.btn-pinterest {
+ background-image: none;
+}
+.btn-pinterest .badge {
+ color: #cb2027;
+ background-color: #ffffff;
}
-
.btn-reddit {
- color: #000000;
- background-color: #eff7ff;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #000000;
+ background-color: #eff7ff;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-reddit:focus,
.btn-reddit.focus {
- color: #000000;
- background-color: #bcddff;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #000000;
+ background-color: #bcddff;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-reddit:hover {
- color: #000000;
- background-color: #bcddff;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #000000;
+ background-color: #bcddff;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-reddit:active,
.btn-reddit.active,
.open > .dropdown-toggle.btn-reddit {
- color: #000000;
- background-color: #bcddff;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #000000;
+ background-color: #bcddff;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-reddit:active,
.btn-reddit.active,
.open > .dropdown-toggle.btn-reddit {
- background-image: none;
+ background-image: none;
}
-
.btn-reddit .badge {
- color: #eff7ff;
- background-color: #000000;
+ color: #eff7ff;
+ background-color: #000000;
+}
+.btn-reddit:focus,
+.btn-reddit.focus {
+ color: #000000;
+ background-color: #bcddff;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-reddit:hover {
+ color: #000000;
+ background-color: #bcddff;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-reddit:active,
+.btn-reddit.active,
+.open > .dropdown-toggle.btn-reddit {
+ color: #000000;
+ background-color: #bcddff;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-reddit:active,
+.btn-reddit.active,
+.open > .dropdown-toggle.btn-reddit {
+ background-image: none;
+}
+.btn-reddit .badge {
+ color: #eff7ff;
+ background-color: #000000;
}
-
.btn-soundcloud {
- color: #ffffff;
- background-color: #ff5500;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #ff5500;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-soundcloud:focus,
.btn-soundcloud.focus {
- color: #ffffff;
- background-color: #cc4400;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cc4400;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-soundcloud:hover {
- color: #ffffff;
- background-color: #cc4400;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cc4400;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-soundcloud:active,
.btn-soundcloud.active,
.open > .dropdown-toggle.btn-soundcloud {
- color: #ffffff;
- background-color: #cc4400;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #cc4400;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-soundcloud:active,
.btn-soundcloud.active,
.open > .dropdown-toggle.btn-soundcloud {
- background-image: none;
+ background-image: none;
}
-
.btn-soundcloud .badge {
- color: #ff5500;
- background-color: #ffffff;
+ color: #ff5500;
+ background-color: #ffffff;
+}
+.btn-soundcloud:focus,
+.btn-soundcloud.focus {
+ color: #ffffff;
+ background-color: #cc4400;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-soundcloud:hover {
+ color: #ffffff;
+ background-color: #cc4400;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-soundcloud:active,
+.btn-soundcloud.active,
+.open > .dropdown-toggle.btn-soundcloud {
+ color: #ffffff;
+ background-color: #cc4400;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-soundcloud:active,
+.btn-soundcloud.active,
+.open > .dropdown-toggle.btn-soundcloud {
+ background-image: none;
+}
+.btn-soundcloud .badge {
+ color: #ff5500;
+ background-color: #ffffff;
}
-
.btn-tumblr {
- color: #ffffff;
- background-color: #2c4762;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2c4762;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-tumblr:focus,
.btn-tumblr.focus {
- color: #ffffff;
- background-color: #1c2d3f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1c2d3f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-tumblr:hover {
- color: #ffffff;
- background-color: #1c2d3f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1c2d3f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-tumblr:active,
.btn-tumblr.active,
.open > .dropdown-toggle.btn-tumblr {
- color: #ffffff;
- background-color: #1c2d3f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1c2d3f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-tumblr:active,
.btn-tumblr.active,
.open > .dropdown-toggle.btn-tumblr {
- background-image: none;
+ background-image: none;
}
-
.btn-tumblr .badge {
- color: #2c4762;
- background-color: #ffffff;
+ color: #2c4762;
+ background-color: #ffffff;
+}
+.btn-tumblr:focus,
+.btn-tumblr.focus {
+ color: #ffffff;
+ background-color: #1c2d3f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-tumblr:hover {
+ color: #ffffff;
+ background-color: #1c2d3f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-tumblr:active,
+.btn-tumblr.active,
+.open > .dropdown-toggle.btn-tumblr {
+ color: #ffffff;
+ background-color: #1c2d3f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-tumblr:active,
+.btn-tumblr.active,
+.open > .dropdown-toggle.btn-tumblr {
+ background-image: none;
+}
+.btn-tumblr .badge {
+ color: #2c4762;
+ background-color: #ffffff;
}
-
.btn-twitter {
- color: #ffffff;
- background-color: #55acee;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #55acee;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-twitter:focus,
.btn-twitter.focus {
- color: #ffffff;
- background-color: #2795e9;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2795e9;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-twitter:hover {
- color: #ffffff;
- background-color: #2795e9;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2795e9;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-twitter:active,
.btn-twitter.active,
.open > .dropdown-toggle.btn-twitter {
- color: #ffffff;
- background-color: #2795e9;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #2795e9;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-twitter:active,
.btn-twitter.active,
.open > .dropdown-toggle.btn-twitter {
- background-image: none;
+ background-image: none;
}
-
.btn-twitter .badge {
- color: #55acee;
- background-color: #ffffff;
+ color: #55acee;
+ background-color: #ffffff;
+}
+.btn-twitter:focus,
+.btn-twitter.focus {
+ color: #ffffff;
+ background-color: #2795e9;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-twitter:hover {
+ color: #ffffff;
+ background-color: #2795e9;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-twitter:active,
+.btn-twitter.active,
+.open > .dropdown-toggle.btn-twitter {
+ color: #ffffff;
+ background-color: #2795e9;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-twitter:active,
+.btn-twitter.active,
+.open > .dropdown-toggle.btn-twitter {
+ background-image: none;
+}
+.btn-twitter .badge {
+ color: #55acee;
+ background-color: #ffffff;
}
-
.btn-vimeo {
- color: #ffffff;
- background-color: #1ab7ea;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1ab7ea;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vimeo:focus,
.btn-vimeo.focus {
- color: #ffffff;
- background-color: #1295bf;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1295bf;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vimeo:hover {
- color: #ffffff;
- background-color: #1295bf;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1295bf;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vimeo:active,
.btn-vimeo.active,
.open > .dropdown-toggle.btn-vimeo {
- color: #ffffff;
- background-color: #1295bf;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #1295bf;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vimeo:active,
.btn-vimeo.active,
.open > .dropdown-toggle.btn-vimeo {
- background-image: none;
+ background-image: none;
}
-
.btn-vimeo .badge {
- color: #1ab7ea;
- background-color: #ffffff;
+ color: #1ab7ea;
+ background-color: #ffffff;
+}
+.btn-vimeo:focus,
+.btn-vimeo.focus {
+ color: #ffffff;
+ background-color: #1295bf;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-vimeo:hover {
+ color: #ffffff;
+ background-color: #1295bf;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-vimeo:active,
+.btn-vimeo.active,
+.open > .dropdown-toggle.btn-vimeo {
+ color: #ffffff;
+ background-color: #1295bf;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-vimeo:active,
+.btn-vimeo.active,
+.open > .dropdown-toggle.btn-vimeo {
+ background-image: none;
+}
+.btn-vimeo .badge {
+ color: #1ab7ea;
+ background-color: #ffffff;
}
-
.btn-vk {
- color: #ffffff;
- background-color: #587ea3;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #587ea3;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vk:focus,
.btn-vk.focus {
- color: #ffffff;
- background-color: #466482;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #466482;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vk:hover {
- color: #ffffff;
- background-color: #466482;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #466482;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vk:active,
.btn-vk.active,
.open > .dropdown-toggle.btn-vk {
- color: #ffffff;
- background-color: #466482;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #466482;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-vk:active,
.btn-vk.active,
.open > .dropdown-toggle.btn-vk {
- background-image: none;
+ background-image: none;
}
-
.btn-vk .badge {
- color: #587ea3;
- background-color: #ffffff;
+ color: #587ea3;
+ background-color: #ffffff;
+}
+.btn-vk:focus,
+.btn-vk.focus {
+ color: #ffffff;
+ background-color: #466482;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-vk:hover {
+ color: #ffffff;
+ background-color: #466482;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-vk:active,
+.btn-vk.active,
+.open > .dropdown-toggle.btn-vk {
+ color: #ffffff;
+ background-color: #466482;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-vk:active,
+.btn-vk.active,
+.open > .dropdown-toggle.btn-vk {
+ background-image: none;
+}
+.btn-vk .badge {
+ color: #587ea3;
+ background-color: #ffffff;
}
-
.btn-yahoo {
- color: #ffffff;
- background-color: #720e9e;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #720e9e;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-yahoo:focus,
.btn-yahoo.focus {
- color: #ffffff;
- background-color: #500a6f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #500a6f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-yahoo:hover {
- color: #ffffff;
- background-color: #500a6f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #500a6f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-yahoo:active,
.btn-yahoo.active,
.open > .dropdown-toggle.btn-yahoo {
- color: #ffffff;
- background-color: #500a6f;
- border-color: rgba(0, 0, 0, 0.2);
+ color: #ffffff;
+ background-color: #500a6f;
+ border-color: rgba(0, 0, 0, 0.2);
}
-
.btn-yahoo:active,
.btn-yahoo.active,
.open > .dropdown-toggle.btn-yahoo {
- background-image: none;
+ background-image: none;
}
-
.btn-yahoo .badge {
- color: #720e9e;
- background-color: #ffffff;
+ color: #720e9e;
+ background-color: #ffffff;
+}
+.btn-yahoo:focus,
+.btn-yahoo.focus {
+ color: #ffffff;
+ background-color: #500a6f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-yahoo:hover {
+ color: #ffffff;
+ background-color: #500a6f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-yahoo:active,
+.btn-yahoo.active,
+.open > .dropdown-toggle.btn-yahoo {
+ color: #ffffff;
+ background-color: #500a6f;
+ border-color: rgba(0, 0, 0, 0.2);
+}
+.btn-yahoo:active,
+.btn-yahoo.active,
+.open > .dropdown-toggle.btn-yahoo {
+ background-image: none;
+}
+.btn-yahoo .badge {
+ color: #720e9e;
+ background-color: #ffffff;
}
-
/*
* Plugin: Full Calendar
* ---------------------
*/
.fc-button {
- background: #f4f4f4;
- background-image: none;
- color: #444;
- border-color: #ddd;
- border-bottom-color: #ddd;
+ background: #f4f4f4;
+ background-image: none;
+ color: #444;
+ border-color: #ddd;
+ border-bottom-color: #ddd;
}
-
.fc-button:hover,
.fc-button:active,
.fc-button.hover {
- background-color: #e9e9e9;
+ background-color: #e9e9e9;
}
-
.fc-header-title h2 {
- font-size: 15px;
- line-height: 1.6em;
- color: #666;
- margin-left: 10px;
+ font-size: 15px;
+ line-height: 1.6em;
+ color: #666;
+ margin-left: 10px;
}
-
.fc-header-right {
- padding-right: 10px;
+ padding-right: 10px;
}
-
.fc-header-left {
- padding-left: 10px;
+ padding-left: 10px;
}
-
.fc-widget-header {
- background: #fafafa;
+ background: #fafafa;
}
-
.fc-grid {
- width: 100%;
- border: 0;
+ width: 100%;
+ border: 0;
}
-
.fc-widget-header:first-of-type,
.fc-widget-content:first-of-type {
- border-left: 0;
- border-right: 0;
+ border-left: 0;
+ border-right: 0;
}
-
.fc-widget-header:last-of-type,
.fc-widget-content:last-of-type {
- border-right: 0;
+ border-right: 0;
}
-
.fc-toolbar {
- padding: 10px;
- margin: 0;
+ padding: 10px;
+ margin: 0;
}
-
.fc-day-number {
- font-size: 20px;
- font-weight: 300;
- padding-right: 10px;
+ font-size: 20px;
+ font-weight: 300;
+ padding-right: 10px;
}
-
.fc-color-picker {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
-
.fc-color-picker > li {
- float: left;
- font-size: 30px;
- margin-right: 5px;
- line-height: 30px;
+ float: left;
+ font-size: 30px;
+ margin-right: 5px;
+ line-height: 30px;
}
-
.fc-color-picker > li .fa {
- -webkit-transition: -webkit-transform linear 0.3s;
- -moz-transition: -moz-transform linear 0.3s;
- -o-transition: -o-transform linear 0.3s;
- transition: transform linear 0.3s;
+ -webkit-transition: -webkit-transform linear 0.3s;
+ -moz-transition: -moz-transform linear 0.3s;
+ -o-transition: -o-transform linear 0.3s;
+ transition: transform linear 0.3s;
}
-
.fc-color-picker > li .fa:hover {
- -webkit-transform: rotate(30deg);
- -ms-transform: rotate(30deg);
- -o-transform: rotate(30deg);
- transform: rotate(30deg);
+ -webkit-transform: rotate(30deg);
+ -ms-transform: rotate(30deg);
+ -o-transform: rotate(30deg);
+ transform: rotate(30deg);
}
-
#add-new-event {
- -webkit-transition: all linear 0.3s;
- -o-transition: all linear 0.3s;
- transition: all linear 0.3s;
+ -webkit-transition: all linear 0.3s;
+ -o-transition: all linear 0.3s;
+ transition: all linear 0.3s;
}
-
.external-event {
- padding: 5px 10px;
- font-weight: bold;
- margin-bottom: 4px;
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- border-radius: 3px;
- cursor: move;
+ padding: 5px 10px;
+ font-weight: bold;
+ margin-bottom: 4px;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ border-radius: 3px;
+ cursor: move;
}
-
.external-event:hover {
- box-shadow: inset 0 0 90px rgba(0, 0, 0, 0.2);
+ box-shadow: inset 0 0 90px rgba(0, 0, 0, 0.2);
}
-
/*
* Plugin: Select2
* ---------------
@@ -5018,164 +4930,157 @@ table.text-center th {
.select2-selection:focus,
.select2-container--default:active,
.select2-selection:active {
- outline: none;
+ outline: none;
}
-
.select2-container--default .select2-selection--single,
.select2-selection .select2-selection--single {
- border: 1px solid #d2d6de;
- border-radius: 0;
- padding: 6px 12px;
- height: 34px;
+ border: 1px solid #d2d6de;
+ border-radius: 0;
+ padding: 6px 12px;
+ height: 34px;
}
-
.select2-container--default.select2-container--open {
- border-color: #3c8dbc;
+ border-color: #3c8dbc;
}
-
.select2-dropdown {
- border: 1px solid #d2d6de;
- border-radius: 0;
+ border: 1px solid #d2d6de;
+ border-radius: 0;
}
-
.select2-container--default .select2-results__option--highlighted[aria-selected] {
- background-color: #3c8dbc;
- color: white;
+ background-color: #3c8dbc;
+ color: white;
}
-
.select2-results__option {
- padding: 6px 12px;
- user-select: none;
- -webkit-user-select: none;
+ padding: 6px 12px;
+ user-select: none;
+ -webkit-user-select: none;
}
-
.select2-container .select2-selection--single .select2-selection__rendered {
- padding-left: 0;
- padding-right: 0;
- height: auto;
- margin-top: -4px;
+ padding-left: 0;
+ padding-right: 0;
+ height: auto;
+ margin-top: -4px;
}
-
.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
- padding-right: 6px;
- padding-left: 20px;
+ padding-right: 6px;
+ padding-left: 20px;
}
-
.select2-container--default .select2-selection--single .select2-selection__arrow {
- height: 28px;
- right: 3px;
+ height: 28px;
+ right: 3px;
}
-
.select2-container--default .select2-selection--single .select2-selection__arrow b {
- margin-top: 0;
+ margin-top: 0;
}
-
.select2-dropdown .select2-search__field,
.select2-search--inline .select2-search__field {
- border: 1px solid #d2d6de;
+ border: 1px solid #d2d6de;
}
-
.select2-dropdown .select2-search__field:focus,
.select2-search--inline .select2-search__field:focus {
- outline: none;
- border: 1px solid #3c8dbc;
+ outline: none;
+}
+.select2-container--default.select2-container--focus .select2-selection--multiple,
+.select2-container--default .select2-search--dropdown .select2-search__field {
+ border-color: #3c8dbc !important;
}
-
.select2-container--default .select2-results__option[aria-disabled=true] {
- color: #999;
+ color: #999;
}
-
.select2-container--default .select2-results__option[aria-selected=true] {
- background-color: #ddd;
+ background-color: #ddd;
}
-
.select2-container--default .select2-results__option[aria-selected=true],
.select2-container--default .select2-results__option[aria-selected=true]:hover {
- color: #444;
+ color: #444;
}
-
.select2-container--default .select2-selection--multiple {
- border: 1px solid #d2d6de;
- border-radius: 0;
+ border: 1px solid #d2d6de;
+ border-radius: 0;
}
-
.select2-container--default .select2-selection--multiple:focus {
- border-color: #3c8dbc;
+ border-color: #3c8dbc;
}
-
.select2-container--default.select2-container--focus .select2-selection--multiple {
- border-color: #d2d6de;
+ border-color: #d2d6de;
}
-
.select2-container--default .select2-selection--multiple .select2-selection__choice {
- background-color: #3c8dbc;
- border-color: #367fa9;
- padding: 1px 10px;
- color: #fff;
+ background-color: #3c8dbc;
+ border-color: #367fa9;
+ padding: 1px 10px;
+ color: #fff;
}
-
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
- margin-right: 5px;
- color: rgba(255, 255, 255, 0.7);
+ margin-right: 5px;
+ color: rgba(255, 255, 255, 0.7);
}
-
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
- color: #fff;
+ color: #fff;
}
-
.select2-container .select2-selection--single .select2-selection__rendered {
- padding-right: 10px;
+ padding-right: 10px;
+}
+.box .datepicker-inline,
+.box .datepicker-inline .datepicker-days,
+.box .datepicker-inline > table,
+.box .datepicker-inline .datepicker-days > table {
+ width: 100%;
+}
+.box .datepicker-inline td:hover,
+.box .datepicker-inline .datepicker-days td:hover,
+.box .datepicker-inline > table td:hover,
+.box .datepicker-inline .datepicker-days > table td:hover {
+ background-color: rgba(255, 255, 255, 0.3);
+}
+.box .datepicker-inline td.day.old,
+.box .datepicker-inline .datepicker-days td.day.old,
+.box .datepicker-inline > table td.day.old,
+.box .datepicker-inline .datepicker-days > table td.day.old,
+.box .datepicker-inline td.day.new,
+.box .datepicker-inline .datepicker-days td.day.new,
+.box .datepicker-inline > table td.day.new,
+.box .datepicker-inline .datepicker-days > table td.day.new {
+ color: #777;
}
-
/*
* General: Miscellaneous
* ----------------------
*/
.pad {
- padding: 10px;
+ padding: 10px;
}
-
.margin {
- margin: 10px;
+ margin: 10px;
}
-
.margin-bottom {
- margin-bottom: 20px;
+ margin-bottom: 20px;
}
-
.margin-bottom-none {
- margin-bottom: 0;
+ margin-bottom: 0;
}
-
.margin-r-5 {
- margin-right: 5px;
+ margin-right: 5px;
}
-
.inline {
- display: inline;
+ display: inline;
}
-
.description-block {
- display: block;
- margin: 10px 0;
- text-align: center;
+ display: block;
+ margin: 10px 0;
+ text-align: center;
}
-
.description-block.margin-bottom {
- margin-bottom: 25px;
+ margin-bottom: 25px;
}
-
.description-block > .description-header {
- margin: 0;
- padding: 0;
- font-weight: 600;
- font-size: 16px;
+ margin: 0;
+ padding: 0;
+ font-weight: 600;
+ font-size: 16px;
}
-
.description-block > .description-text {
- text-transform: uppercase;
+ text-transform: uppercase;
}
-
.bg-red,
.bg-yellow,
.bg-aqua,
@@ -5235,660 +5140,549 @@ table.text-center th {
.modal-danger .modal-body,
.modal-danger .modal-header,
.modal-danger .modal-footer {
- color: #fff !important;
+ color: #fff !important;
}
-
.bg-gray {
- color: #000;
- background-color: #d2d6de !important;
+ color: #000;
+ background-color: #d2d6de !important;
}
-
.bg-gray-light {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
-
.bg-black {
- background-color: #111111 !important;
+ background-color: #111111 !important;
}
-
.bg-red,
.callout.callout-danger,
.alert-danger,
.alert-error,
.label-danger,
.modal-danger .modal-body {
- background-color: #dd4b39 !important;
+ background-color: #dd4b39 !important;
}
-
.bg-yellow,
.callout.callout-warning,
.alert-warning,
.label-warning,
.modal-warning .modal-body {
- background-color: #f39c12 !important;
+ background-color: #f39c12 !important;
}
-
.bg-aqua,
.callout.callout-info,
.alert-info,
.label-info,
.modal-info .modal-body {
- background-color: #00c0ef !important;
+ background-color: #00c0ef !important;
}
-
.bg-blue {
- background-color: #0073b7 !important;
+ background-color: #0073b7 !important;
}
-
.bg-light-blue,
.label-primary,
.modal-primary .modal-body {
- background-color: #3c8dbc !important;
+ background-color: #3c8dbc !important;
}
-
.bg-green,
.callout.callout-success,
.alert-success,
.label-success,
.modal-success .modal-body {
- background-color: #00a65a !important;
+ background-color: #00a65a !important;
}
-
.bg-navy {
- background-color: #001f3f !important;
+ background-color: #001f3f !important;
}
-
.bg-teal {
- background-color: #39cccc !important;
+ background-color: #39cccc !important;
}
-
.bg-olive {
- background-color: #3d9970 !important;
+ background-color: #3d9970 !important;
}
-
.bg-lime {
- background-color: #01ff70 !important;
+ background-color: #01ff70 !important;
}
-
.bg-orange {
- background-color: #ff851b !important;
+ background-color: #ff851b !important;
}
-
.bg-fuchsia {
- background-color: #f012be !important;
+ background-color: #f012be !important;
}
-
.bg-purple {
- background-color: #605ca8 !important;
+ background-color: #605ca8 !important;
}
-
.bg-maroon {
- background-color: #d81b60 !important;
+ background-color: #d81b60 !important;
}
-
.bg-gray-active {
- color: #000;
- background-color: #b5bbc8 !important;
+ color: #000;
+ background-color: #b5bbc8 !important;
}
-
.bg-black-active {
- background-color: #000000 !important;
+ background-color: #000000 !important;
}
-
.bg-red-active,
.modal-danger .modal-header,
.modal-danger .modal-footer {
- background-color: #d33724 !important;
+ background-color: #d33724 !important;
}
-
.bg-yellow-active,
.modal-warning .modal-header,
.modal-warning .modal-footer {
- background-color: #db8b0b !important;
+ background-color: #db8b0b !important;
}
-
.bg-aqua-active,
.modal-info .modal-header,
.modal-info .modal-footer {
- background-color: #00a7d0 !important;
+ background-color: #00a7d0 !important;
}
-
.bg-blue-active {
- background-color: #005384 !important;
+ background-color: #005384 !important;
}
-
.bg-light-blue-active,
.modal-primary .modal-header,
.modal-primary .modal-footer {
- background-color: #357ca5 !important;
+ background-color: #357ca5 !important;
}
-
.bg-green-active,
.modal-success .modal-header,
.modal-success .modal-footer {
- background-color: #008d4c !important;
+ background-color: #008d4c !important;
}
-
.bg-navy-active {
- background-color: #001a35 !important;
+ background-color: #001a35 !important;
}
-
.bg-teal-active {
- background-color: #30bbbb !important;
+ background-color: #30bbbb !important;
}
-
.bg-olive-active {
- background-color: #368763 !important;
+ background-color: #368763 !important;
}
-
.bg-lime-active {
- background-color: #00e765 !important;
+ background-color: #00e765 !important;
}
-
.bg-orange-active {
- background-color: #ff7701 !important;
+ background-color: #ff7701 !important;
}
-
.bg-fuchsia-active {
- background-color: #db0ead !important;
+ background-color: #db0ead !important;
}
-
.bg-purple-active {
- background-color: #555299 !important;
+ background-color: #555299 !important;
}
-
.bg-maroon-active {
- background-color: #ca195a !important;
+ background-color: #ca195a !important;
}
-
[class^="bg-"].disabled {
- opacity: 0.65;
- filter: alpha(opacity=65);
+ opacity: 0.65;
+ filter: alpha(opacity=65);
}
-
.text-red {
- color: #dd4b39 !important;
+ color: #dd4b39 !important;
}
-
.text-yellow {
- color: #f39c12 !important;
+ color: #f39c12 !important;
}
-
.text-aqua {
- color: #00c0ef !important;
+ color: #00c0ef !important;
}
-
.text-blue {
- color: #0073b7 !important;
+ color: #0073b7 !important;
}
-
.text-black {
- color: #111111 !important;
+ color: #111111 !important;
}
-
.text-light-blue {
- color: #3c8dbc !important;
+ color: #3c8dbc !important;
}
-
.text-green {
- color: #00a65a !important;
+ color: #00a65a !important;
}
-
.text-gray {
- color: #d2d6de !important;
+ color: #d2d6de !important;
}
-
.text-navy {
- color: #001f3f !important;
+ color: #001f3f !important;
}
-
.text-teal {
- color: #39cccc !important;
+ color: #39cccc !important;
}
-
.text-olive {
- color: #3d9970 !important;
+ color: #3d9970 !important;
}
-
.text-lime {
- color: #01ff70 !important;
+ color: #01ff70 !important;
}
-
.text-orange {
- color: #ff851b !important;
+ color: #ff851b !important;
}
-
.text-fuchsia {
- color: #f012be !important;
+ color: #f012be !important;
}
-
.text-purple {
- color: #605ca8 !important;
+ color: #605ca8 !important;
}
-
.text-maroon {
- color: #d81b60 !important;
+ color: #d81b60 !important;
}
-
.link-muted {
- color: #7a869d;
+ color: #7a869d;
}
-
.link-muted:hover,
.link-muted:focus {
- color: #606c84;
+ color: #606c84;
}
-
.link-black {
- color: #666;
+ color: #666;
}
-
.link-black:hover,
.link-black:focus {
- color: #999;
+ color: #999;
}
-
.hide {
- display: none !important;
+ display: none !important;
}
-
.no-border {
- border: 0 !important;
+ border: 0 !important;
}
-
.no-padding {
- padding: 0 !important;
+ padding: 0 !important;
}
-
.no-margin {
- margin: 0 !important;
+ margin: 0 !important;
}
-
.no-shadow {
- box-shadow: none !important;
+ box-shadow: none !important;
}
-
.list-unstyled,
.chart-legend,
.contacts-list,
.users-list,
.mailbox-attachments {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
-
.list-group-unbordered > .list-group-item {
- border-left: 0;
- border-right: 0;
- border-radius: 0;
- padding-left: 0;
- padding-right: 0;
+ border-left: 0;
+ border-right: 0;
+ border-radius: 0;
+ padding-left: 0;
+ padding-right: 0;
}
-
.flat {
- border-radius: 0 !important;
+ border-radius: 0 !important;
}
-
.text-bold,
.text-bold.table td,
.text-bold.table th {
- font-weight: 700;
+ font-weight: 700;
}
-
.text-sm {
- font-size: 12px;
+ font-size: 12px;
}
-
.jqstooltip {
- padding: 5px !important;
- width: auto !important;
- height: auto !important;
+ padding: 5px !important;
+ width: auto !important;
+ height: auto !important;
}
-
.bg-teal-gradient {
- background: #39cccc !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #39cccc), color-stop(1, #7adddd)) !important;
- background: -ms-linear-gradient(bottom, #39cccc, #7adddd) !important;
- background: -moz-linear-gradient(center bottom, #39cccc 0%, #7adddd 100%) !important;
- background: -o-linear-gradient(#7adddd, #39cccc) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7adddd', endColorstr='#39cccc', GradientType=0) !important;
- color: #fff;
+ background: #39cccc !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #39cccc), color-stop(1, #7adddd)) !important;
+ background: -ms-linear-gradient(bottom, #39cccc, #7adddd) !important;
+ background: -moz-linear-gradient(center bottom, #39cccc 0%, #7adddd 100%) !important;
+ background: -o-linear-gradient(#7adddd, #39cccc) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7adddd', endColorstr='#39cccc', GradientType=0) !important;
+ color: #fff;
}
-
.bg-light-blue-gradient {
- background: #3c8dbc !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #3c8dbc), color-stop(1, #67a8ce)) !important;
- background: -ms-linear-gradient(bottom, #3c8dbc, #67a8ce) !important;
- background: -moz-linear-gradient(center bottom, #3c8dbc 0%, #67a8ce 100%) !important;
- background: -o-linear-gradient(#67a8ce, #3c8dbc) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#67a8ce', endColorstr='#3c8dbc', GradientType=0) !important;
- color: #fff;
+ background: #3c8dbc !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #3c8dbc), color-stop(1, #67a8ce)) !important;
+ background: -ms-linear-gradient(bottom, #3c8dbc, #67a8ce) !important;
+ background: -moz-linear-gradient(center bottom, #3c8dbc 0%, #67a8ce 100%) !important;
+ background: -o-linear-gradient(#67a8ce, #3c8dbc) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#67a8ce', endColorstr='#3c8dbc', GradientType=0) !important;
+ color: #fff;
}
-
.bg-blue-gradient {
- background: #0073b7 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #0073b7), color-stop(1, #0089db)) !important;
- background: -ms-linear-gradient(bottom, #0073b7, #0089db) !important;
- background: -moz-linear-gradient(center bottom, #0073b7 0%, #0089db 100%) !important;
- background: -o-linear-gradient(#0089db, #0073b7) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0089db', endColorstr='#0073b7', GradientType=0) !important;
- color: #fff;
+ background: #0073b7 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #0073b7), color-stop(1, #0089db)) !important;
+ background: -ms-linear-gradient(bottom, #0073b7, #0089db) !important;
+ background: -moz-linear-gradient(center bottom, #0073b7 0%, #0089db 100%) !important;
+ background: -o-linear-gradient(#0089db, #0073b7) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0089db', endColorstr='#0073b7', GradientType=0) !important;
+ color: #fff;
}
-
.bg-aqua-gradient {
- background: #00c0ef !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00c0ef), color-stop(1, #14d1ff)) !important;
- background: -ms-linear-gradient(bottom, #00c0ef, #14d1ff) !important;
- background: -moz-linear-gradient(center bottom, #00c0ef 0%, #14d1ff 100%) !important;
- background: -o-linear-gradient(#14d1ff, #00c0ef) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#14d1ff', endColorstr='#00c0ef', GradientType=0) !important;
- color: #fff;
+ background: #00c0ef !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00c0ef), color-stop(1, #14d1ff)) !important;
+ background: -ms-linear-gradient(bottom, #00c0ef, #14d1ff) !important;
+ background: -moz-linear-gradient(center bottom, #00c0ef 0%, #14d1ff 100%) !important;
+ background: -o-linear-gradient(#14d1ff, #00c0ef) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#14d1ff', endColorstr='#00c0ef', GradientType=0) !important;
+ color: #fff;
}
-
.bg-yellow-gradient {
- background: #f39c12 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f39c12), color-stop(1, #f7bc60)) !important;
- background: -ms-linear-gradient(bottom, #f39c12, #f7bc60) !important;
- background: -moz-linear-gradient(center bottom, #f39c12 0%, #f7bc60 100%) !important;
- background: -o-linear-gradient(#f7bc60, #f39c12) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7bc60', endColorstr='#f39c12', GradientType=0) !important;
- color: #fff;
+ background: #f39c12 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f39c12), color-stop(1, #f7bc60)) !important;
+ background: -ms-linear-gradient(bottom, #f39c12, #f7bc60) !important;
+ background: -moz-linear-gradient(center bottom, #f39c12 0%, #f7bc60 100%) !important;
+ background: -o-linear-gradient(#f7bc60, #f39c12) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7bc60', endColorstr='#f39c12', GradientType=0) !important;
+ color: #fff;
}
-
.bg-purple-gradient {
- background: #605ca8 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #605ca8), color-stop(1, #9491c4)) !important;
- background: -ms-linear-gradient(bottom, #605ca8, #9491c4) !important;
- background: -moz-linear-gradient(center bottom, #605ca8 0%, #9491c4 100%) !important;
- background: -o-linear-gradient(#9491c4, #605ca8) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9491c4', endColorstr='#605ca8', GradientType=0) !important;
- color: #fff;
+ background: #605ca8 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #605ca8), color-stop(1, #9491c4)) !important;
+ background: -ms-linear-gradient(bottom, #605ca8, #9491c4) !important;
+ background: -moz-linear-gradient(center bottom, #605ca8 0%, #9491c4 100%) !important;
+ background: -o-linear-gradient(#9491c4, #605ca8) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9491c4', endColorstr='#605ca8', GradientType=0) !important;
+ color: #fff;
}
-
.bg-green-gradient {
- background: #00a65a !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00a65a), color-stop(1, #00ca6d)) !important;
- background: -ms-linear-gradient(bottom, #00a65a, #00ca6d) !important;
- background: -moz-linear-gradient(center bottom, #00a65a 0%, #00ca6d 100%) !important;
- background: -o-linear-gradient(#00ca6d, #00a65a) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ca6d', endColorstr='#00a65a', GradientType=0) !important;
- color: #fff;
+ background: #00a65a !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00a65a), color-stop(1, #00ca6d)) !important;
+ background: -ms-linear-gradient(bottom, #00a65a, #00ca6d) !important;
+ background: -moz-linear-gradient(center bottom, #00a65a 0%, #00ca6d 100%) !important;
+ background: -o-linear-gradient(#00ca6d, #00a65a) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ca6d', endColorstr='#00a65a', GradientType=0) !important;
+ color: #fff;
}
-
.bg-red-gradient {
- background: #dd4b39 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #dd4b39), color-stop(1, #e47365)) !important;
- background: -ms-linear-gradient(bottom, #dd4b39, #e47365) !important;
- background: -moz-linear-gradient(center bottom, #dd4b39 0%, #e47365 100%) !important;
- background: -o-linear-gradient(#e47365, #dd4b39) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e47365', endColorstr='#dd4b39', GradientType=0) !important;
- color: #fff;
+ background: #dd4b39 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #dd4b39), color-stop(1, #e47365)) !important;
+ background: -ms-linear-gradient(bottom, #dd4b39, #e47365) !important;
+ background: -moz-linear-gradient(center bottom, #dd4b39 0%, #e47365 100%) !important;
+ background: -o-linear-gradient(#e47365, #dd4b39) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e47365', endColorstr='#dd4b39', GradientType=0) !important;
+ color: #fff;
}
-
.bg-black-gradient {
- background: #111111 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #111111), color-stop(1, #2b2b2b)) !important;
- background: -ms-linear-gradient(bottom, #111111, #2b2b2b) !important;
- background: -moz-linear-gradient(center bottom, #111111 0%, #2b2b2b 100%) !important;
- background: -o-linear-gradient(#2b2b2b, #111111) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2b2b2b', endColorstr='#111111', GradientType=0) !important;
- color: #fff;
+ background: #111111 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #111111), color-stop(1, #2b2b2b)) !important;
+ background: -ms-linear-gradient(bottom, #111111, #2b2b2b) !important;
+ background: -moz-linear-gradient(center bottom, #111111 0%, #2b2b2b 100%) !important;
+ background: -o-linear-gradient(#2b2b2b, #111111) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2b2b2b', endColorstr='#111111', GradientType=0) !important;
+ color: #fff;
}
-
.bg-maroon-gradient {
- background: #d81b60 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #d81b60), color-stop(1, #e73f7c)) !important;
- background: -ms-linear-gradient(bottom, #d81b60, #e73f7c) !important;
- background: -moz-linear-gradient(center bottom, #d81b60 0%, #e73f7c 100%) !important;
- background: -o-linear-gradient(#e73f7c, #d81b60) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e73f7c', endColorstr='#d81b60', GradientType=0) !important;
- color: #fff;
+ background: #d81b60 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #d81b60), color-stop(1, #e73f7c)) !important;
+ background: -ms-linear-gradient(bottom, #d81b60, #e73f7c) !important;
+ background: -moz-linear-gradient(center bottom, #d81b60 0%, #e73f7c 100%) !important;
+ background: -o-linear-gradient(#e73f7c, #d81b60) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e73f7c', endColorstr='#d81b60', GradientType=0) !important;
+ color: #fff;
}
-
.description-block .description-icon {
- font-size: 16px;
+ font-size: 16px;
}
-
.no-pad-top {
- padding-top: 0;
+ padding-top: 0;
}
-
.position-static {
- position: static !important;
+ position: static !important;
}
-
.list-header {
- font-size: 15px;
- padding: 10px 4px;
- font-weight: bold;
- color: #666;
+ font-size: 15px;
+ padding: 10px 4px;
+ font-weight: bold;
+ color: #666;
}
-
.list-seperator {
- height: 1px;
- background: #f4f4f4;
- margin: 15px 0 9px 0;
+ height: 1px;
+ background: #f4f4f4;
+ margin: 15px 0 9px 0;
}
-
.list-link > a {
- padding: 4px;
- color: #777;
+ padding: 4px;
+ color: #777;
}
-
.list-link > a:hover {
- color: #222;
+ color: #222;
}
-
.font-light {
- font-weight: 300;
+ font-weight: 300;
}
-
.user-block:before,
.user-block:after {
- content: " ";
- display: table;
+ content: " ";
+ display: table;
}
-
.user-block:after {
- clear: both;
+ clear: both;
+}
+.user-block:before,
+.user-block:after {
+ content: " ";
+ display: table;
+}
+.user-block:after {
+ clear: both;
}
-
.user-block img {
- width: 40px;
- height: 40px;
- float: left;
+ width: 40px;
+ height: 40px;
+ float: left;
}
-
.user-block .username,
.user-block .description,
.user-block .comment {
- display: block;
- margin-left: 50px;
+ display: block;
+ margin-left: 50px;
}
-
.user-block .username {
- font-size: 16px;
- font-weight: 600;
+ font-size: 16px;
+ font-weight: 600;
}
-
.user-block .description {
- color: #999;
- font-size: 13px;
+ color: #999;
+ font-size: 13px;
}
-
.user-block.user-block-sm .username,
.user-block.user-block-sm .description,
.user-block.user-block-sm .comment {
- margin-left: 40px;
+ margin-left: 40px;
}
-
.user-block.user-block-sm .username {
- font-size: 14px;
+ font-size: 14px;
}
-
.img-sm,
.img-md,
.img-lg,
.box-comments .box-comment img,
.user-block.user-block-sm img {
- float: left;
+ float: left;
}
-
.img-sm,
.box-comments .box-comment img,
.user-block.user-block-sm img {
- width: 30px !important;
- height: 30px !important;
+ width: 30px !important;
+ height: 30px !important;
}
-
.img-sm + .img-push {
- margin-left: 40px;
+ margin-left: 40px;
}
-
.img-md {
- width: 60px;
- height: 60px;
+ width: 60px;
+ height: 60px;
}
-
.img-md + .img-push {
- margin-left: 70px;
+ margin-left: 70px;
}
-
.img-lg {
- width: 100px;
- height: 100px;
+ width: 100px;
+ height: 100px;
}
-
.img-lg + .img-push {
- margin-left: 110px;
+ margin-left: 110px;
}
-
.img-bordered {
- border: 3px solid #d2d6de;
- padding: 3px;
+ border: 3px solid #d2d6de;
+ padding: 3px;
}
-
.img-bordered-sm {
- border: 2px solid #d2d6de;
- padding: 2px;
+ border: 2px solid #d2d6de;
+ padding: 2px;
}
-
.attachment-block {
- border: 1px solid #f4f4f4;
- padding: 5px;
- margin-bottom: 10px;
- background: #f7f7f7;
+ border: 1px solid #f4f4f4;
+ padding: 5px;
+ margin-bottom: 10px;
+ background: #f7f7f7;
}
-
.attachment-block .attachment-img {
- max-width: 100px;
- max-height: 100px;
- height: auto;
- float: left;
+ max-width: 100px;
+ max-height: 100px;
+ height: auto;
+ float: left;
}
-
.attachment-block .attachment-pushed {
- margin-left: 110px;
+ margin-left: 110px;
}
-
.attachment-block .attachment-heading {
- margin: 0;
+ margin: 0;
}
-
.attachment-block .attachment-text {
- color: #555;
+ color: #555;
}
-
.connectedSortable {
- min-height: 100px;
+ min-height: 100px;
}
-
.ui-helper-hidden-accessible {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0 0 0 0);
+ height: 1px;
+ margin: -1px;
+ overflow: hidden;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
-
.sort-highlight {
- background: #f4f4f4;
- border: 1px dashed #ddd;
- margin-bottom: 10px;
+ background: #f4f4f4;
+ border: 1px dashed #ddd;
+ margin-bottom: 10px;
}
-
.full-opacity-hover {
- opacity: 0.65;
- filter: alpha(opacity=65);
+ opacity: 0.65;
+ filter: alpha(opacity=65);
}
-
.full-opacity-hover:hover {
- opacity: 1;
- filter: alpha(opacity=100);
+ opacity: 1;
+ filter: alpha(opacity=100);
}
-
.chart {
- position: relative;
- overflow: hidden;
- width: 100%;
+ position: relative;
+ overflow: hidden;
+ width: 100%;
}
-
.chart svg,
.chart canvas {
- width: 100% !important;
+ width: 100% !important;
}
-
/*
* Misc: print
* -----------
*/
@media print {
- .no-print,
- .main-sidebar,
- .left-side,
- .main-header,
- .content-header {
- display: none !important;
- }
-
- .content-wrapper,
- .right-side,
- .main-footer {
- margin-left: 0 !important;
- min-height: 0 !important;
- -webkit-transform: translate(0, 0) !important;
- -ms-transform: translate(0, 0) !important;
- -o-transform: translate(0, 0) !important;
- transform: translate(0, 0) !important;
- }
-
- .fixed .content-wrapper,
- .fixed .right-side {
- padding-top: 0 !important;
- }
-
- .invoice {
- width: 100%;
- border: 0;
- margin: 0;
- padding: 0;
- }
-
- .invoice-col {
- float: left;
- width: 33.3333333%;
- }
-
- .table-responsive {
- overflow: auto;
- }
-
- .table-responsive > .table tr th,
- .table-responsive > .table tr td {
- white-space: normal !important;
- }
+ .no-print,
+ .main-sidebar,
+ .left-side,
+ .main-header,
+ .content-header {
+ display: none !important;
+ }
+ .content-wrapper,
+ .right-side,
+ .main-footer {
+ margin-left: 0 !important;
+ min-height: 0 !important;
+ -webkit-transform: translate(0, 0) !important;
+ -ms-transform: translate(0, 0) !important;
+ -o-transform: translate(0, 0) !important;
+ transform: translate(0, 0) !important;
+ }
+ .fixed .content-wrapper,
+ .fixed .right-side {
+ padding-top: 0 !important;
+ }
+ .invoice {
+ width: 100%;
+ border: 0;
+ margin: 0;
+ padding: 0;
+ }
+ .invoice-col {
+ float: left;
+ width: 33.3333333%;
+ }
+ .table-responsive {
+ overflow: auto;
+ }
+ .table-responsive > .table tr th,
+ .table-responsive > .table tr td {
+ white-space: normal !important;
+ }
}
diff --git a/public/lib/adminlte/css/skins/skin-blue-light.css b/public/lib/adminlte/css/skins/skin-blue-light.css
index be502018b6..580644081b 100755
--- a/public/lib/adminlte/css/skins/skin-blue-light.css
+++ b/public/lib/adminlte/css/skins/skin-blue-light.css
@@ -3,13 +3,11 @@
* ----------
*/
.skin-blue-light .main-header .navbar {
- background-color: #3c8dbc;
+ background-color: #3c8dbc;
}
-
.skin-blue-light .main-header .navbar .nav > li > a {
- color: #ffffff;
+ color: #ffffff;
}
-
.skin-blue-light .main-header .navbar .nav > li > a:hover,
.skin-blue-light .main-header .navbar .nav > li > a:active,
.skin-blue-light .main-header .navbar .nav > li > a:focus,
@@ -17,186 +15,149 @@
.skin-blue-light .main-header .navbar .nav .open > a:hover,
.skin-blue-light .main-header .navbar .nav .open > a:focus,
.skin-blue-light .main-header .navbar .nav > .active > a {
- background: rgba(0, 0, 0, 0.1);
- color: #f6f6f6;
+ background: rgba(0, 0, 0, 0.1);
+ color: #f6f6f6;
}
-
.skin-blue-light .main-header .navbar .sidebar-toggle {
- color: #ffffff;
+ color: #ffffff;
}
-
.skin-blue-light .main-header .navbar .sidebar-toggle:hover {
- color: #f6f6f6;
- background: rgba(0, 0, 0, 0.1);
+ color: #f6f6f6;
+ background: rgba(0, 0, 0, 0.1);
}
-
.skin-blue-light .main-header .navbar .sidebar-toggle {
- color: #fff;
+ color: #fff;
}
-
.skin-blue-light .main-header .navbar .sidebar-toggle:hover {
- background-color: #367fa9;
+ background-color: #367fa9;
}
-
@media (max-width: 767px) {
- .skin-blue-light .main-header .navbar .dropdown-menu li.divider {
- background-color: rgba(255, 255, 255, 0.1);
- }
-
- .skin-blue-light .main-header .navbar .dropdown-menu li a {
- color: #fff;
- }
-
- .skin-blue-light .main-header .navbar .dropdown-menu li a:hover {
- background: #367fa9;
- }
+ .skin-blue-light .main-header .navbar .dropdown-menu li.divider {
+ background-color: rgba(255, 255, 255, 0.1);
+ }
+ .skin-blue-light .main-header .navbar .dropdown-menu li a {
+ color: #fff;
+ }
+ .skin-blue-light .main-header .navbar .dropdown-menu li a:hover {
+ background: #367fa9;
+ }
}
-
.skin-blue-light .main-header .logo {
- background-color: #3c8dbc;
- color: #ffffff;
- border-bottom: 0 solid transparent;
+ background-color: #3c8dbc;
+ color: #ffffff;
+ border-bottom: 0 solid transparent;
}
-
.skin-blue-light .main-header .logo:hover {
- background-color: #3b8ab8;
+ background-color: #3b8ab8;
}
-
.skin-blue-light .main-header li.user-header {
- background-color: #3c8dbc;
+ background-color: #3c8dbc;
}
-
.skin-blue-light .content-header {
- background: transparent;
+ background: transparent;
}
-
.skin-blue-light .wrapper,
.skin-blue-light .main-sidebar,
.skin-blue-light .left-side {
- background-color: #f9fafc;
+ background-color: #f9fafc;
}
-
-.skin-blue-light .content-wrapper,
-.skin-blue-light .main-footer {
- border-left: 1px solid #d2d6de;
+.skin-blue-light .main-sidebar {
+ border-right: 1px solid #d2d6de;
}
-
.skin-blue-light .user-panel > .info,
.skin-blue-light .user-panel > .info > a {
- color: #444444;
+ color: #444444;
}
-
.skin-blue-light .sidebar-menu > li {
- -webkit-transition: border-left-color 0.3s ease;
- -o-transition: border-left-color 0.3s ease;
- transition: border-left-color 0.3s ease;
+ -webkit-transition: border-left-color 0.3s ease;
+ -o-transition: border-left-color 0.3s ease;
+ transition: border-left-color 0.3s ease;
}
-
.skin-blue-light .sidebar-menu > li.header {
- color: #848484;
- background: #f9fafc;
+ color: #848484;
+ background: #f9fafc;
}
-
.skin-blue-light .sidebar-menu > li > a {
- border-left: 3px solid transparent;
- font-weight: 600;
+ border-left: 3px solid transparent;
+ font-weight: 600;
}
-
.skin-blue-light .sidebar-menu > li:hover > a,
.skin-blue-light .sidebar-menu > li.active > a {
- color: #000000;
- background: #f4f4f5;
+ color: #000000;
+ background: #f4f4f5;
}
-
.skin-blue-light .sidebar-menu > li.active {
- border-left-color: #3c8dbc;
+ border-left-color: #3c8dbc;
}
-
.skin-blue-light .sidebar-menu > li.active > a {
- font-weight: 600;
+ font-weight: 600;
}
-
.skin-blue-light .sidebar-menu > li > .treeview-menu {
- background: #f4f4f5;
+ background: #f4f4f5;
}
-
.skin-blue-light .sidebar a {
- color: #444444;
+ color: #444444;
}
-
.skin-blue-light .sidebar a:hover {
- text-decoration: none;
+ text-decoration: none;
}
-
-.skin-blue-light .treeview-menu > li > a {
- color: #777777;
+.skin-blue-light .sidebar-menu .treeview-menu > li > a {
+ color: #777777;
}
-
-.skin-blue-light .treeview-menu > li.active > a,
-.skin-blue-light .treeview-menu > li > a:hover {
- color: #000000;
+.skin-blue-light .sidebar-menu .treeview-menu > li.active > a,
+.skin-blue-light .sidebar-menu .treeview-menu > li > a:hover {
+ color: #000000;
}
-
-.skin-blue-light .treeview-menu > li.active > a {
- font-weight: 600;
+.skin-blue-light .sidebar-menu .treeview-menu > li.active > a {
+ font-weight: 600;
}
-
.skin-blue-light .sidebar-form {
- border-radius: 3px;
- border: 1px solid #d2d6de;
- margin: 10px 10px;
+ border-radius: 3px;
+ border: 1px solid #d2d6de;
+ margin: 10px 10px;
}
-
.skin-blue-light .sidebar-form input[type="text"],
.skin-blue-light .sidebar-form .btn {
- box-shadow: none;
- background-color: #fff;
- border: 1px solid transparent;
- height: 35px;
+ box-shadow: none;
+ background-color: #fff;
+ border: 1px solid transparent;
+ height: 35px;
}
-
.skin-blue-light .sidebar-form input[type="text"] {
- color: #666;
- border-top-left-radius: 2px;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 2px;
+ color: #666;
+ border-top-left-radius: 2px;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 2px;
}
-
.skin-blue-light .sidebar-form input[type="text"]:focus,
.skin-blue-light .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
- background-color: #fff;
- color: #666;
+ background-color: #fff;
+ color: #666;
}
-
.skin-blue-light .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
- border-left-color: #fff;
+ border-left-color: #fff;
}
-
.skin-blue-light .sidebar-form .btn {
- color: #999;
- border-top-left-radius: 0;
- border-top-right-radius: 2px;
- border-bottom-right-radius: 2px;
- border-bottom-left-radius: 0;
+ color: #999;
+ border-top-left-radius: 0;
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+ border-bottom-left-radius: 0;
}
-
@media (min-width: 768px) {
- .skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
- border-left: 1px solid #d2d6de;
- }
+ .skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu > li > .treeview-menu {
+ border-left: 1px solid #d2d6de;
+ }
}
-
.skin-blue-light .main-footer {
- border-top-color: #d2d6de;
+ border-top-color: #d2d6de;
}
-
.skin-blue.layout-top-nav .main-header > .logo {
- background-color: #3c8dbc;
- color: #ffffff;
- border-bottom: 0 solid transparent;
+ background-color: #3c8dbc;
+ color: #ffffff;
+ border-bottom: 0 solid transparent;
}
-
.skin-blue.layout-top-nav .main-header > .logo:hover {
- background-color: #3b8ab8;
+ background-color: #3b8ab8;
}
diff --git a/public/lib/adminlte/css/skins/skin-blue-light.min.css b/public/lib/adminlte/css/skins/skin-blue-light.min.css
index c41ca33fa1..033834e29f 100755
--- a/public/lib/adminlte/css/skins/skin-blue-light.min.css
+++ b/public/lib/adminlte/css/skins/skin-blue-light.min.css
@@ -1 +1 @@
-.skin-blue-light .main-header .navbar{background-color:#3c8dbc}.skin-blue-light .main-header .navbar .nav>li>a{color:#fff}.skin-blue-light .main-header .navbar .nav>li>a:hover,.skin-blue-light .main-header .navbar .nav>li>a:active,.skin-blue-light .main-header .navbar .nav>li>a:focus,.skin-blue-light .main-header .navbar .nav .open>a,.skin-blue-light .main-header .navbar .nav .open>a:hover,.skin-blue-light .main-header .navbar .nav .open>a:focus,.skin-blue-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue-light .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue-light .main-header .logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue-light .main-header .logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header li.user-header{background-color:#3c8dbc}.skin-blue-light .content-header{background:transparent}.skin-blue-light .wrapper,.skin-blue-light .main-sidebar,.skin-blue-light .left-side{background-color:#f9fafc}.skin-blue-light .content-wrapper,.skin-blue-light .main-footer{border-left:1px solid #d2d6de}.skin-blue-light .user-panel>.info,.skin-blue-light .user-panel>.info>a{color:#444}.skin-blue-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-blue-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-blue-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-blue-light .sidebar-menu>li:hover>a,.skin-blue-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-blue-light .sidebar-menu>li.active{border-left-color:#3c8dbc}.skin-blue-light .sidebar-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-blue-light .sidebar a{color:#444}.skin-blue-light .sidebar a:hover{text-decoration:none}.skin-blue-light .treeview-menu>li>a{color:#777}.skin-blue-light .treeview-menu>li.active>a,.skin-blue-light .treeview-menu>li>a:hover{color:#000}.skin-blue-light .treeview-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-blue-light .sidebar-form input[type="text"],.skin-blue-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-blue-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue-light .sidebar-form input[type="text"]:focus,.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-blue-light .main-footer{border-top-color:#d2d6de}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}
\ No newline at end of file
+.skin-blue-light .main-header .navbar{background-color:#3c8dbc}.skin-blue-light .main-header .navbar .nav>li>a{color:#fff}.skin-blue-light .main-header .navbar .nav>li>a:hover,.skin-blue-light .main-header .navbar .nav>li>a:active,.skin-blue-light .main-header .navbar .nav>li>a:focus,.skin-blue-light .main-header .navbar .nav .open>a,.skin-blue-light .main-header .navbar .nav .open>a:hover,.skin-blue-light .main-header .navbar .nav .open>a:focus,.skin-blue-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue-light .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue-light .main-header .logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue-light .main-header .logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header li.user-header{background-color:#3c8dbc}.skin-blue-light .content-header{background:transparent}.skin-blue-light .wrapper,.skin-blue-light .main-sidebar,.skin-blue-light .left-side{background-color:#f9fafc}.skin-blue-light .main-sidebar{border-right:1px solid #d2d6de}.skin-blue-light .user-panel>.info,.skin-blue-light .user-panel>.info>a{color:#444}.skin-blue-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-blue-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-blue-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-blue-light .sidebar-menu>li:hover>a,.skin-blue-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-blue-light .sidebar-menu>li.active{border-left-color:#3c8dbc}.skin-blue-light .sidebar-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-blue-light .sidebar a{color:#444}.skin-blue-light .sidebar a:hover{text-decoration:none}.skin-blue-light .sidebar-menu .treeview-menu>li>a{color:#777}.skin-blue-light .sidebar-menu .treeview-menu>li.active>a,.skin-blue-light .sidebar-menu .treeview-menu>li>a:hover{color:#000}.skin-blue-light .sidebar-menu .treeview-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-blue-light .sidebar-form input[type="text"],.skin-blue-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-blue-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue-light .sidebar-form input[type="text"]:focus,.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-blue-light .main-footer{border-top-color:#d2d6de}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}
\ No newline at end of file
diff --git a/resources/lang/de_DE/bank.php b/resources/lang/de_DE/bank.php
index c50588e153..86a0c3062b 100644
--- a/resources/lang/de_DE/bank.php
+++ b/resources/lang/de_DE/bank.php
@@ -1,6 +1,8 @@
'Voraussetzungen für einen Import von bunq',
'bunq_prerequisites_text' => 'Um aus bunq importieren zu können, benötigen Sie einen API-Schlüssel. Sie können dies über die App tun.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php
index 9e9b691b2c..5f2bf17f65 100644
--- a/resources/lang/de_DE/breadcrumbs.php
+++ b/resources/lang/de_DE/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Umsatz, Einkommen und Einlagen',
'transfer_list' => 'Überweisungen',
'transfers_list' => 'Überweisungen',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Erstelle eine neue Ausgabe',
'create_deposit' => 'Erstelle ein neues Einkommen',
'create_transfer' => 'Erstelle eine neue Überweisung',
'edit_journal' => 'Bearbeite Transaktion ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Lösche Transaktion ":description"',
'tags' => 'Tags',
'createTag' => 'Neuen Tag erstellen',
diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php
index 804452a045..9077d9fe15 100644
--- a/resources/lang/de_DE/csv.php
+++ b/resources/lang/de_DE/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'Bestandskonto (vgl. ID in Firefly)',
'column_account-name' => 'Bestandskonto (Name)',
'column_amount' => 'Betrag',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Betrag (Komma als Dezimaltrennzeichen)',
'column_bill-id' => 'Rechnung (ID übereinstimmend mit Firefly)',
'column_bill-name' => 'Name der Rechnung',
diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php
index 19d4a1bbf5..eec5193c40 100644
--- a/resources/lang/de_DE/demo.php
+++ b/resources/lang/de_DE/demo.php
@@ -16,11 +16,11 @@ return [
'accounts-index' => 'Vermögenskonten sind Ihre persönlichen Bank-Konten. Aufwandskonten sind Konten, denen Sie Geld zahlen, z. B. Läden und Freunde. Einnahmekonten sind Konten von denen Sie Geld erhalten, z. B. Ihr Arbeitgeber und andere Einkommensquellen. Auf dieser Seite können Sie diese bearbeiten oder entfernen.',
'budgets-index' => 'Diese Seite zeigt Ihnen einen Überblick über Ihre Budgets. Die obere Leiste zeigt den Betrag, der zur Verfügung steht. Dieser kann für einen Zeitraum angepasst werden, indem Sie auf den Betrag auf der rechten Seite klicken. Wie viel bisher ausgegeben wurde wird darunter angezeigt. Darunter sind die Aufwendungen pro Haushalt und wie viel dafür veranschlagt ist.',
'reports-index-start' => 'Firefly III unterstützt vier Berichtarten. Mehr Informationen hierzu können durch ein Klick auf das eine monatliche Finanzübersicht , eine jährliche Finanzübersicht und eine Haushaltsübersicht .',
+ 'reports-index-examples' => 'Sehen Sie sich auch diese Beispiele an: eine monatliche Finanzübersicht , eine jährliche Finanzübersicht und eine Haushaltsübersicht .',
'currencies-index' => 'Firefly III unterstützt mehrere Währungen. Obwohl es den Euro standardmäßig nutzt, ist es möglich US-Dollar oder viele andere Währungen zu verwenden. Wie Sie sehen können, ist eine kleine Auswahl an Währungen aufgenommen worden, aber Sie können Ihre eigenen hinzufügen. Die Standardwährung zu ändern, wird die Währung der vorhandenen Buchungen jedoch nicht ändern: Firefly III unterstützt die Verwendung mehrerer Währungen zur gleichen Zeit.',
'transactions-index' => 'Diese Aufwendungen, Einzahlungen und Überweisungen sind nicht besonders einfallsreich. Sie wurden automatisch generiert.',
'piggy-banks-index' => 'Wie Sie sehen können, gibt es drei Sparschweine. Benutzen die Plus- und Minusknöpfe um die Menge des Geldes in den Sparschweinen zu beeinflussen. Klicken Sie auf den Namen des Sparschweins um Details einzusehen.',
- 'import-index' => 'Natürlich kann jede CSV-Datei in Firefly III importiert werden ',
+ 'import-index' => 'Natürlich kann jede CSV-Datei in Firefly III importiert werden',
'import-configure-security' => 'Aufgrund von Sicherheitsbedenken wurde der Upload mit einer lokalen Datei ersetzt.',
'import-configure-configuration' => 'Die unten stehende Konfiguration für die lokale Datei ist korrekt.',
];
diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index e7afb2d94c..d5590a87dc 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Unvollständige Übersetzung',
'close' => 'Schließen',
'actions' => 'Aktionen',
'edit' => 'Bearbeiten',
'delete' => 'Löschen',
'welcomeBack' => 'Was ist gerade los?',
'everything' => 'Alle',
+ 'today' => 'heute',
'customRange' => 'Individueller Bereich',
'apply' => 'Übernehmen',
'select_date' => 'Wähle ein Datum..',
@@ -71,7 +73,7 @@ return [
'destination_accounts' => 'Zielkonto',
'user_id_is' => 'Ihre Benutzerkennung ist :user ',
'field_supports_markdown' => 'Diese Feld unterstützt Abschlag .',
- 'need_more_help' => 'Wenn du Hilfe beim Bedienen von Firefly III brauchst, erstelle ein Ticket auf Github .',
+ 'need_more_help' => 'Wenn Sie Hilfe beim Bedienen von Firefly III brauchen, erstellen Sie ein Ticket auf Github .',
'reenable_intro_text' => 'Sie können auch die Einführung wieder aktivieren.',
'intro_boxes_after_refresh' => 'Die Einführungsfelder werden wieder angezeigt, wenn Sie die Seite aktualisieren.',
'show_all_no_filter' => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
@@ -85,10 +87,10 @@ return [
'sum_of_income' => 'Summe von Einnahmen',
'spent_in_specific_budget' => 'Ausgegeben in Budget ":budget"',
'sum_of_expenses_in_budget' => 'Vollkommen ausgegeben in Budget ":budget"',
- 'left_in_budget_limit' => 'Übrig zum ausgeben aufgrund der Budgetierung',
- 'current_period' => 'Aktuelle Periode',
- 'show_the_current_period_and_overview' => 'Zeigen Sie die aktuelle Periode und die Übersicht',
- 'pref_languages_locale' => 'Damit eine andere Sprache als Englisch richtig funktioniert muss Ihr Betriebssystem mit den korrekten Gebietsschema-Informationen ausgestattet werden. Wenn diese nicht vorhanden sind, können die Währungsdaten, Terminen und Mengen falsch formatiert.',
+ 'left_in_budget_limit' => 'Übrig zum Ausgeben aufgrund der Budgetierung',
+ 'current_period' => 'Aktueller Zeitraum',
+ 'show_the_current_period_and_overview' => 'Zeigen Sie den aktuellen Zeitraum und die Übersicht',
+ 'pref_languages_locale' => 'Damit eine andere Sprache als Englisch richtig funktioniert muss Ihr Betriebssystem mit den korrekten Gebietsschema-Informationen ausgestattet werden. Wenn diese nicht vorhanden sind, können die Währungsdaten, Termine und Mengen falsch formatiert.',
'budget_in_period' => 'Alle Transaktionen für Haushalt :name zwischen :start und :end',
'chart_budget_in_period' => 'Diagramm für alle Transaktionen des Haushalts ":name" zwischen :start und :end',
'chart_account_in_period' => 'Diagramm für alle Transaktionen des Kontos ":name" zwischen :start und :end',
@@ -129,7 +131,8 @@ return [
'transfer_exchange_rate_instructions' => 'Das Quellkonto "@source_name" akzeptiert nur Transaktionen in @source_currency. Das Zielkonto "@dest_name" akzeptiert nur Transaktionen in @dest_currency. Sie müssen den Betrag in beiden Währungen korrekt angeben.',
'transaction_data' => 'Transaktionsdaten',
'invalid_server_configuration' => 'Ungültige Serverkonfiguration',
- 'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'invalid_locale_settings' => 'Firefly III kann keine Geldbeträge formatieren, da auf Ihrem Server die erforderlichen Pakete fehlen. Es gibt eine Anleitung , wie dies behoben werden kann.',
+ 'quickswitch' => 'Schnellauswahl',
// search
'search' => 'Suche',
@@ -144,10 +147,10 @@ return [
// repeat frequencies:
'repeat_freq_yearly' => 'Jährlich',
- 'repeat_freq_half-year' => 'every half-year',
- 'repeat_freq_quarterly' => 'quarterly',
+ 'repeat_freq_half-year' => 'halbjährlich',
+ 'repeat_freq_quarterly' => 'vierteljährlich',
'repeat_freq_monthly' => 'monatlich',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'wöchentlich',
'weekly' => 'wöchentlich',
'quarterly' => 'vierteljährlich',
'half-year' => 'halbjährlich',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Ohne Datum',
'result' => 'Ergebnis',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'Um die Karte zu verwenden, besorgen Sie sich einen API-Schlüssel von Mapbox . Öffnen Sie Ihre .env Datei und geben Sie diesen Code unter MAPBOX_API_KEY= ein.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -435,25 +439,25 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'password_changed' => 'Passwort geändert!',
'should_change' => 'Ziel ist es, ihr Passwort zu ändern.',
'invalid_password' => 'Ungültiges Passwort!',
- 'what_is_pw_security' => 'Was ist "Kennwort Sicherheit überprüfen"?',
+ 'what_is_pw_security' => 'Was ist "Passwortsicherheit überprüfen"?',
'secure_pw_title' => 'So wählen Sie ein sicheres Passwort aus',
'secure_pw_history' => 'Im August 2017 veröffentlichte die bekannte Sicherheitsforscherin Troy Hunt eine Liste von 306 Millionen gestohlenen Passwörtern. Diese Passwörter wurden während der Einbrüche bei Firmen wie LinkedIn, Adobe und NeoPets (und vielen mehr) gestohlen.',
- 'secure_pw_check_box' => 'By checking the box, Firefly III will send the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.',
+ 'secure_pw_check_box' => 'Wenn Sie das Kontrollkästchen aktivieren, wird Firefly III den SHA1-Hash Ihres Passworts an die Website von Troy Hunt senden, um zu sehen, ob es auf der Liste steht. Dies verhindert, dass Sie unsichere Passwörter verwenden, was in der aktuellen NIST-Sonderveröffentlichung zu diesem Thema empfohlen wird.',
'secure_pw_sha1' => 'Aber ich dachte, dass SHA1 schon geknackt wurde?',
- 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1 , it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.',
- 'secure_pw_hash_security' => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.',
+ 'secure_pw_hash_speed' => 'Ja, aber nicht in diesem Zusammenhang. Wie Sie auf auf der Website, die erklärt, wie SHA1 gebrochen wurde, lesen können , ist es jetzt etwas leichter, eine "Kollision" zu finden: eine andere Zeichenfolge, die zu demselben SHA1-Hash führt. Es dauert nur mehr 10.000 Jahre mit einer Single-GPU-Maschine.',
+ 'secure_pw_hash_security' => 'Diese Kollision wäre nicht gleich Ihrem Passwort, noch wäre es nützlich auf (einer Seite wie) Firefly III. Diese Anwendung verwendet SHA1 nicht zur Passwortüberprüfung. Es ist also sicher, dieses Kästchen zu aktivieren. Ihr Passwort wird gehasht und über HTTPS übertragen.',
'secure_pw_should' => 'Soll ich die Box ankreuzen?',
- 'secure_pw_long_password' => 'Wenn du gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert hast: Nein .',
+ 'secure_pw_long_password' => 'Wenn Sie gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert haben: Nein .',
'secure_pw_short' => 'Wenn Sie gerade das Passwort eingegeben haben, welches Sie immer verwenden: Bitte ja .',
'personal_access_token' => 'Persönlicher Zugangs-Token',
'explain_access_token' => 'You need this token to perform command line options, such as importing or exporting data. Without it, such sensitive commands will not work. Do not share your access token. Nobody will ask you for this token, not even me. If you fear you lost this, or when you\'re paranoid, regenerate this token using the button.',
'regenerate_access_token' => 'Zugangs-Token neu erstellen',
'token_regenerated' => 'Ein neuer Zugangs-Token wurde generiert',
'change_your_email' => 'E-Mail Adresse ändern',
- 'email_verification' => 'An email message will be sent to your old AND new email address. For security purposes, you will not be able to login until you verify your new email address. If you are unsure if your Firefly III installation is capable of sending email, please do not use this feature. If you are an administrator, you can test this in the Administration .',
+ 'email_verification' => 'Eine E-Mail-Nachricht wird an Ihre alte UND neue E-Mail-Adresse gesendet. Aus Sicherheitsgründen können Sie sich erst anmelden, wenn Sie Ihre neue E-Mail-Adresse bestätigt haben. Wenn Sie sich nicht sicher sind, ob Ihre Firefly III-Installation E-Mails versenden kann, verwenden Sie bitte diese Funktion nicht. Wenn Sie Administrator sind, können Sie dies in der Administration testen.',
'email_changed_logout' => 'Sie müssen Ihre E-Mail-Adresse bestätigen, um sich anmelden zu können.',
- 'login_with_new_email' => 'You can now login with your new email address.',
- 'login_with_old_email' => 'You can now login with your old email address again.',
+ 'login_with_new_email' => 'Sie können sich jetzt mit Ihrer neuen E-Mail-Adresse anmelden.',
+ 'login_with_old_email' => 'Sie können sich jetzt wieder mit Ihrer alten E-Mail-Adresse anmelden.',
// attachments
@@ -556,9 +560,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'update_budget' => 'Budget aktualisieren',
'update_budget_amount_range' => 'Aktualisiere (erwarteten) verfügbaren Betrag zwischen :start und :end',
'budget_period_navigator' => 'Zeitraum-navigator',
- 'info_on_available_amount' => 'What do I have available?',
+ 'info_on_available_amount' => 'Was habe ich verfügbar?',
'available_amount_indication' => 'Use these amounts to get an indication of what your total budget could be.',
- 'suggested' => 'Suggested',
+ 'suggested' => 'Vorgeschlagen',
'average_between' => 'Average between :start and :end',
@@ -587,6 +591,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'not_expected_period' => 'Diesen Zeitraum nicht erwartet',
'bill_is_active' => 'Rechnung ist aktiv',
'bill_will_automatch' => 'Rechnung wird automatisch mit passenden Transaktionen verknüpft',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'Details für Girokonto ":name"',
'details_for_expense' => 'Details für Debitor ":name"',
@@ -615,18 +621,55 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'revenue_accounts' => 'Schuldner',
'cash_accounts' => 'Bargeldkonten',
'Cash account' => 'Bargeldkonto',
+ 'reconcile_account' => 'Konto ":account" ausgleichen',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Kontotyp',
'save_transactions_by_moving' => 'Speichern Sie diese Transaktion(en), indem Sie sie auf ein anderes Konto verschieben:',
'stored_new_account' => 'Neues Konto ":name" gespeichert!',
'updated_account' => 'Konto ":name" aktualisiert',
'credit_card_options' => 'Kreditkartenoptionen',
- 'no_transactions_account' => 'Es gibt keine Transaktionen (in dieser Zeit) für Girokonto ":name".',
+ 'no_transactions_account' => 'Es gibt keine Transaktionen (in diesem Zeitraum) für das Girokonto ":name".',
'no_data_for_chart' => 'Es gibt derzeit (noch) nicht genügend Informationen, um dieses Diagramm zu generieren.',
- 'select_more_than_one_account' => 'Bitte mehr als ein Konto wählen',
- 'select_more_than_one_category' => 'Bitte mehr als eine Kategorie wählen',
- 'select_more_than_one_budget' => 'Bitte mehr als ein Budget wählen',
+ 'select_more_than_one_account' => 'Bitte wählen Sie mehr als einen Konto aus',
+ 'select_more_than_one_category' => 'Bitte wählen Sie mehr als eine Kategorie aus',
+ 'select_more_than_one_budget' => 'Bitte wählen Sie mehr als einen Budget aus',
'select_more_than_one_tag' => 'Bitte wählen Sie mehr als einen Tag aus',
'account_default_currency' => 'Wenn Sie eine andere Währung auswählen, werden neue Transaktionen von diesem Konto standardmäßig diese Währung ausgewählt haben.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'Sie können dies jederzeit später bearbeiten oder löschen.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'Neue Kategorie',
@@ -660,11 +703,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'stored_journal' => 'Neue Überweisung ":description" erfolgreich erstellt',
'select_transactions' => 'Überweisungen auswählen',
'stop_selection' => 'Auswahl von Überweisungen stoppen',
- 'edit_selected' => 'Auswahl bearbeiten',
- 'delete_selected' => 'Auswahl löschen',
+ 'reconcile_selected' => 'Ausgleichen',
'mass_delete_journals' => 'Löschen Sie eine Reihe von Überweisungen',
'mass_edit_journals' => 'Bearbeiten Sie eine Reihe von Überweisungen',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'no_budget' => '(kein Budget)',
'perm-delete-many' => 'Das Löschen von mehreren Elementen auf einmal kann sich störend auswirken. Bitte seien Sie vorsichtig.',
'mass_deleted_transactions_success' => ':amount Überweisung(en) gelöscht.',
'mass_edited_transactions_success' => ':amount Überweisung(en) aktualisiert',
@@ -677,11 +720,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
// new user:
'welcome' => 'Willkommen bei Firefly!',
- 'submit' => 'Bestätigen',
+ 'submit' => 'Absenden',
'getting_started' => 'Erste Schritte',
- 'to_get_started' => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+ 'to_get_started' => 'Es ist schön, dass Sie Firefly III erfolgreich installiert haben. Um mit diesem Tool zu beginnen, geben Sie bitte den Namen Ihrer Bank und das Guthaben Ihres Hauptkontos ein. Machen Sie sich keine Sorgen, wenn Sie mehrere Konten haben. Sie können diese später hinzufügen. Dies ist nur der Anfang.',
'savings_balance_text' => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
- 'finish_up_new_user' => 'That\'s it! You can continue by pressing Submit . You will be taken to the index of Firefly III.',
+ 'finish_up_new_user' => 'Das war\'s! Sie können fortfahren, indem Sie Absenden drücken. Sie werden zur Startseite von Firefly III gebracht.',
'stored_new_accounts_new_user' => 'Yay! Ihre neuen Konten wurden gespeichert.',
// home page:
@@ -694,13 +737,15 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'bills_to_pay' => 'Unbezahlte Rechnungen',
'per_day' => 'Pro Tag',
'left_to_spend_per_day' => 'Left to spend per day',
- 'bills_paid' => 'Bills paid',
+ 'bills_paid' => 'Rechnungen bezahlt',
// menu and titles, should be recycled as often as possible:
'currency' => 'Währung',
'preferences' => 'Einstellungen',
'logout' => 'Abmelden',
+ 'toggleNavigation' => 'Navigation umschalten',
'searchPlaceholder' => 'Suchen...',
+ 'version' => 'Version',
'dashboard' => 'Übersicht',
'currencies' => 'Währungen',
'accounts' => 'Konten',
@@ -720,11 +765,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'piggyBanks' => 'Sparschweine',
'bills' => 'Rechnungen',
'withdrawal' => 'Ausgabe',
- 'deposit' => 'Einzahlung',
+ 'deposit' => 'Einnahme',
'account' => 'Konto',
'transfer' => 'Überweisung',
'Withdrawal' => 'Ausgabe',
- 'Deposit' => 'Einzahlung',
+ 'Deposit' => 'Einnahme',
'Transfer' => 'Überweisung',
'bill' => 'Rechnung',
'yes' => 'Ja',
@@ -826,8 +871,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'account_role_sharedAsset' => 'Shared asset account',
'account_role_savingAsset' => 'Sparkonto',
'account_role_ccAsset' => 'Kreditkarte',
- 'budget_chart_click' => 'Please click on a budget name in the table above to see a chart.',
- 'category_chart_click' => 'Please click on a category name in the table above to see a chart.',
+ 'budget_chart_click' => 'Klicken Sie auf einen Budgetnamen in der obigen Tabelle, um ein Diagramm anzuzeigen.',
+ 'category_chart_click' => 'Klicken Sie auf einen Kategorienamen in der obigen Tabelle, um ein Diagramm zu sehen.',
// charts:
@@ -840,7 +885,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'earned' => 'Verdient',
'overspent' => 'Zuviel ausgegeben',
'left' => 'Übrig',
- 'no_budget' => '(kein Budget)',
+ 'no_budget' => '(no budget)',
'max-amount' => 'Höchstbetrag',
'min-amount' => 'Mindestbetrag',
'journal-amount' => 'Aktueller Rechnungseintrag',
@@ -867,11 +912,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'sum_of_piggy_banks' => 'Summe der Sparschweine',
'saved_so_far' => 'Gespart',
'left_to_save' => 'Zu Sparen',
- 'suggested_amount' => 'Suggested monthly amount to save',
+ 'suggested_amount' => 'Empfohlener monatliche Sparbetrag',
'add_money_to_piggy_title' => 'Geld dem Sparschwein ":name" hinzufügen',
'remove_money_from_piggy_title' => 'Geld dem Sparschwein ":name" entnehmen',
'add' => 'Hinzufügen',
- 'no_money_for_piggy' => 'You have no money to put in this piggy bank.',
+ 'no_money_for_piggy' => 'Sie haben kein Geld, welches Sie in dieses Sparschwein geben können.',
'remove' => 'Entfernen',
'max_amount_add' => 'Der maximale Betrag, den Sie hinzufügen können ist',
@@ -904,7 +949,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'transaction_journal_information' => 'Transaktionsinformationen',
'transaction_journal_meta' => 'Metainformationen',
'total_amount' => 'Gesamtbetrag',
- 'number_of_decimals' => 'Anzahl der Dezimalstellen',
+ 'number_of_decimals' => 'Anzahl der Nachkommastellen',
// administration
'administration' => 'Administration',
@@ -926,10 +971,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'budgets_with_limits' => 'Budget(s) mit konfigurierten Betrag',
'rule_or_rules' => 'Regel(n)',
'rulegroup_or_groups' => 'Regelgruppe(n)',
+ 'tag_or_tags' => 'Tag(s)',
'configuration_updated' => 'Die Konfiguration wurde aktualisiert',
'setting_is_demo_site' => 'Demonstrationsseite',
'setting_is_demo_site_explain' => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungewollte Auswirkungen haben kann.',
- 'block_code_bounced' => 'Email message(s) bounced',
+ 'block_code_bounced' => 'E-Mail-Nachricht(en) wurden abgewiesen',
'block_code_expired' => 'Demo-Konto abgelaufen',
'no_block_code' => 'Kein Grund für Block oder Benutzer nicht blockiert',
'block_code_email_changed' => 'Der Benutzer hat die neue E-Mail-Adresse noch nicht bestätigt',
@@ -962,20 +1008,20 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'link_transaction' => 'Link transaction',
'link_to_other_transaction' => 'Link this transaction to another transaction',
'select_transaction_to_link' => 'Select a transaction to link this transaction to',
- 'this_transaction' => 'This transaction',
+ 'this_transaction' => 'Diese Transaktion',
'transaction' => 'Transaction',
- 'comments' => 'Comments',
+ 'comments' => 'Kommentare',
'to_link_not_found' => 'If the transaction you want to link to is not listed, simply enter its ID.',
- 'invalid_link_selection' => 'Cannot link these transactions',
+ 'invalid_link_selection' => 'Diese Transaktionen können nicht verknüpft werden',
'journals_linked' => 'Transactions are linked.',
'journals_error_linked' => 'These transactions are already linked.',
'journal_links' => 'Transaction links',
'this_withdrawal' => 'This withdrawal',
- 'this_deposit' => 'This deposit',
+ 'this_deposit' => 'Diese Einnahme',
'this_transfer' => 'This transfer',
'overview_for_link' => 'Overview for link type ":name"',
'source_transaction' => 'Source transaction',
- 'link_description' => 'Link description',
+ 'link_description' => 'Linkbeschreibung',
'destination_transaction' => 'Destination transaction',
'delete_journal_link' => 'Delete the link between :source and :destination ',
'deleted_link' => 'Deleted link',
@@ -1001,7 +1047,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'split_this_transfer' => 'Diese Überweisung aufteilen',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
- 'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
+ 'cannot_edit_opening_balance' => 'Sie können die Eröffnungsbilanz eines Kontos nicht bearbeiten.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1013,6 +1060,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'import_index_title' => 'Daten in Firefly III importieren',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Willkommen beim Importassistenten von Firefly. Es gibt einige Möglichkeiten, Daten in Firefly III zu importieren, die hier als Schaltflächen angezeigt werden.',
+ 'import_general_index_csv_file' => 'Importiere eine (CSV) Datei',
'import_index_intro' => 'Dieser Assistent hilft Ihnen, Dateien von Ihrer Bank in Firefly III zu importieren. Bitte sehen Sie sich die Hilfeseiten in der oberen rechten Ecke an.',
'import_index_file' => 'Datei auswählen',
'import_index_config' => 'Wenn Sie bereits zuvor Daten in Firefly III importiert haben, haben Sie eventuell eine Kofigurationsdatei, welche einige Einstellungen für Sie voreinstellt. Für einige Banken haben andere Nutzer freundlicherweise bereits ihre Konfigurationsdatei zur Verfügung gestellt.',
@@ -1028,31 +1076,31 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'import_config_bread_crumb' => 'Set up your import file',
// import status page:
- 'import_status_bread_crumb' => 'Import status',
- 'import_status_sub_title' => 'Import status',
- 'import_status_wait_title' => 'Please hold...',
- 'import_status_wait_text' => 'This box will disappear in a moment.',
+ 'import_status_bread_crumb' => 'Importstatus',
+ 'import_status_sub_title' => 'Importstatus',
+ 'import_status_wait_title' => 'Bitte warten...',
+ 'import_status_wait_text' => 'Diese Box wird gleich verschwinden.',
'import_status_ready_title' => 'Der Import ist startbereit',
- 'import_status_ready_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
- 'import_status_ready_config' => 'Download configuration',
- 'import_status_ready_start' => 'Start the import',
- 'import_status_ready_share' => 'Please consider downloading your configuration and sharing it at the import configuration center Sammlung an Import-Einstellungen :tag .',
+ 'import_status_finished_job' => 'Die importierten Transaktionen finden Sie im Tag : tag .',
'import_status_job_running' => 'Der Import läuft...',
'import_with_key' => 'Import with key \':key\'',
// sandstorm.io errors and messages:
- 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
+ 'sandstorm_not_available' => 'Diese Funktion ist nicht verfügbar, wenn Sie Firefly III in einer Sandstorm.io-Umgebung verwenden.',
// empty lists? no objects? instructions:
'no_accounts_title_asset' => 'Let\'s create an asset account!',
@@ -1068,36 +1116,36 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'no_accounts_imperative_revenue' => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
'no_accounts_create_revenue' => 'Create a revenue account',
'no_budgets_title_default' => 'Let\'s create a budget',
- 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organise your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+ 'no_budgets_intro_default' => 'Sie haben noch keine Budgets. Budgets werden verwendet, um Ihre Ausgaben in logischen Gruppen zu organisieren, die Sie mit einem Limit versehen können, um Ihre Ausgaben zu begrenzen.',
'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
'no_budgets_create_default' => 'Ein Budget erstellen',
- 'no_categories_title_default' => 'Lassen Sie uns eine Kategorie erstellen!',
+ 'no_categories_title_default' => 'Erstellen wir eine Kategorie!',
'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
'no_categories_create_default' => 'Eine Kategorie erstellen',
- 'no_tags_title_default' => 'Lassen Sie uns ein Tag erstellen!',
+ 'no_tags_title_default' => 'Erstellen wir einen Tag!',
'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
'no_tags_create_default' => 'Ein neues Tag erstellen',
'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
- 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
- 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+ 'no_transactions_intro_withdrawal' => 'Sie haben noch keine Ausgaben verbucht. Sie sollten Ausgabenseinträge erstellen, um Ihre Finanzen zu verwalten.',
+ 'no_transactions_imperative_withdrawal' => 'Haben Sie Geld ausgegeben? Dann sollten Sie es aufschreiben:',
'no_transactions_create_withdrawal' => 'Eine neue Ausgabe erstellen',
'no_transactions_title_deposit' => 'Let\'s create some income!',
- 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
- 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
- 'no_transactions_create_deposit' => 'Create a deposit',
+ 'no_transactions_intro_deposit' => 'Sie haben noch keine Einnahmen verbucht. Sie sollten Einkommenseinträge erstellen, um Ihre Finanzen zu verwalten.',
+ 'no_transactions_imperative_deposit' => 'Haben Sie Geld erhalten? Dann sollten Sie es aufschreiben:',
+ 'no_transactions_create_deposit' => 'Eine Einnahme erstellen',
'no_transactions_title_transfers' => 'Let\'s create a transfer!',
- 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
- 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
+ 'no_transactions_intro_transfers' => 'Sie haben noch keine Transfers. Wenn Sie Geld zwischen Ihren Konten bewegen, wird es als Überweisung erfasst.',
+ 'no_transactions_imperative_transfers' => 'Haben Sie Geld überwiesen? Dann sollten Sie es aufschreiben:',
'no_transactions_create_transfers' => 'Eine Überweisung erstellen',
'no_piggies_title_default' => 'Let\'s create a piggy bank!',
- 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
- 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
- 'no_piggies_create_default' => 'Create a new piggy bank',
+ 'no_piggies_intro_default' => 'Sie haben noch keine Sparscheine. Sie können Sparschweine erstellen, um Ihre Ersparnisse zu teilen und den Überblick darüber zu behalten, wofür Sie sparen.',
+ 'no_piggies_imperative_default' => 'Haben Sie Dinge, auf die Sie sparen? Erstellen Sie eine Sparschwein und behalten Sie den Überblick:',
+ 'no_piggies_create_default' => 'Ein neues Sparschwein erstellen',
'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
- 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+ 'no_bills_intro_default' => 'Du hast noch keine Rechnungen. Sie können Rechnungen erstellen, um die laufenden Ausgaben, wie zum Beispiel Ihre Versicherung oder Miete, nachzuverfolgen.',
+ 'no_bills_imperative_default' => 'Haben Sie regelmäßige Rechnungen? Erstellen Sie eine Rechnung und verfolgen Sie Ihre Zahlungen:',
'no_bills_create_default' => 'Eine Rechnung erstellen',
diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 8d8c9157f2..2714fae3e4 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -33,7 +33,7 @@ return [
'journal_source_account_name' => 'Kreditor (Quelle)',
'journal_source_account_id' => 'Girokonto (Quelle)',
'BIC' => 'BIC',
- 'verify_password' => 'Überprüfen Sie die Kennwortsicherheit',
+ 'verify_password' => 'Passwortsicherheit überprüfen',
'source_account' => 'Quellkonto',
'destination_account' => 'Zielkonto',
'journal_destination_account_id' => 'Girokonto (Ziel)',
@@ -57,19 +57,19 @@ return [
'ccMonthlyPaymentDate' => 'Monatliches Zahlungsdatum der Kreditkarte',
'piggy_bank_id' => 'Sparschwein',
'returnHere' => 'Hierhin zurückkehren',
- 'returnHereExplanation' => 'Nach dem Speichern, hierher zurückkehren und eine weitere zu erstellen.',
+ 'returnHereExplanation' => 'Nach dem Speichern hierher zurückkehren, um ein weiteres Element zu erstellen.',
'returnHereUpdateExplanation' => 'Nach dem Update, hierher zurückkehren.',
'description' => 'Beschreibung',
'expense_account' => 'Debitor (Ausgabe)',
'revenue_account' => 'Kreditor (Einnahme)',
'decimal_places' => 'Nachkommastellen',
- 'exchange_rate_instruction' => 'Ausländische Währungen',
+ 'exchange_rate_instruction' => 'Fremdwährungen',
'source_amount' => 'Betrag (Quelle)',
'destination_amount' => 'Betrag (Ziel)',
'native_amount' => 'Nativer Betrag',
'new_email_address' => 'Neue E-Mail-Adresse',
'verification' => 'Bestätigung',
- 'api_key' => 'API key',
+ 'api_key' => 'API-Schlüssel',
'source_account_asset' => 'Quellkonto (Bestandskonto)',
'destination_account_expense' => 'Zielkonto (Unkostenkonto)',
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Dauerhaft löschen',
'cancel' => 'Abbrechen',
'targetdate' => 'Zieldatum',
+ 'startdate' => 'Startdatum',
'tag' => 'Tag',
'under' => 'Unter',
'symbol' => 'Zeichen',
@@ -147,7 +148,7 @@ return [
'journal_areYouSure' => 'Sind Sie sicher, dass Sie die Überweisung mit dem Namen ":description" löschen möchten?',
'mass_journal_are_you_sure' => 'Sind Sie sicher, dass Sie diese Überweisung löschen möchten?',
'tag_areYouSure' => 'Sind Sie sicher, dass Sie den Tag ":name" löschen möchten?',
- 'journal_link_areYouSure' => 'Bist du sicher, dass du die Verknüpfung zwischen :source und :destination löschen möchtest?',
+ 'journal_link_areYouSure' => 'Sind Sie sicher, dass Sie die Verknüpfung zwischen :source und :destination löschen möchten?',
'linkType_areYouSure' => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
'permDeleteWarning' => 'Das Löschen von Dingen in Firefly ist dauerhaft und kann nicht rückgängig gemacht werden.',
'mass_make_selection' => 'Sie können das Löschen von Elementen verhindern, indem Sie die Checkbox entfernen.',
@@ -164,7 +165,7 @@ return [
'email' => 'E-Mail Adresse',
'password' => 'Passwort',
- 'password_confirmation' => 'Passwort (nochmal)',
+ 'password_confirmation' => 'Passwort (wiederholen)',
'blocked' => 'Ist blockiert?',
'blocked_code' => 'Grund für Block',
diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php
index 7c470ca97f..7f181bb9f6 100644
--- a/resources/lang/de_DE/intro.php
+++ b/resources/lang/de_DE/intro.php
@@ -20,7 +20,7 @@ return [
// create account:
'accounts_create_iban' => 'Geben Sie Ihren Konten eine gültige IBAN. Dies könnte einen Datenimport in Zukunft sehr einfach machen.',
- 'accounts_create_asset_opening_balance' => 'Anlagekonten können ein "Eröffnungsguthaben" haben, welches den Beginn der Historie dieses Kontos in Firefly angibt.',
+ 'accounts_create_asset_opening_balance' => 'Anlagekonten können eine "Eröffnungsbilanz" haben, welche den Beginn der Historie dieses Kontos in Firefly angibt.',
'accounts_create_asset_currency' => 'Firefly III unterstützt mehrere Währungen. Anlagenkonten haben eine Hauptwährung, die Sie hier einstellen müssen.',
'accounts_create_asset_virtual' => 'Es kann manchmal helfen, Ihrem Konto ein virtuelles Gleichgewicht zu geben: eine zusätzliche Menge, die dem tatsächlichen Kontostand immer hinzugefügt oder daraus entfernt wird.',
@@ -68,14 +68,14 @@ return [
// piggy banks index:
'piggy-banks_index_saved' => 'Dieses Feld zeigt Ihnen, wie viel Sie in jedem Sparschwein gespart haben.',
'piggy-banks_index_button' => 'Neben diesem Fortschrittsbalken befinden sich zwei Buttons (+ und -), um Geld von jedem Sparschwein hinzuzufügen oder zu entfernen.',
- 'piggy-banks_index_accountStatus' => 'In dieser Tabelle wird der Status der Anlagenkonten aufgeführt, die mindestens mit einem Sparschwein verbunden sind.',
+ 'piggy-banks_index_accountStatus' => 'In dieser Tabelle wird der Status der Anlagenkonten aufgeführt, die mit mindestens einem Sparschwein verbunden sind.',
// create piggy
- 'piggy-banks_create_name' => 'Was ist Ihr Ziel? Eine neue Couch, eine Kamera, Geld für Notfälle?',
+ 'piggy-banks_create_name' => 'Worauf sparen Sie? Eine neue Couch, eine Kamera, Geld für Notfälle?',
'piggy-banks_create_date' => 'Sie können ein Zieldatum oder einen Termin für Ihr Sparschwein festlegen.',
// show piggy
- 'piggy-banks_show_piggyChart' => 'Diese Grafik zeigt die Historie dieses Sparschweins.',
+ 'piggy-banks_show_piggyChart' => 'Dieses Diagramm zeigt den Verlauf dieses Sparschweins.',
'piggy-banks_show_piggyDetails' => 'Einige Details über Ihr Sparschwein',
'piggy-banks_show_piggyEvents' => 'Hinzufügungen oder Entfernungen sind hier ebenfalls aufgeführt.',
@@ -105,9 +105,9 @@ return [
'rules_index_outro' => 'Be sure to check out the help pages using the (?) icon in the top right!',
// create rule:
- 'rules_create_mandatory' => 'Choose a descriptive title, and set when the rule should be fired.',
+ 'rules_create_mandatory' => 'Wählen Sie einen aussagekräftigen Titel und legen Sie fest, wann die Regel ausgelöst werden soll.',
'rules_create_ruletriggerholder' => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.',
- 'rules_create_test_rule_triggers' => 'Use this button to see which transactions would match your rule.',
+ 'rules_create_test_rule_triggers' => 'Verwenden Sie diese Schaltfläche, um zu sehen, welche Transaktionen zu Ihrer Regel passen würden.',
'rules_create_actions' => 'Legen Sie so viele Aktionen fest, wie Sie möchten.',
// preferences
diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index 118d36becd..e021c7d5e9 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'Id',
'create_date' => 'Erstellt am',
'update_date' => 'Aktualisiert am',
- 'updated_at' => 'Aktualisiert am',
+ 'updated_at' => 'Aktualisiert am',
'balance_before' => 'Bilanz vor',
'balance_after' => 'Bilanz nach',
'name' => 'Name',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Summe der Auszahlungen',
'sum_deposits' => 'Summe der Einzahlungen',
'sum_transfers' => 'Summe der Überweisungen',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index f9e52e740e..2633ffb165 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
return [
'iban' => 'Dies ist keine gültige IBAN.',
'unique_account_number_for_user' => 'Es sieht so aus, als ob diese Kontonummer bereits verwendet würde.',
- 'deleted_user' => 'Aufgrund von Sicherheitsbeschränkungen ist eine Registrierung dieser Email-Adresse nicht zugelassen.',
+ 'deleted_user' => 'Aufgrund von Sicherheitsbeschränkungen ist eine Registrierung mit dieser E-Mail-Adresse nicht zugelassen.',
'rule_trigger_value' => 'Dieser Wert ist für den ausgewählten Trigger ungültig.',
'rule_action_value' => 'Dieser Wert ist für die gewählte Aktion ungültig.',
'file_already_attached' => 'Die hochgeladene Datei ":name" ist diesem Objekt bereits angehängt.',
@@ -89,5 +89,5 @@ return [
'in_array' => ':attribute existiert nicht in :other.',
'present' => 'Das :attribute Feld muss vorhanden sein.',
'amount_zero' => 'Der Gesamtbetrag darf nicht Null sein',
- 'secure_password' => 'Das ist kein sicheres Passwort. Bitte versuche es erneut. Weitere Informationen finden Sie unter https://goo.gl/NCh2tN',
+ 'secure_password' => 'Das ist kein sicheres Passwort. Bitte versuchen Sie es erneut. Weitere Informationen finden Sie unter https://goo.gl/NCh2tN',
];
diff --git a/resources/lang/en_US/bank.php b/resources/lang/en_US/bank.php
index 11f05b3785..4becc5984c 100644
--- a/resources/lang/en_US/bank.php
+++ b/resources/lang/en_US/bank.php
@@ -1,6 +1,8 @@
'Prerequisites for an import from bunq',
'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php
index 0be3587f3c..be62acdc7a 100644
--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Revenue, income and deposits',
'transfer_list' => 'Transfers',
'transfers_list' => 'Transfers',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Create new withdrawal',
'create_deposit' => 'Create new deposit',
'create_transfer' => 'Create new transfer',
'edit_journal' => 'Edit transaction ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Delete transaction ":description"',
'tags' => 'Tags',
'createTag' => 'Create new tag',
diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php
index eb7fe230b1..094df1e9a2 100644
--- a/resources/lang/en_US/csv.php
+++ b/resources/lang/en_US/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'Asset account ID (matching Firefly)',
'column_account-name' => 'Asset account (name)',
'column_amount' => 'Amount',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
'column_bill-id' => 'Bill ID (matching Firefly)',
'column_bill-name' => 'Bill name',
diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php
index 5c99a55718..c35b020f4a 100644
--- a/resources/lang/en_US/demo.php
+++ b/resources/lang/en_US/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
];
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 49daf7d145..718e80e255 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Incomplete translation',
'close' => 'Close',
'actions' => 'Actions',
'edit' => 'Edit',
'delete' => 'Delete',
'welcomeBack' => 'What\'s playing?',
'everything' => 'Everything',
+ 'today' => 'today',
'customRange' => 'Custom range',
'apply' => 'Apply',
'select_date' => 'Select date..',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Transaction data',
'invalid_server_configuration' => 'Invalid server configuration',
'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Search',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'monthly',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'weekly',
'weekly' => 'weekly',
'quarterly' => 'quarterly',
'half-year' => 'every half year',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Without date',
'result' => 'Result',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox . Open your .env file en enter this code after MAPBOX_API_KEY=.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Not expected this period',
'bill_is_active' => 'Bill is active',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'Details for asset account ":name"',
'details_for_expense' => 'Details for expense account ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Revenue accounts',
'cash_accounts' => 'Cash accounts',
'Cash account' => 'Cash account',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'New category',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Successfully created new transaction ":description"',
'select_transactions' => 'Select transactions',
'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
+ 'reconcile_selected' => 'Reconcile',
'mass_delete_journals' => 'Delete a number of transactions',
'mass_edit_journals' => 'Edit a number of transactions',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'no_budget' => 'none',
'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Currency',
'preferences' => 'Preferences',
'logout' => 'Logout',
+ 'toggleNavigation' => 'Toggle navigation',
'searchPlaceholder' => 'Search...',
+ 'version' => 'Version',
'dashboard' => 'Dashboard',
'currencies' => 'Currencies',
'accounts' => 'Accounts',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budget(s) with configured amount',
'rule_or_rules' => 'rule(s)',
'rulegroup_or_groups' => 'rule group(s)',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'The configuration has been updated',
'setting_is_demo_site' => 'Demo site',
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Split this transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Import data into Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+ 'import_general_index_csv_file' => 'Import a (CSV) file',
'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
'import_index_file' => 'Select your file',
'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a bill',
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 24d6519276..6d7a98c2fe 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Delete permanently',
'cancel' => 'Cancel',
'targetdate' => 'Target date',
+ 'startdate' => 'Start date',
'tag' => 'Tag',
'under' => 'Under',
'symbol' => 'Symbol',
diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index 992afacc40..8129b082fc 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Created at',
'update_date' => 'Updated at',
- 'updated_at' => 'Updated at',
+ 'updated_at' => 'Updated at',
'balance_before' => 'Balance before',
'balance_after' => 'Balance after',
'name' => 'Name',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Sum of withdrawals',
'sum_deposits' => 'Sum of deposits',
'sum_transfers' => 'Sum of transfers',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/es_ES/bank.php b/resources/lang/es_ES/bank.php
index 11f05b3785..d331576355 100644
--- a/resources/lang/es_ES/bank.php
+++ b/resources/lang/es_ES/bank.php
@@ -1,6 +1,8 @@
'Prerequisites for an import from bunq',
- 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app.',
-];
\ No newline at end of file
+ 'bunq_prerequisites_title' => 'Requisitos previos para una importación de bunq',
+ 'bunq_prerequisites_text' => 'Para importar de bunq, necesita obtener una clave de API. Puedes hacer esto a través de la aplicación.',
+];
diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php
index be02ccc42a..11056d5703 100644
--- a/resources/lang/es_ES/breadcrumbs.php
+++ b/resources/lang/es_ES/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Ganancia, ingresos y depósitos',
'transfer_list' => 'Transferencias',
'transfers_list' => 'Transferencias',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Crear nuevo retiro',
'create_deposit' => 'Crear nuevo depósito',
'create_transfer' => 'Crear nueva transferencia',
'edit_journal' => 'Editar transacción ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Eliminar transacción ":description"',
'tags' => 'Etiquetas',
'createTag' => 'Crear nueva etiqueta',
diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php
index 42c5abf09a..452567e105 100644
--- a/resources/lang/es_ES/csv.php
+++ b/resources/lang/es_ES/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'ID de la caja de ahorro (coincide con Firefly)',
'column_account-name' => 'Caja de ahorro (nombre)',
'column_amount' => 'Monto',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Monto (coma como separador de decimales)',
'column_bill-id' => 'ID de factura (coincide con Firefly)',
'column_bill-name' => 'Nombre de factura',
diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php
index dfb4fc04c7..62a8b022e8 100644
--- a/resources/lang/es_ES/demo.php
+++ b/resources/lang/es_ES/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III admite múltiples monedas. A pesar de que la moneda por defecto es el Euro, se puede seleccionar el Dólar de EE.UU, y muchas otras monedas. Como se puede ver se ha incluido una pequeña selección de monedas, pero puedes agregar tu propia moneda si lo deseas. Sin embargo, cambiar la moneda predeterminada no cambiará la moneda de las transacciones existentes: Firefly III admite el uso de varias monedas al mismo tiempo.',
'transactions-index' => 'Estos gastos, depósitos y transferencias no son particularmente imaginativos. Se han generado automáticamente.',
'piggy-banks-index' => 'Como puede ver, hay tres alcancías. Utilice los botones más y menos para influir en la cantidad de dinero en cada alcancía. Haga clic en el nombre de la alcancía para ver la administración de cada una.',
- 'import-index' => 'Por supuesto, cualquier archivo CSV puede ser importado en Firefly III',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
'import-configure-security' => 'Debido a problemas de seguridad, su subida se ha sustituido por un archivo local.',
'import-configure-configuration' => 'La configuración que ves a continuación es correcta para el archivo local.',
];
diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index fe8a9cc315..c567acc384 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Incomplete translation',
'close' => 'Cerrar',
'actions' => 'Acciones',
'edit' => 'Editar',
'delete' => 'Eliminar',
'welcomeBack' => '¿Qué está pasando?',
'everything' => 'Todo',
+ 'today' => 'today',
'customRange' => 'Rango personalizado',
'apply' => 'Aplicar',
'select_date' => 'Seleccionar fecha...',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Transaction data',
'invalid_server_configuration' => 'Invalid server configuration',
'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Buscar',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'monthly',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'weekly',
'weekly' => 'weekly',
'quarterly' => 'quarterly',
'half-year' => 'every half year',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Without date',
'result' => 'Result',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox . Open your .env file en enter this code after MAPBOX_API_KEY=.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Not expected this period',
'bill_is_active' => 'Bill is active',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'Details for asset account ":name"',
'details_for_expense' => 'Details for expense account ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Cuentas de ingresos',
'cash_accounts' => 'Cuentas de efectivo',
'Cash account' => 'Cash account',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'New category',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Successfully created new transaction ":description"',
'select_transactions' => 'Select transactions',
'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
+ 'reconcile_selected' => 'Reconcile',
'mass_delete_journals' => 'Delete a number of transactions',
'mass_edit_journals' => 'Edit a number of transactions',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'no_budget' => '(no budget)',
'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Currency',
'preferences' => 'Preferencias',
'logout' => 'Cerrar sesión',
+ 'toggleNavigation' => 'Toggle navigation',
'searchPlaceholder' => 'Buscar...',
+ 'version' => 'Version',
'dashboard' => 'Panel de control',
'currencies' => 'Divisas',
'accounts' => 'Cuentas',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'presupuesto(s) con el importe configurado',
'rule_or_rules' => 'regla(s)',
'rulegroup_or_groups' => 'rule group(s)',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'The configuration has been updated',
'setting_is_demo_site' => 'Demo site',
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Split this transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Importar datos a Firefly III',
'import_index_sub_title' => 'Índice',
'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+ 'import_general_index_csv_file' => 'Import a (CSV) file',
'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
'import_index_file' => 'Select your file',
'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => '¡Vamos a crear una factura!',
- 'no_bills_intro_default' => 'Aún no tienes facturas. Puedes crear facturas para realizar un seguimiento de los gastos periódicos, como el alquiler o un seguro.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => '¿Tienes facturas periódicas? Crea una factura y haz un seguimiento de tus pagos:',
'no_bills_create_default' => 'Crear una factura',
diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index ae0dcf5931..e201f9d429 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -30,25 +30,25 @@ return [
'currency_id' => 'Divisa',
'attachments' => 'Adjuntos',
'journal_amount' => 'Importe',
- 'journal_source_account_name' => 'Revenue account (source)',
- 'journal_source_account_id' => 'Asset account (source)',
+ 'journal_source_account_name' => 'Cuenta de ingresos (origen)',
+ 'journal_source_account_id' => 'Cuenta de activos (origen)',
'BIC' => 'BIC',
'verify_password' => 'Verificar la seguridad de contraseña',
'source_account' => 'Cuenta origen',
'destination_account' => 'Cuenta destino',
- 'journal_destination_account_id' => 'Asset account (destination)',
- 'asset_destination_account' => 'Asset account (destination)',
- 'asset_source_account' => 'Asset account (source)',
+ 'journal_destination_account_id' => 'Cuenta de activos (destino)',
+ 'asset_destination_account' => 'Cuenta de activos (destino)',
+ 'asset_source_account' => 'Cuenta de activos (origen)',
'journal_description' => 'Descripción',
'note' => 'Notas',
- 'split_journal' => 'Split this transaction',
- 'split_journal_explanation' => 'Split this transaction in multiple parts',
+ 'split_journal' => 'Dividir esta transacción',
+ 'split_journal_explanation' => 'Dividir esta transacción en múltiples partes',
'currency' => 'Divisa',
'account_id' => 'Cuenta',
'budget_id' => 'Presupuesto',
'openingBalance' => 'Saldo inicial',
'tagMode' => 'Modo de etiqueta',
- 'tag_position' => 'Tag location',
+ 'tag_position' => 'Etiquetar ubicación',
'virtualBalance' => 'Saldo virtual',
'targetamount' => 'Cantidad objetivo',
'accountRole' => 'Tipo de cuenta',
@@ -67,16 +67,16 @@ return [
'source_amount' => 'Importe (origen)',
'destination_amount' => 'Importe (destino)',
'native_amount' => 'Native amount',
- 'new_email_address' => 'New email address',
- 'verification' => 'Verification',
- 'api_key' => 'API key',
+ 'new_email_address' => 'Nueva dirección de email',
+ 'verification' => 'Verificación',
+ 'api_key' => 'Clave de API',
- 'source_account_asset' => 'Source account (asset account)',
- 'destination_account_expense' => 'Destination account (expense account)',
- 'destination_account_asset' => 'Destination account (asset account)',
- 'source_account_revenue' => 'Source account (revenue account)',
+ 'source_account_asset' => 'Cuenta de origen (cuenta de activos)',
+ 'destination_account_expense' => 'Cuenta de destino (cuenta de gastos)',
+ 'destination_account_asset' => 'Cuenta de destino (cuenta de activos)',
+ 'source_account_revenue' => 'Cuenta de origen (cuenta de ingresos)',
'type' => 'Tipo',
- 'convert_Withdrawal' => 'Convert withdrawal',
+ 'convert_Withdrawal' => 'Convertir extracción',
'convert_Deposit' => 'Convertir depósito',
'convert_Transfer' => 'Convertir transferencia',
@@ -90,7 +90,8 @@ return [
'tags' => 'Etiquetas',
'deletePermanently' => 'Borrar permanentemente',
'cancel' => 'Cancelar',
- 'targetdate' => 'Target date',
+ 'targetdate' => 'Fecha tope',
+ 'startdate' => 'Start date',
'tag' => 'Etiqueta',
'under' => 'Under',
'symbol' => 'Símbolo',
@@ -117,50 +118,50 @@ return [
'stop_processing' => 'Detener el procesamiento',
'start_date' => 'Inicio del rango',
'end_date' => 'Final del rango',
- 'export_start_range' => 'Start of export range',
- 'export_end_range' => 'End of export range',
+ 'export_start_range' => 'Inicio del rango de exportación',
+ 'export_end_range' => 'Fin del rango de exportación',
'export_format' => 'Formato del archivo',
'include_attachments' => 'Incluir archivos adjuntos subidos',
'include_old_uploads' => 'Incluir datos importados',
- 'accounts' => 'Export transactions from these accounts',
- 'delete_account' => 'Delete account ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'delete_budget' => 'Delete budget ":name"',
- 'delete_category' => 'Delete category ":name"',
+ 'accounts' => 'Exportar transacciones de estas cuentas',
+ 'delete_account' => 'Borrar cuenta ":name"',
+ 'delete_bill' => 'Eliminar factura ":name"',
+ 'delete_budget' => 'Eliminar presupuesto ":name"',
+ 'delete_category' => 'Eliminar categoría ":name"',
'delete_currency' => 'Eliminar divisa ":name"',
'delete_journal' => 'Eliminar la transacción con descripción ":description"',
'delete_attachment' => 'Eliminar adjunto ":name"',
'delete_rule' => 'Eliminar regla ":title"',
'delete_rule_group' => 'Eliminar grupo de reglas ":title"',
'delete_link_type' => 'Eliminar tipo de enlace ":name"',
- 'delete_user' => 'Delete user ":email"',
- 'user_areYouSure' => 'If you delete user ":email", everything will be gone. There is no undo, undelete or anything. If you delete yourself, you will lose access to this instance of Firefly III.',
- 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
- 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
- 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
- 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
- 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
- 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
- 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
- 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
- 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
- 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
+ 'delete_user' => 'Eliminar usuario ":email"',
+ 'user_areYouSure' => 'Si elimina usuario ":email", todo desaparecerá. No hay deshacer, recuperar ni nada. Si te eliminas, perderás el acceso a esta instancia de Firefly III.',
+ 'attachment_areYouSure' => '¿Seguro que quieres eliminar el archivo adjunto llamado "name"?',
+ 'account_areYouSure' => '¿Seguro que quieres eliminar la cuenta llamada ":name"?',
+ 'bill_areYouSure' => '¿Seguro que quieres eliminar la factura llamada ":name"?',
+ 'rule_areYouSure' => '¿Seguro que quieres eliminar la regla titulada ":title"?',
+ 'ruleGroup_areYouSure' => '¿Seguro que quieres eliminar el grupo de reglas titulado ":title"?',
+ 'budget_areYouSure' => '¿Seguro que quieres eliminar el presupuesto llamado ":name"?',
+ 'category_areYouSure' => '¿Seguro que quieres eliminar la categoría llamada ":name"?',
+ 'currency_areYouSure' => '¿Está seguro que desea eliminar la moneda denominada ":name"?',
+ 'piggyBank_areYouSure' => '¿Está seguro que desea eliminar la hucha llamada ":name"?',
+ 'journal_areYouSure' => '¿Estás seguro de que deseas eliminar la transacción descrita ":description"?',
'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
- 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
- 'journal_link_areYouSure' => 'Are you sure you want to delete the link between :source and :destination ?',
- 'linkType_areYouSure' => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
- 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
- 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
- 'delete_all_permanently' => 'Delete selected permanently',
- 'update_all_journals' => 'Update these transactions',
- 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
- 'also_delete_connections' => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
- 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
- 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
- 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will spared deletion.',
- 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will spared deletion.',
- 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
- 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
+ 'tag_areYouSure' => '¿Seguro que quieres eliminar la etiqueta ":tag"?',
+ 'journal_link_areYouSure' => '¿Seguro que quieres eliminar el vínculo entre :source y :destination ?',
+ 'linkType_areYouSure' => '¿Estás seguro de que deseas eliminar el tipo de vínculo ":name" (":inward" / ":outward")?',
+ 'permDeleteWarning' => 'Eliminar cosas de Firely es permanente y no se puede deshacer.',
+ 'mass_make_selection' => 'Aún puede evitar que se eliminen elementos quitando la casilla de verificación.',
+ 'delete_all_permanently' => 'Eliminar selección permanentemente',
+ 'update_all_journals' => 'Actualiza estas transacciones',
+ 'also_delete_transactions' => 'La única transacción conectada a esta cuenta también se eliminará. | Todas las :count transacciones conectadas a esta cuenta también se eliminarán.',
+ 'also_delete_connections' => 'La única transacción vinculada con este tipo de enlace perderá esta conexión. | Todas las :count transacciones vinculadas con este tipo de enlace perderán su conexión.',
+ 'also_delete_rules' => 'La única regla conectada a este grupo de reglas también se eliminará. | Todas las :count reglas conectadas a este grupo de reglas también se eliminarán.',
+ 'also_delete_piggyBanks' => 'La única alcancía conectada a esta cuenta también se eliminará. | Todas las :count alcancías conectadas a esta cuenta también se eliminará.',
+ 'bill_keep_transactions' => 'La única transacción conectada a esta factura no se eliminará. | Todas las :count transacciones conectadas a esta factura evitarán la eliminación.',
+ 'budget_keep_transactions' => 'La única transacción conectada a este presupuesto no se eliminará. | Todas las :count transacciones conectadas a este presupuesto evitarán la eliminación.',
+ 'category_keep_transactions' => 'La única transacción conectada a esta categoría no se eliminará. | Todas las :count transacciones conectadas a esta categoría evitarán la eliminación.',
+ 'tag_keep_transactions' => 'La única transacción conectada a esta etiqueta no se eliminará. | Todas las :count transacciones conectadas a esta etiqueta evitarán la eliminación.',
'email' => 'Correo electrónico',
'password' => 'Contraseña',
@@ -171,27 +172,27 @@ return [
// admin
'domain' => 'Dominio',
- 'single_user_mode' => 'Disable user registration',
+ 'single_user_mode' => 'Deshabilitar registro de usuario',
'is_demo_site' => 'Está en modo demostración',
// import
'import_file' => 'Importar archivo',
'configuration_file' => 'Archivo de configuración',
- 'import_file_type' => 'Import file type',
- 'csv_comma' => 'A comma (,)',
- 'csv_semicolon' => 'A semicolon (;)',
- 'csv_tab' => 'A tab (invisible)',
- 'csv_delimiter' => 'CSV field delimiter',
- 'csv_import_account' => 'Default import account',
- 'csv_config' => 'CSV import configuration',
+ 'import_file_type' => 'Importar tipo de archivo',
+ 'csv_comma' => 'Una coma (,)',
+ 'csv_semicolon' => 'Un punto y coma (;)',
+ 'csv_tab' => 'Un tabulador (invisible)',
+ 'csv_delimiter' => 'Delimitador de campo CSV',
+ 'csv_import_account' => 'Cuenta de importación predeterminada',
+ 'csv_config' => 'Configuración de importación de CSV',
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'internal_reference' => 'Internal reference',
- 'inward' => 'Inward description',
- 'outward' => 'Outward description',
- 'rule_group_id' => 'Rule group',
+ 'due_date' => 'Fecha de vencimiento',
+ 'payment_date' => 'Fecha de pago',
+ 'invoice_date' => 'Fecha de la factura',
+ 'internal_reference' => 'Referencia interna',
+ 'inward' => 'Descripción interna',
+ 'outward' => 'Descripción externa',
+ 'rule_group_id' => 'Grupo de reglas',
];
diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index 77824e1ef7..d658e4995b 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Fecha de creación',
'update_date' => 'Fecha de modificación',
- 'updated_at' => 'Updated at',
+ 'updated_at' => 'Updated at',
'balance_before' => 'Balance antes de ',
'balance_after' => 'Balance después de la',
'name' => 'Nombre',
@@ -83,10 +83,11 @@ return [
'inward' => 'Descripción interna',
'outward' => 'Descripción externa',
'number_of_transactions' => 'Número de transacciones',
- 'total_amount' => 'Total amount',
- 'sum' => 'Sum',
+ 'total_amount' => 'Total',
+ 'sum' => 'Suma',
'sum_excluding_transfers' => 'Sum (excluding transfers)',
'sum_withdrawals' => 'Sum of withdrawals',
'sum_deposits' => 'Sum of deposits',
- 'sum_transfers' => 'Sum of transfers',
+ 'sum_transfers' => 'Suma de transferencias',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/fr_FR/bank.php b/resources/lang/fr_FR/bank.php
index e15a71094d..dc45c22851 100644
--- a/resources/lang/fr_FR/bank.php
+++ b/resources/lang/fr_FR/bank.php
@@ -1,6 +1,8 @@
'Pré-requis pour un import depuis Bunq',
'bunq_prerequisites_text' => 'Pour pouvoir importer depuis Bunq, vous avez besoin d\'obtenir une clé API. Vous pouvez faire celà depuis l\'appli.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php
index f807e4aedb..20ac87c186 100644
--- a/resources/lang/fr_FR/breadcrumbs.php
+++ b/resources/lang/fr_FR/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Revenu, salaire et versements',
'transfer_list' => 'Virements',
'transfers_list' => 'Virements',
+ 'reconciliation_list' => 'Rapprochements',
'create_withdrawal' => 'Créer un nouveau retrait',
'create_deposit' => 'Créer un nouveau versement',
'create_transfer' => 'Créer un nouveau virement',
'edit_journal' => 'Éditer la transaction ":description"',
+ 'edit_reconciliation' => 'Éditer ":description"',
'delete_journal' => 'Supprimer la transaction ":description"',
'tags' => 'Mots-clés',
'createTag' => 'Créer un nouveau mot-clé',
diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php
index 0d678882b7..b9cd03e7a1 100644
--- a/resources/lang/fr_FR/csv.php
+++ b/resources/lang/fr_FR/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'Compte d\'actif (ID correspondant à Firefly)',
'column_account-name' => 'Compte d’actif (nom)',
'column_amount' => 'Montant',
+ 'column_amount_debet' => 'Montant (colonne débit)',
+ 'column_amount_credit' => 'Montant (colonne de crédit)',
'column_amount-comma-separated' => 'Montant (virgule comme séparateur décimal)',
'column_bill-id' => 'Facture (ID correspondant à Firefly)',
'column_bill-name' => 'Nom de la facture',
diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php
index fbb7aaa450..6466b291ac 100644
--- a/resources/lang/fr_FR/demo.php
+++ b/resources/lang/fr_FR/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III prend en charge plusieurs devises. Bien que l\'Euro soit la devise par défaut, cette dernière peut être changée pour le Dollar américain et de nombreuses autres devises. Comme vous pouvez le remarquer une petite sélection des monnaies a été incluse, mais vous pouvez ajouter vos propres devises si vous le souhaitez. Gardez à l\'esprit que la modification de la devise par défaut ne modifie pas la monnaie des transactions existantes : Firefly III prend en charge l’utilisation de plusieurs devises en même temps.',
'transactions-index' => 'Ces dépenses, dépôts et transferts ne sont pas particulièrement imaginatifs. Ils ont été générés automatiquement.',
'piggy-banks-index' => 'Comme vous pouvez le voir, il y a trois tirelires. Utilisez les boutons plus et moins pour influer sur le montant d’argent dans chaque tirelire. Cliquez sur le nom de la tirelire pour voir l’administration pour chaque tirelire.',
- 'import-index' => 'Bien sûr, n’importe quel fichier CSV peut être importé dans Firefly III ',
+ 'import-index' => 'Bien sûr, n’importe quel fichier CSV peut être importé dans Firefly III',
'import-configure-security' => 'Pour des raisons de sécurité, votre téléchargement a été remplacé par un fichier local.',
'import-configure-configuration' => 'La configuration que vous voyez ci-dessous est correcte pour le fichier local.',
];
diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 8f249119da..b9d082f29b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Traduction incomplète',
'close' => 'Fermer',
'actions' => 'Actions',
'edit' => 'Modifier',
'delete' => 'Supprimer',
'welcomeBack' => 'Que se passe-t-il ?',
'everything' => 'Tout',
+ 'today' => 'aujourd\'hui',
'customRange' => 'Etendue personnalisée',
'apply' => 'Appliquer',
'select_date' => 'Sélectionner une date..',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Données de transaction',
'invalid_server_configuration' => 'Configuration de serveur invalide',
'invalid_locale_settings' => 'Firefly III ne parvient pas à formater les montants monétaires car il manque des paquets logiciels sur votre serveur. Voici des insctructions sur comment procéder .',
+ 'quickswitch' => 'Changement rapide',
// search
'search' => 'Rechercher',
@@ -144,10 +147,10 @@ return [
// repeat frequencies:
'repeat_freq_yearly' => 'annuellement',
- 'repeat_freq_half-year' => 'every half-year',
- 'repeat_freq_quarterly' => 'quarterly',
+ 'repeat_freq_half-year' => 'semestriel',
+ 'repeat_freq_quarterly' => 'trimestriel',
'repeat_freq_monthly' => 'mensuel',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'hebdomadaire',
'weekly' => 'hebdomadaire',
'quarterly' => 'trimestriel',
'half-year' => 'semestriel',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Sans date',
'result' => 'Résultat',
'sums_apply_to_range' => 'Toutes les sommes s\'appliquent à l\'ensemble sélectionné',
+ 'mapbox_api_key' => 'Pour utiliser la carte, obtenez une clé API à partir de Mapbox . Ouvrez votre fichier .env et entrez ce code après MAPBOX_API_KEY = .',
'press_tag_location' => 'Faites un clic droit ou appuyez longuement sur pour définir l\'emplacement de l\'étiquette.',
'clear_location' => 'Effacer la localisation',
@@ -587,6 +591,8 @@ return [
'not_expected_period' => 'Cette période n\'est pas prévu',
'bill_is_active' => 'Facture en cours',
'bill_will_automatch' => 'La facture sera automatiquement liée aux transactions correspondantes',
+ 'skips_over' => 'saute',
+
// accounts:
'details_for_asset' => 'Détails pour le compte d’actif ":name"',
'details_for_expense' => 'Détail du compte de dépenses ":name"',
@@ -615,6 +621,27 @@ return [
'revenue_accounts' => 'Comptes de recettes',
'cash_accounts' => 'Comptes de trésorerie',
'Cash account' => 'Compte de trésorerie',
+ 'reconcile_account' => 'Rapprocher le compte ":account"',
+ 'delete_reconciliation' => 'Supprimer le rapprochement',
+ 'update_reconciliation' => 'Mettre à jour le rapprochement',
+ 'amount_cannot_be_zero' => 'Le montant ne peut pas être zéro',
+ 'end_of_reconcile_period' => 'Fin de la période de rapptrochement : :period',
+ 'start_of_reconcile_period' => 'Début de la période de rapprochement : :period',
+ 'start_balance' => 'Solde initial',
+ 'end_balance' => 'Solde de clotûre',
+ 'update_balance_dates_instruction' => 'Faites correspondre les montants et les dates ci-dessus à votre relevé bancaire et appuyez sur "Démarrer le rapprochement"',
+ 'select_transactions_instruction' => 'Sélectionnez les transactions qui apparaissent sur votre relevé bancaire.',
+ 'select_range_and_balance' => 'Vérifiez d\'abord la plage de dates et les soldes. Puis appuyez sur "Démarrer le rapprochement"',
+ 'date_change_instruction' => 'Si vous modifiez la plage de dates maintenant, toute progression sera perdue.',
+ 'update_selection' => 'Mettre à jour la sélection',
+ 'store_reconcile' => 'Stocker le rapprochement',
+ 'reconciliation_transaction' => 'Transaction de rapprochement',
+ 'Reconciliation' => 'Rapprochement',
+ 'reconciliation' => 'Rapprochement',
+ 'reconcile_options' => 'Options de rapprochement',
+ 'reconcile_range' => 'Plage de rapprochement',
+ 'start_reconcile' => 'Commencer le rapprochement',
+ 'cash' => 'espèce',
'account_type' => 'Type de compte',
'save_transactions_by_moving' => 'Enregistrer ces opération(s) en les déplaçant vers un autre compte :',
'stored_new_account' => 'Nouveau compte ":name" créé !',
@@ -627,6 +654,22 @@ return [
'select_more_than_one_budget' => 'Veuillez sélectionner plus d\'un budget',
'select_more_than_one_tag' => 'Veuillez sélectionner plus d\'un tag',
'account_default_currency' => 'Si vous sélectionnez une autre monnaie, les nouvelles transactions de ce compte auront cette monnaie pré-sélectionnées.',
+ 'reconcile_has_more' => 'Votre registre Firefly III a plus d\'argent que ce que votre banque prétend que vous devriez avoir. Il y a plusieurs options. S\'il vous plaît choisir quoi faire. Ensuite, appuyez sur "Confirmer le rapprochement".',
+ 'reconcile_has_less' => 'Votre registre Firefly III a moins d\'argent que ce que votre banque prétend que vous devriez avoir. Il y a plusieurs options. S\'il vous plaît choisir quoi faire. Ensuite, appuyez sur "Confirmer le rapprochement".',
+ 'reconcile_is_equal' => 'Votre registre Firefly III et vos relevés bancaires correspondent. Il n\'y a rien à faire. S\'il vous plaît appuyez sur "Confirmer le rapprochement" pour confirmer votre entrée.',
+ 'create_pos_reconcile_transaction' => 'Effacez les transactions sélectionnées et créez une correction en ajoutant :amount à ce compte d\'actif.',
+ 'create_neg_reconcile_transaction' => 'Effacez les transactions sélectionnées et créez une correction en enlevant :amount à ce compte d\'actif.',
+ 'reconcile_do_nothing' => 'Effacez les transactions sélectionnées, mais ne les corrigez pas.',
+ 'reconcile_go_back' => 'Vous pouvez toujours modifier ou supprimer une correction ultérieurement.',
+ 'must_be_asset_account' => 'Vous pouvez uniquement rapprocher les comptes d\'actifs',
+ 'reconciliation_stored' => 'Rapprochement stocké',
+ 'reconcilliation_transaction_title' => 'Rapprochement (:from vers :to)',
+ 'reconcile_this_account' => 'Rapprocher ce compte',
+ 'confirm_reconciliation' => 'Confirmer le rapprochement',
+ 'submitted_start_balance' => 'Solde initial soumis',
+ 'selected_transactions' => 'Transactions sélectionnées ( :count)',
+ 'already_cleared_transactions' => 'Transactions déjà effacées ( :count)',
+ 'submitted_end_balance' => 'Solde final soumis',
// categories:
'new_category' => 'Nouvelle catégorie',
@@ -660,11 +703,11 @@ return [
'stored_journal' => 'Opération créée avec succès ":description"',
'select_transactions' => 'Sélectionner des opérations',
'stop_selection' => 'Arrêter de sélectionner les transactions',
- 'edit_selected' => 'Modifier la sélection',
- 'delete_selected' => 'Supprimer la sélection',
+ 'reconcile_selected' => 'Rapproché',
'mass_delete_journals' => 'Supprimer un certain nombre de transactions',
'mass_edit_journals' => 'Modifier un certain nombre d’opérations',
'cannot_edit_other_fields' => 'Vous ne peut pas modifier en masse d\'autres champs que ceux ici, car il n’y a pas de place pour tous les montrer. S’il vous plaît suivez le lien et modifiez les par un par un, si vous devez modifier ces champs.',
+ 'no_budget' => '(pas de budget)',
'perm-delete-many' => 'Supprimer de nombreux éléments en une seule fois peut être très problématique. Soyez prudent.',
'mass_deleted_transactions_success' => 'Montant des opérations supprimées : :amount.',
'mass_edited_transactions_success' => 'Montant des opérations mises à jour : :amount',
@@ -700,7 +743,9 @@ return [
'currency' => 'Devise',
'preferences' => 'Préférences',
'logout' => 'Se déconnecter',
+ 'toggleNavigation' => 'Activer navigation',
'searchPlaceholder' => 'Rechercher...',
+ 'version' => 'Version',
'dashboard' => 'Tableau de Bord',
'currencies' => 'Devises',
'accounts' => 'Comptes',
@@ -710,7 +755,7 @@ return [
'Revenue account' => 'Compte de recettes',
'Initial balance account' => 'Balance initiale',
'budgets' => 'Budgets',
- 'tags' => 'Tags',
+ 'tags' => 'Mots-clés',
'reports' => 'Rapports',
'transactions' => 'Opérations',
'expenses' => 'Dépenses',
@@ -915,7 +960,7 @@ return [
'firefly_instance_configuration' => 'Options de configuration pour Firefly III',
'setting_single_user_mode' => 'Mode utilisateur unique',
'setting_single_user_mode_explain' => 'Par défaut, Firefly III accepte uniquement un (1) enregistrement : vous. Il s\'agit d\'une mesure de sécurité qui empêche les autres d\'utiliser votre instance, à moins que vous ne les autorisiez. Les enregistrements futurs sont bloqués. Lorsque vous désactivez cette case, d\'autres personnes peuvent utiliser votre instance aussi bien, en supposant qu\'elles puissent l\'atteindre (quand il est connecté à Internet).',
- 'store_configuration' => 'Configuration de la boutique',
+ 'store_configuration' => 'Sauvegarder la configuration',
'single_user_administration' => 'Gestion de l\'utilisateur pour :email',
'edit_user' => 'Modifier l\'utilisateur :email',
'hidden_fields_preferences' => 'Tous les champs ne sont pas visibles dès maintenant. Vous devez les activer dans vos paramètres .',
@@ -926,6 +971,7 @@ return [
'budgets_with_limits' => 'budget(s) avec montant configuré',
'rule_or_rules' => 'règle(s)',
'rulegroup_or_groups' => 'groupe(s) de règles',
+ 'tag_or_tags' => 'tag (s)',
'configuration_updated' => 'La configuration a été mise à jour',
'setting_is_demo_site' => 'Site de démonstration',
'setting_is_demo_site_explain' => 'Si vous cochez cette case, cette installation se comportera comme si c\'était le site de démonstration, ce qui peut engendrer des effets secondaires étranges.',
@@ -1001,6 +1047,7 @@ return [
'split_this_transfer' => 'Scinder ce transfert',
'cannot_edit_multiple_source' => 'Vous ne pouvez pas modifier la transaction scindée #:id avec la description ":description" car elle contient plusieurs comptes sources.',
'cannot_edit_multiple_dest' => 'Vous ne pouvez pas modifier la transaction scindée #:id avec la description ":description" car elle contient plusieurs comptes de destination.',
+ 'cannot_edit_reconciled' => 'Vous ne pouvez pas modifier transaction #: id avec la description ": description" car elle a été marquée comme rapprochée.',
'cannot_edit_opening_balance' => 'Vous ne pouvez pas modifier le solde d\'ouverture d\'un compte.',
'no_edit_multiple_left' => 'Vous n\'avez sélectionné aucune transaction valide à éditer.',
'cannot_convert_split_journal' => 'Vous ne pouvez pas convertir une transaction ventilée',
@@ -1013,6 +1060,7 @@ return [
'import_index_title' => 'Importer des données dans Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Bienvenue dans la routine d\'importation de Firefly. Il existe différentes façons d\'importer des données dans Firefly III, affichées ici sous forme de boutons.',
+ 'import_general_index_csv_file' => 'Importer un fichier CSV',
'import_index_intro' => 'Cette routine vous aidera à importer des fichiers de votre banque dans Firefly III. Consultez les pages d\'aide en haut à droite.',
'import_index_file' => 'Sélectionnez votre fichier',
'import_index_config' => 'Si vous avez précédemment importé des données dans Firefly III, vous pouvez avoir un fichier de configuration qui définira les valeurs de configuration. Pour certaines banques, les autres utilisateurs ont bien voulu fournir leur fichier configuration .',
@@ -1096,7 +1144,7 @@ return [
'no_piggies_imperative_default' => 'Avez-vous des choses pour lesquelles vous économisez de l\'argent ? Créer une tirelire et suivez-là :',
'no_piggies_create_default' => 'Créer une nouvelle tirelire',
'no_bills_title_default' => 'Nous allons créer une facture !',
- 'no_bills_intro_default' => 'Vous n\'avez pas encore de factures. Vous pouvez créer des factures pour suivre les dépenses ordinaires, comme votre loyer d\'assurance.',
+ 'no_bills_intro_default' => 'Vous n\'avez pas encore de factures. Vous pouvez créer des factures pour suivre les dépenses ordinaires, comme votre loyer ou l\'assurance.',
'no_bills_imperative_default' => 'Avez-vous des factures régulières ? Créez une facture et suivez vos paiements :',
'no_bills_create_default' => 'Créer une facture',
diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index 713da77a23..7c8f86d20e 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Supprimer définitivement',
'cancel' => 'Annuler',
'targetdate' => 'Date cible',
+ 'startdate' => 'Date de début',
'tag' => 'Mot-clé',
'under' => 'En dessous de',
'symbol' => 'Symbole',
@@ -171,7 +172,7 @@ return [
// admin
'domain' => 'Domaine',
- 'single_user_mode' => 'Disable user registration',
+ 'single_user_mode' => 'Désactiver le formulaire d\'inscription',
'is_demo_site' => 'Est un site de démonstration',
diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 7851f5e0a2..d857ad4361 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'Identifiant',
'create_date' => 'Créé le',
'update_date' => 'Mis à jour le',
- 'updated_at' => 'Mis à jour le',
+ 'updated_at' => 'Mis à jour le',
'balance_before' => 'Solde avant',
'balance_after' => 'Solde après',
'name' => 'Nom',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Somme des retraits',
'sum_deposits' => 'Somme des dépôts',
'sum_transfers' => 'Somme des transferts',
+ 'reconcile' => 'Rapprocher',
];
diff --git a/resources/lang/id_ID/bank.php b/resources/lang/id_ID/bank.php
index 189df0107b..7a4a8d1b11 100644
--- a/resources/lang/id_ID/bank.php
+++ b/resources/lang/id_ID/bank.php
@@ -1,6 +1,8 @@
'Prasyarat untuk impor dari bunq',
'bunq_prerequisites_text' => 'Untuk mengimpor dari bunq, Anda perlu mendapatkan kunci API. Anda dapat melakukan ini melalui aplikasi.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/id_ID/breadcrumbs.php b/resources/lang/id_ID/breadcrumbs.php
index 0e8a1deda7..52438bb1cf 100644
--- a/resources/lang/id_ID/breadcrumbs.php
+++ b/resources/lang/id_ID/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Pendapatan, pemasukan, dan deposit',
'transfer_list' => 'Transfer',
'transfers_list' => 'Transfer',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Buat penarikan baru',
'create_deposit' => 'Buat deposit baru',
'create_transfer' => 'Buat transfer baru',
'edit_journal' => 'Edit transaksi ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Hapus transaksi ":description"',
'tags' => 'Label',
'createTag' => 'Buat label baru',
diff --git a/resources/lang/id_ID/csv.php b/resources/lang/id_ID/csv.php
index ff1c20c9ae..21209b6726 100644
--- a/resources/lang/id_ID/csv.php
+++ b/resources/lang/id_ID/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'ID akun aset (yang cocok dengan Firefly)',
'column_account-name' => 'Akun aset (nama)',
'column_amount' => 'Jumlah',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Jumlah (koma sebagai tanda desimal)',
'column_bill-id' => 'ID tagihan (yang cocok dengan Firefly)',
'column_bill-name' => 'Nama tagihan',
diff --git a/resources/lang/id_ID/demo.php b/resources/lang/id_ID/demo.php
index 5c99a55718..c35b020f4a 100644
--- a/resources/lang/id_ID/demo.php
+++ b/resources/lang/id_ID/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
];
diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php
index 49daf7d145..147509399d 100644
--- a/resources/lang/id_ID/firefly.php
+++ b/resources/lang/id_ID/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Incomplete translation',
'close' => 'Close',
'actions' => 'Actions',
'edit' => 'Edit',
'delete' => 'Delete',
'welcomeBack' => 'What\'s playing?',
'everything' => 'Everything',
+ 'today' => 'today',
'customRange' => 'Custom range',
'apply' => 'Apply',
'select_date' => 'Select date..',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Transaction data',
'invalid_server_configuration' => 'Invalid server configuration',
'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Search',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'monthly',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'weekly',
'weekly' => 'weekly',
'quarterly' => 'quarterly',
'half-year' => 'every half year',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Without date',
'result' => 'Result',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox . Open your .env file en enter this code after MAPBOX_API_KEY=.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Not expected this period',
'bill_is_active' => 'Bill is active',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'Details for asset account ":name"',
'details_for_expense' => 'Details for expense account ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Revenue accounts',
'cash_accounts' => 'Cash accounts',
'Cash account' => 'Cash account',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'New category',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Successfully created new transaction ":description"',
'select_transactions' => 'Select transactions',
'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
+ 'reconcile_selected' => 'Reconcile',
'mass_delete_journals' => 'Delete a number of transactions',
'mass_edit_journals' => 'Edit a number of transactions',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'no_budget' => '(no budget)',
'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Currency',
'preferences' => 'Preferences',
'logout' => 'Logout',
+ 'toggleNavigation' => 'Toggle navigation',
'searchPlaceholder' => 'Search...',
+ 'version' => 'Version',
'dashboard' => 'Dashboard',
'currencies' => 'Currencies',
'accounts' => 'Accounts',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budget(s) with configured amount',
'rule_or_rules' => 'rule(s)',
'rulegroup_or_groups' => 'rule group(s)',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'The configuration has been updated',
'setting_is_demo_site' => 'Demo site',
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Split this transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Import data into Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+ 'import_general_index_csv_file' => 'Import a (CSV) file',
'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
'import_index_file' => 'Select your file',
'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a bill',
diff --git a/resources/lang/id_ID/form.php b/resources/lang/id_ID/form.php
index 24d6519276..6d7a98c2fe 100644
--- a/resources/lang/id_ID/form.php
+++ b/resources/lang/id_ID/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Delete permanently',
'cancel' => 'Cancel',
'targetdate' => 'Target date',
+ 'startdate' => 'Start date',
'tag' => 'Tag',
'under' => 'Under',
'symbol' => 'Symbol',
diff --git a/resources/lang/id_ID/list.php b/resources/lang/id_ID/list.php
index 992afacc40..8129b082fc 100644
--- a/resources/lang/id_ID/list.php
+++ b/resources/lang/id_ID/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Created at',
'update_date' => 'Updated at',
- 'updated_at' => 'Updated at',
+ 'updated_at' => 'Updated at',
'balance_before' => 'Balance before',
'balance_after' => 'Balance after',
'name' => 'Name',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Sum of withdrawals',
'sum_deposits' => 'Sum of deposits',
'sum_transfers' => 'Sum of transfers',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/nl_NL/bank.php b/resources/lang/nl_NL/bank.php
index ae18c976ad..9afeaf242d 100644
--- a/resources/lang/nl_NL/bank.php
+++ b/resources/lang/nl_NL/bank.php
@@ -1,6 +1,8 @@
'Voorwaarden voor een import van bunq',
'bunq_prerequisites_text' => 'Om transacties bij bunq te importeren heb je een API sleutel nodig. Dit kan via de app.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php
index 16694da0ea..5e56c5e727 100644
--- a/resources/lang/nl_NL/breadcrumbs.php
+++ b/resources/lang/nl_NL/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Inkomsten',
'transfer_list' => 'Overschrijvingen',
'transfers_list' => 'Overschrijvingen',
+ 'reconciliation_list' => 'Afstemmingen',
'create_withdrawal' => 'Sla nieuwe uitgave op',
'create_deposit' => 'Sla nieuwe inkomsten op',
'create_transfer' => 'Sla nieuwe overschrijving op',
'edit_journal' => 'Wijzig transactie ":description"',
+ 'edit_reconciliation' => 'Wijzig ":description"',
'delete_journal' => 'Verwijder transactie ":description"',
'tags' => 'Tags',
'createTag' => 'Maak nieuwe tag',
diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php
index be68315716..b23f80dac1 100644
--- a/resources/lang/nl_NL/csv.php
+++ b/resources/lang/nl_NL/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'Betaalrekening (ID gelijk aan Firefly)',
'column_account-name' => 'Betaalrekeningnaam',
'column_amount' => 'Bedrag',
+ 'column_amount_debet' => 'Bedrag (debetkolom)',
+ 'column_amount_credit' => 'Bedrag (creditkolom)',
'column_amount-comma-separated' => 'Bedrag (komma as decimaalscheidingsteken)',
'column_bill-id' => 'Contract (ID gelijk aan Firefly)',
'column_bill-name' => 'Contractnaam',
diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php
index 01aa680497..631ff2236e 100644
--- a/resources/lang/nl_NL/demo.php
+++ b/resources/lang/nl_NL/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly ondersteunt meerdere valuta\'s. Hoewel het standaard de Euro is kan je ook kiezen voor de US dollar of een van de vele anderen. Er is een kleine selectie valuta meegeleverd maar je kan je eigen valuta toevoegen. Het veranderen van de standaardvaluta verandert de bestaande transacties niet: Firefly III ondersteunt het gebruik van meerdere valuta op hetzelfde moment.',
'transactions-index' => 'Deze uitgaven, inkomsten en overschrijvingen zijn niet heel fantasierijk. Ze zijn automatisch gegenereerd.',
'piggy-banks-index' => 'Zoals je kan zien zijn er drie spaarpotjes. Gebruik de plus- en minknoppen om het bedrag in de spaarpotjes te veranderen. Klik op de naam van het spaarpotje om er de geschiedenis van te zien.',
- 'import-index' => 'Uiteraard kan je elk CSV bestand importeren in Firefly III ',
+ 'import-index' => 'Uiteraard kan je elk CSV bestand importeren in Firefly III',
'import-configure-security' => 'Uit veiligheidsoverwegingen is je upload vervangen door een lokaal bestand.',
'import-configure-configuration' => 'Deze configuratie is correct voor het lokale bestand.',
];
diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 94444918ed..a727a603ae 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Onvolledige vertaling',
'close' => 'Sluiten',
'actions' => 'Acties',
'edit' => 'Wijzig',
'delete' => 'Verwijder',
'welcomeBack' => 'Hoe staat het er voor?',
'everything' => 'Alles',
+ 'today' => 'vandaag',
'customRange' => 'Zelf bereik kiezen',
'apply' => 'Go',
'select_date' => 'Selecteer periode..',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Transactiegegevens',
'invalid_server_configuration' => 'Ongeldige serverconfiguratie',
'invalid_locale_settings' => 'Firefly III kan geldbedragen niet goed weergeven omdat je server de vereiste software mist. Er zijn instructies hoe dit te doen .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Zoeken',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'elk half jaar',
'repeat_freq_quarterly' => 'elk kwartaal',
'repeat_freq_monthly' => 'maandelijks',
- 'repeat_freq_weekly' => 'wekelijks',
+ 'repeat_freq_weekly' => 'wekelijks',
'weekly' => 'wekelijks',
'quarterly' => 'elk kwartaal',
'half-year' => 'elk half jaar',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Zonder datum',
'result' => 'Resultaat',
'sums_apply_to_range' => 'Alle sommen gelden voor het geselecteerde bereik',
+ 'mapbox_api_key' => 'Om de kaart te gebruiken regel je een API-key bij Mapbox . Open je .env-bestand en zet deze achter MAPBOX_API_KEY=.',
'press_tag_location' => 'Klik met de rechtermuisknop of druk lang om de locatie van de tag in te stellen.',
'clear_location' => 'Wis locatie',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Niet verwacht deze periode',
'bill_is_active' => 'Contract is actief',
'bill_will_automatch' => 'Waar van toepassing wordt dit contract automatisch gekoppeld aan transacties',
+ 'skips_over' => 'slaat over',
+
// accounts:
'details_for_asset' => 'Overzicht voor betaalrekening ":name"',
'details_for_expense' => 'Overzicht voor crediteur ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Debiteuren',
'cash_accounts' => 'Contant geldrekeningen',
'Cash account' => 'Contant geldrekening',
+ 'reconcile_account' => 'Afstemmen betaalrekening ": account"',
+ 'delete_reconciliation' => 'Verwijder correctie',
+ 'update_reconciliation' => 'Update correctie',
+ 'amount_cannot_be_zero' => 'Het bedrag mag niet nul zijn',
+ 'end_of_reconcile_period' => 'Einde van verrekenperiode: :period',
+ 'start_of_reconcile_period' => 'Begin van verrekenperiode: :period',
+ 'start_balance' => 'Startsaldo',
+ 'end_balance' => 'Eindsaldo',
+ 'update_balance_dates_instruction' => 'Vergelijk de bedragen en datums hierboven met uw bankafschrift en druk op "Begin met afstemmen"',
+ 'select_transactions_instruction' => 'Selecteer de transacties die op je bankafschrift staan.',
+ 'select_range_and_balance' => 'Controleer eerst het datumbereik en de saldo\'s. Druk vervolgens op "Begin met afstemmen"',
+ 'date_change_instruction' => 'Als je het datumbereik nu wijzigt, gaat je voortgang verloren.',
+ 'update_selection' => 'Selectie bijwerken',
+ 'store_reconcile' => 'Afstemming opslaan',
+ 'reconciliation_transaction' => 'Corrigerende transactie',
+ 'Reconciliation' => 'Correctie',
+ 'reconciliation' => 'Correctie',
+ 'reconcile_options' => 'Afstemmingsopties',
+ 'reconcile_range' => 'Afstemmingsbereik',
+ 'start_reconcile' => 'Begin met afstemmen',
+ 'cash' => 'contant',
'account_type' => 'Rekeningtype',
'save_transactions_by_moving' => 'Bewaar deze transacties door ze aan een andere rekening te koppelen:',
'stored_new_account' => 'Nieuwe rekening ":name" opgeslagen!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Selecteer meer dan één budget',
'select_more_than_one_tag' => 'Selecteer meer dan één tag',
'account_default_currency' => 'Nieuwe transacties van deze betaalrekening krijgen automatisch deze valuta.',
+ 'reconcile_has_more' => 'Je Firefly III boekhouding bevat meer geld dan je bank beweert dat er in zou moeten zitten. Je hebt verschillende opties. Kies wat je wilt doen, en klik dan "Bevestig correctie".',
+ 'reconcile_has_less' => 'Je Firefly III boekhouding bevat minder geld dan je bank beweert dat er in zou moeten zitten. Je hebt verschillende opties. Kies wat je wilt doen, en klik dan "Bevestig correctie".',
+ 'reconcile_is_equal' => 'Je Firefly III boekhouding en je bankafschriften lopen gelijk. Je hoeft niets te doen. Klik op "Bevestig correctie" om je invoer te bevestigen.',
+ 'create_pos_reconcile_transaction' => 'Markeer de geselecteerde transacties als afgestemd, en voeg :amount toe aan de betaalrekening.',
+ 'create_neg_reconcile_transaction' => 'Markeer de geselecteerde transacties als afgestemd, en verwijder :amount van de betaalrekening.',
+ 'reconcile_do_nothing' => 'Markeer de geselecteerde transacties als afgestemd, maar maak geen correctie.',
+ 'reconcile_go_back' => 'Je kan een correctie later altijd wijzigen.',
+ 'must_be_asset_account' => 'Je kan alleen betaalrekeningen corrigeren',
+ 'reconciliation_stored' => 'Correctie opgeslagen',
+ 'reconcilliation_transaction_title' => 'Correctie (:from tot :to)',
+ 'reconcile_this_account' => 'Corrigeer deze rekening',
+ 'confirm_reconciliation' => 'Bevestig correctie',
+ 'submitted_start_balance' => 'Ingevoerd startsaldo',
+ 'selected_transactions' => 'Geselecteerde transacties (:count)',
+ 'already_cleared_transactions' => 'Al afgestemde transacties (:count)',
+ 'submitted_end_balance' => 'Ingevoerd eindsaldo',
// categories:
'new_category' => 'Nieuwe categorie',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Nieuw transactie ":description" opgeslagen',
'select_transactions' => 'Selecteer transacties',
'stop_selection' => 'Stop met selecteren',
- 'edit_selected' => 'Wijzig geselecteerden',
- 'delete_selected' => 'Verwijder geselecteerden',
+ 'reconcile_selected' => 'Verrekenen',
'mass_delete_journals' => 'Verwijder een aantal transacties',
'mass_edit_journals' => 'Wijzig een aantal transacties',
'cannot_edit_other_fields' => 'Je kan andere velden dan de velden die je hier ziet niet groepsgewijs wijzigen. Er is geen ruimte om ze te laten zien. Als je deze velden toch wilt wijzigen, volg dan de link naast de transactie en wijzig ze stuk voor stuk.',
+ 'no_budget' => '(geen budget)',
'perm-delete-many' => 'Veel items in één keer verwijderen kan zeer storend zijn. Wees voorzichtig.',
'mass_deleted_transactions_success' => 'Verwijder :amount transactie(s).',
'mass_edited_transactions_success' => 'Wijzig :amount transactie(s)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Valuta',
'preferences' => 'Voorkeuren',
'logout' => 'Uitloggen',
+ 'toggleNavigation' => 'Navigatie aan of uit',
'searchPlaceholder' => 'Zoeken...',
+ 'version' => 'Versie',
'dashboard' => 'Dashboard',
'currencies' => 'Valuta',
'accounts' => 'Rekeningen',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budget(ten) met een ingesteld bedrag',
'rule_or_rules' => 'regel(s)',
'rulegroup_or_groups' => 'regelgroep(en)',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'De configuratie is bijgewerkt',
'setting_is_demo_site' => 'Demo website',
'setting_is_demo_site_explain' => 'Als je dit aanzet doet jouw installatie alsof het een demo-site is, en dat kan problemen opleveren.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Splits deze overschrijving',
'cannot_edit_multiple_source' => 'Je kan transactie #:id met omschrijving ":description" niet splitsen, want deze bevat meerdere bronrekeningen.',
'cannot_edit_multiple_dest' => 'Je kan transactie #:id met omschrijving ":description" niet wijzigen, want deze bevat meerdere doelrekeningen.',
+ 'cannot_edit_reconciled' => 'U kunt transactie #:id met omschrijving ": description" niet bewerken omdat deze is gemarkeerd als afgestemd (verrekend).',
'cannot_edit_opening_balance' => 'Je kan het startsaldo van een rekening niet wijzigen via dit scherm.',
'no_edit_multiple_left' => 'Je hebt geen geldige transacties geselecteerd.',
'cannot_convert_split_journal' => 'Kan geen gesplitste transactie omzetten',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Gegevens importeren in Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Dit is de import-routine van Firefly. Er zijn verschillende manieren om gegevens te importeren in Firefly III, hier als knoppen weergegeven.',
+ 'import_general_index_csv_file' => 'Importeer een (CSV) bestand',
'import_index_intro' => 'Deze pagina\'s helpen je bestanden van je bank te importeren in Firefly III. Gebruik de hulp-pagina\'s linksboven voor meer informatie.',
'import_index_file' => 'Selecteer je bestand',
'import_index_config' => 'Als je eerder gegevens hebt geïmporteerd in Firefly III, heb je wellicht een configuratiebestand, dat een aantal zaken alvast voor je kan instellen. Voor bepaalde banken hebben andere gebruikers uit de liefde van hun hart het benodigde configuratiebestand gedeeld.',
diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index 23aee16c7e..6e395b39b1 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Verwijderen',
'cancel' => 'Annuleren',
'targetdate' => 'Doeldatum',
+ 'startdate' => 'Startdatum',
'tag' => 'Tag',
'under' => 'Onder',
'symbol' => 'Symbool',
@@ -184,6 +185,8 @@ return [
'csv_tab' => 'Een tab (onzichtbaar)',
'csv_delimiter' => 'CSV scheidingsteken',
'csv_import_account' => 'Standaard rekening voor importeren',
+ 'csv_config' => 'Configuratiebestand',
+
'due_date' => 'Vervaldatum',
'payment_date' => 'Betalingsdatum',
diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index ccba0762b4..2678a80cd3 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Aangemaakt op',
'update_date' => 'Bijgewerkt op',
- 'updated_at' => 'Bijgewerkt op',
+ 'updated_at' => 'Bijgewerkt op',
'balance_before' => 'Saldo voor',
'balance_after' => 'Saldo na',
'name' => 'Naam',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Som van uitgaven',
'sum_deposits' => 'Som van inkomsten',
'sum_transfers' => 'Som van overschrijvingen',
+ 'reconcile' => 'Afstemmen',
];
diff --git a/resources/lang/pl_PL/bank.php b/resources/lang/pl_PL/bank.php
index da46c4be03..7f2f4c5db0 100644
--- a/resources/lang/pl_PL/bank.php
+++ b/resources/lang/pl_PL/bank.php
@@ -1,6 +1,8 @@
'Wymagania wstępne dotyczące importowania z bunq',
'bunq_prerequisites_text' => 'Aby zaimportować dane z bunq, musisz uzyskać klucz API. Możesz to zrobić za pośrednictwem aplikacji.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php
index 52019feac2..8f05e92cee 100644
--- a/resources/lang/pl_PL/breadcrumbs.php
+++ b/resources/lang/pl_PL/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Przychody, dochody oraz depozyty',
'transfer_list' => 'Transfery',
'transfers_list' => 'Transfery',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Utwórz nową wypłatę',
'create_deposit' => 'Utwórz nową wpłatę',
'create_transfer' => 'Utwórz nowy transfer',
'edit_journal' => 'Modyfikuj transakcję ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Usuń transakcję ":description"',
'tags' => 'Tagi',
'createTag' => 'Utwórz nowy tag',
diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php
index 77e80a686a..a4789a5db3 100644
--- a/resources/lang/pl_PL/csv.php
+++ b/resources/lang/pl_PL/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'ID konta aktywów (taki sam jak w Firefly)',
'column_account-name' => 'Konto aktywów (nazwa)',
'column_amount' => 'Kwota',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Kwota (przecinek jako separator dziesiętny)',
'column_bill-id' => 'ID rachunku (taki sam jak w Firefly)',
'column_bill-name' => 'Nazwa rachunku',
diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php
index 0ffd1b88bf..094bff01a7 100644
--- a/resources/lang/pl_PL/demo.php
+++ b/resources/lang/pl_PL/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
'import-configure-configuration' => 'Konfiguracja, która widzisz poniżej jest prawidłowa dla lokalnego pliku.',
];
diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index f1c3209bea..e616a331e8 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Niepełne tłumaczenie',
'close' => 'Zamknij',
'actions' => 'Akcje',
'edit' => 'Modyfikuj',
'delete' => 'Usuń',
'welcomeBack' => 'Co jest grane?',
'everything' => 'Wszystko',
+ 'today' => 'dzisiaj',
'customRange' => 'Niestandardowy zakres',
'apply' => 'Zastosuj',
'select_date' => 'Wybierz datę...',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Dane transakcji',
'invalid_server_configuration' => 'Nieprawidłowa konfiguracja serwera',
'invalid_locale_settings' => 'Firefly III nie może sformatować kwot, ponieważ brakuje wymaganych pakietów na Twoim serwerze. Sprawdźinstrukcje jak je zainstalować (po angielsku).',
+ 'quickswitch' => 'Szybki przełącznik',
// search
'search' => 'Szukaj',
@@ -144,10 +147,10 @@ return [
// repeat frequencies:
'repeat_freq_yearly' => 'rocznie',
- 'repeat_freq_half-year' => 'every half-year',
- 'repeat_freq_quarterly' => 'quarterly',
+ 'repeat_freq_half-year' => 'co pół roku',
+ 'repeat_freq_quarterly' => 'kwartalnie',
'repeat_freq_monthly' => 'miesięcznie',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'tygodniowo',
'weekly' => 'tygodniowo',
'quarterly' => 'kwartalnie',
'half-year' => 'co pół roku',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Bez daty',
'result' => 'Wynik',
'sums_apply_to_range' => 'Wszystkie sumy mają zastosowanie do wybranego zakresu',
+ 'mapbox_api_key' => 'Aby użyć mapy, pobierz klucz API z Mapbox . Otwórz plik .env i wprowadź ten kod po MAPBOX_API_KEY=.',
'press_tag_location' => 'Kliknij prawym przyciskiem myszy lub naciśnij i przytrzymaj aby ustawić lokalizację taga.',
'clear_location' => 'Wyczyść lokalizację',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Nie oczekiwany w tym okresie',
'bill_is_active' => 'Rachunek jest aktywny',
'bill_will_automatch' => 'Rachunek będzie automatycznie powiązany z pasującymi transakcjami',
+ 'skips_over' => 'pomija',
+
// accounts:
'details_for_asset' => 'Szczegóły konta aktywów ":name"',
'details_for_expense' => 'Szczegóły konta wydatków ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Konta przychodów',
'cash_accounts' => 'Konta gotówkowe',
'Cash account' => 'Konto gotówkowe',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'gotówka',
'account_type' => 'Typ konta',
'save_transactions_by_moving' => 'Zapisz te transakcje, przenosząc je do innego konta:',
'stored_new_account' => 'Nowe konto ":name" zostało zapisane!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Proszę wybierz więcej niż jeden budżet',
'select_more_than_one_tag' => 'Proszę wybierz więcej niż jeden tag',
'account_default_currency' => 'Jeśli wybierzesz inną walutę, nowe transakcje z tego konta będą miały tę walutę wstępnie wybraną.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'Nowa kategoria',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Pomyślnie utworzono nową transakcję ":description"',
'select_transactions' => 'Wybierz transakcje',
'stop_selection' => 'Przestań wybierać transakcje',
- 'edit_selected' => 'Modyfikuj zaznaczone',
- 'delete_selected' => 'Usuń zaznaczone',
+ 'reconcile_selected' => 'Uzgodnij',
'mass_delete_journals' => 'Usuń wiele transakcji',
'mass_edit_journals' => 'Modyfikuj wiele transakcji',
'cannot_edit_other_fields' => 'Nie możesz masowo modyfikować innych pól niż te tutaj, ponieważ nie ma miejsca, aby je pokazać. Proszę użyć ikony edycji i edytować je jedno po drugim, jeśli chcesz edytować te pola.',
+ 'no_budget' => '(bez budżetu)',
'perm-delete-many' => 'Usuwanie wielu elementów jednocześnie może być bardzo destrukcyjne. Proszę zachować ostrożność.',
'mass_deleted_transactions_success' => 'Usunięto :amount transakcję(i).',
'mass_edited_transactions_success' => 'Zaktualizowano :amount transakcję(i)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Waluta',
'preferences' => 'Preferencje',
'logout' => 'Wyloguj',
+ 'toggleNavigation' => 'Przełącz nawigację',
'searchPlaceholder' => 'Szukaj...',
+ 'version' => 'Wersja',
'dashboard' => 'Kokpit',
'currencies' => 'Waluty',
'accounts' => 'Konta',
@@ -825,8 +870,8 @@ return [
'account_role_sharedAsset' => 'Współdzielone konto aktywów',
'account_role_savingAsset' => 'Konto oszczędnościowe',
'account_role_ccAsset' => 'Karta kredytowa',
- 'budget_chart_click' => 'Please click on a budget name in the table above to see a chart.',
- 'category_chart_click' => 'Please click on a category name in the table above to see a chart.',
+ 'budget_chart_click' => 'Kliknij na nazwę budżetu w tabeli powyżej, aby zobaczyć wykres.',
+ 'category_chart_click' => 'Kliknij na nazwę kategorii w tabeli powyżej, aby zobaczyć wykres.',
// charts:
@@ -839,7 +884,7 @@ return [
'earned' => 'Zarobiono',
'overspent' => 'Przepłacono',
'left' => 'Pozostało',
- 'no_budget' => '(bez budżetu)',
+ 'no_budget' => '(no budget)',
'max-amount' => 'Maksymalna kwota',
'min-amount' => 'Minimalna kwota',
'journal-amount' => 'Faktyczna kwota',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budżet(y) z określoną kwotą',
'rule_or_rules' => 'reguła(y)',
'rulegroup_or_groups' => 'grupa(y) reguł',
+ 'tag_or_tags' => 'tag(ów)',
'configuration_updated' => 'Konfiguracja została zaktualizowana',
'setting_is_demo_site' => 'Strona demonstracyjna',
'setting_is_demo_site_explain' => 'Jeśli zaznaczysz to pole, ta instalacja będzie zachowywać się jak witryna demonstracyjna, co może mieć dziwne efekty uboczne.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Podziel ten transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'Nie wybrałeś żadnych poprawnych transakcji do edycji.',
'cannot_convert_split_journal' => 'Nie można przekonwertować podzielonej transakcji',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Importuj dane do Firefly III',
'import_index_sub_title' => 'Indeks',
'import_general_index_intro' => 'Witamy w procedurze importu Firefly III. Istnieje kilka sposobów importowania danych do Firefly III.',
+ 'import_general_index_csv_file' => 'Importuj plik CSV',
'import_index_intro' => 'Ta procedura pomoże Ci zaimportować pliki z Twojego banku do Firefly III. Proszę sprawdzić stronę pomocy w prawym górnym rogu.',
'import_index_file' => 'Wybierz swój plik',
'import_index_config' => 'Jeśli wcześniej importowałeś dane do Firefly III, może posiadać plik konfiguracji, który wstępnie ustawi wartości parametrów konfiguracyjnych dla Ciebie. Dla niektórych banków, inni użytkownicy uprzejmie dostarczyli swoje pliki konfiguracji .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Oszczędzasz pieniądze na coś? Utwórz skarbonkę i śledź:',
'no_piggies_create_default' => 'Utwórz nową skarbonkę',
'no_bills_title_default' => 'Stwórzmy rachunek!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Utwórz rachunek',
diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php
index ea7e8bf603..396568faf3 100644
--- a/resources/lang/pl_PL/form.php
+++ b/resources/lang/pl_PL/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Usuń trwale',
'cancel' => 'Anuluj',
'targetdate' => 'Data docelowa',
+ 'startdate' => 'Start date',
'tag' => 'Tag',
'under' => 'Poniżej',
'symbol' => 'Symbol',
diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php
index b1f02b2b66..b32a13c8ba 100644
--- a/resources/lang/pl_PL/list.php
+++ b/resources/lang/pl_PL/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Utworzono',
'update_date' => 'Zaktualizowano',
- 'updated_at' => 'Zaktualizowano',
+ 'updated_at' => 'Zaktualizowano',
'balance_before' => 'Saldo przed',
'balance_after' => 'Saldo po',
'name' => 'Nazwa',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Suma wypłat',
'sum_deposits' => 'Suma wpłat',
'sum_transfers' => 'Suma transferów',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/pt_BR/bank.php b/resources/lang/pt_BR/bank.php
index 11f05b3785..4becc5984c 100644
--- a/resources/lang/pt_BR/bank.php
+++ b/resources/lang/pt_BR/bank.php
@@ -1,6 +1,8 @@
'Prerequisites for an import from bunq',
'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index 1a97cb2988..6e9b01528f 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Receitas, renda e depósitos',
'transfer_list' => 'Transferências',
'transfers_list' => 'Transferências',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Criar uma nova retirada',
'create_deposit' => 'Criar um novo depósito',
'create_transfer' => 'Criar nova transferência',
'edit_journal' => 'Editar transação ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Apagar transação ":description"',
'tags' => 'Etiquetas',
'createTag' => 'Criar nova etiqueta',
diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php
index 830d7cd73f..961502a938 100644
--- a/resources/lang/pt_BR/csv.php
+++ b/resources/lang/pt_BR/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'ID da Conta de Ativo (correspondente Firefly)',
'column_account-name' => 'Conta de Ativo (nome)',
'column_amount' => 'Quantia',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Quantia (vírgula como separador decimal)',
'column_bill-id' => 'ID Fatura (correspondente Firefly)',
'column_bill-name' => 'Nome da Fatura',
diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php
index 749f6d09b1..83d5bdac9f 100644
--- a/resources/lang/pt_BR/demo.php
+++ b/resources/lang/pt_BR/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III oferece suporte a várias moedas. Embora o padrão seja o Euro, ela pode ser definida para o dólar americano e muitas outras moedas. Como você pode ver uma pequena seleção de moedas foi incluída, mas você pode adicionar suas próprias se desejar. No entanto, alterar a moeda padrão não vai mudar a moeda de transações existentes: Firefly III suporta o uso de várias moedas ao mesmo tempo.',
'transactions-index' => 'Estas despesas, depósitos e transferências não são fantasiosas. Elas foram geradas automaticamente.',
'piggy-banks-index' => 'Como você pode ver, existem três cofrinhos. Use o sinal de mais e menos botões para influenciar a quantidade de dinheiro em cada cofrinho. Clique no nome do cofrinho para ver a administração de cada cofrinho.',
- 'import-index' => 'Claro, qualquer arquivo .CSV pode ser importado em Firefly III ',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
'import-configure-security' => 'Por questões de segurança, seu upload foi substituído por um arquivo local.',
'import-configure-configuration' => 'A configuração que você vê abaixo é a correta para o arquivo local.',
];
diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 7dffb37a40..a41bc50f7d 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Incomplete translation',
'close' => 'Fechar',
'actions' => 'Ações',
'edit' => 'Editar',
'delete' => 'Apagar',
'welcomeBack' => 'O que está passando?',
'everything' => 'Tudo',
+ 'today' => 'today',
'customRange' => 'Intervalo Personalizado',
'apply' => 'Aplicar',
'select_date' => 'Selecione a data..',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Transaction data',
'invalid_server_configuration' => 'Invalid server configuration',
'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Pesquisa',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'mensal',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'weekly',
'weekly' => 'semanal',
'quarterly' => 'trimestral',
'half-year' => 'metade de cada ano',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Without date',
'result' => 'Result',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox . Open your .env file en enter this code after MAPBOX_API_KEY=.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Não esperado neste período',
'bill_is_active' => 'Bill is active',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'Detalhes para a conta de ativo ":name"',
'details_for_expense' => 'Detalhes para a conta de despesas ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Contas de receitas',
'cash_accounts' => 'Contas Correntes',
'Cash account' => 'Conta Corrente',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Tipo de conta',
'save_transactions_by_moving' => 'Salve essas transações, movendo-os para outra conta:',
'stored_new_account' => 'Nova conta ":name" armazenado!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'Nova categoria',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Transação ":description" excluída com sucesso',
'select_transactions' => 'Selecione as transações',
'stop_selection' => 'Parar de selecionar transações',
- 'edit_selected' => 'Editar selecionado',
- 'delete_selected' => 'Excluir selecionados',
+ 'reconcile_selected' => 'Reconcile',
'mass_delete_journals' => 'Excluir um número de transacções',
'mass_edit_journals' => 'Editar um número de transacções',
'cannot_edit_other_fields' => 'Você não pode editar em massa outros campos que não esse aqui, porque não há espaço para mostrá-los. Por favor siga o link e editá-los por um por um, se você precisar editar esses campos.',
+ 'no_budget' => '(sem orçamento)',
'perm-delete-many' => 'Exclusão de muitos itens de uma só vez pode ser muito perturbador. Por favor, seja cauteloso.',
'mass_deleted_transactions_success' => 'Excluído :amount de transação(ões).',
'mass_edited_transactions_success' => 'Atualizado :amount de transação(ões)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Moeda',
'preferences' => 'Preferências',
'logout' => 'Desconectar',
+ 'toggleNavigation' => 'Toggle navigation',
'searchPlaceholder' => 'Pesquisar...',
+ 'version' => 'Version',
'dashboard' => 'Painel de Controle',
'currencies' => 'Moedas',
'accounts' => 'Contas',
@@ -839,7 +884,7 @@ return [
'earned' => 'Ganho',
'overspent' => 'Gasto excedido',
'left' => 'Esquerda',
- 'no_budget' => '(sem orçamento)',
+ 'no_budget' => '(no budget)',
'max-amount' => 'Maximum amount',
'min-amount' => 'Minumum amount',
'journal-amount' => 'Current bill entry',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budget(s) com quantidade configurada',
'rule_or_rules' => 'regra(s)',
'rulegroup_or_groups' => 'grupo(s) de regra',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'A configuração foi atualizada',
'setting_is_demo_site' => 'Site demo',
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Dividir essa transferência',
'cannot_edit_multiple_source' => 'Você não pode editar transações parceladas #:id com a descrição ":description" porque ele contém várias contas de origem.',
'cannot_edit_multiple_dest' => 'Você não pode editar transações parceladas #:id com a descrição ":description" porque ele contém várias contas de destino.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'Você não selecionou nenhuma transação válida para editar.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Import data into Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+ 'import_general_index_csv_file' => 'Import a (CSV) file',
'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
'import_index_file' => 'Select your file',
'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a bill',
diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 255a2d254f..1377664080 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Apagar permanentemente',
'cancel' => 'Cancelar',
'targetdate' => 'Data Alvo',
+ 'startdate' => 'Start date',
'tag' => 'Etiqueta',
'under' => 'Debaixo',
'symbol' => 'Símbolo',
diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index 2033eec94c..6e258cdc09 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Criado em',
'update_date' => 'Atualizado em',
- 'updated_at' => 'Updated at',
+ 'updated_at' => 'Updated at',
'balance_before' => 'Saldo Antes',
'balance_after' => 'Saldo depois',
'name' => 'Nome',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Sum of withdrawals',
'sum_deposits' => 'Sum of deposits',
'sum_transfers' => 'Sum of transfers',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/ru_RU/bank.php b/resources/lang/ru_RU/bank.php
index 11f05b3785..27d103f5f9 100644
--- a/resources/lang/ru_RU/bank.php
+++ b/resources/lang/ru_RU/bank.php
@@ -1,6 +1,8 @@
'Prerequisites for an import from bunq',
- 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app.',
-];
\ No newline at end of file
+ 'bunq_prerequisites_title' => 'Реквизиты для импорта из bunq',
+ 'bunq_prerequisites_text' => 'Для импорта из bunq вам необходимо получить API ключ. Вы можете сделать это через приложение.',
+];
diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index 7cd631ef0c..6b9d6eaf60 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'Мои доходы',
'transfer_list' => 'Переводы',
'transfers_list' => 'Переводы',
+ 'reconciliation_list' => 'Reconciliations',
'create_withdrawal' => 'Создать новый расход',
'create_deposit' => 'Создать новый доход',
'create_transfer' => 'Создать новый перевод',
'edit_journal' => 'Редактирование транзакции ":description"',
+ 'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Удаление транзакции ":description"',
'tags' => 'Метки',
'createTag' => 'Создать новую метку',
diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php
index 1b3c320594..f81770ec63 100644
--- a/resources/lang/ru_RU/csv.php
+++ b/resources/lang/ru_RU/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'Asset account ID (matching Firefly)',
'column_account-name' => 'Asset account (name)',
'column_amount' => 'Amount',
+ 'column_amount_debet' => 'Amount (debet column)',
+ 'column_amount_credit' => 'Amount (credit column)',
'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
'column_bill-id' => 'Bill ID (matching Firefly)',
'column_bill-name' => 'Bill name',
diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php
index 57e9277cdb..babdfb5310 100644
--- a/resources/lang/ru_RU/demo.php
+++ b/resources/lang/ru_RU/demo.php
@@ -20,7 +20,7 @@ return [
'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
- 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
+ 'import-configure-security' => 'По соображениям безопасности, загружаемый вами файл был заменен локальным.',
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
];
diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 7dcf9afe4d..e56bd79980 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'Incomplete translation',
'close' => 'Закрыть',
'actions' => 'Действия',
'edit' => 'Изменить',
'delete' => 'Удалить',
'welcomeBack' => 'Что происходит с моими финансами?',
'everything' => 'Всё',
+ 'today' => 'today',
'customRange' => 'Другой интервал',
'apply' => 'Применить',
'select_date' => 'Выбрать дату...',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Данные транзакции',
'invalid_server_configuration' => 'Invalid server configuration',
'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Поиск',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'ежемесячно',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'weekly',
'weekly' => 'еженедельно',
'quarterly' => 'раз в квартал',
'half-year' => 'раз в полгода',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Without date',
'result' => 'Result',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox . Open your .env file en enter this code after MAPBOX_API_KEY=.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Not expected this period',
'bill_is_active' => 'Bill is active',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'Details for asset account ":name"',
'details_for_expense' => 'Details for expense account ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Revenue accounts',
'cash_accounts' => 'Cash accounts',
'Cash account' => 'Cash account',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'Новая категория',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Successfully created new transaction ":description"',
'select_transactions' => 'Выбрать транзакции',
'stop_selection' => 'Завершить выбор транзакций',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
+ 'reconcile_selected' => 'Reconcile',
'mass_delete_journals' => 'Delete a number of transactions',
'mass_edit_journals' => 'Edit a number of transactions',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'no_budget' => '(no budget)',
'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Валюта',
'preferences' => 'Настройки',
'logout' => 'Выход',
+ 'toggleNavigation' => 'Toggle navigation',
'searchPlaceholder' => 'Поиск...',
+ 'version' => 'Version',
'dashboard' => 'Сводка',
'currencies' => 'Валюты',
'accounts' => 'Счета',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budget(s) with configured amount',
'rule_or_rules' => 'rule(s)',
'rulegroup_or_groups' => 'rule group(s)',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'The configuration has been updated',
'setting_is_demo_site' => 'Demo site',
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Split this transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Импорт данных в Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+ 'import_general_index_csv_file' => 'Import a (CSV) file',
'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
'import_index_file' => 'Select your file',
'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a bill',
diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index b4832f0cf6..c5fd8619f3 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Delete permanently',
'cancel' => 'Отмена',
'targetdate' => 'Намеченная дата',
+ 'startdate' => 'Start date',
'tag' => 'Тег',
'under' => 'Under',
'symbol' => 'Символ',
diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php
index f1ce3395d5..a0a1d8cd6e 100644
--- a/resources/lang/ru_RU/list.php
+++ b/resources/lang/ru_RU/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Создан',
'update_date' => 'Обновлён',
- 'updated_at' => 'Updated at',
+ 'updated_at' => 'Updated at',
'balance_before' => 'Баланс до',
'balance_after' => 'Баланс после',
'name' => 'Имя',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Sum of withdrawals',
'sum_deposits' => 'Sum of deposits',
'sum_transfers' => 'Sum of transfers',
+ 'reconcile' => 'Reconcile',
];
diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php
index 8273315994..a4ef9fd56b 100644
--- a/resources/lang/ru_RU/validation.php
+++ b/resources/lang/ru_RU/validation.php
@@ -22,49 +22,49 @@ return [
'file_invalid_mime' => 'Файл ":name" имеет тип ":mime". Загрузка файлов такого типа невозможна.',
'file_too_large' => 'Файл ":name" слишком большой.',
'belongs_to_user' => 'Значение :attribute неизвестно',
- 'accepted' => 'The :attribute must be accepted.',
- 'bic' => 'This is not a valid BIC.',
- 'more' => ':attribute must be larger than zero.',
- 'active_url' => 'The :attribute is not a valid URL.',
- 'after' => 'The :attribute must be a date after :date.',
- 'alpha' => 'The :attribute may only contain letters.',
- 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
- 'alpha_num' => 'The :attribute may only contain letters and numbers.',
- 'array' => 'The :attribute must be an array.',
- 'unique_for_user' => 'There already is an entry with this :attribute.',
- 'before' => 'The :attribute must be a date before :date.',
- 'unique_object_for_user' => 'This name is already in use',
- 'unique_account_for_user' => 'This account name is already in use',
- 'between.numeric' => 'The :attribute must be between :min and :max.',
- 'between.file' => 'The :attribute must be between :min and :max kilobytes.',
- 'between.string' => 'The :attribute must be between :min and :max characters.',
- 'between.array' => 'The :attribute must have between :min and :max items.',
- 'boolean' => 'The :attribute field must be true or false.',
- 'confirmed' => 'The :attribute confirmation does not match.',
- 'date' => 'The :attribute is not a valid date.',
- 'date_format' => 'The :attribute does not match the format :format.',
- 'different' => 'The :attribute and :other must be different.',
- 'digits' => 'The :attribute must be :digits digits.',
- 'digits_between' => 'The :attribute must be between :min and :max digits.',
- 'email' => 'The :attribute must be a valid email address.',
- 'filled' => 'The :attribute field is required.',
- 'exists' => 'The selected :attribute is invalid.',
- 'image' => 'The :attribute must be an image.',
- 'in' => 'The selected :attribute is invalid.',
- 'integer' => 'The :attribute must be an integer.',
- 'ip' => 'The :attribute must be a valid IP address.',
- 'json' => 'The :attribute must be a valid JSON string.',
+ 'accepted' => 'Необходимо принять :attribute.',
+ 'bic' => 'Это некорректный BIC.',
+ 'more' => ':attribute должен быть больше нуля.',
+ 'active_url' => ':attribute не является допустимым URL-адресом.',
+ 'after' => ':attribute должна быть позже :date.',
+ 'alpha' => ':attribute может содержать только буквы.',
+ 'alpha_dash' => ':attribute может содержать только буквы, числа и дефис.',
+ 'alpha_num' => ':attribute может содержать только буквы и числа.',
+ 'array' => ':attribute должен быть массивом.',
+ 'unique_for_user' => 'Уже существует запись с этим :attribute.',
+ 'before' => ':attribute должна быть раньше :date.',
+ 'unique_object_for_user' => 'Это имя уже используется',
+ 'unique_account_for_user' => 'Имя аккаунта уже используется',
+ 'between.numeric' => ':attribute должен быть больше :min и меньше :max.',
+ 'between.file' => ':attribute должен быть размером :min - :max килобайт.',
+ 'between.string' => ':attribute должен содержать :min - :max символов.',
+ 'between.array' => ':attribute должен содержать :min - :max элементов.',
+ 'boolean' => 'Поле :attribute должно быть истинным или ложным.',
+ 'confirmed' => ':attribute не совпадает с подтверждением.',
+ 'date' => ':attribute не является верной датой.',
+ 'date_format' => ':attribute не совпадает с форматом :format.',
+ 'different' => ':attribute и :other не должны совпадать.',
+ 'digits' => ':attribute должно содержать :digits цифр.',
+ 'digits_between' => ':attribute должен содержать :min - :max цифр.',
+ 'email' => ':attribute не является верным email адресом.',
+ 'filled' => 'Поле :attribute должно быть заполнено.',
+ 'exists' => 'Выбран неверный :attribute.',
+ 'image' => ':attribute должен быть изображением.',
+ 'in' => 'Выбранный :attribute не верный.',
+ 'integer' => ':attribute должно быть целым числом.',
+ 'ip' => ':attribute должен быть верным IP-адресом.',
+ 'json' => ':attribute должно быть верной JSON строкой.',
'max.numeric' => 'The :attribute may not be greater than :max.',
'max.file' => 'The :attribute may not be greater than :max kilobytes.',
'max.string' => 'The :attribute may not be greater than :max characters.',
'max.array' => 'The :attribute may not have more than :max items.',
'mimes' => 'The :attribute must be a file of type: :values.',
- 'min.numeric' => 'The :attribute must be at least :min.',
- 'min.file' => 'The :attribute must be at least :min kilobytes.',
+ 'min.numeric' => ':attribute должен быть минимум :min.',
+ 'min.file' => ':attribute должен быть минимум :min килобайт.',
'min.string' => 'The :attribute must be at least :min characters.',
'min.array' => 'The :attribute must have at least :min items.',
- 'not_in' => 'The selected :attribute is invalid.',
- 'numeric' => 'The :attribute must be a number.',
+ 'not_in' => 'Выбранный :attribute не верный.',
+ 'numeric' => ':attribute должен быть числом.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
@@ -72,22 +72,22 @@ return [
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.',
- 'required_without_all' => 'The :attribute field is required when none of :values are present.',
- 'same' => 'The :attribute and :other must match.',
- 'size.numeric' => 'The :attribute must be :size.',
- 'size.file' => 'The :attribute must be :size kilobytes.',
- 'size.string' => 'The :attribute must be :size characters.',
- 'size.array' => 'The :attribute must contain :size items.',
- 'unique' => 'The :attribute has already been taken.',
- 'string' => 'The :attribute must be a string.',
- 'url' => 'The :attribute format is invalid.',
- 'timezone' => 'The :attribute must be a valid zone.',
- '2fa_code' => 'The :attribute field is invalid.',
- 'dimensions' => 'The :attribute has invalid image dimensions.',
- 'distinct' => 'The :attribute field has a duplicate value.',
- 'file' => 'The :attribute must be a file.',
- 'in_array' => 'The :attribute field does not exist in :other.',
- 'present' => 'The :attribute field must be present.',
- 'amount_zero' => 'The total amount cannot be zero',
- 'secure_password' => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN',
+ 'required_without_all' => ':attribute поле обязательно для заполнения, так как ни одно из :values не существует.',
+ 'same' => ':attribute и :other должны совпадать.',
+ 'size.numeric' => ':attribute должен быть размером :size.',
+ 'size.file' => ':attribute должен быть размером :size килобайт.',
+ 'size.string' => ':attribute должен состоять из :size символов.',
+ 'size.array' => ':attribute должен содержать :size элементов.',
+ 'unique' => ':attribute уже занят.',
+ 'string' => 'Значение :attribute должно быть строкой.',
+ 'url' => 'Неверный формат ввода :attribute.',
+ 'timezone' => ':attribute должен быть в допустимом диапазоне.',
+ '2fa_code' => ':attribute введен неверно.',
+ 'dimensions' => 'Недопустимые размеры изображения :attribute.',
+ 'distinct' => 'Поле :attribute содержит повторяющееся значение.',
+ 'file' => ':attribute должен быть файлом.',
+ 'in_array' => 'Поле :attribute не существует в :other.',
+ 'present' => 'Поле :attribute должно быть заполнено.',
+ 'amount_zero' => 'Общее количество не может быть равно нулю',
+ 'secure_password' => 'Это не безопасный пароль. Попробуйте еще раз. Для получения справки посетите https://goo.gl/NCh2tN',
];
diff --git a/resources/lang/sl_SI/bank.php b/resources/lang/sl_SI/bank.php
index 964f43f024..fd0521b288 100644
--- a/resources/lang/sl_SI/bank.php
+++ b/resources/lang/sl_SI/bank.php
@@ -1,6 +1,8 @@
'Predpogoji za uvoz iz bunq',
'bunq_prerequisites_text' => 'Če želite uvoziti iz bunq-a, morate pridobiti ključ za API. To lahko storite s pomočjo aplikacije.',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php
index 04b738b939..c221d3df3f 100644
--- a/resources/lang/sl_SI/breadcrumbs.php
+++ b/resources/lang/sl_SI/breadcrumbs.php
@@ -31,10 +31,12 @@ return [
'deposit_list' => 'prihodki',
'transfer_list' => 'prenosi',
'transfers_list' => 'prenosi',
+ 'reconciliation_list' => 'Poravnave',
'create_withdrawal' => 'ustvari nov odhodek',
'create_deposit' => 'ustvari nov prihodek',
'create_transfer' => 'ustvari nov prenos',
'edit_journal' => 'uredi transakcijo ":description"',
+ 'edit_reconciliation' => 'Uredi ":description"',
'delete_journal' => 'izbriši transakcijo ":description"',
'tags' => 'značke',
'createTag' => 'ustvari novo značko',
diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php
index 216c4886ae..e9a21edc07 100644
--- a/resources/lang/sl_SI/csv.php
+++ b/resources/lang/sl_SI/csv.php
@@ -51,6 +51,8 @@ return [
'column_account-id' => 'ID premoženjskega računa (Firefly)',
'column_account-name' => 'premoženjski račun (ime)',
'column_amount' => 'znesek',
+ 'column_amount_debet' => 'Znesek v breme',
+ 'column_amount_credit' => 'Znesek v dobro',
'column_amount-comma-separated' => 'znesek (z decimalno vejico)',
'column_bill-id' => 'ID trajnika (Firefly)',
'column_bill-name' => 'Ime trajnika',
diff --git a/resources/lang/sl_SI/demo.php b/resources/lang/sl_SI/demo.php
index dca94a9aa7..a3df49a192 100644
--- a/resources/lang/sl_SI/demo.php
+++ b/resources/lang/sl_SI/demo.php
@@ -21,7 +21,7 @@ Konti prihodkov so računi iz katerih dobivate denar, kot npr. vaš delodajalec,
'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.',
'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.',
'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.',
- 'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
+ 'import-index' => 'Of course, any CSV file can be imported into Firefly III',
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
];
diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php
index 22124ba713..b171129468 100644
--- a/resources/lang/sl_SI/firefly.php
+++ b/resources/lang/sl_SI/firefly.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
return [
// general stuff:
+ 'language_incomplete' => 'nepopoln prevod',
'close' => 'zapri',
'actions' => 'Dejanja',
'edit' => 'uredi',
'delete' => 'izbriši',
'welcomeBack' => 'Kaj dogaja?',
'everything' => 'vse',
+ 'today' => 'danes',
'customRange' => 'obseg po meri',
'apply' => 'uporabi',
'select_date' => 'Izberi datum..',
@@ -82,11 +84,11 @@ return [
'expenses_by_expense_account' => 'stroški po stroškovnih kontih',
'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
'sum_of_expenses' => 'vsota stroškov',
- 'sum_of_income' => 'Sum of income',
+ 'sum_of_income' => 'Vsota dohodkov',
'spent_in_specific_budget' => 'Spent in budget ":budget"',
'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
'left_in_budget_limit' => 'Left to spend according to budgeting',
- 'current_period' => 'Current period',
+ 'current_period' => 'Tekoče obdobje',
'show_the_current_period_and_overview' => 'Show the current period and overview',
'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
'budget_in_period' => 'All transactions for budget ":name" between :start and :end',
@@ -94,30 +96,30 @@ return [
'chart_account_in_period' => 'Chart for all transactions for account ":name" between :start and :end',
'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
'chart_category_all' => 'Chart for all transactions for category ":name"',
- 'clone_withdrawal' => 'Clone this withdrawal',
- 'clone_deposit' => 'Clone this deposit',
- 'clone_transfer' => 'Clone this transfer',
- 'multi_select_no_selection' => 'None selected',
- 'multi_select_all_selected' => 'All selected',
- 'multi_select_filter_placeholder' => 'Find..',
- 'between_dates_breadcrumb' => 'Between :start and :end',
- 'all_journals_without_budget' => 'All transactions without a budget',
- 'journals_without_budget' => 'Transactions without a budget',
- 'all_journals_without_category' => 'All transactions without a category',
- 'journals_without_category' => 'Transactions without a category',
- 'all_journals_for_account' => 'All transactions for account :name',
- 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
- 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
- 'transferred' => 'Transferred',
+ 'clone_withdrawal' => 'Kloniraj ta odhodek',
+ 'clone_deposit' => 'Kloniraj ta prihodek',
+ 'clone_transfer' => 'Kloniraj ta prenos',
+ 'multi_select_no_selection' => 'Nič ni izbrano',
+ 'multi_select_all_selected' => 'Vse je izbrano',
+ 'multi_select_filter_placeholder' => 'Najdi..',
+ 'between_dates_breadcrumb' => 'Med :start in :end',
+ 'all_journals_without_budget' => 'Vse transakcije brez budžeta',
+ 'journals_without_budget' => 'Transakcije brez budžeta',
+ 'all_journals_without_category' => 'Vse transakcije brez kategorije',
+ 'journals_without_category' => 'Transakcije brez kategorije',
+ 'all_journals_for_account' => 'Vse transakcije za konto :ime',
+ 'chart_all_journals_for_account' => 'Graf vseh transakcij za konto :name',
+ 'journals_in_period_for_account' => 'stroški na kontu ":name" med :start in :end',
+ 'transferred' => 'Prenešeno',
'all_withdrawal' => 'vsi stroški',
- 'all_transactions' => 'All transactions',
+ 'all_transactions' => 'Vse transakcije',
'title_withdrawal_between' => 'vsi stroški med :start in :end',
- 'all_deposit' => 'All revenue',
- 'title_deposit_between' => 'All revenue between :start and :end',
- 'all_transfers' => 'All transfers',
- 'title_transfers_between' => 'All transfers between :start and :end',
- 'all_transfer' => 'All transfers',
- 'all_journals_for_tag' => 'All transactions for tag ":tag"',
+ 'all_deposit' => 'Vsi prihodki',
+ 'title_deposit_between' => 'Vsi prihodki med :start in :end',
+ 'all_transfers' => 'Vsi prenosi',
+ 'title_transfers_between' => 'vsi prenosi med :start in :end',
+ 'all_transfer' => 'Vsi prenosi',
+ 'all_journals_for_tag' => 'Vse transakcije za značko ":tag"',
'title_transfer_between' => 'All transfers between :start and :end',
'all_journals_for_category' => 'All transactions for category :name',
'all_journals_for_budget' => 'All transactions for budget :name',
@@ -130,6 +132,7 @@ return [
'transaction_data' => 'Transaction data',
'invalid_server_configuration' => 'Invalid server configuration',
'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this .',
+ 'quickswitch' => 'Quickswitch',
// search
'search' => 'Search',
@@ -147,7 +150,7 @@ return [
'repeat_freq_half-year' => 'every half-year',
'repeat_freq_quarterly' => 'quarterly',
'repeat_freq_monthly' => 'monthly',
- 'repeat_freq_weekly' => 'weekly',
+ 'repeat_freq_weekly' => 'weekly',
'weekly' => 'weekly',
'quarterly' => 'quarterly',
'half-year' => 'every half year',
@@ -354,6 +357,7 @@ return [
'without_date' => 'Without date',
'result' => 'Result',
'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox . Open your .env file en enter this code after MAPBOX_API_KEY=.',
'press_tag_location' => 'Right click or long press to set the tag\'s location.',
'clear_location' => 'Clear location',
@@ -586,6 +590,8 @@ return [
'not_expected_period' => 'Not expected this period',
'bill_is_active' => 'Bill is active',
'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+
// accounts:
'details_for_asset' => 'podrobnosti za premoženjski račun ":name"',
'details_for_expense' => 'podrobnosti stroškovnega konta ":name"',
@@ -614,6 +620,27 @@ return [
'revenue_accounts' => 'Revenue accounts',
'cash_accounts' => 'Cash accounts',
'Cash account' => 'Cash account',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash' => 'cash',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'stored_new_account' => 'New account ":name" stored!',
@@ -626,6 +653,22 @@ return [
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'account_default_currency' => 'If you select another currency, new transactions from this account will have this currency pre-selected.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconcilliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
// categories:
'new_category' => 'New category',
@@ -659,11 +702,11 @@ return [
'stored_journal' => 'Successfully created new transaction ":description"',
'select_transactions' => 'Select transactions',
'stop_selection' => 'Stop selecting transactions',
- 'edit_selected' => 'Edit selected',
- 'delete_selected' => 'Delete selected',
+ 'reconcile_selected' => 'Reconcile',
'mass_delete_journals' => 'Delete a number of transactions',
'mass_edit_journals' => 'Edit a number of transactions',
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'no_budget' => '(no budget)',
'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.',
'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).',
'mass_edited_transactions_success' => 'Updated :amount transaction(s)',
@@ -699,7 +742,9 @@ return [
'currency' => 'Currency',
'preferences' => 'Preferences',
'logout' => 'Logout',
+ 'toggleNavigation' => 'Toggle navigation',
'searchPlaceholder' => 'Search...',
+ 'version' => 'Version',
'dashboard' => 'Dashboard',
'currencies' => 'Currencies',
'accounts' => 'Accounts',
@@ -925,6 +970,7 @@ return [
'budgets_with_limits' => 'budget(s) with configured amount',
'rule_or_rules' => 'rule(s)',
'rulegroup_or_groups' => 'rule group(s)',
+ 'tag_or_tags' => 'tag(s)',
'configuration_updated' => 'The configuration has been updated',
'setting_is_demo_site' => 'Demo site',
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
@@ -1000,6 +1046,7 @@ return [
'split_this_transfer' => 'Split this transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
+ 'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction',
@@ -1012,6 +1059,7 @@ return [
'import_index_title' => 'Import data into Firefly III',
'import_index_sub_title' => 'Index',
'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
+ 'import_general_index_csv_file' => 'Import a (CSV) file',
'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.',
'import_index_file' => 'Select your file',
'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file .',
@@ -1095,7 +1143,7 @@ return [
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a bill',
diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php
index 178718ace6..69ec14c2f2 100644
--- a/resources/lang/sl_SI/form.php
+++ b/resources/lang/sl_SI/form.php
@@ -91,6 +91,7 @@ return [
'deletePermanently' => 'Delete permanently',
'cancel' => 'Cancel',
'targetdate' => 'Target date',
+ 'startdate' => 'Start date',
'tag' => 'Tag',
'under' => 'Under',
'symbol' => 'Symbol',
diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php
index 6aa58450e2..15f7b08998 100644
--- a/resources/lang/sl_SI/list.php
+++ b/resources/lang/sl_SI/list.php
@@ -17,7 +17,7 @@ return [
'id' => 'ID',
'create_date' => 'Ustvarjeno',
'update_date' => 'Posodobljeno',
- 'updated_at' => 'Posodobljeno',
+ 'updated_at' => 'Posodobljeno',
'balance_before' => 'Stanje prej',
'balance_after' => 'Stanje potem',
'name' => 'ime',
@@ -89,4 +89,5 @@ return [
'sum_withdrawals' => 'Vsota odlivov',
'sum_deposits' => 'Vsota prilivov',
'sum_transfers' => 'Vsota prenosov',
+ 'reconcile' => 'Poravnaj',
];
diff --git a/resources/stubs/binary.bin b/resources/stubs/binary.bin
new file mode 100644
index 0000000000..25602c8fbc
Binary files /dev/null and b/resources/stubs/binary.bin differ
diff --git a/resources/views/accounts/reconcile/edit.twig b/resources/views/accounts/reconcile/edit.twig
new file mode 100644
index 0000000000..dff6c8c6dc
--- /dev/null
+++ b/resources/views/accounts/reconcile/edit.twig
@@ -0,0 +1,115 @@
+{% extends "./layout/default" %}
+
+{% block breadcrumbs %}
+ {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
+{% endblock %}
+
+{% block content %}
+
+
+
+{% endblock %}
+{% block scripts %}
+
+
+
+
+
+
+
+
+
+{% endblock %}
+{% block styles %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'select_range_and_balance'|_ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ trans('list.type') }}
+ {{ journal.transactiontype.type|_ }}
+
+
+ {{ trans('list.description') }}
+ {{ journal.description }}
+
+ {# total amount #}
+
+ {{ 'total_amount'|_ }}
+
+ {{ formatAmountByAccount(transaction.account, transaction.amount) }}
+
+
+
+
+ {{ trans('list.date') }}
+ {{ journal.date.formatLocalized(monthAndDayFormat) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'categories'|_ }}
+ {{ journalCategories(journal)|raw }}
+
+ {% if journal.tags|length > 0 %}
+
+ {{ 'tags'|_ }}
+
+ {% for tag in journal.tags %}
+
+
+ {% endfor %}
+
+
+ {% endif %}
+
+
+
+
+
+
{{ 'transactions'|_ }}
- {% include 'list.journals' with {sorting:true, hideBills:true, hideBudgets: true, hideCategories: true} %}
+ {% include 'list.journals' with {sorting:true, hideBills:true, hideBudgets: true, hideCategories: true, showReconcile: true} %}
{% if periods.count > 0 %}
{{ link.source.description }}
-
{{ journalAmount(link.source) }}
+
{{ link.source|journalTotalAmount }}
{{ linkType.outward }}
{{ link.destination.description }}
- {{ journalAmount(link.destination) }}
+ {{ link.destination|journalTotalAmount }}
+
{% endfor %}
diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig
index 2922ed89ff..b627f4c2f0 100644
--- a/resources/views/admin/users/show.twig
+++ b/resources/views/admin/users/show.twig
@@ -32,9 +32,9 @@
{{ trans('list.is_admin') }}
{% if information.is_admin %}
-
@@ -42,9 +42,9 @@
{{ trans('list.has_two_factor') }}
{% if information.has_2fa %}
-
@@ -52,7 +52,7 @@
{{ trans('list.is_blocked') }}
{% if information.blocked %}
- ~
@@ -61,7 +61,7 @@
{% endif %}
{% else %}
-
@@ -122,7 +122,7 @@
{{ trans('list.tags_count') }}
- {{ information.tags }} tags
+ {{ information.tags }} {{ 'tag_or_tags'|_ }}
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index 5ee65cf3c8..3f2701cbcd 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -6,7 +6,7 @@
{% block content %}
-
{{ 'optionalFields'|_ }}
+ {{ ExpandedForm.textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }}
+ {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
{{ ExpandedForm.integer('skip') }}
{{ ExpandedForm.checkbox('automatch',1) }}
{{ ExpandedForm.checkbox('active',1) }}
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index ef136db47f..0870429463 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -19,7 +19,7 @@
-
+
{{ 'matching_on'|_ }}
@@ -84,12 +84,60 @@
-
-
- {{ 'rescan_old'|_ }}
-
+
+ {% if bill.notes.count == 1 %}
+
+
+ {{ trans('list.notes') }}
+ {{ bill.notes.first.text|markdown }}
+
+
+ {% endif %}
+
+
+
{% if budgetInformation[budget.id]['currentLimit'] %}
- {% set repAmount = budgetInformation[budget.id]['currentLimit'].amount %}
+ {% set repAmount = budgetInformation[budget.id]['budgeted'] %}
{% else %}
{% set repAmount = '0' %}
{% endif %}
@@ -174,8 +174,8 @@
{{ defaultCurrency.symbol|raw }}
-
- Please copy and paste the content of this textbox into a (new) Github issue. Don't change anything, don't add enters or something.
+
+ If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new
+ or existing Github issue . It will generate a beautiful table that can
+ be used to quickly diagnose your problem.
-
+
+
+ Back to the index
+
+
+
+ You may also share the content of the box below. You can also copy-and-paste this into a new
+ or existing Github issue . However, the content of this
+ box may contain private information such as account names, transaction details or email addresses.
+
+
+
+
+
+ Back to the index
+
+
-
\ No newline at end of file
+