scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-12 16:14:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

New asset box style update

Browse source
This commit is contained in:
Urban Rotnik 2019-04-04 18:15:30 +02:00
parent 2cbf70819f
commit a3932cc67f
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/my_modules.scss
View file

@ -54,7 +54,7 @@
img { img {
margin-right: 5px; margin-right: 5px;
width: 32px; width: 23px;
} }
} }

10
app/assets/stylesheets/themes/scinote.scss
View file

@ -1041,6 +1041,16 @@ ul.content-activities {
margin-top: 20px; margin-top: 20px;
padding-bottom: 30px; padding-bottom: 30px;
padding-top: 30px; padding-top: 30px;
background-color: $color-concrete;
.new-asset-upload-icon{
margin-right: 6px;
}
.new-asset-upload-button {
margin-left: 20px;
background-color: inherit;
}
} }
.dnd-error, .dnd-error,

4
app/views/result_assets/_new.html.erb
View file

@ -5,8 +5,8 @@
data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.step_add_files') %>"> data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.step_add_files') %>">
<%=t 'assets.drag_n_drop.label_html' %> <%=t 'assets.drag_n_drop.label_html' %>
<label> <label>
<span class="btn btn-primary"> <span class="btn btn-default new-asset-upload-button">
<span class="fas fa-plus"></span> <span class="fas fa-file-upload new-asset-upload-icon"></span>
<%=t 'assets.drag_n_drop.browse_label' %> <%=t 'assets.drag_n_drop.browse_label' %>
</span> </span>
<input type="file" <input type="file"

4
app/views/steps/_empty_step.html.erb
View file

@ -48,8 +48,8 @@
data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.step_add_files') %>"> data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.step_add_files') %>">
<%=t 'assets.drag_n_drop.label_html' %> <%=t 'assets.drag_n_drop.label_html' %>
<label> <label>
<span class="btn btn-primary"> <span class="btn btn-default new-asset-upload-button">
<span class="fas fa-plus"></span> <span class="fas fa-file-upload new-asset-upload-icon"></span>
<%=t 'assets.drag_n_drop.browse_label' %> <%=t 'assets.drag_n_drop.browse_label' %>
</span> </span>
<input type="file" <input type="file"

4
config/locales/en.yml
View file

@ -1874,8 +1874,8 @@ en:
edit: "SciNote | %{file_name} | Edit" edit: "SciNote | %{file_name} | Edit"
view: "SciNote | %{file_name} | View" view: "SciNote | %{file_name} | View"
drag_n_drop: drag_n_drop:
label_html: 'Drag &amp; drop files here, CTRL+V (for images from clipboard) or ' label_html: 'Drag &amp; drop here. Copy &amp Paste images.'
browse_label: 'Browse to add' browse_label: 'Select to Upload...'
drop_label: 'Drop to add to Step' drop_label: 'Drop to add to Step'
file_label: 'File' file_label: 'File'
from_clipboard: from_clipboard: