diff --git a/assets/css/frenzy.scss b/assets/css/frenzy.scss index 38a810a..908141e 100644 --- a/assets/css/frenzy.scss +++ b/assets/css/frenzy.scss @@ -83,15 +83,20 @@ label.sidebar-toggle > .oi { .sidebar .nav-item a { font-weight: 500; color: #333; + transition: none; } .sidebar .nav-item a:hover { text-decoration: none; - color: var(--blue); + color: var(--bs-link-color); } .sidebar .nav-link.active { - color: var(--blue); + color: var(--bs-link-color); +} + +.sidebar .nav-item details summary a { + padding: 0; } .sidebar .nav-item details summary a:hover { diff --git a/lib/frenzy_web/live/configure_stage/conditional_stage_live.html.heex b/lib/frenzy_web/live/configure_stage/conditional_stage_live.html.heex index e122701..815e890 100644 --- a/lib/frenzy_web/live/configure_stage/conditional_stage_live.html.heex +++ b/lib/frenzy_web/live/configure_stage/conditional_stage_live.html.heex @@ -4,10 +4,10 @@ <% end %> <%= form_for @opts, "#", [as: :opts, phx_change: :update_stage, phx_target: @myself], fn f -> %> -
+
- <%= select f, :stage, @stages, prompt: "Select a stage...", id: "#{@id}-stage", class: "custom-select" %> + <%= select f, :stage, @stages, prompt: "Select a stage...", id: "#{@id}-stage", class: "form-select" %>
<% end %> @@ -31,7 +31,7 @@

Condition: Filter

-
+
@@ -55,7 +55,7 @@

Condition: Rule

-
+
diff --git a/lib/frenzy_web/live/configure_stage/scrape_stage_live.html.heex b/lib/frenzy_web/live/configure_stage/scrape_stage_live.html.heex index 2c98194..b9f48bb 100644 --- a/lib/frenzy_web/live/configure_stage/scrape_stage_live.html.heex +++ b/lib/frenzy_web/live/configure_stage/scrape_stage_live.html.heex @@ -3,14 +3,14 @@ 
<%= Jason.encode!(@opts, pretty: true) %>
<% end %> <%= form_for @opts, "#", [as: :opts, phx_change: :update_stage, phx_target: @myself], fn f -> %> -
+
<%= checkbox f, :convert_to_data_uris, id: "#{@id}-convert_to_data_uris", class: "form-check-input" %>
-
+
- <%= select f, :extractor, @extractors, id: "#{@id}-extractor", class: "custom-select" %> + <%= select f, :extractor, @extractors, id: "#{@id}-extractor", class: "form-select" %>
<% end %> diff --git a/lib/frenzy_web/live/edit_pipeline_live.html.heex b/lib/frenzy_web/live/edit_pipeline_live.html.heex index ff506e8..566c5cf 100644 --- a/lib/frenzy_web/live/edit_pipeline_live.html.heex +++ b/lib/frenzy_web/live/edit_pipeline_live.html.heex @@ -9,7 +9,7 @@

<%= stage["module_name"] %>

-
+
<%= content_tag :button, "Move Up", [phx_click: :move_up, phx_value_index: index, disabled: index == 0, class: "btn btn-secondary btn-sm"] %> <%= content_tag :button, "Move Down", [phx_click: :move_down, phx_value_index: index, disabled: index == length(@pipeline.stages) - 1, class: "btn btn-secondary btn-sm"] %> @@ -25,10 +25,10 @@ <% end %> <%= form_for :stage, "#", [class: "mt-4 mb-4", phx_submit: :add_stage], fn f -> %> -
+
- <%= select f, :module_name, @stages, class: "custom-select" %> + <%= select f, :module_name, @stages, class: "form-select" %>
<%= submit "Add Stage", class: "btn btn-primary" %> diff --git a/lib/frenzy_web/live/filter/filter_live.html.heex b/lib/frenzy_web/live/filter/filter_live.html.heex index 8c302d8..e1ebffe 100644 --- a/lib/frenzy_web/live/filter/filter_live.html.heex +++ b/lib/frenzy_web/live/filter/filter_live.html.heex @@ -1,12 +1,12 @@
<%= form_for @filter, "#", [phx_change: :update_filter, phx_target: "##{@parent_id}"], fn f -> %> -
+
- <%= select f, :mode, @modes, id: "#{@id}-mode", class: "custom-select" %> + <%= select f, :mode, @modes, id: "#{@id}-mode", class: "form-select" %>
-
+
<%= number_input f, :score, id: "#{@id}-score", class: "form-control" %> @@ -20,7 +20,7 @@

Rule <%= index %>

-
+
diff --git a/lib/frenzy_web/live/filter/filter_rule_live.html.heex b/lib/frenzy_web/live/filter/filter_rule_live.html.heex index b906636..0182cb8 100644 --- a/lib/frenzy_web/live/filter/filter_rule_live.html.heex +++ b/lib/frenzy_web/live/filter/filter_rule_live.html.heex @@ -3,16 +3,16 @@ <%= hidden_input f, :index, value: @index %>
- <%= select f, :property, @properties, id: "#{@id}-property", class: "custom-select" %> + <%= select f, :property, @properties, id: "#{@id}-property", class: "form-select" %>
- <%= select f, :mode, @modes, id: "#{@id}-mode", class: "custom-select" %> + <%= select f, :mode, @modes, id: "#{@id}-mode", class: "form-select" %>
<%= text_input f, :param, id: "#{@id}-param", placeholder: if(@rule["mode"] == "contains_string", do: "substring", else: "regex"), class: "form-control text-monospace" %>
-
+
<%= number_input f, :weight, id: "#{@id}-weight", class: "form-control" %> diff --git a/lib/frenzy_web/templates/account/change_fever_password.html.eex b/lib/frenzy_web/templates/account/change_fever_password.html.eex index 9b4c361..8339bd4 100644 --- a/lib/frenzy_web/templates/account/change_fever_password.html.eex +++ b/lib/frenzy_web/templates/account/change_fever_password.html.eex @@ -1,15 +1,15 @@

Change Fever Password

<%= form_tag Routes.account_path(@conn, :do_change_fever_password), method: :post do %> -
+
-
+
<%= submit "Change Fever Password", class: "btn btn-primary" %>
-<% end %> \ No newline at end of file +<% end %> diff --git a/lib/frenzy_web/templates/account/change_password.html.eex b/lib/frenzy_web/templates/account/change_password.html.eex index e50b0c5..0f742b1 100644 --- a/lib/frenzy_web/templates/account/change_password.html.eex +++ b/lib/frenzy_web/templates/account/change_password.html.eex @@ -1,27 +1,27 @@

Change Password

<%= form_tag Routes.account_path(@conn, :do_change_password), method: :post do %> -
+
-
+
-
+
-
+
<%= submit "Change Password", class: "btn btn-primary" %>
-<% end %> \ No newline at end of file +<% end %> diff --git a/lib/frenzy_web/templates/feed/edit.html.eex b/lib/frenzy_web/templates/feed/edit.html.eex index 6300606..7f338ae 100644 --- a/lib/frenzy_web/templates/feed/edit.html.eex +++ b/lib/frenzy_web/templates/feed/edit.html.eex @@ -1,32 +1,32 @@

Edit Feed

<%= form_for @changeset, Routes.feed_path(@conn, :update, @feed.id), fn f -> %> -
+
<%= text_input f, :feed_url, class: "form-control" %>
-
+
- <%= select f, :refresh_frequency, @refresh_frequencies, class: "custom-select" %> + <%= select f, :refresh_frequency, @refresh_frequencies, class: "form-select" %>
-
+
- <%= select f, :pipeline_id, @pipelines, class: "custom-select" %> + <%= select f, :pipeline_id, @pipelines, class: "form-select" %>
<%= if @feed.pipeline_id do %> -
+
View Pipeline
<% end %> -
+
<%= submit "Update Feed", class: "btn btn-primary" %>
diff --git a/lib/frenzy_web/templates/fervor/oauth/authorize.html.eex b/lib/frenzy_web/templates/fervor/oauth/authorize.html.eex index ca10de1..41f6464 100644 --- a/lib/frenzy_web/templates/fervor/oauth/authorize.html.eex +++ b/lib/frenzy_web/templates/fervor/oauth/authorize.html.eex @@ -5,8 +5,8 @@ <%= if @state do %> <% end %> -
+
<%= submit "Grant access", class: "btn btn-primary" %>

To reject the request, close this page.

-<% end %> \ No newline at end of file +<% end %> diff --git a/lib/frenzy_web/templates/group/edit.html.eex b/lib/frenzy_web/templates/group/edit.html.eex index e4d4d5c..2ef2a13 100644 --- a/lib/frenzy_web/templates/group/edit.html.eex +++ b/lib/frenzy_web/templates/group/edit.html.eex @@ -1,13 +1,15 @@

Edit Group

<%= form_for @changeset, Routes.group_path(@conn, :update, @group.id), fn f -> %> -
+
<%= text_input f, :title, class: "form-control" %>
-
- <%= submit "Update Group", class: "btn btn-primary" %> +
+
+ <%= submit "Update Group", class: "btn btn-primary" %> +
<% end %> diff --git a/lib/frenzy_web/templates/group/new.html.eex b/lib/frenzy_web/templates/group/new.html.eex index ccc2fa4..ba9b0e2 100644 --- a/lib/frenzy_web/templates/group/new.html.eex +++ b/lib/frenzy_web/templates/group/new.html.eex @@ -1,13 +1,13 @@

New Group

<%= form_for @changeset, Routes.group_path(@conn, :create), fn form -> %> -
+
<%= text_input form, :title, placeholder: "My New Group", class: "form-control" %>
-
+
<%= submit "Create Group", class: "btn btn-primary" %>
diff --git a/lib/frenzy_web/templates/layout/root.html.eex b/lib/frenzy_web/templates/layout/root.html.eex index 177d03d..0a8af83 100644 --- a/lib/frenzy_web/templates/layout/root.html.eex +++ b/lib/frenzy_web/templates/layout/root.html.eex @@ -49,7 +49,7 @@
  • - <%= group.title %> + <%= group.title %>
      <%= for feed <- group.feeds do %> diff --git a/lib/frenzy_web/templates/login/login.html.eex b/lib/frenzy_web/templates/login/login.html.eex index a2ef772..557881d 100644 --- a/lib/frenzy_web/templates/login/login.html.eex +++ b/lib/frenzy_web/templates/login/login.html.eex @@ -4,19 +4,19 @@ <%= if @continue do %> <% end %> -
      +
      -
      +
      -
      +
      <%= submit "Log In", class: "btn btn-primary" %>
      diff --git a/lib/frenzy_web/templates/pipeline/edit.html.eex b/lib/frenzy_web/templates/pipeline/edit.html.eex index 042b293..1b213e4 100644 --- a/lib/frenzy_web/templates/pipeline/edit.html.eex +++ b/lib/frenzy_web/templates/pipeline/edit.html.eex @@ -3,16 +3,16 @@ Edit UI <%= form_tag Routes.pipeline_path(@conn, :update, @pipeline.id), method: :put do %> -
      +
      <%= text_input :pipeline, :name, value: @name, placeholder: "My New Pipeline", class: "form-control" %>
      -
      +
      <%= textarea :pipeline, :stages, value: @stages_json, class: "form-control", rows: 15, style: "font-family: monospace;" %>
      -
      +
      <%= submit "Edit Pipeline", class: "btn btn-primary" %>
      diff --git a/lib/frenzy_web/templates/pipeline/new.html.eex b/lib/frenzy_web/templates/pipeline/new.html.eex index 316d1e4..bd8fcad 100644 --- a/lib/frenzy_web/templates/pipeline/new.html.eex +++ b/lib/frenzy_web/templates/pipeline/new.html.eex @@ -1,14 +1,14 @@ <%= form_for @changeset, Routes.pipeline_path(@conn, :create), fn form -> %> -
      +
      <%= text_input form, :name, placeholder: "My New Pipeline", class: "form-control" %>
      -
      +
      <%= textarea form, :stages, class: "form-control", rows: 15, style: "font-family: monospace;" %>
      -
      +
      <%= submit "Create Pipeline", class: "btn btn-primary" %>