raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid name collision by renaming some classes with a prefix flex-

Browse Source 
This classes should only be used with `.flex`
This commit is contained in:
Jean-Baptiste Bellet
2023-04-26 09:52:24 +02:00
parent 9584205a8e
commit 30ba29382a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/shops/_skinny.html.haml
View File

@@ -10,8 +10,8 @@
%span.margin-top.ellipsed{"ng-bind" => "::hub.address.state_name"}
%span.margin-top{"ng-if" => "hub.distance != null && hub.distance > 0"} ({{ hub.distance / 1000 | number:0 }} km)
.columns.small-5.medium-3.large-3.text-right.no-wrap.flex.align-center.justify-end{"ng-if" => "::hub.active"}
%a.hub.open_closed.flex.align-center{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
.columns.small-5.medium-3.large-3.text-right.no-wrap.flex.flex-align-center.flex-justify-end{"ng-if" => "::hub.active"}
%a.hub.open_closed.flex.flex-align-center{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
%span{ ng: { if: "::current()" } }
%em= t :hubs_shopping_here
%span{ ng: { if: "::!current()" } }
@@ -20,7 +20,7 @@
%span{style: "margin-left: 0.5rem;"}
%i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
.columns.small-5.medium-3.large-3.text-right.no-wrap.flex.align-center.justify-end{"ng-if" => "::!hub.active"}
.columns.small-5.medium-3.large-3.text-right.no-wrap.flex.flex-align-center.flex-justify-end{"ng-if" => "::!hub.active"}
%a.hub.open_closed.flex{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
%span{ ng: { if: "::current()" } }
%em= t :hubs_shopping_here
@@ -41,6 +41,6 @@
.columns.small-2.medium-1.large-1
%span.ellipsed{"ng-bind" => "::hub.address.state_name"}
.columns.small-6.medium-3.large-4.text-right.no-wrap.flex.align-center.justify-end
.columns.small-6.medium-3.large-4.text-right.no-wrap.flex.flex-align-center.flex-justify-end
%span{ ng: { if: "::!current()" } }
%em= t :hubs_profile_only

4
app/webpacker/css/shared/utilities.scss
View File

@@ -11,11 +11,11 @@
.flex {
display: flex;
&.align-center {
&.flex-align-center {
align-items: center;
}
&.justify-end {
&.flex-justify-end {
justify-content: flex-end;
}
}