tramway 2.2.1 → 2.2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88472147f728346a8406400f46ce9b0c3aeda279944f7c3df64c793addf2f37e
-  data.tar.gz: 65a3a58d859f7c88f960547f78aaa3ba55fb061af5b0abbd0b6b4671c5dee252
+  metadata.gz: d5340c2d99f2c8a3bb262cd939c3a96e19f9ddbd45d2df354896709d4eaf106b
+  data.tar.gz: 7f5b801f6e4991efb47fd99a15ff7a1e9502fed1fb7d4dbd402be77c770a3408
 SHA512:
-  metadata.gz: 73ad5c1dab62c549c296a15ba556e7df759ea5613c2afe9894fd794e89d1d6b1b16020c51516ef12559ac3d499b280b3c9cdbb026145705f8c3232737232375d
-  data.tar.gz: 74cd74e6f6c57495ac2ea2178c52e33f94b57ee48ce0c5c746a84895c54af1dff33a491b757e597f863c5630beacd825c66269136054886c7eec2360ff61318b
+  metadata.gz: 4beda40cd25ea87d274c86daada9938ad3036c21855c1f703be0fcdaa4ae45cef277fdec9cb5e1ec20183f4c045f79714ca375e43687cb666eda5ba0b840de4e
+  data.tar.gz: 04dad79a2e722cbf7189ef5bab6d7579db5b47d948db8d4f996ffc24f51204b23ff1158d3f195d63c26c630ddf1615f08a10d4bb29ecfab5ca508cf3f5d67ad2

data/app/assets/javascripts/tramway/table_row_preview_controller.js

@@ -59,10 +59,8 @@ export default class TableRowPreview extends Controller {
   createTableRow(key, value) {
     const keyRow = document.createElement("div");
     keyRow.classList.add("div-table-row");
-    keyRow.classList.add("bg-purple-300");
-    keyRow.classList.add("text-purple-700");
-    keyRow.classList.add("dark:text-white");
-    keyRow.classList.add("dark:bg-gray-700");
+    keyRow.classList.add("bg-gray-700");
+    keyRow.classList.add("text-white");
     keyRow.classList.add("px-2");
     keyRow.classList.add("py-1");
     keyRow.classList.add("text-xs");
@@ -71,7 +69,7 @@ export default class TableRowPreview extends Controller {
 
     const valueRow = document.createElement("div"); 
     valueRow.classList.add("div-table-row");
-    valueRow.classList.add("dark:bg-gray-800");
+    valueRow.classList.add("bg-gray-800");
     valueRow.classList.add("px-2");
     valueRow.classList.add("py-2");
     valueRow.textContent = value;

data/app/components/tailwind_component.rb

@@ -40,41 +40,36 @@ class TailwindComponent < Tramway::BaseComponent
 
   def text_input_base_classes
     theme_classes(
-      classic: 'w-full rounded-xl border border-gray-200 bg-gray-100 text-gray-700 shadow-inner ' \
-               'focus:outline-none focus:ring-2 focus:ring-gray-300 placeholder-gray-400 ' \
-               'dark:bg-gray-900 dark:border-gray-700 dark:text-gray-100 dark:placeholder-gray-500 ' \
-               'dark:focus:ring-gray-600'
+      classic: 'w-full rounded-xl border border-gray-700 bg-gray-900 text-gray-100 shadow-inner ' \
+               'focus:outline-none focus:ring-2 focus:ring-gray-600 placeholder-gray-500'
     )
   end
 
   def select_base_classes
     theme_classes(
-      classic: 'w-full rounded-xl border border-gray-200 bg-gray-100 text-gray-700 shadow-inner ' \
-               'focus:outline-none focus:ring-2 focus:ring-gray-300 disabled:cursor-not-allowed ' \
-               'disabled:bg-gray-200 disabled:text-gray-400 dark:bg-gray-900 dark:border-gray-700 ' \
-               'dark:text-gray-100 dark:focus:ring-gray-600 dark:disabled:bg-gray-800 ' \
-               'dark:disabled:text-gray-500'
+      classic: 'w-full rounded-xl border border-gray-700 bg-gray-900 text-gray-100 shadow-inner ' \
+               'focus:outline-none focus:ring-2 focus:ring-gray-600 disabled:cursor-not-allowed ' \
+               'disabled:bg-gray-800 disabled:text-gray-500'
     )
   end
 
   def file_button_base_classes
     theme_classes(
-      classic: 'inline-block text-blue-800 font-semibold rounded-xl cursor-pointer mt-4 bg-blue-100 ' \
-               'hover:bg-blue-200 shadow-md dark:bg-blue-900 dark:text-blue-100 dark:hover:bg-blue-800'
+      classic: 'inline-block text-blue-100 font-semibold rounded-xl cursor-pointer mt-4 bg-blue-900 ' \
+               'hover:bg-blue-800 shadow-md'
     )
   end
 
   def submit_button_base_classes
     theme_classes(
-      classic: 'font-semibold rounded-xl focus:outline-none focus:ring-2 focus:ring-red-200 cursor-pointer ' \
-               'bg-green-100 hover:bg-green-200 shadow-md dark:bg-green-900 ' \
-               'dark:hover:bg-green-800 dark:focus:ring-red-700'
+      classic: 'font-semibold rounded-xl focus:outline-none focus:ring-2 focus:ring-red-700 cursor-pointer ' \
+               'bg-green-900 hover:bg-green-800 shadow-md'
     )
   end
 
   def form_label_classes
     theme_classes(
-      classic: 'block text-sm font-semibold mb-2 text-gray-700 dark:text-gray-200'
+      classic: 'block text-sm font-semibold mb-2 text-gray-200'
     )
   end
 

data/app/components/tailwinds/back_button_component.rb

@@ -5,8 +5,8 @@ module Tailwinds
   class BackButtonComponent < BaseComponent
     def back_button_classes
       theme_classes(
-        classic: 'btn btn-delete bg-orange-100 hover:bg-orange-200 text-orange-800 font-semibold py-2 px-4 ' \
-                 'rounded-xl ml-2 shadow-md dark:bg-orange-800 dark:text-orange-100 dark:hover:bg-orange-700'
+        classic: 'btn btn-delete bg-orange-400 hover:bg-orange-200 text-white font-semibold py-2 px-4 ' \
+                 'rounded-xl ml-2 shadow-md'
       )
     end
   end

data/app/components/tailwinds/badge_component.rb

@@ -12,8 +12,7 @@ module Tailwinds
       theme_classes(
         classic: [
           'flex', 'px-3', 'py-1', 'text-sm', 'font-semibold', 'rounded-full', 'w-fit', 'h-fit',
-          "bg-#{resolved_color}-200", "text-#{resolved_color}-800", 'shadow-md',
-          "dark:bg-#{resolved_color}-700", "dark:text-#{resolved_color}-100"
+          "bg-#{resolved_color}-700", "text-#{resolved_color}-100", 'shadow-md'
         ]
       )
     end

data/app/components/tailwinds/button_component.rb

@@ -39,11 +39,10 @@ module Tailwinds
 
     def color_classes
       if disabled?
-        %w[bg-gray-200 text-gray-400 shadow-inner dark:bg-gray-800 dark:text-gray-500]
+        %w[bg-gray-800 text-gray-500 shadow-inner]
       else
         [
-          "bg-#{resolved_color}-200", "hover:bg-#{resolved_color}-300", "text-#{resolved_color}-800",
-          "dark:bg-#{resolved_color}-700", "dark:hover:bg-#{resolved_color}-600", "dark:text-#{resolved_color}-100"
+          "bg-#{resolved_color}-700", "hover:bg-#{resolved_color}-800", 'text-white'
         ]
       end => classes_collection
 

data/app/components/tailwinds/containers/main_component.rb

@@ -6,7 +6,7 @@ module Tailwinds
     class MainComponent < Tramway::BaseComponent
       def container_classes
         theme_classes(
-          classic: 'bg-gray-100 text-gray-700 shadow-inner dark:bg-gray-900 dark:text-gray-100'
+          classic: 'bg-gray-900 text-gray-100 shadow-inner'
         )
       end
     end

data/app/components/tailwinds/containers/narrow_component.rb

@@ -10,7 +10,7 @@ module Tailwinds
       def container_classes
         theme_classes(
           classic: 'container p-4 flex align-center justify-center w-full mx-auto bg-gray-100 text-gray-700 ' \
-                   'shadow-inner rounded-xl dark:bg-gray-900 dark:text-gray-100'
+                   'shadow-inner rounded-xl bg-gray-900 text-gray-100'
         )
       end
     end

data/app/components/tailwinds/form/multiselect/dropdown_container.rb

@@ -8,7 +8,7 @@ module Tailwinds
         def dropdown_classes
           theme_classes(
             classic: 'absolute shadow top-11 z-40 w-full lef-0 rounded-xl max-h-select overflow-y-auto ' \
-                     'bg-gray-100 shadow-md ring-1 ring-gray-200 dark:bg-gray-900 dark:ring-gray-700'
+                     'bg-gray-900 shadow-md ring-1 ring-gray-700'
           )
         end
       end

data/app/components/tailwinds/form/multiselect/item_container.rb

@@ -7,22 +7,21 @@ module Tailwinds
       class ItemContainer < Tramway::BaseComponent
         def item_classes
           theme_classes(
-            classic: 'cursor-pointer w-full rounded-xl border-b border-gray-200 bg-gray-100 ' \
-                     'hover:bg-gray-200 shadow-inner dark:bg-gray-900 dark:border-gray-700 ' \
-                     'dark:hover:bg-gray-800'
+            classic: 'cursor-pointer w-full rounded-xl border-b border-gray-700 bg-gray-900 ' \
+                     'hover:bg-gray-800 shadow-inner'
           )
         end
 
         def item_inner_classes
           theme_classes(
             classic: 'flex w-full items-center p-2 pl-2 border-transparent border-l-2 relative ' \
-                     'hover:border-gray-300 dark:hover:border-gray-600'
+                     'hover:border-gray-600'
           )
         end
 
         def item_text_classes
           theme_classes(
-            classic: 'w-full items-center flex text-gray-700 dark:text-gray-100'
+            classic: 'w-full items-center flex text-gray-100'
           )
         end
       end

data/app/components/tailwinds/form/multiselect/select_as_input.rb

@@ -12,8 +12,8 @@ module Tailwinds
 
         def base_classes
           theme_classes(
-            classic: 'bg-transparent appearance-none outline-none h-full w-full hidden text-gray-700 ' \
-                     'placeholder-gray-400 dark:text-gray-100 dark:placeholder-gray-500'
+            classic: 'bg-transparent appearance-none outline-none h-full w-full hidden text-gray-100 ' \
+                     'placeholder-gray-500'
           )
         end
       end

data/app/components/tailwinds/form/multiselect/selected_item_template.rb

@@ -8,8 +8,7 @@ module Tailwinds
         def selected_item_classes
           theme_classes(
             classic: 'flex justify-center items-center m-1 font-medium py-1 px-2 rounded-full border ' \
-                     'bg-teal-100 text-teal-800 border-teal-200 shadow-md dark:bg-teal-900 ' \
-                     'dark:text-teal-100 dark:border-teal-700'
+                     'bg-teal-900 text-teal-100 border-teal-700 shadow-md'
           )
         end
       end

data/app/components/tailwinds/form/multiselect_component.rb

@@ -28,21 +28,19 @@ module Tailwinds
 
       def wrapper_classes
         theme_classes(
-          classic: 'flex flex-col relative text-gray-700 dark:text-gray-200'
+          classic: 'flex flex-col relative text-gray-200'
         )
       end
 
       def dropdown_classes
         theme_classes(
-          classic: 'p-1 flex border rounded-xl border-gray-200 bg-gray-100 shadow-inner ' \
-                   'dark:bg-gray-900 dark:border-gray-700'
+          classic: 'p-1 flex border rounded-xl border-gray-700 bg-gray-900 shadow-inner'
         )
       end
 
       def dropdown_indicator_classes
         theme_classes(
-          classic: 'w-8 py-1 pl-2 pr-1 border-l flex items-center text-gray-400 border-gray-200 ' \
-                   'dark:text-gray-500 dark:border-gray-700'
+          classic: 'w-8 py-1 pl-2 pr-1 border-l flex items-center text-gray-500 border-gray-700'
         )
       end
 

data/app/components/tailwinds/nav/item_component.rb

@@ -8,8 +8,7 @@ module Tailwinds
       def style
         @style ||= [
           theme_classes(
-            classic: 'px-4 py-2 rounded-xl whitespace-nowrap hover:bg-gray-200 hover:text-gray-600 text-gray-700 ' \
-                     'dark:text-gray-200 dark:hover:bg-gray-800 dark:hover:text-gray-300'
+            classic: 'px-4 py-2 rounded-xl whitespace-nowrap hover:bg-gray-800 hover:text-gray-300 text-white'
           )
         ].join(' ')
       end

data/app/components/tailwinds/navbar_component.rb

@@ -11,26 +11,25 @@ module Tailwinds
 
     def navbar_classes
       theme_classes(
-        classic: 'py-2 px-4 sm:px-8 flex justify-between items-center bg-gray-100 shadow-md ' \
-                 'dark:bg-gray-900'
+        classic: 'py-2 px-4 sm:px-8 flex justify-between items-center bg-gray-900 shadow-md'
       )
     end
 
     def title_classes
       theme_classes(
-        classic: 'text-xl font-semibold text-gray-800 dark:text-gray-100'
+        classic: 'text-xl font-semibold text-gray-100'
       )
     end
 
     def mobile_button_classes
       theme_classes(
-        classic: 'text-gray-700 focus:outline-none dark:text-gray-200'
+        classic: 'text-gray-200 focus:outline-none'
       )
     end
 
     def mobile_menu_classes
       theme_classes(
-        classic: 'hidden flex-col sm:hidden bg-gray-100 shadow-inner dark:bg-gray-900'
+        classic: 'hidden flex-col sm:hidden bg-gray-900 shadow-inner'
       )
     end
   end

data/app/components/tailwinds/pagination/base.rb

@@ -11,8 +11,8 @@ module Tailwinds
       def pagination_classes(klass: nil)
         default_classes = theme_classes(
           classic: [
-            'cursor-pointer', 'px-3', 'py-2', 'font-medium', 'rounded-xl', 'text-gray-700', 'bg-gray-100',
-            'shadow-md', 'hover:bg-gray-200', 'dark:bg-gray-800', 'dark:text-gray-200', 'dark:hover:bg-gray-700'
+            'cursor-pointer', 'px-3', 'py-2', 'font-medium', 'rounded-xl', 'text-gray-200', 'bg-gray-800',
+            'shadow-md', 'hover:bg-gray-700'
           ]
         )
 

data/app/components/tailwinds/pagination/gap_component.html.haml

@@ -1,3 +1,3 @@
 %div.flex.justify-end.mt-2
   %span{ class: gap_classes }
-    = helpers.t('views.pagination.truncate').html_safe
+    …

data/app/components/tailwinds/pagination/gap_component.rb

@@ -6,7 +6,7 @@ module Tailwinds
     class GapComponent < Tramway::BaseComponent
       def gap_classes
         theme_classes(
-          classic: 'page gap px-3 py-2 text-sm font-medium text-gray-600 sm:flex hidden dark:text-gray-400'
+          classic: 'page gap px-3 py-2 text-sm font-medium text-gray-400 sm:flex hidden'
         )
       end
     end

data/app/components/tailwinds/pagination/page_component.rb

@@ -8,8 +8,7 @@ module Tailwinds
 
       def current_page_classes
         theme_classes(
-          classic: 'px-3 py-2 font-medium rounded-xl text-gray-700 bg-gray-200 shadow-inner ' \
-                   'dark:bg-gray-700 dark:text-gray-100'
+          classic: 'px-3 py-2 font-medium rounded-xl text-gray-100 bg-gray-700 shadow-inner'
         )
       end
     end

data/app/components/tailwinds/table/cell_component.rb

@@ -6,8 +6,7 @@ module Tailwinds
     class CellComponent < Tramway::BaseComponent
       def cell_classes
         theme_classes(
-          classic: 'div-table-cell md:block first:block hidden px-6 py-4 font-medium text-gray-700 text-base ' \
-                   'dark:text-gray-100'
+          classic: 'div-table-cell md:block first:block hidden px-6 py-4 font-medium text-gray-100 text-base'
         )
       end
 

data/app/components/tailwinds/table/header_component.rb

@@ -13,8 +13,7 @@ module Tailwinds
 
       def header_row_classes
         theme_classes(
-          classic: 'div-table-row grid text-small gap-4 bg-gray-200 text-gray-600 grid-cols-1 ' \
-                   'dark:bg-gray-800 dark:text-gray-300'
+          classic: 'div-table-row grid text-small gap-4 bg-gray-800 text-gray-500 grid-cols-1'
         )
       end
 

data/app/components/tailwinds/table/row_component.rb

@@ -27,23 +27,21 @@ module Tailwinds
       def desktop_row_classes(cells_count)
         theme_classes(
           classic: [
-            'div-table-row', 'grid', 'gap-4', 'border-b', 'last:border-b-0', 'bg-gray-100',
-            'border-gray-200', "md:grid-cols-#{cells_count}", 'grid-cols-1',
-            'dark:bg-gray-900', 'dark:border-gray-700'
+            'div-table-row', 'grid', 'gap-4', 'border-b', 'last:border-b-0', 'bg-gray-900',
+            'border-gray-700', "md:grid-cols-#{cells_count}", 'grid-cols-1'
           ]
         ).join(' ')
       end
 
       def link_row_classes
         theme_classes(
-          classic: 'cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-800'
+          classic: 'cursor-pointer hover:bg-gray-800'
         )
       end
 
       def cell_classes
         theme_classes(
-          classic: 'div-table-cell px-6 py-4 font-medium text-gray-700 text-xs sm:text-base ' \
-                   'dark:text-gray-100'
+          classic: 'div-table-cell px-6 py-4 font-medium text-gray-100 text-xs sm:text-base'
         )
       end
     end

data/app/components/tailwinds/table_component.rb

@@ -7,7 +7,7 @@ module Tailwinds
 
     def table_classes
       theme_classes(
-        classic: 'div-table text-left rtl:text-right text-gray-500 dark:text-gray-300'
+        classic: 'div-table text-left rtl:text-right text-gray-300'
       )
     end
   end

data/app/components/tailwinds/title_component.rb

@@ -7,7 +7,7 @@ module Tailwinds
 
     def title_classes
       theme_classes(
-        classic: 'font-semibold text-4xl text-gray-800 dark:text-gray-100'
+        classic: 'font-semibold text-4xl text-gray-100'
       )
     end
   end

data/config/tailwind.config.js

@@ -118,46 +118,62 @@ module.exports = {
     'h-12',
 
     // === Button color presets ===
-    'bg-gray-100',
-    'bg-gray-200',
-    'bg-gray-300',
-    'bg-gray-900',
-    'hover:bg-gray-200',
-    'hover:bg-gray-300',
+    'bg-green-100',
+    'bg-green-200',
+    'bg-green-700',
+    'hover:bg-green-200',
+    'hover:bg-green-300',
+    'hover:bg-green-800',
+
+    'bg-red-100',
+    'bg-red-200',
+    'bg-red-700',
+    'hover:bg-red-200',
+    'hover:bg-red-300',
+    'hover:bg-red-800',
 
     'bg-blue-100',
     'bg-blue-200',
+    'bg-blue-700',
     'hover:bg-blue-200',
     'hover:bg-blue-300',
-
-    'bg-zinc-100',
-    'bg-zinc-200',
-    'hover:bg-zinc-300',
-
-    'bg-green-100',
-    'bg-green-200',
-    'hover:bg-green-300',
+    'hover:bg-blue-800',
 
     'bg-orange-100',
     'bg-orange-200',
+    'bg-orange-700',
+    'hover:bg-orange-200',
     'hover:bg-orange-300',
+    'hover:bg-orange-800',
 
-    'bg-red-100',
-    'bg-red-200',
-    'hover:bg-red-200',
-    'hover:bg-red-300',
+    'bg-zinc-100',
+    'bg-zinc-200',
+    'bg-zinc-700',
+    'hover:bg-zinc-200',
+    'hover:bg-zinc-300',
+    'hover:bg-zinc-800',
 
     'bg-violet-100',
     'bg-violet-200',
+    'bg-violet-700',
+    'hover:bg-violet-200',
     'hover:bg-violet-300',
+    'hover:bg-violet-800',
 
     'bg-indigo-100',
     'bg-indigo-200',
+    'bg-indigo-700',
+    'hover:bg-indigo-200',
     'hover:bg-indigo-300',
+    'hover:bg-indigo-800',
 
     'bg-yellow-100',
     'bg-yellow-200',
+    'bg-yellow-700',
+    'hover:bg-yellow-200',
     'hover:bg-yellow-300',
+    'hover:bg-yellow-800',
+
     'bg-teal-100',
     'bg-teal-900',
     'bg-purple-300',
@@ -165,6 +181,9 @@ module.exports = {
 
     // === Button Disabled state ===
     'bg-gray-200',
+    'text-gray-100',
+    'text-gray-200',
+    'text-gray-300',
     'text-gray-400',
     'text-gray-500',
     'text-gray-700',

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '2.2.1'
+  VERSION = '2.2.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.1.1
 platform: ruby
 authors:
 - kalashnikovisme