Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Compare commits

merge into: Karavel:master
Branches Tags
Karavel:master
Karavel:issue30
fixin.me:master
...
pull from: Karavel:issue30
Branches Tags
Karavel:issue30
Karavel:master
fixin.me:master

5 Commits
master ... issue30

Author SHA1 Message Date
Karavel
7eafb86d9b Merge pull request 'Merging from Repo master to my master.' (#3) 
Reviewed-on: #3
 2024-05-18 09:32:11 +02:00
cryptogopher
abd02fc7d0 Update /profile/edit layout to grid 
Closes #29
 2024-05-18 09:15:41 +02:00
Karavel
de8f291cee Merge pull request 'issue4' (#2) from issue4 into master 
Reviewed-on: #2
 2024-05-15 00:17:02 +02:00
K4r0n1
c049fc8d24 Moved table in profile/edit and updated grid. 2024-05-14 23:52:41 +02:00
K4r0n1
2c37865265 Moved table in profile/edit and updated grid. 2024-05-14 23:43:40 +02:00
2 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
app/assets/stylesheets/application.css
View File

@ -202,7 +202,6 @@ input[type=text]:read-only {
fill: #009ade; fill: #009ade;
} }
.leftside { .leftside {
grid-area: leftside; grid-area: leftside;
} }
@ -460,6 +459,9 @@ table.items select:focus-visible {
.extendedright { .extendedright {
margin-right: auto; margin-right: auto;
} }
.extendedleft {
margin-left: auto;
}
[disabled] { [disabled] {
border-color: var(--color-border-gray) !important; border-color: var(--color-border-gray) !important;
color: var(--color-border-gray) !important; color: var(--color-border-gray) !important;

6
app/views/users/registrations/edit.html.erb
View File

@ -1,3 +1,4 @@
<div class="leftside">
<% content_for :navigation, flush: true do %> <% content_for :navigation, flush: true do %>
<%= image_link_to t(:back), 'arrow-left-bold-outline', <%= image_link_to t(:back), 'arrow-left-bold-outline',
request.referer.present? ? :back : root_path %> request.referer.present? ? :back : root_path %>
@ -12,7 +13,7 @@
html: {method: :patch, class: 'main'} do |f| %> html: {method: :patch, class: 'main'} do |f| %>
<%= f.email_field :email, size: 30, autofocus: true, autocomplete: "off" %> <%= f.email_field :email, size: 30, autofocus: true, autocomplete: "off" %>
<% if f.object.pending_reconfirmation? %> <% if f.object.pending_reconfirmation? %>
<%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1, <%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1,
hint: t(".unconfirmed_email_hint", hint: t(".unconfirmed_email_hint",
timestamp: f.object.confirmation_sent_at.to_fs(:db_without_sec)) %> timestamp: f.object.confirmation_sent_at.to_fs(:db_without_sec)) %>
<% end %> <% end %>
@ -24,7 +25,8 @@
hint: t(".blank_password_hint_html", hint: t(".blank_password_hint_html",
subhint: t("users.minimum_password_length", count: @minimum_password_length)) %> subhint: t("users.minimum_password_length", count: @minimum_password_length)) %>
<%= f.password_field :password_confirmation, label: t(".password_confirmation"), <%= f.password_field :password_confirmation, label: t(".password_confirmation"),
size: 30, minlength: @minimum_password_length, autocomplete: "off" %> size: 30, minlength: @minimum_password_length, autocomplete: "off" %>
<%= f.submit t(".update") %> <%= f.submit t(".update") %>
</div>
<% end %> <% end %>