Merge pull request #242 from tidusjar/dev

1.7.2
Ombi-app · May 25, 2016 · e419727 · e419727
2 parents 215b189 + c70ed93
commit e419727
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 26 deletions.
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -84,11 +84,8 @@ public async Task NotifyAsync(NotificationModel model, Settings settings)
  case NotificationType.Test:
  await EmailTest(model, emailSettings);
  break;
-
- default:
- throw new ArgumentOutOfRangeException();
  }
- 
+
  }
 
  private EmailNotificationSettings GetConfiguration()
@@ -168,7 +165,7 @@ private async Task Send(MimeMessage message, EmailNotificationSettings settings)
  // Note: since we don't have an OAuth2 token, disable
  // the XOAUTH2 authentication mechanism.
  client.AuthenticationMechanisms.Remove("XOAUTH2");
- 
+
  client.Authenticate(settings.EmailUsername, settings.EmailPassword);
 
  await client.SendAsync(message);
@@ -185,7 +182,7 @@ private async Task EmailTest(NotificationModel model, EmailNotificationSettings
  {
  var message = new MimeMessage
  {
- Body = new TextPart("plain") {Text= "This is just a test! Success!"},
+ Body = new TextPart("plain") { Text = "This is just a test! Success!" },
  Subject = "Plex Requests: Test Message!",
  };
  message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));

diff --git a/PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.css b/PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.css
@@ -14,6 +14,14 @@
  .home {
  padding-top: 4rem; } }
 
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+ color: #fff; }
+
+hr {
+ border-color: #777; }
+
 .btn {
  border-radius: 0.25rem !important; }
 
@@ -219,7 +227,7 @@ label {
  position: absolute;
  right: 45px;
  z-index: 3;
- top: 13px;
+ top: 10px;
  box-shadow: 0 0 0; }
 
 .input-group-addon .btn-group .btn {
@@ -238,9 +246,10 @@ label {
  padding: 12px 8px; }
 
 #updateAvailable {
- background-color: #ffa400;
+ background-color: #df691a;
  text-align: center;
- font-size: 15px; }
+ font-size: 15px;
+ padding: 3px 0; }
 
 .checkbox label {
  display: inline-block;

diff --git a/PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.min.css b/PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.min.css
diff --git a/PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.scss b/PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.scss
@@ -33,6 +33,16 @@ $i:
  }
 }
 
+.navbar-default .navbar-nav > .active > a, 
+.navbar-default .navbar-nav > .active > a:hover, 
+.navbar-default .navbar-nav > .active > a:focus {
+ color: #fff;
+}
+
+hr {
+ border-color: #777;
+}
+
 .btn {
  border-radius: .25rem $i;
 }
@@ -279,7 +289,7 @@ $border-radius: 10px;
  position: absolute;
  right: 45px;
  z-index: 3;
- top: 13px;
+ top: 10px;
  box-shadow: 0 0 0;
 }
 
@@ -303,9 +313,10 @@ $border-radius: 10px;
 }
 
 #updateAvailable {
- background-color:  rgb(255, 164, 0);
+ background-color: #df691a;
  text-align: center;
  font-size: 15px;
+ padding: 3px 0;
 }
 
 .checkbox label {

diff --git a/PlexRequests.UI/Content/Themes/PlexBootstrapCustom.css b/PlexRequests.UI/Content/Themes/PlexBootstrapCustom.css
@@ -14,6 +14,17 @@
  .home {
  padding-top: 4rem; } }
 
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+ color: #fff; }
+
+hr {
+ border-color: #777; }
+
+body.update-available {
+ margin-top: 80px; }
+
 .btn {
  border-radius: 0.25rem !important; }
 
@@ -219,7 +230,7 @@ label {
  position: absolute;
  right: 45px;
  z-index: 3;
- top: 13px;
+ top: 10px;
  box-shadow: 0 0 0; }
 
 .input-group-addon .btn-group .btn {
@@ -238,9 +249,10 @@ label {
  padding: 12px 8px; }
 
 #updateAvailable {
- background-color: #ffa400;
+ background-color: #df691a;
  text-align: center;
- font-size: 15px; }
+ font-size: 15px;
+ padding: 3px 0; }
 
 .checkbox label {
  display: inline-block;