1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-17 23:05:11 -05:00

Merge pull request #844 from Supremicus/dev

fix for ui-pnotify & fix for fuzzydates on comingepisodes list
This commit is contained in:
adam111316 2014-10-03 07:09:33 +08:00
commit a876059d2c
2 changed files with 12 additions and 14 deletions

View File

@ -26,22 +26,20 @@ html > body .ui-pnotify {
.ui-pnotify-container {
background-position: 0 0;
border: 1px solid #111;
background-image: -moz-linear-gradient(#3D3D3D, #3D3D3D) !important;
background-image: linear-gradient(#3D3D3D, #3D3D3D) !important;
background-image: -webkit-linear-gradient(#3D3D3D, #3D3D3D) !important;
background-image: -o-linear-gradient(#3D3D3D, #3D3D3D) !important;
filter: progid:dximagetransform.microsoft.gradient(startColorstr=#3D3D3D, endColorstr=#3D3D3D) !important;
-ms-filter: progid:dximagetransform.microsoft.gradient(startColorstr=#3D3D3D, endColorstr=#3D3D3D) !important;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
background-color: #3D3D3D !important;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
font-size: 14px;
-moz-box-shadow: 0px 0px 2px #000000;
-webkit-box-shadow: 0px 0px 2px #000000;
-o-box-shadow: 0px 0px 2px #000000;
box-shadow: 0px 0px 2px #000000;
padding: 7px 10px;
text-align: center;
min-height: 22px;
width: 250px;
z-index: 9999;
font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
font-family: "Open Sans", "Trebuchet MS", Helvetica, Arial, sans-serif;
line-height: normal;
}
.ui-pnotify-closer {
@ -53,14 +51,14 @@ html > body .ui-pnotify {
background: none;
font-size: 14px;
font-weight: bold;
font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
font-family: "Open Sans", "Trebuchet MS", Helvetica, Arial, sans-serif;
line-height: normal;
color: #ffffff;
}
.ui-pnotify-text {
display: block;
font-size: 14px;
font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
font-family: "Open Sans", "Trebuchet MS", Helvetica, Arial, sans-serif;
line-height: normal;
color: #ffffff;
}

View File

@ -172,7 +172,7 @@
<tr class="$show_div">
## forced to use a div to wrap airdate, the column sort went crazy with a span
<td align="center" class="nowrap">
<div class="${fuzzydate}">$sbdatetime.sbdatetime.fromtimestamp($time.mktime($cur_result["localtime"].timetuple())).sbfdate().decode($sickbeard.SYS_ENCODING)</div><span class="sort_data">$time.mktime($cur_result["localtime"].timetuple())</span>
<div class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdatetime($cur_result["localtime"]).decode($sickbeard.SYS_ENCODING)</div><span class="sort_data">$time.mktime($cur_result["localtime"].timetuple())</span>
</td>
<td class="comingtvShow"><a href="$sbRoot/home/displayShow?show=${cur_result["showid"]}">$cur_result["show_name"]</a>