System-End/hackatime
1
0
Fork 0
mirror of https://github.com/System-End/hackatime.git synced 2026-04-19 23:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix borders

Browse source
This commit is contained in:
Echo 2025-06-24 17:29:13 -04:00
parent da41bf3aa6
commit ff863b328b
No known key found for this signature in database
7 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/layouts/application.html.erb
View file

@ -177,12 +177,12 @@
</footer>
</main>
<div class="fixed top-0 right-5 max-w-sm max-h-[80vh] bg-elevated border border-default rounded-b-xl shadow-lg z-[1000] overflow-hidden"
<div class="fixed top-0 right-5 max-w-sm max-h-[80vh] bg-elevated border border-red rounded-b-xl shadow-lg z-[1000] overflow-hidden"
data-controller="currently-hacking"
data-currently-hacking-target="container"
data-currently-hacking-url-value="<%= currently_hacking_static_pages_path %>"
data-currently-hacking-interval-value="60000">
<div class="currently-hacking p-3 bg-elevated cursor-pointer select-none border-b border-default">
<div class="currently-hacking p-3 bg-elevated cursor-pointer select-none border-b border-red">
<div class="text-white text-sm font-medium">
<div class="flex items-center">
<div class="w-2 h-2 rounded-full bg-green-500 animate-pulse mr-2"></div>

8
app/views/leaderboards/_mini_leaderboard.html.erb
View file

@ -23,7 +23,7 @@
%>
<% if mini_leaderboard_entries&.any? %>
<div class="bg-elevated rounded-xl border border-default p-4 shadow-lg">
<div class="bg-elevated rounded-xl border border-red p-4 shadow-lg">
<p class="text-xs italic text-muted mb-4">
<% if leaderboard.respond_to?(:scope_name) %>
<strong>Showing others in <%= link_to "your timezone", my_settings_path(anchor: "user_timezone"), data: { turbo: false }, class: "text-accent hover:text-cyan-400 transition-colors" %></strong>
@ -37,7 +37,7 @@
<div class="space-y-2">
<% mini_leaderboard_entries.each_with_index do |entry, idx| %>
<% is_competition = !show_top_entries && idx >= 2 %>
<div class="flex items-center p-3 rounded-lg hover:bg-dark transition-colors duration-200 <%= 'bg-dark border border-primary' if entry.user_id == current_user&.id %>">
<div class="flex items-center p-3 rounded-lg hover:bg-dark transition-colors duration-200 <%= 'bg-dark border border-red' if entry.user_id == current_user&.id %>">
<% if !is_competition %>
<% rank_emoji = case entries.index(entry)
when 0 then "🥇"
@ -47,9 +47,9 @@
<div class="w-8 text-center text-lg"><%= rank_emoji %></div>
<% else %>
<% if idx == 2 && entries.index(entry) - entries.index(mini_leaderboard_entries[1]) > 1 %>
<div class="text-center text-muted font-bold tracking-widest text-sm py-1">...</div>
<div class="text-center text-muted font-bold tracking-widest text-lg py-1">...</div>
<% end %>
<div class="w-8 text-center text-sm font-medium text-muted"><%= entries.index(entry) + 1 %></div>
<div class="w-8 text-center text-lg font-medium text-muted"><%= entries.index(entry) + 1 %></div>
<% end %>
<div class="flex-1 mx-3 min-w-0">
<div class="flex items-center gap-2 flex-wrap">

2
app/views/leaderboards/_mini_leaderboard_loading.html.erb
View file

@ -1,4 +1,4 @@
<div class="bg-elevated rounded-xl border border-default p-4 shadow-lg">
<div class="bg-elevated rounded-xl border border-red p-4 shadow-lg">
<p class="text-xs italic text-muted mb-4 opacity-70">
This leaderboard is in <%= Leaderboard::GLOBAL_TIMEZONE %>.
<% if current_user && timezone_difference_in_seconds(Leaderboard::GLOBAL_TIMEZONE, current_user.timezone) != 0 %>

10
app/views/leaderboards/index.html.erb
View file

@ -31,7 +31,7 @@
</div>
<% if current_user && current_user.github_uid.blank? %>
<div class="bg-dark border border-primary rounded-lg p-4 mb-6">
<div class="bg-dark border border-red rounded-lg p-4 mb-6">
<%= link_to "Connect your GitHub", "/auth/github", class: "bg-primary hover:bg-red-600 text-white font-medium px-4 py-2 rounded-lg transition-colors duration-200" %> to qualify for the leaderboard.
</div>
<% end %>
@ -59,7 +59,7 @@
</div>
</div>
<div class="bg-elevated rounded-xl border border-default overflow-hidden">
<div class="bg-elevated rounded-xl border border-red overflow-hidden">
<% if @entries&.any? %>
<div class="divide-y divide-gray-800">
<% @entries.each_with_index do |entry, index| %>
@ -101,7 +101,7 @@
<%= short_time_detailed entry.total_seconds %>
</div>
<% admin_tool do %>
<select class="ml-4 bg-dark border border-default rounded px-2 py-1 text-sm text-white"
<select class="ml-4 bg-dark border border-red rounded px-2 py-1 text-sm text-white"
data-controller="trust-level"
data-trust-level-target="select"
data-user-id="<%= entry.user.id %>"
@ -116,7 +116,7 @@
<% end %>
</div>
<% unless @user_on_leaderboard && @untracked_entries != 0 %>
<div class="px-4 py-3 text-sm text-muted border-t border-default">
<div class="px-4 py-3 text-sm text-muted border-t border-red">
Don't see yourself on the leaderboard? You're probably one of the
<%= pluralize(@untracked_entries, "user") %>
who haven't
@ -124,7 +124,7 @@
</div>
<% end %>
<% if @leaderboard.finished_generating? && @leaderboard.persisted? %>
<div class="px-4 py-2 text-xs italic text-muted border-t border-default">
<div class="px-4 py-2 text-xs italic text-muted border-t border-red">
Generated in <%= @leaderboard.finished_generating_at - @leaderboard.created_at %> seconds
</div>
<% end %>

2
app/views/shared/_nav.html.erb
View file

@ -1,4 +1,4 @@
<aside class="flex flex-col min-h-screen w-[250px] bg-darkless text-white px-2 py-4 border-r border-default overflow-y-auto lg:block" data-nav-target="nav">
<aside class="flex flex-col min-h-screen w-[250px] bg-darkless text-white px-2 py-4 border-r border-red overflow-y-auto lg:block" data-nav-target="nav">
<div class="space-y-4">
<% flash.each do |name, msg| %>
<div>

34
app/views/users/edit.html.erb
View file

@ -11,7 +11,7 @@
</header>
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">🚀</span>
@ -23,7 +23,7 @@
class: "inline-flex items-center gap-2 px-4 py-2 bg-primary text-white font-medium rounded transition-colors duration-200" %>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">🌍</span>
@ -39,14 +39,14 @@
<%= f.select :timezone,
TZInfo::Timezone.all.map(&:identifier).sort,
{ include_blank: @user.timezone.blank? },
{ class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary" } %>
{ class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary" } %>
</div>
<p class="text-xs text-gray-400">This affects how your activity graph and other time-based features are displayed.</p>
<%= f.submit "Save Settings", class: "w-full px-4 py-2 bg-primary text-white font-medium rounded transition-colors duration-200" %>
<% end %>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">⚙️</span>
@ -62,13 +62,13 @@
<%= f.select :hackatime_extension_text_type,
User.hackatime_extension_text_types.keys.map { |key| [key.humanize, key] },
{},
{ class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary" } %>
{ class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary" } %>
</div>
<%= f.submit "Save Settings", class: "w-full px-4 py-2 bg-primary text-white font-medium rounded transition-colors duration-200" %>
<% end %>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">💬</span>
@ -118,7 +118,7 @@
</div>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">🔒</span>
@ -140,7 +140,7 @@
<% end %>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">🏆</span>
@ -151,7 +151,7 @@
<%= render "timezone_leaderboard_toggle", user: @user %>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200 md:col-span-2">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200 md:col-span-2">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">🔗</span>
@ -199,14 +199,14 @@
<%= email_field_tag :email, nil,
placeholder: "Add another email address",
required: true,
class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary text-sm" %>
class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary text-sm" %>
<%= submit_tag "Add Email", class: "w-full px-3 py-2 bg-primary hover:bg-primary/80 text-white text-sm font-medium rounded transition-colors duration-200" %>
<% end %>
</div>
</div>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">📊</span>
@ -223,7 +223,7 @@
<div>
<label class="block text-sm font-medium text-gray-200 mb-2">Theme</label>
<select name="theme" id="theme-select" onchange="up1(this.value)"
class="w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary">
class="w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary">
<% GithubReadmeStats.themes.each do |theme| %>
<option value="<%= theme %>"><%= theme.humanize %></option>
<% end %>
@ -244,7 +244,7 @@
<div class="space-y-2">
<label class="block text-sm font-medium text-gray-200">Project</label>
<select name="project" id="project-select" onchange="up2(this.value)"
class="w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary">
class="w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary">
<% @projects.each do |project| %>
<option value="<%= project %>"><%= project %></option>
<% end %>
@ -279,7 +279,7 @@
</script>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200 space-y-6">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200 space-y-6">
<div>
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
@ -322,7 +322,7 @@
</div>
</div>
<div class="border border-primary rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200 md:col-span-2">
<div class="border border-red rounded-xl p-6 hover:bg-gray-800/50 transition-all duration-200 md:col-span-2">
<div class="flex items-center gap-3 mb-4">
<div class="p-2 bg-red-600/10 rounded">
<span class="text-2xl">📝</span>
@ -371,11 +371,11 @@
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<%= f.label :name, class: "block text-sm font-medium text-gray-200 mb-2" %>
<%= f.text_field :name, class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary" %>
<%= f.text_field :name, class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary" %>
</div>
<div>
<%= f.label :endpoint_url, class: "block text-sm font-medium text-gray-200 mb-2" %>
<%= f.url_field :endpoint_url, class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-primary focus:ring-1 focus:ring-primary" %>
<%= f.url_field :endpoint_url, class: "w-full px-3 py-2 bg-gray-800 border border-gray-600 rounded text-white focus:border-red focus:ring-1 focus:ring-primary" %>
</div>
</div>
<%= f.submit "Add Mirror", class: "px-4 py-2 bg-primary text-white font-medium rounded transition-colors duration-200" %>

5
tailwind.config.js → config/tailwind.config.js
View file

@ -1,10 +1,7 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: [
'./app/views/**/*.html.erb',
'./app/helpers/**/*.rb',
'./app/assets/stylesheets/**/*.css',
'./app/javascript/**/*.js'
'./app/**/*',
],
theme: {
extend: {