diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index feeecb29..5ed1f0bf 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -1,4 +1,4 @@ -$navbar-default-bg: #299a0b; +$navbar-default-bg: #005cb3; $navbar-default-link-active-bg: #DFE0DF; $navbar-default-border: 1px solid #d4d4d4; $navbar-default-color: #ffffff; diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb index 41eeb416..575b44ae 100644 --- a/config/initializers/time_formats.rb +++ b/config/initializers/time_formats.rb @@ -1 +1 @@ -Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %H:%M' +Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %l:%M %p'