Skip to content

Commit 4563c9f

Browse files
committed
Fix CSS
1 parent 07358f0 commit 4563c9f

File tree

3 files changed

+34
-238
lines changed

3 files changed

+34
-238
lines changed

assets/css/app.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import "./milligram.css";
2-
@import "./diff.css";
32

43
html, body {
54
display:flex;
@@ -383,6 +382,8 @@ table.package-list .button {
383382
margin-bottom: 0;
384383
}
385384

385+
386+
386387
@media only screen
387388
and (min-device-width: 320px)
388389
and (max-device-width: 480px) {

assets/css/diff.css

Lines changed: 0 additions & 192 deletions
This file was deleted.

lib/diff_web/live/diff_live_view.ex

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,70 +6,55 @@ defmodule DiffWeb.DiffLiveView do
66
def render(assigns) do
77
~H"""
88
<%= if assigns[:error] do %>
9-
<div class="error-container">
10-
<h2>Error</h2>
9+
<div class="message-container">
10+
<h2 class="message">Error</h2>
1111
<p><%= @error %></p>
1212
</div>
1313
<% else %>
1414
<%= if assigns[:view_mode] == :diffs_list do %>
15-
<div class="diffs-container">
16-
<h1>Package Diffs</h1>
17-
<div class="diffs-list">
15+
<div class="search-area">
16+
<h1 class="package-header">Package Diffs</h1>
17+
<div>
1818
<%= for {package, from, to, url} <- @diffs do %>
19-
<div class="diff-item">
20-
<a href={url} class="diff-link">
21-
<span class="package-name"><%= package %></span>
22-
<span class="version-range">
23-
<%= from %><%= to %>
24-
</span>
19+
<div>
20+
<a href={url} class="package-name">
21+
<%= package %> (<%= from %><%= to %>)
2522
</a>
2623
</div>
2724
<% end %>
2825
</div>
2926
</div>
3027
<% else %>
31-
<div class="diff-container">
32-
<div class="diff-header">
33-
<h1><%= @package %></h1>
34-
<div class="version-range">
35-
<span class="from-version"><%= @from %></span>
36-
<span class="arrow"></span>
37-
<span class="to-version"><%= @to %></span>
38-
</div>
28+
<div class="search-area">
29+
<h1 class="package-header"><%= @package %></h1>
30+
<div class="package-sub-header">
31+
<span><%= @from %></span>
32+
<span></span>
33+
<span><%= @to %></span>
3934
</div>
4035
41-
<div class="diff-stats">
42-
<div class="stat">
43-
<span class="label">Files changed:</span>
44-
<span class="value"><%= @metadata.files_changed %></span>
45-
</div>
46-
<div class="stat additions">
47-
<span class="label">Additions:</span>
48-
<span class="value">+<%= @metadata.total_additions %></span>
49-
</div>
50-
<div class="stat deletions">
51-
<span class="label">Deletions:</span>
52-
<span class="value">-<%= @metadata.total_deletions %></span>
53-
</div>
36+
<div class="package-sub-header">
37+
Files: <%= @metadata.files_changed %> |
38+
+<%= @metadata.total_additions %> |
39+
-<%= @metadata.total_deletions %>
5440
</div>
5541
5642
<%= if @generating do %>
57-
<div class="loading-container">
58-
<div class="loading-spinner"></div>
59-
<span>Generating diff patches...</span>
43+
<div class="message-container">
44+
<div class="message">Generating diff patches...</div>
6045
</div>
6146
<% end %>
6247
6348
<%= if @loading do %>
64-
<div class="loading-container">
65-
<div class="loading-spinner"></div>
66-
<span>Loading patches...</span>
49+
<div class="message-container">
50+
<div class="message">Loading patches...</div>
6751
</div>
6852
<% end %>
6953
7054
<%= if @search_query != "" do %>
71-
<div class="search-container">
55+
<div class="search-form">
7256
<input
57+
class="search-input"
7358
type="text"
7459
placeholder="Search files..."
7560
phx-keyup="search"
@@ -79,26 +64,28 @@ defmodule DiffWeb.DiffLiveView do
7964
</div>
8065
<% end %>
8166
82-
<div class="patch-list" id="patch-list">
67+
<div class="ghd-container" id="patch-list">
8368
<%= for patch_id <- @loaded_patches do %>
84-
<div class="patch-container" id={"patch-#{patch_id}"}>
69+
<div id={"patch-#{patch_id}"}>
8570
<%= case Map.get(@patch_contents, patch_id) do %>
8671
<% nil -> %>
87-
<div class="patch-loading">Loading patch <%= patch_id %>...</div>
72+
<div class="message-container">
73+
<div class="message">Loading patch <%= patch_id %>...</div>
74+
</div>
8875
<% content -> %>
8976
<%= raw(content) %>
9077
<% end %>
9178
</div>
9279
<% end %>
9380
9481
<%= if @has_more_patches do %>
95-
<div class="load-more-container">
96-
<button phx-click="load-more" class="load-more-btn">
82+
<div class="message-container">
83+
<button phx-click="load-more" class="diff-button button">
9784
Load more patches
9885
</button>
9986
</div>
10087
<% end %>
101-
</div>
88+
</div>
10289
</div>
10390
<% end %>
10491
<% end %>

0 commit comments

Comments
 (0)