valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update notice/error css classes

This commit is contained in:
Andrew Dolgov 2015-08-11 18:37:07 +03:00
parent 7a1133521c
commit c1ebb6cdf7
3 changed files with 103 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
css/tt-rss.css
View File

@ -272,58 +272,77 @@ div.filterTestHolder {
} }
#content-insert pre, #headlines-frame pre, .dijitContentPane pre { #content-insert pre, #headlines-frame pre, .dijitContentPane pre {
margin : 5px 0px 5px 0px; margin: 5px 0px 5px 0px;
padding : 10px; padding: 10px;
color : #555; color: #555;
font-family : monospace; font-family: monospace;
font-size : 12px; font-size: 12px;
border-width : 0px; border-width: 0px;
border-color : #ccc; border-color: #ccc;
border-style : solid; border-style: solid;
background : #f5f5f5; background: #f5f5f5;
display : block; display: block;
max-width : 98%; max-width: 98%;
overflow : auto; overflow: auto;
} }
div.notice, div.warning, div.error { .alert {
padding : 4px 10px 4px 4px; padding: 8px 35px 8px 14px;
display : inline-block; margin-bottom: 20px;
margin : 2px 0px 4px 0px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
font-size : 12px; background-color: #fcf8e3;
border-style : solid; border: 1px solid #fbeed5;
border-color : #ccc; -webkit-border-radius: 4px;
border-width : 1px; -moz-border-radius: 4px;
border-radius: 4px;
} }
div.notice div.inner, div.warning div.inner, div.error div.inner { .alert,
vertical-align : middle; .alert h4 {
color: #c09853;
} }
div.notice { .alert h4 {
background : #ecf4ff; margin: 0;
border-color : #88b0f0;
} }
div.warning { .alert .close {
background : #fff7d5; position: relative;
border-color : #e7d796;; top: -2px;
right: -21px;
line-height: 20px;
} }
div.error { .alert-success {
background : #ffcccc; color: #468847;
border-color : #ff0000; background-color: #dff0d8;
border-color: #d6e9c6;
} }
div.warning img, div.notice img, div.error img { .alert-success h4 {
margin : 4px; color: #468847;
vertical-align : middle;
} }
div.warning span, div.notice span, div.error span { .alert-danger,
display : table-cell; .alert-error {
vertical-align : middle; color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-danger h4,
.alert-error h4 {
color: #b94a48;
}
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
.alert-info h4 {
color: #3a87ad;
} }
ul.nomarks { ul.nomarks {

70
css/utility.css
View File

@ -57,45 +57,63 @@ a:hover {
color : black; color : black;
} }
div.notice, div.warning, div.error { .alert {
padding : 4px 10px 4px 4px; padding: 8px 35px 8px 14px;
display : inline-block; margin-bottom: 20px;
margin : 2px 0px 4px 0px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
font-size : 12px; background-color: #fcf8e3;
border-style : solid; border: 1px solid #fbeed5;
border-color : #ccc; -webkit-border-radius: 4px;
border-width : 1px; -moz-border-radius: 4px;
box-shadow : inset 0px 0px 2px rgba(0,0,0,0.1); border-radius: 4px;
} }
div.notice div.inner, div.warning div.inner, div.error div.inner { .alert,
vertical-align : middle; .alert h4 {
color: #c09853;
} }
div.notice { .alert h4 {
background : #ecf4ff; margin: 0;
border-color : #88b0f0;
} }
div.warning { .alert .close {
border-color : #EFDC88; position: relative;
background : #fff7d5; top: -2px;
right: -21px;
line-height: 20px;
} }
div.error { .alert-success {
background : #ffcccc; color: #468847;
border-color : #ff0000; background-color: #dff0d8;
border-color: #d6e9c6;
} }
div.warning img, div.notice img, div.error img { .alert-success h4 {
margin : 4px; color: #468847;
vertical-align : middle;
} }
div.warning span, div.notice span, div.error span { .alert-danger,
display : table-cell; .alert-error {
vertical-align : middle; color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.alert-danger h4,
.alert-error h4 {
color: #b94a48;
}
.alert-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
}
.alert-info h4 {
color: #3a87ad;
} }
h1 { h1 {

9
include/functions2.php
View File

@ -1154,18 +1154,15 @@
} }
function format_warning($msg, $id = "") { function format_warning($msg, $id = "") {
return "<div class=\"warning\" id=\"$id\"> return "<div class=\"alert\" id=\"$id\">$msg</div>";
<span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
} }
function format_notice($msg, $id = "") { function format_notice($msg, $id = "") {
return "<div class=\"notice\" id=\"$id\"> return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
<span><img src=\"images/information.png\"></span><span>$msg</span></div>";
} }
function format_error($msg, $id = "") { function format_error($msg, $id = "") {
return "<div class=\"error\" id=\"$id\"> return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
<span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
} }
function print_notice($msg) { function print_notice($msg) {