lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Add a colour picker that is consistent across all browsers (GRN2-96) (#518)

Browse Source 
* sync

* Fix corruption

* Add back room.rb

* Line endings

* More line endings

* Add jQuery colour picker

* Remove inline styling
This commit is contained in:
shawn-higgins1
2019-05-17 12:28:58 -04:00
committed by Jesus Federico
parent 23abdb52ee
commit 4a4fcec6fb
33 changed files with 680 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/shared/admin_settings/_site_settings.html.erb
View File

@@ -22,7 +22,7 @@
<div class="input-group">
<input id="branding-url" type="text" class="form-control" value="<%= logo_image %>">
<span class="input-group-append">
<button onclick="changeBrandingImage('<%= admin_branding_path %>')" class="btn btn-primary" type="button"><%= t("administrator.site_settings.branding.change") %></button>
<button id="branding-image" onclick="changeBrandingImage('<%= admin_branding_path %>')" class="btn btn-primary" type="button"><%= t("administrator.site_settings.branding.change") %></button>
</span>
</div>
</div>
@@ -33,12 +33,12 @@
<div class="row gutters-xs">
<div class="col-auto">
<input id="coloring-path" value="<%= admin_coloring_path %>" hidden>
<label class="colorinput">
<input name="color" type="color" value="<%= user_color %>" class="colorinput-input" />
<input id="user-colour" value="<%= user_color %>" hidden/>
<div class="colorinput">
<span class="colorinput-color" style="background: <%= user_color %>;">
<i class="p-1 fas fa-paint-brush"></i>
</span>
</label>
</div>
</div>
</div>
</div>