Skip to content

Commit b57675a

Browse files
committed
clean-up/Remove locally defined fledbox classes
1 parent f14b003 commit b57675a

File tree

6 files changed

+7
-30
lines changed

6 files changed

+7
-30
lines changed

app/assets/stylesheets/helpers.scss

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@
2424
overflow-y: hidden;
2525
}
2626

27-
// FLEXBOX
28-
29-
.flex { display: flex }
30-
.inline-flex { display: inline-flex; }
31-
.flex-column { flex-direction: column; }
32-
.v-center { align-items: center; }
33-
.v-bottom { align-items: baseline; }
34-
.h-center { justify-content: center; }
35-
.flex-end { justify-content: flex-end; }
36-
37-
.space-between { justify-content: space-between; }
38-
39-
.flex-1 { flex: 1; }
40-
.flex-2 { flex: 2; }
41-
.flex-3 { flex: 3; }
42-
4327
// DISPLAY
4428

4529
.block { display: block; }

app/views/devise/registrations/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<%= form_for current_user, url: modify_users_path, html: { data: { controller: "form", form_enabled_class: "button--cta-primary", form_disabled_class: "button--disabled" }, method: :put } do |f| %>
1818

1919
<div>
20-
<div id="upload" data-controller="upload modal" data-modal-url-value='/modals/users/edit_avatar' class="mt-1 edit-avatar--wrapper flex v-center">
20+
<div id="upload" data-controller="upload modal" data-modal-url-value='/modals/users/edit_avatar' class="mt-1 edit-avatar--wrapper flex items-center">
2121
<img data-target="upload.avatar" src="<%= current_user.avatar_url %>" width="60" height="60" style="border-radius: 50%;">
2222
<button class="ml-4 button--cta-tertiary" data-action="click->upload#selectNewImage">Edit avatar</button>
2323
<%= f.file_field :avatar, class: "hidden", data: { target: "upload.fileInput", action: "change->upload#handleFileSelect open-avatar-modal@window->modal#present" } %>

app/views/shared/_sidebar.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<span class="bold"><%= @page_title.upcase %></span>
44
</div>
55

6-
<div class="flex h-center">
6+
<div class="flex justify-center">
77
<%= link_to('NEW SNIPPET', @modal_url, data: { controller: 'modal', action: 'modal#present', modal_url_value: @modal_url }, class: 'button--sidebar') %>
88
</div>
99

app/views/shared/_topbar.html.erb

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div id="header">
22
<div id="header-nav-wrapper">
33
<div id="header-nav" class="position-relative">
4-
<div class="flex v-center flex-1">
4+
<div class="flex items-center flex-1">
55
<%= link_to root_path do %>
66
<div class="border-radius-50" style="background-color: #3AAFA9; height: 40px; width: 40px;"></div>
77
<% end %>
88
</div>
99

10-
<div class="flex v-center relative">
10+
<div class="flex items-center relative">
1111
<% if user_signed_in? %>
1212
<%= render partial: 'shared/nav_item', locals: { path: root_path, page_title: 'Feed', icon: 'home' } %>
1313
<%= render partial: 'shared/nav_item', locals: { path: folders_path, page_title: 'Folders', icon: 'folder' } %>
@@ -24,19 +24,12 @@
2424
</div>
2525

2626
<% if user_signed_in? %>
27-
<div class="flex v-center flex-1 flex-end">
27+
<div class="flex items-center flex-1 justify-end">
2828
<%= render partial: 'shared/profile_nav_item.html.erb' %>
2929
</div>
3030
<% end %>
3131
</div>
3232
</div>
33-
34-
<%# <div class="flex h-center" style="margin-top: -14px; margin-bottom: -14px;">
35-
<div class="inline-block padding-left padding-right" style="background-color: white; z-index: 50; padding-top: 4px; padding-bottom: 4px; border-radius: 20px; background-color: #DEF2F1; box-shadow: 0 2px 2px lightgrey;">
36-
<h3 class="no-margin bold">page title</h3>
37-
</div>
38-
</div> %>
39-
<%# <div class="bg-grey" style="height: 16px;"></div> %>
4033
</div>
4134

4235
<div id="header-spacer"></div>

app/views/users/_notification_preview.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
data-hovercard-url="<%= hovercard_user_path(user) %>"
55
data-action="mouseenter->hovercard#show mouseleave->hovercard#hide"
66
data-is-hovering="false"
7-
class="position-relative flex v-center"
7+
class="position-relative flex items-center"
88
>
99
<%= link_to user_path(user) do %>
1010
<%= image_tag user.avatar_url, class: "user-preview--img", height: 48, width: 48 %>

app/views/users/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<div class="card--container card--container-padding">
66
<div class="flex">
7-
<div class="flex flex-column">
7+
<div class="flex flex-col">
88
<img style="border-radius: 50%;" src="<%= @user.avatar_url %>" height="120" width="120" />
99
<% if @user == current_user %>
1010
<%= button_to 'Edit Profile', edit_user_registration_path, method: :get, class: 'mt-2 button--cta-tertiary flex w-full justify-center' %>

0 commit comments

Comments
 (0)