diff --git a/app/assets/images/crown.svg b/app/assets/images/crown.svg new file mode 100644 index 000000000..a5d104b4c --- /dev/null +++ b/app/assets/images/crown.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/everyone.svg b/app/assets/images/everyone.svg new file mode 100644 index 000000000..eb8a9a92d --- /dev/null +++ b/app/assets/images/everyone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/remove-med.svg b/app/assets/images/remove-med.svg new file mode 100644 index 000000000..c15d589ec --- /dev/null +++ b/app/assets/images/remove-med.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/bubbles.css b/app/assets/stylesheets/bubbles.css index cde38c362..839de0224 100644 --- a/app/assets/stylesheets/bubbles.css +++ b/app/assets/stylesheets/bubbles.css @@ -315,7 +315,7 @@ -webkit-line-clamp: var(--lines, 5); -webkit-box-orient: vertical; display: -webkit-box; - font-size: 8cqi; + font-size: 9cqi; hyphens: auto; line-height: 1.2; margin: auto; @@ -344,11 +344,11 @@ } .bubbles-list { - --bubble-size: 1.2em; + --bubble-size: 1.8em; --bubble-shift: 15deg; --hover-size: 0; - font-size: clamp(1rem, 1.8cqi, 2rem); + font-size: var(--text-medium); max-inline-size: 80ch; .bubble { @@ -409,9 +409,9 @@ .bubble__shape { background-color: var(--bubble-color); - block-size: 1.2em; + block-size: var(--bubble-size, 1.2em); border-radius: var(--bubble-shape); - inline-size: 1.2em; + inline-size: var(--bubble-size, 1.2em); pointer-events: none; position: relative; transform: rotate(var(--bubble-rotate)); @@ -419,10 +419,10 @@ z-index: 0; .bubble & { + --bubble-size: 100%; + background-color: color(from var(--bubble-color) srgb r g b / 0.15); border: var(--bubble-border-width) solid var(--bubble-color); - block-size: 100%; - inline-size: 100%; } .bubble:has(.bubble__link) & { diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css index 9141411e2..61aab22a4 100644 --- a/app/assets/stylesheets/utilities.css +++ b/app/assets/stylesheets/utilities.css @@ -6,14 +6,23 @@ --block-space: 1rem; --block-space-half: calc(var(--block-space) / 2); --block-space-double: calc(var(--block-space) * 2); + + /* Text sizes */ + --text-x-small: 0.6rem; + --text-small: 0.8rem; + --text-medium: 1.2rem; + --text-large: 1.5rem; + --text-x-large: 1.8rem; + --text-xx-large: 2.4rem; } /* Text */ -.txt-small { font-size: 0.8rem; } -.txt-medium { font-size: 1rem; } -.txt-large { font-size: 1.4rem; } -.txt-x-large { font-size: 1.8rem; } -.txt-xx-large { font-size: 2.4rem; } +.txt-x-small { font-size: var(--text-x-small); } +.txt-small { font-size: var(--text-small); } +.txt-medium { font-size: var(--text-medium); } +.txt-large { font-size: var(--text-large); } +.txt-x-large { font-size: var(--text-x-large); } +.txt-xx-large { font-size: var(--text-xx-large); } .txt-align-center { text-align: center; } .txt-align-start { text-align: start; } diff --git a/app/views/accounts/users/_user.html.erb b/app/views/accounts/users/_user.html.erb index 97cc34e83..787d2b37f 100644 --- a/app/views/accounts/users/_user.html.erb +++ b/app/views/accounts/users/_user.html.erb @@ -7,6 +7,12 @@ + + <%# FIXME: Move this Current.user check to a stimulus controller that just checks for admin? or the like we so we can cache user list %> <%= button_to account_user_path(user), method: :delete, class: "btn btn--small btn--negative flex-item-no-shrink", disabled: !Current.user.can_remove?(user), diff --git a/app/views/accounts/users/index.html.erb b/app/views/accounts/users/index.html.erb index d77d1e11e..5d93666d8 100644 --- a/app/views/accounts/users/index.html.erb +++ b/app/views/accounts/users/index.html.erb @@ -7,7 +7,14 @@ Go back <% end %> - <%= button_to session_path, method: :delete, class: "btn", form_class: "flex-item-justify-end" do %> +

<%= @page_title %>

+ + <%= link_to workflows_path, class: "btn flex-item-justify-end" do %> + <%= image_tag "bolt.svg", aria: { hidden: true }, size: 24 %> + Workflows + <% end %> + + <%= button_to session_path, method: :delete, class: "btn" do %> <%= image_tag "logout.svg", aria: { hidden: true }, size: 24 %> Sign out <% end %> @@ -21,8 +28,3 @@
<%= render partial: "accounts/users/user", collection: @users %>
- -
-

Workflows

- <%= turbo_frame_tag :workflows, src: workflows_path %> -
diff --git a/app/views/bubbles/list/_bubble.html.erb b/app/views/bubbles/list/_bubble.html.erb index fad458c71..ae1763177 100644 --- a/app/views/bubbles/list/_bubble.html.erb +++ b/app/views/bubbles/list/_bubble.html.erb @@ -1,33 +1,35 @@ -
  • - <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "bubble__title-link flex align-center gap flex-item-grow min-width" do %> - <%= bubble.title %> - <% end %> +
    + <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "bubble__title-link flex align-center gap min-width" do %> + <%= bubble.title %> + <% end %> - <% if bubble.due_on.present? %> - - <% end %> +
    + <% bubble.tags.each do |tag| %> + <%= link_to tag.hashtag, bubbles_path(@filter.to_params.merge(tag_ids: [ tag.id ])), + class: "btn btn--plain txt-small fill-transparent", style: "color: #{bubble.color}" %> + <% end %> +
    +
    -
    + + +
    <% bubble.assignees.each do |assignee| %> - <%= link_to bubbles_path(@filter.to_params.merge(assignee_ids: [ assignee.id ])), class: "btn avatar txt-small" do %> + <%= link_to bubbles_path(@filter.to_params.merge(assignee_ids: [ assignee.id ])), class: "btn avatar txt-x-small" do %> <%= avatar_image_tag assignee, loading: :lazy %> <% end %> <% end %>
    - - <% bubble.tags.each do |tag| %> - <%= link_to tag.hashtag, bubbles_path(@filter.to_params.merge(tag_ids: [ tag.id ])), - class: "btn btn--plain", style: "color: #{bubble.color}" %> - <% end %> + <% if bubble.due_on.present? %> + + <% end %> + - <%= tag.time bubble.created_at, class: "txt-nowrap flex-item-justify-end" do %> - <%= bubble.created_at.strftime("%b %d") %> - <% end %> -
    • diff --git a/app/views/bubbles/stage_pickers/new.html.erb b/app/views/bubbles/stage_pickers/new.html.erb index 2783bc6aa..d3826ddaa 100644 --- a/app/views/bubbles/stage_pickers/new.html.erb +++ b/app/views/bubbles/stage_pickers/new.html.erb @@ -3,11 +3,12 @@