Compare commits

..

No commits in common. "b38c8cf814255faad508ffb20a400c27fd9e528b" and "6c14632bd5803fc3f11990fb769a8818705f0906" have entirely different histories.

10 changed files with 18 additions and 67 deletions

View File

@ -57,11 +57,11 @@
justify-content: center; justify-content: center;
} }
.stat, .counter, .text-field { .stat, .counter {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
border-radius: var(--border-radius); border-radius: var(--border-radius);
h6, .feature-edit-buttons { h6 {
font-size: .8em; font-size: .8em;
text-align: center; text-align: center;
background-color: var(--background-color); background-color: var(--background-color);
@ -70,37 +70,12 @@
padding: .5em; padding: .5em;
} }
input, .stat-value { input, .stat-value {
font-size: 3em;
width: 2.5em;
}
input, .stat-value, .trix-content {
padding: .5em; padding: .5em;
color: var(--text-color); color: var(--text-color);
background-color: var(--input-background); background-color: var(--input-background);
text-align: center; text-align: center;
font-size: 3em;
width: 2.5em;
border: 1px solid var(--background-color); border: 1px solid var(--background-color);
height: 120px;
}
trix-toolbar {
display: none;
}
.trix-content {
min-width: 10em;
max-width: 20em;
overflow-y: scroll;
font-size: .8em;
}
input[type=submit] {
width: 100%;
font-size: .8em;
height: auto;
padding: auto;
}
}
.feature-edit-buttons {
a:link, a:visited {
color: inherit;
text-decoration: none;
} }
} }

View File

@ -1,5 +1,3 @@
@import "https://www.nerdfonts.com/assets/css/webfont.css";
* { * {
box-sizing: border-box; box-sizing: border-box;
} }

View File

@ -8,9 +8,4 @@ module ApplicationHelper
object.errors.full_messages_for(attr).join(". ") object.errors.full_messages_for(attr).join(". ")
end end
end end
def icon_link_to(icon_name, path, data: {})
icon = content_tag(:i, nil, class: "nf nf-#{icon_name}").html_safe
link_to icon, path, data: data
end
end end

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Counter < ApplicationRecord class Counter < ApplicationRecord
has_one :character_sheet_feature, as: :featurable, dependent: :destroy has_one :character_sheet_feature, as: :featurable
has_one :character_sheet_section, through: :character_sheet_feature has_one :character_sheet_section, through: :character_sheet_feature
accepts_nested_attributes_for :character_sheet_feature, allow_destroy: true accepts_nested_attributes_for :character_sheet_feature, allow_destroy: true

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Stat < ApplicationRecord class Stat < ApplicationRecord
has_one :character_sheet_feature, as: :featurable, dependent: :destroy has_one :character_sheet_feature, as: :featurable
has_one :character_sheet_section, through: :character_sheet_feature has_one :character_sheet_section, through: :character_sheet_feature
accepts_nested_attributes_for :character_sheet_feature, allow_destroy: true accepts_nested_attributes_for :character_sheet_feature, allow_destroy: true

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class TextField < ApplicationRecord class TextField < ApplicationRecord
has_one :character_sheet_feature, as: :featurable, dependent: :destroy has_one :character_sheet_feature, as: :featurable
has_one :character_sheet_section, through: :character_sheet_feature has_one :character_sheet_section, through: :character_sheet_feature
accepts_nested_attributes_for :character_sheet_feature, allow_destroy: true accepts_nested_attributes_for :character_sheet_feature, allow_destroy: true

View File

@ -1,13 +1,7 @@
<div class="counter" id="<%= dom_id(counter) %>"> <div class="counter" id="<%= dom_id(counter) %>">
<% if @editable %> <% if @editable %>
<div class="feature-edit-buttons"> <%= link_to(t(".delete"), counter,
<%= icon_link_to("cod-triangle_left", reorder_down_character_sheet_feature_path(counter),
data: { turbo_method: :patch }) %>
<%= icon_link_to("md-delete", counter,
data: { turbo_method: :delete, turbo_confirm: t(".confirm_delete", name: counter.name) }) %> data: { turbo_method: :delete, turbo_confirm: t(".confirm_delete", name: counter.name) }) %>
<%= icon_link_to("cod-triangle_right", reorder_up_character_sheet_feature_path(counter),
data: { turbo_method: :patch }) %>
</div>
<% end %> <% end %>
<h6><%= counter.name %></h6> <h6><%= counter.name %></h6>
<%= form_with model: counter, class: "counter-form", <%= form_with model: counter, class: "counter-form",

View File

@ -1,13 +1,9 @@
<div class="stat" id="<%= dom_id(stat) %>"> <div class="stat" id="<%= dom_id(stat) %>">
<% if @editable %> <% if @editable %>
<div class="feature-edit-buttons"> <%= link_to t(".down"), reorder_down_character_sheet_feature_path(stat), data: { turbo_method: :patch } %>
<%= icon_link_to("cod-triangle_left", reorder_down_character_sheet_feature_path(stat), <%= link_to t(".up"), reorder_up_character_sheet_feature_path(stat), data: { turbo_method: :patch } %>
data: { turbo_method: :patch }) %> <%= link_to(t(".delete"), stat,
<%= icon_link_to("md-delete", stat,
data: { turbo_method: :delete, turbo_confirm: t(".confirm_delete", name: stat.name) }) %> data: { turbo_method: :delete, turbo_confirm: t(".confirm_delete", name: stat.name) }) %>
<%= icon_link_to("cod-triangle_right", reorder_up_character_sheet_feature_path(stat),
data: { turbo_method: :patch }) %>
</div>
<% end %> <% end %>
<h6><%= stat.name %></h6> <h6><%= stat.name %></h6>
<% if @editable %> <% if @editable %>

View File

@ -1,13 +1,7 @@
<div class="text-field" id="<%= dom_id(text_field) %>"> <div class="text-field" id="<%= dom_id(text_field) %>">
<% if @editable %> <% if @editable %>
<div class="feature-edit-buttons"> <%= link_to t(".delete"), text_field,
<%= icon_link_to("cod-triangle_left", reorder_down_character_sheet_feature_path(text_field), data: { turbo_method: :delete, turbo_confirm: t(".confirm_delete", name: text_field.name) } %>
data: { turbo_method: :patch }) %>
<%= icon_link_to("md-delete", text_field,
data: { turbo_method: :delete, turbo_confirm: t(".confirm_delete", name: text_field.name) }) %>
<%= icon_link_to("cod-triangle_right", reorder_up_character_sheet_feature_path(text_field),
data: { turbo_method: :patch }) %>
</div>
<% end %> <% end %>
<h6><%= text_field.name %></h6> <h6><%= text_field.name %></h6>
@ -17,7 +11,7 @@
<%= f.submit t(".save") %> <%= f.submit t(".save") %>
<% end %> <% end %>
<% else %> <% else %>
<%= text_field.content %> <p><%= text_field.content %></p>
<% end %> <% end %>
</div> </div>

View File

@ -1,10 +1,9 @@
- don't move down/up top/bottom features - set orders on sheets
- auto save text fields
- indicate save status on titlebar
- easily edit text fields without entering edit mode - easily edit text fields without entering edit mode
- add roll command to counters (e.g. luck) - add roll command to counters (e.g. luck)
- test for rolls controller & system tests - test for rolls controller & system tests
- Show individual dice on dice roll - Show individual dice on dice roll
- customise trix bar
- Sheets - Sheets
- Lists - Lists
- Weapons/spells - Weapons/spells