adjust alert css classes to the message severity

Use panel classes for styling and leave error class for errors.
This commit is contained in:
Mathias Kresin 2015-01-17 23:15:47 +01:00
parent e08ba7771d
commit f602ff50e2
13 changed files with 21 additions and 24 deletions

View File

@ -237,7 +237,7 @@ textarea.form-error {
}
/* alerts */
.alert {
.alert, .panel {
padding: 8px 35px 8px 14px;
margin-bottom: 20px;
color: #c09853;
@ -253,7 +253,7 @@ textarea.form-error {
border-color: #d6e9c6;
}
.alert-error {
.alert-error, .panel-danger {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
@ -265,13 +265,13 @@ textarea.form-error {
border-color: #bce8f1;
}
.alert-normal {
.alert-normal, .panel-default {
color: #333;
background-color: #f0f0f0;
border-color: #ddd;
}
.alert-error a {
.alert-error a, .panel-danger a {
color: #b94a48;
}

View File

@ -12,7 +12,7 @@
</nav>
</div>
<section>
<div class="alert alert-normal">
<div class="panel panel-default">
<h3><?= t('Bookmarks') ?></h3>
<ul>
<li>
@ -20,12 +20,12 @@
</li>
</ul>
</div>
<div class="alert alert-normal">
<div class="panel panel-default">
<h3><?= t('Bookmarklet') ?></h3>
<a class="bookmarklet" href="javascript:location.href='<?= Helper\get_current_base_url() ?>?action=subscribe&amp;token=<?= urlencode($config['bookmarklet_token']) ?>&amp;url='+encodeURIComponent(location.href)"><?= t('Subscribe with Miniflux') ?></a> (<?= t('Drag and drop this link to your bookmarks') ?>)
<input type="text" class="auto-select" readonly="readonly" value="javascript:location.href='<?= Helper\get_current_base_url() ?>?action=subscribe&amp;token=<?= urlencode($config['bookmarklet_token']) ?>&amp;url='+encodeURIComponent(location.href)"/>
</div>
<div class="alert alert-normal">
<div class="panel panel-default">
<h3><?= t('About') ?></h3>
<ul>
<li><?= t('Miniflux version:') ?> <strong><?= APP_VERSION ?></strong></li>

View File

@ -12,7 +12,7 @@
</nav>
</div>
<section>
<div class="alert alert-normal">
<div class="panel panel-default">
<h3 id="fever"><?= t('Fever API') ?></h3>
<ul>
<li><?= t('API endpoint:') ?> <strong><?= Helper\get_current_base_url().'fever/' ?></strong></li>
@ -20,7 +20,7 @@
<li><?= t('API token:') ?> <strong><?= Helper\escape($config['fever_token']) ?></strong></li>
</ul>
</div>
<div class="alert alert-normal">
<div class="panel panel-default">
<h3 id="api"><?= t('Miniflux API') ?></h3>
<ul>
<li><?= t('API endpoint:') ?> <strong><?= Helper\get_current_base_url().'jsonrpc.php' ?></strong></li>

View File

@ -7,7 +7,7 @@
</div>
<?php if ($nothing_to_read): ?>
<p class="alert"><?= t('There is nothing new to read, enjoy your favorites articles!') ?></p>
<p class="alert alert-info"><?= t('There is nothing new to read, enjoy your favorites articles!') ?></p>
<?php endif ?>
<section class="items" id="listing">

View File

@ -75,7 +75,7 @@
<div class="page-section">
<h2><?= t('Advanced') ?></h2>
</div>
<section class="alert alert-error">
<section class="panel panel-danger">
<ul>
<li><a href="?action=generate-tokens&amp;csrf=<?= $values['csrf'] ?>"><?= t('Generate new tokens') ?></a> (<?= t('Miniflux API') ?>, <?= t('Fever API') ?>, <?= t('Bookmarklet') ?>, <?= t('Bookmark RSS Feed') ?>)</li>
<?php if (ENABLE_AUTO_UPDATE): ?>

View File

@ -2,7 +2,7 @@
<h2><?= t('Confirmation') ?></h2>
</div>
<p class="alert alert-error"><?= t('This action will update Miniflux with the last development version, are you sure?') ?></p>
<p class="alert alert-info"><?= t('This action will update Miniflux with the last development version, are you sure?') ?></p>
<div class="form-actions">
<a href="?action=auto-update" class="btn btn-red"><?= t('Update Miniflux') ?></a>

View File

@ -12,7 +12,7 @@
</nav>
</div>
<section>
<div class="alert alert-normal">
<div class="panel panel-default">
<ul>
<li><?= t('Database size:') ?> <strong><?= Helper\format_bytes($db_size) ?></strong></li>
<li><a href="?action=optimize-db&amp;csrf=<?= $csrf ?>"><?= t('Optimize the database') ?></a> <?= t('(VACUUM command)') ?></li>

View File

@ -32,9 +32,6 @@
<?= t('or') ?> <a href="?action=feeds"><?= t('cancel') ?></a>
</div>
</form>
<br/>
<div class="alert alert-error">
<ul>
<li><a href="?action=confirm-remove-feed&amp;feed_id=<?= $values['id'] ?>"><?= t('Remove this feed') ?></a></li>
</ul>
<div class="form-actions">
<a href="?action=confirm-remove-feed&amp;feed_id=<?= $values['id'] ?>" class="btn btn-red"><?= t('Remove this feed') ?></a>
</div>

View File

@ -1,5 +1,5 @@
<?php if (empty($items)): ?>
<p class="alert">
<p class="alert alert-info">
<?= tne('This subscription is empty, <a href="?action=unread">go back to unread items</a>') ?>
</p>
<?php else: ?>
@ -20,7 +20,7 @@
</div>
<?php if ($feed['parsing_error']): ?>
<p class="alert alert-warning">
<p class="alert alert-error">
<?= tne('An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!','<a href="?action=console">','</a>') ?>
</p>
<?php endif; ?>

View File

@ -20,7 +20,7 @@
<?php if ($nb_failed_feeds > 0): ?>
<p class="alert alert-error"><?= tne('An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!', '<a href="?action=console">', '</a>') ?></p>
<?php elseif ($nothing_to_read): ?>
<p class="alert"><?= tne('Nothing to read, do you want to <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>') ?></p>
<p class="alert alert-info"><?= tne('Nothing to read, do you want to <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>') ?></p>
<?php endif ?>
<section class="items">

View File

@ -10,7 +10,7 @@
</div>
<?php if ($nothing_to_read): ?>
<p class="alert"><?= t('There is nothing new to read, enjoy your previous readings!') ?></p>
<p class="alert alert-info"><?= t('There is nothing new to read, enjoy your previous readings!') ?></p>
<?php endif ?>
<section class="items" id="listing">

View File

@ -1,4 +1,4 @@
<div class="alert alert-normal" id="shortcuts">
<div class="panel panel-default" id="shortcuts">
<h3><?= t('Keyboard shortcuts') ?></h3>
<ul>
<li><?= t('Go to unread') ?> = <strong>gu</strong></li>

View File

@ -1,5 +1,5 @@
<?php if (empty($item)): ?>
<p class="alert alert-info"><?= t('Item not found') ?></p>
<p class="alert alert-error"><?= t('Item not found') ?></p>
<?php else: ?>
<article
class="item"