scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 11:57:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

some extra button styling

Browse source
This commit is contained in:
mlorb 2018-04-26 15:19:05 +02:00
parent 763d934aa7
commit f97477f3f0
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sitewide/drag_n_drop.js.erb
View file

@ -137,7 +137,7 @@
html += 'placeholder="<%= I18n.t('assets.from_clipboard.file_name_placeholder') %>" aria-describedby="image-name">'; html += 'placeholder="<%= I18n.t('assets.from_clipboard.file_name_placeholder') %>" aria-describedby="image-name">';
html += '<span class="input-group-addon" id="image-name"></span></div>'; html += '<span class="input-group-addon" id="image-name"></span></div>';
html += '</div><div class="modal-footer">'; html += '</div><div class="modal-footer">';
html += '<button type="button" class="btn btn-default" data-dismiss="modal"><%= I18n.t('general.cancel') %></button>' html += '<button type="button" class="btn btn-default" data-dismiss="modal"><%= I18n.t('general.cancel') %></button>';
html += '<button type="button" class="btn btn-success" data-action="addImageFormClipboard"><%= I18n.t('assets.from_clipboard.add_image') %></button>'; html += '<button type="button" class="btn btn-success" data-action="addImageFormClipboard"><%= I18n.t('assets.from_clipboard.add_image') %></button>';
html += '</div></div></div></div><!-- /.modal -->'; html += '</div></div></div></div><!-- /.modal -->';
return $(html).appendTo($('body')).promise().done(function() { return $(html).appendTo($('body')).promise().done(function() {

6
app/views/my_modules/_complete_task_modal.html.erb
View file

@ -16,12 +16,12 @@
<p><%=t 'my_modules.complete_modal.description' %></p> <p><%=t 'my_modules.complete_modal.description' %></p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button"
class="btn btn-primary"
data-action="complete"><%=t 'my_modules.buttons.complete' %></button>
<button type="button" <button type="button"
class="btn btn-default" class="btn btn-default"
data-dismiss="modal"><%=t 'my_modules.complete_modal.leave_uncompleted' %></button> data-dismiss="modal"><%=t 'my_modules.complete_modal.leave_uncompleted' %></button>
<button type="button"
class="btn btn-success"
data-action="complete"><%=t 'my_modules.buttons.complete' %></button>
</div> </div>
</div> </div>
</div> </div>

4
app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
View file

@ -7,9 +7,9 @@
</div> </div>
<div class="modal-body"></div> <div class="modal-body"></div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="submit"></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button> <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-success" data-action="submit"></button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
app/views/repositories/_repository_row_info_modal.html.erb
View file

@ -82,7 +82,7 @@
</div> </div>
<script>window.initPreviewModal()</script> <script>window.initPreviewModal()</script>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal"><%= t("general.close")%></button> <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.close")%></button>
</div> </div>
</div> </div>
</div> </div>

2
app/views/users/settings/teams/_destroy_modal.html.erb
View file

@ -15,7 +15,7 @@
<div class="modal-footer"> <div class="modal-footer">
<%= bootstrap_form_tag url: destroy_team_path(team), method: :delete do |f| %> <%= bootstrap_form_tag url: destroy_team_path(team), method: :delete do |f| %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button> <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
<%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-primary" %> <%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-danger" %>
<% end %> <% end %>
</div> </div>
</div> </div>

2
app/views/users/settings/teams/index.html.erb
View file

@ -15,7 +15,7 @@
<% end %> <% end %>
<% if can_create_teams? %> <% if can_create_teams? %>
<span id="new-team-button"> <span id="new-team-button">
<%= link_to new_team_path, class: "btn btn-default", style: "margin-left: 30px;" do %> <%= link_to new_team_path, class: "btn btn-primary", style: "margin-left: 30px;" do %>
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"> <span class="hidden-xs">
<%= t("users.settings.teams.index.new_team") %> <%= t("users.settings.teams.index.new_team") %>

2
app/views/users/settings/teams/new.html.erb
View file

@ -26,7 +26,7 @@
</div> </div>
<%= link_to t('general.cancel'), teams_path, class: 'btn btn-default' %> <%= link_to t('general.cancel'), teams_path, class: 'btn btn-default' %>
<%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-primary' %> <%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-success' %>
<% end %> <% end %>
</div> </div>

4
config/locales/en.yml
View file

@ -1396,7 +1396,7 @@ en:
one: "You are member of %{count} team." one: "You are member of %{count} team."
other: "You are member of %{count} teams." other: "You are member of %{count} teams."
no_teams: "You are not a member of any team." no_teams: "You are not a member of any team."
new_team: "New team" new_team: "New Team"
thead_name: "Team" thead_name: "Team"
thead_role: "Role" thead_role: "Role"
thead_created_at: "Created at" thead_created_at: "Created at"
@ -1410,7 +1410,7 @@ en:
name_sublabel: "Pick a name that would best describe your team (e.g. 'University of ..., Department of ...')." name_sublabel: "Pick a name that would best describe your team (e.g. 'University of ..., Department of ...')."
description_label: "Description" description_label: "Description"
description_sublabel: "Describe your team." description_sublabel: "Describe your team."
create: "Create team" create: "Create"
edit: edit:
header_created_at: "Created on:" header_created_at: "Created on:"
header_created_by: "Created by:" header_created_by: "Created by:"