moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-13 12:55:05 -05:00
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source
This commit is contained in:
echel0n 2014-05-22 20:22:22 -07:00
commit e1146d4050
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/slick/css/default.css
View File

@ -115,7 +115,7 @@ form {
padding: 0; padding: 0;
} }
a{ a{
color: #75add8; color: #6196c2;
-moz-text-decoration-line: none; -moz-text-decoration-line: none;
text-decoration: none; text-decoration: none;
} }
@ -364,7 +364,7 @@ input:not(.btn){margin-right:6px;margin-top:5px;padding-top:4px;padding-bottom:4
font-size: 11px; font-size: 11px;
} }
.footer a { .footer a {
color: #75add8; color: #6196c2;
text-decoration: none; text-decoration: none;
} }
.footer ul li { .footer ul li {
@ -519,17 +519,19 @@ width: 30%;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
} }
.ui-progressbar .ui-widget-header { .ui-progressbar .ui-widget-header {
background-image: -moz-linear-gradient(#a3e532, #90cc2a) !important; background-image: -moz-linear-gradient(#d9eef8, #6194be) !important;
background-image: linear-gradient(#a3e532, #90cc2a) !important; background-image: linear-gradient(#d9eef8, #6194be) !important;
background-image: -webkit-linear-gradient(#a3e532, #90cc2a) !important; background-image: -webkit-linear-gradient(#d9eef8, #6194be) !important;
background-image: -o-linear-gradient(#a3e532, #90cc2a) !important; background-image: -o-linear-gradient(#d9eef8, #6194be) !important;
filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fdf0d5, endColorstr=#fff9ee) !important; filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fdf0d5, endColorstr=#fff9ee) !important;
-ms-filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fdf0d5, endColorstr=#fff9ee) !important; -ms-filter: progid:dximagetransform.microsoft.gradient(startColorstr=#fdf0d5, endColorstr=#fff9ee) !important;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
tr.seasonheader { tr.seasonheader {
background-color: #FFFFFF; background-color: #FFFFFF;
padding-bottom: 5px; padding-bottom: 5px;

2
gui/slick/css/superfish.css
View File

@ -85,7 +85,7 @@ ul.sf-menu li li li.sfHover ul {
top: 0; top: 0;
} }
.sf-menu li.current > a { .sf-menu li.current > a {
color: #bde433; color: #6196c2;
} }
.sf-menu { .sf-menu {
float: left; float: left;

10
gui/slick/interfaces/default/inc_top.tmpl
View File

@ -204,10 +204,18 @@ a > i.icon-question-sign { background-image: url("$sbRoot/images/glyphicons-half
</head> </head>
<body> <body>
#if $sickbeard.NEWEST_VERSION_STRING:
<div id="upgrade-notification">
<div>
<span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
</div>
</div>
<div id="header-fix"></div>
#end if
<div id="header"> <div id="header">
<div class="wrapper"> <div class="wrapper">
<a name="top"></a> <a name="top"></a>
<span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Rage" src="$sbRoot/images/sickrage.png" /></a></span> <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Rage" src="$sbRoot/images/sickrage.png"/></a></span>
<ul id="MainMenu" class="sf-menu"> <ul id="MainMenu" class="sf-menu">
<li id="NAVhome"><a href="$sbRoot/home/">Show list</a> <li id="NAVhome"><a href="$sbRoot/home/">Show list</a>
<ul> <ul>

1
sickbeard/helpers.py
View File

@ -986,7 +986,6 @@ def is_hidden_folder(folder):
return False return False
def real_path(path): def real_path(path):
""" """
Returns: the canonicalized absolute pathname. The resulting path will have no symbolic link, '/./' or '/../' components. Returns: the canonicalized absolute pathname. The resulting path will have no symbolic link, '/./' or '/../' components.