scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 01:03:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

some extra style unification

Browse source
This commit is contained in:
mlorb 2018-05-15 17:10:31 +02:00
parent 5f462165b5
commit cea7f5a3f7
7 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ $btn-default-color: $gray-dark;
$btn-default-bg: $brand-default;
$btn-default-border: $color-silver;
$btn-primary-color: $color-white;
$btn-primary-bg: $brand-primary;
$btn-primary-bg: $brand-success;
$btn-primary-border: darken($btn-primary-bg, 5%);
$btn-success-color: $color-white;
$btn-success-bg: $brand-success;

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

@ -60,7 +60,7 @@
}
.system-message {
background-color: $brand-other;
background-color: $brand-success;
border-radius: 50%;
color: $color-concrete;
display: inline-block;

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

@ -42,8 +42,6 @@ $color-module-hover: $brand-primary;
}
#canvas-new-module {
margin-left: 10px;
.hbtn-default {
opacity: 1;
width: 0;

8
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -107,7 +107,7 @@
}
.system-message {
background-color: $brand-other;
background-color: $brand-success;
border-radius: 50%;
color: $color-concrete;
display: block;
@ -225,7 +225,7 @@
}
.system-message {
background-color: $brand-other;
background-color: $brand-success;
border-radius: 50%;
color: $color-concrete;
display: block !important;
@ -253,8 +253,8 @@
.glyphicon-ok-sign {
color: $brand-primary;
margin-left: -10px;
margin-right: 10px;
margin-left: -2px;
margin-right: 2px;
}
.team-name-item {

28
app/views/canvas/_edit.html.erb
View file

@ -9,7 +9,20 @@
data-unsaved-work-text="<%=t "experiments.canvas.edit.unsaved_work" %>"
>
<%= bootstrap_form_tag url: canvas_experiment_url, method: "post" do |f| %>
<div class="btn-group" role="group">
<% if can_manage_experiment?(@experiment) %>
<%=link_to "", type: "button", class: "btn btn-primary", id: "canvas-new-module" do %>
<span class="hbtn-default">
<span class="glyphicon glyphicon-credit-card"></span>
<%= t("experiments.canvas.edit.new_module") %>
</span>
<span class="hbtn-hover">
<span class="glyphicon glyphicon-credit-card"></span>
<em class="hidden-xs"><%= t("experiments.canvas.edit.new_module_hover") %></em>
<span class="visible-xs-inline"><%= t("experiments.canvas.edit.new_module") %></span>
</span>
<% end %>
<% end %>
<div class="btn-group pull-right" role="group">
<%= link_to canvas_experiment_path(@experiment), type: "button", class: "btn btn-default cancel-edit-canvas" do %>
<span class="hidden-xs"><%= t("experiments.canvas.edit.cancel") %></span>
<span class="glyphicon glyphicon-remove visible-xs" style="height: 16px;margin-top: 4px;">&nbsp;</span>
@ -19,19 +32,6 @@
<span class="hidden-xs"><%= t("experiments.canvas.edit.save") %></span>
<% end %>
</div>
<% if can_manage_experiment?(@experiment) %>
<%=link_to "", type: "button", class: "btn btn-primary", id: "canvas-new-module" do %>
<span class="hbtn-default">
<span class="glyphicon glyphicon-credit-card"></span>
<%= t("experiments.canvas.edit.new_module") %>
</span>
<span class="hbtn-hover">
<span class="glyphicon glyphicon-credit-card"></span>
<em class="hidden-xs"><%= t("experiments.canvas.edit.new_module_hover") %></em>
<span class="visible-xs-inline"><%= t("experiments.canvas.edit.new_module") %></span>
</span>
<% end %>
<% end %>
<%= hidden_field_tag 'connections', '' %>
<%= hidden_field_tag 'positions', '' %>
<%= hidden_field_tag 'add', '' %>

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

@ -1,9 +1,10 @@
<% provide(:head_title, t("users.settings.teams.head_title")) %>
<% provide(:container_class, "no-second-nav-container") %>
<%= render partial: "users/settings/sidebar.html.erb" %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings" role="tabpanel"></div>
<div class="tab-pane tab-pane-settings active" role="tabpanel">
<div class="tab-pane content-pane" role="tabpanel"></div>
<div class="tab-pane content-pane active" role="tabpanel">
<%= render partial: "users/settings/teams/breadcrumbs.html.erb" %>

2
config/locales/en.yml
View file

@ -319,7 +319,7 @@ en:
nav_print: "Print"
nav_pdf: "Download PDF"
nav_save: "Save"
nav_close: "Close"
nav_close: "Cancel"
nav_sort_by: "Sort by"
nav_sort_asc: "Oldest on top"
nav_sort_desc: "Newest on top"