card 1.97.0.1 → 1.98.0

data/mod/bootstrap/set/all/bootstrap/icon.rb

@@ -0,0 +1,109 @@
+format :html do
+  # same for all:
+  # :search,
+  ICON_MAP = {
+    material: {
+      plus: :add,
+      pencil: :edit,
+      trash: :delete,
+      wrench: :build,
+      new_window: :open_in_new,
+      history: :history,
+      triangle_left: :expand_less,
+      triangle_right: :expand_more,
+      flag: :flag,
+      option_horizontal: :more_horiz,
+      option_vertical: :more_vert,
+      pushpin: :pin_drop,
+      baby_formula: :device_hub,
+      log_out: :call_made,
+      log_in: :call_received,
+      explore: :explore,
+      remove: :close,
+      expand: :expand_more,
+      collapse_down: :expand_less,
+      globe: :public,
+      check_circle_o: nil,
+      commenting: :comment
+    },
+    font_awesome: {
+      option_horizontal: :ellipsis_h,
+      pushpin: "thumb-tack",
+      globe: :globe,
+      zoom_out: "search-minus",
+      close: :remove,
+      check_circle_o: "check-circle-o",
+      check_circe: "check-circle",
+      reorder: "align-justify",
+      commenting: :commenting
+    },
+    glyphicon: {
+      option_horizontal: "option-horizontal",
+      option_vertical: "option-vertical",
+      triangle_left: "triangle-left",
+      triangle_right: "triangle-right",
+      baby_formula: "baby-formula",
+      log_out: "log-out",
+      log_in: "log-in",
+      collapse_down: "collapse-down",
+      globe: :globe,
+      zoom_out: "zoom-out",
+      close: :remove,
+      new_window: "new-window",
+      history: :time,
+      check_circle_o: "ok-circle",
+      check_circle: "ok-sign",
+      reorder: "align-justify"
+    }
+
+  }.freeze
+
+  def icon_class library, icon
+    ICON_MAP[library][icon] || icon
+  end
+
+  def material_icon icon, opts={}
+    universal_icon_tag icon, :material, opts
+  end
+
+  def glyphicon icon, opts={}
+    universal_icon_tag icon, :glyphicon, opts
+  end
+
+  def fa_icon icon, opts={}
+    universal_icon_tag icon, :font_awesome, opts
+  end
+
+  def icon_tag icon, opts={}
+    opts = { class: opts } unless opts.is_a? Hash
+    library = opts.delete(:library) || default_icon_library
+    universal_icon_tag icon, library, opts
+  end
+
+  def universal_icon_tag icon, icon_library=default_icon_library, opts={}
+    return "" unless icon.present?
+
+    opts = { class: opts } unless opts.is_a? Hash
+    icon_method = "#{icon_library}_icon_tag"
+    send icon_method, icon, opts
+  end
+
+  def default_icon_library
+    :material
+  end
+
+  def glyphicon_icon_tag icon, opts={}
+    prepend_class opts, "glyphicon glyphicon-#{icon_class(:glyphicon, icon)}"
+    wrap_with :span, "", opts.merge("aria-hidden": true)
+  end
+
+  def font_awesome_icon_tag icon, opts={}
+    prepend_class opts, "fa fa-#{icon_class(:font_awesome, icon)}"
+    wrap_with :i, "", opts
+  end
+
+  def material_icon_tag icon, opts={}
+    add_class opts, "material-icons"
+    wrap_with :i, icon_class(:material, icon), opts
+  end
+end

data/mod/bootstrap/set/type/customized_bootswatch_skin/html_views.rb

@@ -12,10 +12,8 @@ format :html do
     # "#{card.item_count} items"
   end
 
-  view :core, template: :haml do
-  end
+  view :core, template: :haml
 
-  bar_cols 9, 3
   info_bar_cols 6, 3, 3
 
   before :bar do
@@ -28,7 +26,7 @@ format :html do
     render(:short_content)
   end
 
-  before :bar_expanded_nav do
+  before :bar_nav do
     voo.hide :edit_link
   end
 

data/mod/bootstrap/spec/set/all/bootstrap/layout_spec.rb

@@ -37,8 +37,8 @@ describe Bootstrap::Component::Layout, "layout dsl" do
       end
     end
     expect(layout).to have_tag("div.row.six-times-six") do
-      with_tag "div.col-md-8.col-xs-6", text: /c1/
-      with_tag "div.col-md-4.col-xs-6.extra-class", text: /c2/
+      with_tag "div.col-md-8.col-6", text: /c1/
+      with_tag "div.col-md-4.col-6.extra-class", text: /c2/
     end
   end
 

data/mod/bootstrap/vendor/bootswatch/Gruntfile.js

@@ -1,4 +1,6 @@
 module.exports = function (grunt) {
+  const sass = require('node-sass');
+
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
@@ -132,6 +134,7 @@ module.exports = function (grunt) {
     files = {};
     files[scssDest] = scssSrc;
     grunt.config('sass.dist.files', files);
+    grunt.config('sass.dist.options.implementation', sass);
     grunt.config('sass.dist.options.outputStyle', 'expanded');
  
     grunt.task.run(['concat', 'sass:dist', 'postcss', 'clean:build',
@@ -144,6 +147,7 @@ module.exports = function (grunt) {
     grunt.log.writeln('compressing file ' + fileSrc);
 
     grunt.config('sass.dist.files', files);
+    grunt.config('sass.dist.options.implementation', sass);
     grunt.config('sass.dist.options.outputStyle', 'compressed');
     grunt.task.run(['sass:dist']);
   });

data/mod/bootstrap/vendor/bootswatch/dist/darkly/_bootswatch.scss

@@ -15,9 +15,12 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"
   }
 }
 
-.bg-dark {
-  background-color: $success !important;
-  &.navbar-dark .navbar-nav {
+.bg-light {
+  &.navbar {
+    background-color: $success !important;
+  }
+
+  &.navbar-light .navbar-nav {
     .nav-link:focus,
     .nav-link:hover,
     .active > .nav-link {

data/mod/bootstrap/vendor/bootswatch/dist/darkly/_variables.scss

@@ -34,8 +34,8 @@ $success:       $green !default;
 $info:          $cyan !default;
 $warning:       $yellow !default;
 $danger:        $red !default;
-$light:         $gray-800 !default;
-$dark:          $gray-500 !default;
+$light:         $gray-600 !default;
+$dark:          $gray-800 !default;
 
 $yiq-contrasted-threshold:  175 !default;
 
@@ -64,10 +64,6 @@ $table-accent-bg:             $gray-800 !default;
 
 $table-border-color:          $gray-700 !default;
 
-$table-dark-bg:               $gray-500 !default;
-$table-dark-border-color:     darken($gray-500, 7.5%) !default;
-$table-dark-color:            $body-bg !default;
-
 // Forms
 
 $input-border-color:                    transparent !default;
@@ -102,11 +98,11 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color $nav-tabs-border-colo
 
 $navbar-padding-y:                  1rem !default;
 
-$navbar-dark-color:                 $white !default;
-$navbar-dark-hover-color:           $success !default;
+$navbar-dark-color:                rgba($white,.6) !default;
+$navbar-dark-hover-color:          $white !default;
 
-$navbar-light-color:                rgba($white,.5) !default;
-$navbar-light-hover-color:          $white !default;
+$navbar-light-color:                 $white !default;
+$navbar-light-hover-color:           $success !default;
 $navbar-light-active-color:         $white !default;
 $navbar-light-disabled-color:       rgba($white,.3) !default;
 $navbar-light-toggler-border-color: rgba($white,.1) !default;

data/mod/bootstrap/vendor/bootswatch/dist/darkly/bootstrap.css

@@ -32,8 +32,8 @@
   --info: #3498DB;
   --warning: #F39C12;
   --danger: #E74C3C;
-  --light: #303030;
-  --dark: #adb5bd;
+  --light: #999;
+  --dark: #303030;
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
@@ -1859,45 +1859,45 @@ pre code {
 .table-light,
 .table-light > th,
 .table-light > td {
-  background-color: #c5c5c5;
+  background-color: #e2e2e2;
 }
 
 .table-light th,
 .table-light td,
 .table-light thead th,
 .table-light tbody + tbody {
-  border-color: #939393;
+  border-color: #cacaca;
 }
 
 .table-hover .table-light:hover {
-  background-color: #b8b8b8;
+  background-color: #d5d5d5;
 }
 
 .table-hover .table-light:hover > td,
 .table-hover .table-light:hover > th {
-  background-color: #b8b8b8;
+  background-color: #d5d5d5;
 }
 
 .table-dark,
 .table-dark > th,
 .table-dark > td {
-  background-color: #e8eaed;
+  background-color: #c5c5c5;
 }
 
 .table-dark th,
 .table-dark td,
 .table-dark thead th,
 .table-dark tbody + tbody {
-  border-color: #d4d9dd;
+  border-color: #939393;
 }
 
 .table-hover .table-dark:hover {
-  background-color: #dadde2;
+  background-color: #b8b8b8;
 }
 
 .table-hover .table-dark:hover > td,
 .table-hover .table-dark:hover > th {
-  background-color: #dadde2;
+  background-color: #b8b8b8;
 }
 
 .table-active,
@@ -1916,9 +1916,9 @@ pre code {
 }
 
 .table .thead-dark th {
-  color: #222;
-  background-color: #adb5bd;
-  border-color: #98a2ac;
+  color: #fff;
+  background-color: #303030;
+  border-color: #434343;
 }
 
 .table .thead-light th {
@@ -1928,14 +1928,14 @@ pre code {
 }
 
 .table-dark {
-  color: #222;
-  background-color: #adb5bd;
+  color: #fff;
+  background-color: #303030;
 }
 
 .table-dark th,
 .table-dark td,
 .table-dark thead th {
-  border-color: #98a2ac;
+  border-color: #434343;
 }
 
 .table-dark.table-bordered {
@@ -1947,7 +1947,7 @@ pre code {
 }
 
 .table-dark.table-hover tbody tr:hover {
-  color: #222;
+  color: #fff;
   background-color: rgba(255, 255, 255, 0.075);
 }
 
@@ -2821,74 +2821,74 @@ fieldset:disabled a.btn {
 
 .btn-light {
   color: #fff;
-  background-color: #303030;
-  border-color: #303030;
+  background-color: #999;
+  border-color: #999;
 }
 
 .btn-light:hover {
   color: #fff;
-  background-color: #1d1d1d;
-  border-color: #171616;
+  background-color: #868686;
+  border-color: #807f7f;
 }
 
 .btn-light:focus, .btn-light.focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(168, 168, 168, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(168, 168, 168, 0.5);
 }
 
 .btn-light.disabled, .btn-light:disabled {
   color: #fff;
-  background-color: #303030;
-  border-color: #303030;
+  background-color: #999;
+  border-color: #999;
 }
 
 .btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active,
 .show > .btn-light.dropdown-toggle {
   color: #fff;
-  background-color: #171616;
-  border-color: #101010;
+  background-color: #807f7f;
+  border-color: #797979;
 }
 
 .btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus,
 .show > .btn-light.dropdown-toggle:focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(168, 168, 168, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(168, 168, 168, 0.5);
 }
 
 .btn-dark {
-  color: #222;
-  background-color: #adb5bd;
-  border-color: #adb5bd;
+  color: #fff;
+  background-color: #303030;
+  border-color: #303030;
 }
 
 .btn-dark:hover {
   color: #fff;
-  background-color: #98a2ac;
-  border-color: #919ca6;
+  background-color: #1d1d1d;
+  border-color: #171616;
 }
 
 .btn-dark:focus, .btn-dark.focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(152, 159, 166, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(152, 159, 166, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
 }
 
 .btn-dark.disabled, .btn-dark:disabled {
-  color: #222;
-  background-color: #adb5bd;
-  border-color: #adb5bd;
+  color: #fff;
+  background-color: #303030;
+  border-color: #303030;
 }
 
 .btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active,
 .show > .btn-dark.dropdown-toggle {
   color: #fff;
-  background-color: #919ca6;
-  border-color: #8a95a1;
+  background-color: #171616;
+  border-color: #101010;
 }
 
 .btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus,
 .show > .btn-dark.dropdown-toggle:focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(152, 159, 166, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(152, 159, 166, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(79, 79, 79, 0.5);
 }
 
 .btn-outline-primary {
@@ -3096,71 +3096,71 @@ fieldset:disabled a.btn {
 }
 
 .btn-outline-light {
-  color: #303030;
-  border-color: #303030;
+  color: #999;
+  border-color: #999;
 }
 
 .btn-outline-light:hover {
   color: #fff;
-  background-color: #303030;
-  border-color: #303030;
+  background-color: #999;
+  border-color: #999;
 }
 
 .btn-outline-light:focus, .btn-outline-light.focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(153, 153, 153, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(153, 153, 153, 0.5);
 }
 
 .btn-outline-light.disabled, .btn-outline-light:disabled {
-  color: #303030;
+  color: #999;
   background-color: transparent;
 }
 
 .btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active,
 .show > .btn-outline-light.dropdown-toggle {
   color: #fff;
-  background-color: #303030;
-  border-color: #303030;
+  background-color: #999;
+  border-color: #999;
 }
 
 .btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus,
 .show > .btn-outline-light.dropdown-toggle:focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(153, 153, 153, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(153, 153, 153, 0.5);
 }
 
 .btn-outline-dark {
-  color: #adb5bd;
-  border-color: #adb5bd;
+  color: #303030;
+  border-color: #303030;
 }
 
 .btn-outline-dark:hover {
-  color: #222;
-  background-color: #adb5bd;
-  border-color: #adb5bd;
+  color: #fff;
+  background-color: #303030;
+  border-color: #303030;
 }
 
 .btn-outline-dark:focus, .btn-outline-dark.focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(173, 181, 189, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(173, 181, 189, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
 }
 
 .btn-outline-dark.disabled, .btn-outline-dark:disabled {
-  color: #adb5bd;
+  color: #303030;
   background-color: transparent;
 }
 
 .btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active,
 .show > .btn-outline-dark.dropdown-toggle {
-  color: #222;
-  background-color: #adb5bd;
-  border-color: #adb5bd;
+  color: #fff;
+  background-color: #303030;
+  border-color: #303030;
 }
 
 .btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus,
 .show > .btn-outline-dark.dropdown-toggle:focus {
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(173, 181, 189, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(173, 181, 189, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
 }
 
 .btn-link {
@@ -4766,11 +4766,11 @@ input[type="button"].btn-block {
 }
 
 .navbar-light .navbar-nav .nav-link {
-  color: rgba(255, 255, 255, 0.5);
+  color: #fff;
 }
 
 .navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus {
-  color: #fff;
+  color: #00bc8c;
 }
 
 .navbar-light .navbar-nav .nav-link.disabled {
@@ -4785,16 +4785,16 @@ input[type="button"].btn-block {
 }
 
 .navbar-light .navbar-toggler {
-  color: rgba(255, 255, 255, 0.5);
+  color: #fff;
   border-color: rgba(255, 255, 255, 0.1);
 }
 
 .navbar-light .navbar-toggler-icon {
-  background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='%23fff' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
 }
 
 .navbar-light .navbar-text {
-  color: rgba(255, 255, 255, 0.5);
+  color: #fff;
 }
 
 .navbar-light .navbar-text a {
@@ -4814,11 +4814,11 @@ input[type="button"].btn-block {
 }
 
 .navbar-dark .navbar-nav .nav-link {
-  color: #fff;
+  color: rgba(255, 255, 255, 0.6);
 }
 
 .navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {
-  color: #00bc8c;
+  color: #fff;
 }
 
 .navbar-dark .navbar-nav .nav-link.disabled {
@@ -4833,16 +4833,16 @@ input[type="button"].btn-block {
 }
 
 .navbar-dark .navbar-toggler {
-  color: #fff;
+  color: rgba(255, 255, 255, 0.6);
   border-color: rgba(255, 255, 255, 0.1);
 }
 
 .navbar-dark .navbar-toggler-icon {
-  background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='%23fff' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='rgba(255, 255, 255, 0.6)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
 }
 
 .navbar-dark .navbar-text {
-  color: #fff;
+  color: rgba(255, 255, 255, 0.6);
 }
 
 .navbar-dark .navbar-text a {
@@ -5389,34 +5389,34 @@ a.badge-danger:focus, a.badge-danger.focus {
 
 .badge-light {
   color: #fff;
-  background-color: #303030;
+  background-color: #999;
 }
 
 a.badge-light:hover, a.badge-light:focus {
   color: #fff;
-  background-color: #171616;
+  background-color: #807f7f;
 }
 
 a.badge-light:focus, a.badge-light.focus {
   outline: 0;
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(153, 153, 153, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(153, 153, 153, 0.5);
 }
 
 .badge-dark {
-  color: #222;
-  background-color: #adb5bd;
+  color: #fff;
+  background-color: #303030;
 }
 
 a.badge-dark:hover, a.badge-dark:focus {
-  color: #222;
-  background-color: #919ca6;
+  color: #fff;
+  background-color: #171616;
 }
 
 a.badge-dark:focus, a.badge-dark.focus {
   outline: 0;
-  -webkit-box-shadow: 0 0 0 0.2rem rgba(173, 181, 189, 0.5);
-          box-shadow: 0 0 0 0.2rem rgba(173, 181, 189, 0.5);
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
+          box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5);
 }
 
 .jumbotron {
@@ -5551,31 +5551,31 @@ a.badge-dark:focus, a.badge-dark.focus {
 }
 
 .alert-light {
-  color: #191919;
-  background-color: #d6d6d6;
-  border-color: #c5c5c5;
+  color: #505050;
+  background-color: #ebebeb;
+  border-color: #e2e2e2;
 }
 
 .alert-light hr {
-  border-top-color: #b8b8b8;
+  border-top-color: #d5d5d5;
 }
 
 .alert-light .alert-link {
-  color: black;
+  color: #373636;
 }
 
 .alert-dark {
-  color: #5a5e62;
-  background-color: #eff0f2;
-  border-color: #e8eaed;
+  color: #191919;
+  background-color: #d6d6d6;
+  border-color: #c5c5c5;
 }
 
 .alert-dark hr {
-  border-top-color: #dadde2;
+  border-top-color: #b8b8b8;
 }
 
 .alert-dark .alert-link {
-  color: #424547;
+  color: black;
 }
 
 @-webkit-keyframes progress-bar-stripes {
@@ -5965,35 +5965,35 @@ a.badge-dark:focus, a.badge-dark.focus {
 }
 
 .list-group-item-light {
-  color: #191919;
-  background-color: #c5c5c5;
+  color: #505050;
+  background-color: #e2e2e2;
 }
 
 .list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus {
-  color: #191919;
-  background-color: #b8b8b8;
+  color: #505050;
+  background-color: #d5d5d5;
 }
 
 .list-group-item-light.list-group-item-action.active {
   color: #fff;
-  background-color: #191919;
-  border-color: #191919;
+  background-color: #505050;
+  border-color: #505050;
 }
 
 .list-group-item-dark {
-  color: #5a5e62;
-  background-color: #e8eaed;
+  color: #191919;
+  background-color: #c5c5c5;
 }
 
 .list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {
-  color: #5a5e62;
-  background-color: #dadde2;
+  color: #191919;
+  background-color: #b8b8b8;
 }
 
 .list-group-item-dark.list-group-item-action.active {
   color: #fff;
-  background-color: #5a5e62;
-  border-color: #5a5e62;
+  background-color: #191919;
+  border-color: #191919;
 }
 
 .close {
@@ -6964,23 +6964,23 @@ button.bg-danger:focus {
 }
 
 .bg-light {
-  background-color: #303030 !important;
+  background-color: #999 !important;
 }
 
 a.bg-light:hover, a.bg-light:focus,
 button.bg-light:hover,
 button.bg-light:focus {
-  background-color: #171616 !important;
+  background-color: #807f7f !important;
 }
 
 .bg-dark {
-  background-color: #adb5bd !important;
+  background-color: #303030 !important;
 }
 
 a.bg-dark:hover, a.bg-dark:focus,
 button.bg-dark:hover,
 button.bg-dark:focus {
-  background-color: #919ca6 !important;
+  background-color: #171616 !important;
 }
 
 .bg-white {
@@ -7056,11 +7056,11 @@ button.bg-dark:focus {
 }
 
 .border-light {
-  border-color: #303030 !important;
+  border-color: #999 !important;
 }
 
 .border-dark {
-  border-color: #adb5bd !important;
+  border-color: #303030 !important;
 }
 
 .border-white {
@@ -10409,19 +10409,19 @@ a.text-danger:hover, a.text-danger:focus {
 }
 
 .text-light {
-  color: #303030 !important;
+  color: #999 !important;
 }
 
 a.text-light:hover, a.text-light:focus {
-  color: #0a0a0a !important;
+  color: #737373 !important;
 }
 
 .text-dark {
-  color: #adb5bd !important;
+  color: #303030 !important;
 }
 
 a.text-dark:hover, a.text-dark:focus {
-  color: #838f9b !important;
+  color: #0a0a0a !important;
 }
 
 .text-body {
@@ -10553,13 +10553,13 @@ a.text-dark:hover, a.text-dark:focus {
   color: #00bc8c !important;
 }
 
-.bg-dark {
+.bg-light.navbar {
   background-color: #00bc8c !important;
 }
 
-.bg-dark.navbar-dark .navbar-nav .nav-link:focus,
-.bg-dark.navbar-dark .navbar-nav .nav-link:hover,
-.bg-dark.navbar-dark .navbar-nav .active > .nav-link {
+.bg-light.navbar-light .navbar-nav .nav-link:focus,
+.bg-light.navbar-light .navbar-nav .nav-link:hover,
+.bg-light.navbar-light .navbar-nav .active > .nav-link {
   color: #375a7f !important;
 }
 
@@ -10582,13 +10582,13 @@ a.text-dark:hover, a.text-dark:focus {
 .table-light,
 .table-light > th,
 .table-light > td {
-  background-color: #303030;
+  background-color: #999;
 }
 
 .table-dark,
 .table-dark > th,
 .table-dark > td {
-  background-color: #adb5bd;
+  background-color: #303030;
 }
 
 .table-success,
@@ -10630,11 +10630,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .table-hover .table-light:hover, .table-hover .table-light:hover > th, .table-hover .table-light:hover > td {
-  background-color: #232323;
+  background-color: #8c8c8c;
 }
 
 .table-hover .table-dark:hover, .table-hover .table-dark:hover > th, .table-hover .table-dark:hover > td {
-  background-color: #9fa8b2;
+  background-color: #232323;
 }
 
 .table-hover .table-success:hover, .table-hover .table-success:hover > th, .table-hover .table-success:hover > td {
@@ -10730,11 +10730,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .alert-light {
-  background-color: #303030;
+  background-color: #999;
 }
 
 .alert-dark {
-  background-color: #adb5bd;
+  background-color: #303030;
 }
 
 .list-group-item-action {