Skip to content

Commit 03b1fd5

Browse files
authored
Merge pull request #22 from tjerk-git/develop
Develop
2 parents 381af3d + dc9550d commit 03b1fd5

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

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

+42-42
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,47 @@
3030
</label>
3131
</div>
3232

33+
<div class="grid grid-cols-12 gap-6 mt-6">
34+
35+
<div class="col-span-12 sm:col-span-12">
36+
<label class="">What creative fields are you interested in?</label>
37+
38+
<div class="relative inline-block w-full mt-2 text-left" x-data="{open: false}">
39+
<button @click="open = !open" type="button" class="block w-full py-2 pl-3 pr-10 text-left bg-white border border-gray-300 rounded-md shadow-sm cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label">
40+
<span class="block truncate">
41+
Creative Fields
42+
</span>
43+
<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
44+
<svg class="w-5 h-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
45+
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
46+
</svg>
47+
</span>
48+
</button>
49+
<div
50+
x-show="open"
51+
x-transition:enter=""
52+
x-transition:enter-start=""
53+
x-transition:enter-end=""
54+
x-transition:leave="transition ease-in duration-100"
55+
x-transition:leave-start="opacity-100"
56+
x-transition:leave-end="opacity-0"
57+
x-on:click.away="open = false"
58+
>
59+
<div class="absolute left-0 z-20 w-56 py-1 mt-2 ml-2 space-x-2 space-y-2 overflow-auto origin-top-left bg-white rounded-md shadow-2xl max-h-36 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="mobile-menu-button" tabindex="-1">
60+
<%= f.collection_check_boxes :tag_ids, Tag.all, :id, :name do |b| %>
61+
<div class="flex items-center">
62+
<%= b.check_box class: 'h-4 w-4 text-gray-600 focus:ring-gray-500 border-gray-300 rounded' %>
63+
<label for="filter-category-0" class="pr-6 ml-3 text-sm font-medium text-gray-900 whitespace-nowrap">
64+
<%= b.label %>
65+
</label>
66+
</div>
67+
<% end %>
68+
</div>
69+
</div>
70+
</div>
71+
</div>
72+
</div>
73+
3374
<div class="space-y-1">
3475
<%= f.label :password %>
3576
<% if @minimum_password_length %>
@@ -48,49 +89,8 @@
4889
<%= f.text_field :invitation_code, class: 'appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-gray-500 focus:border-gray-500 sm:text-sm' %>
4990
</div>
5091

51-
<div class="grid grid-cols-12 gap-6 mt-6">
52-
53-
<div class="col-span-12 sm:col-span-6">
54-
What creative fields are you intrested in?
55-
56-
<div class="relative inline-block w-full mt-2 text-left" x-data="{open: false}">
57-
<button @click="open = !open" type="button" class="block w-full py-2 pl-3 pr-10 text-left bg-white border border-gray-300 rounded-md shadow-sm cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label">
58-
<span class="block truncate">
59-
Creative Fields
60-
</span>
61-
<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
62-
<svg class="w-5 h-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
63-
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
64-
</svg>
65-
</span>
66-
</button>
67-
<div
68-
x-show="open"
69-
x-transition:enter=""
70-
x-transition:enter-start=""
71-
x-transition:enter-end=""
72-
x-transition:leave="transition ease-in duration-100"
73-
x-transition:leave-start="opacity-100"
74-
x-transition:leave-end="opacity-0"
75-
x-on:click.away="open = false"
76-
>
77-
<div class="absolute left-0 z-20 w-56 py-1 mt-2 ml-2 space-x-2 space-y-2 overflow-auto origin-top-left bg-white rounded-md shadow-2xl max-h-36 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="mobile-menu-button" tabindex="-1">
78-
<%= f.collection_check_boxes :tag_ids, Tag.all, :id, :name do |b| %>
79-
<div class="flex items-center">
80-
<%= b.check_box class: 'h-4 w-4 text-gray-600 focus:ring-gray-500 border-gray-300 rounded' %>
81-
<label for="filter-category-0" class="pr-6 ml-3 text-sm font-medium text-gray-900 whitespace-nowrap">
82-
<%= b.label %>
83-
</label>
84-
</div>
85-
<% end %>
86-
</div>
87-
</div>
88-
</div>
89-
</div>
90-
</div>
91-
9292
<div class="mt-4">
93-
<%= f.submit "Sign up", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-600 hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
93+
<%= f.submit "Sign up", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-900 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
9494
</div>
9595
</div>
9696
<% end %>

app/views/devise/sessions/new.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<% end %>
3939

4040
<div class="mt-2 mb-4 actions">
41-
<%= f.submit "Log in", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-600 hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
41+
<%= f.submit "Log in", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-900 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
4242
</div>
4343
</div>
4444
<% end %>

app/views/layouts/auth.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<%# TODO: = Change the cover image to CMD style %>
2323
<img
2424
class="absolute inset-0 object-cover w-full h-full"
25-
src="https://source.unsplash.com/user/erondu/1600x900"
25+
src="https://images.unsplash.com/photo-1614730321146-b6fa6a46bcb4?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1074&q=80"
2626
alt=""
2727
/>
2828
</div>

0 commit comments

Comments
 (0)