scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-04 19:05:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1153 from mlorb/ml-sci-2440

Browse source 
Final button colour changes [SCI-2440]
This commit is contained in:
mlorb 2018-05-21 16:29:04 +02:00 • committed by GitHub
commit e3fc0237c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/protocols/steps.js.erb
View file

@ -43,7 +43,7 @@
var task_button = $("[data-action='complete-task']"); var task_button = $("[data-action='complete-task']");
task_button.attr('data-action', 'uncomplete-task'); task_button.attr('data-action', 'uncomplete-task');
task_button.find('.btn') task_button.find('.btn')
.removeClass('btn-success').addClass('btn-default'); .removeClass('btn-toggle').addClass('btn-default');
$('.task-due-date').html(data.module_header_due_date_label); $('.task-due-date').html(data.module_header_due_date_label);
$('.task-state-label').html(data.module_state_label); $('.task-state-label').html(data.module_state_label);
task_button task_button
@ -80,7 +80,7 @@
button = step.find("[data-action='complete-step']"); button = step.find("[data-action='complete-step']");
button.attr("data-action", "uncomplete-step"); button.attr("data-action", "uncomplete-step");
button.find(".btn").removeClass("btn-success").addClass("btn-default"); button.find(".btn").removeClass("btn-toggle").addClass("btn-default");
button.find("button").html('<span class="glyphicon glyphicon-remove"></span>&nbsp;' + data.new_title); button.find("button").html('<span class="glyphicon glyphicon-remove"></span>&nbsp;' + data.new_title);
if (data.task_ready_to_complete) { if (data.task_ready_to_complete) {
@ -93,7 +93,7 @@
button = step.find("[data-action='uncomplete-step']"); button = step.find("[data-action='uncomplete-step']");
button.attr("data-action", "complete-step"); button.attr("data-action", "complete-step");
button.find(".btn").removeClass("btn-default").addClass("btn-success"); button.find(".btn").removeClass("btn-default").addClass("btn-toggle");
button.find("button").html('<span class="glyphicon glyphicon-ok"></span>&nbsp;' + data.new_title); button.find("button").html('<span class="glyphicon glyphicon-ok"></span>&nbsp;' + data.new_title);
} }
}, },

10
app/assets/javascripts/users/settings/account/preferences/index.js
View file

@ -75,10 +75,10 @@
for (var i = 0; i < notification_settings.length; i++ ) { for (var i = 0; i < notification_settings.length; i++ ) {
var setting = $('[name="' + notification_settings[i] + '"]'); var setting = $('[name="' + notification_settings[i] + '"]');
var dependant = $('[name="' + notification_settings[i] + '_email"]'); var dependant = $('[name="' + notification_settings[i] + '_email"]');
dependant.checkboxpicker({ onActiveCls: 'btn-primary', offActiveCls: 'btn-primary' }); dependant.checkboxpicker({ onActiveCls: 'btn-toggle', offActiveCls: 'btn-toggle' });
setting setting
.checkboxpicker({ .checkboxpicker({
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary' onActiveCls: 'btn-toggle', offActiveCls: 'btn-toggle'
}).change(function() { }).change(function() {
if ( $(this).prop('checked') ) { if ( $(this).prop('checked') ) {
enableDependant($('[name="' + $(this).attr('name') + '_email"]')); enableDependant($('[name="' + $(this).attr('name') + '_email"]'));
@ -100,7 +100,7 @@
function setEmailSwitch(setting) { function setEmailSwitch(setting) {
setting setting
.checkboxpicker({ .checkboxpicker({
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary' onActiveCls: 'btn-toggle', offActiveCls: 'btn-toggle'
}); });
if ( setting.attr('value') === 'true' ) { if ( setting.attr('value') === 'true' ) {
setting.prop('checked', true); setting.prop('checked', true);
@ -123,7 +123,7 @@
var system_message_notification = $('[name="system_message_notification"]'); var system_message_notification = $('[name="system_message_notification"]');
system_message_notification system_message_notification
.checkboxpicker({ .checkboxpicker({
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary' onActiveCls: 'btn-toggle', offActiveCls: 'btn-toggle'
}); });
system_message_notification.prop('checked', true); system_message_notification.prop('checked', true);
system_message_notification.prop('disabled', true); system_message_notification.prop('disabled', true);
@ -132,7 +132,7 @@
var system_message_notification_mail = $('[name="system_message_notification_email"]'); var system_message_notification_mail = $('[name="system_message_notification_email"]');
system_message_notification_mail system_message_notification_mail
.checkboxpicker({ .checkboxpicker({
onActiveCls: 'btn-primary', offActiveCls: 'btn-primary' onActiveCls: 'btn-toggle', offActiveCls: 'btn-toggle'
}); });
system_message_notification_mail.prop( system_message_notification_mail.prop(
'checked', 'checked',

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

@ -132,6 +132,9 @@ $btn-warning-border: darken($btn-warning-bg, 5%);
$btn-danger-color: $color-white; $btn-danger-color: $color-white;
$btn-danger-bg: $brand-danger; $btn-danger-bg: $brand-danger;
$btn-danger-border: darken($btn-danger-bg, 5%); $btn-danger-border: darken($btn-danger-bg, 5%);
$btn-toggle-color: $color-white;
$btn-toggle-bg: $brand-primary;
$btn-toggle-border: darken($btn-toggle-bg, 5%);
$btn-link-disabled-color: $gray-light; $btn-link-disabled-color: $gray-light;
$btn-border-radius-base: $border-radius-base; $btn-border-radius-base: $border-radius-base;
$btn-border-radius-large: $border-radius-large; $btn-border-radius-large: $border-radius-large;

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

@ -8,7 +8,7 @@ $color-module-hover: $brand-primary;
#new-project-modal, #new-project-modal,
#edit-project-modal, #edit-project-modal,
#copy-to-repository-modal { #copy-to-repository-modal {
.btn-group label.btn-primary:not(.active) { .btn-group label.btn-toggle:not(.active) {
background-color: $color-white; background-color: $color-white;
border-color: $color-silver; border-color: $color-silver;
color: $color-emperor; color: $color-emperor;

3
app/assets/stylesheets/protocol_management.scss
View file

@ -21,7 +21,8 @@
} }
} }
#protocols-index { #protocols-index,
#load-from-repository-modal {
padding: 0; padding: 0;
.nav-tabs > li { .nav-tabs > li {

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

@ -2,6 +2,7 @@
@import "mixins"; @import "mixins";
@import "main_navigation"; @import "main_navigation";
@import "repositories"; @import "repositories";
@import "bootstrap/mixins/buttons";
/** Layout **/ /** Layout **/
body, body,
@ -24,6 +25,10 @@ table {
table-layout: fixed; table-layout: fixed;
} }
.btn-toggle {
@include button-variant($btn-toggle-color, $btn-toggle-bg, $btn-toggle-border);
}
#alert-container { #alert-container {
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -987,7 +992,7 @@ ul.content-module-activities {
position: absolute; position: absolute;
& > .badge { & > .badge {
background: $brand-success; background: $brand-primary;
border-radius: 2em; border-radius: 2em;
float: left; float: left;
font-size: 23.4px; font-size: 23.4px;

2
app/helpers/bootstrap_form_helper.rb
View file

@ -110,7 +110,7 @@ module BootstrapFormHelper
active_str = active ? " active" : "" active_str = active ? " active" : ""
checked_str = active ? " checked='checked'" : "" checked_str = active ? " checked='checked'" : ""
res << "<label class='btn btn-primary#{active_str}'>" res << "<label class='btn btn-toggle#{active_str}'>"
res << "<input type='radio' value='#{val}' name='#{input_name}' id='#{id}_#{val}'#{checked_str}>" res << "<input type='radio' value='#{val}' name='#{input_name}' id='#{id}_#{val}'#{checked_str}>"
res << btn_names[val] res << btn_names[val]
res << "</label>" res << "</label>"

2
app/views/my_modules/_state_button_complete.html.erb
View file

@ -1,4 +1,4 @@
<button class="btn btn-success"> <button class="btn btn-toggle">
<span class="glyphicon glyphicon-ok"></span> <span class="glyphicon glyphicon-ok"></span>
<%= t("my_modules.buttons.complete") %> <%= t("my_modules.buttons.complete") %>
</button> </button>

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

@ -4,11 +4,11 @@
<div class="form-group"> <div class="form-group">
<label for="protocol_protocol_type"><%= t("my_modules.protocols.copy_to_repository_modal.type_label") %></label><br> <label for="protocol_protocol_type"><%= t("my_modules.protocols.copy_to_repository_modal.type_label") %></label><br>
<div class="btn-group" data-toggle="buttons"> <div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary active"> <label class="btn btn-toggle active">
<input type="radio" value="in_repository_public" name="protocol[protocol_type]" id="protocol_protocol_type_in_repository_public" checked="checked"> <input type="radio" value="in_repository_public" name="protocol[protocol_type]" id="protocol_protocol_type_in_repository_public" checked="checked">
<%= t("my_modules.protocols.copy_to_repository_modal.type_public") %> <%= t("my_modules.protocols.copy_to_repository_modal.type_public") %>
</label> </label>
<label class="btn btn-primary"> <label class="btn btn-toggle">
<input type="radio" value="in_repository_private" name="protocol[protocol_type]" id="protocol_protocol_type_in_repository_private"> <input type="radio" value="in_repository_private" name="protocol[protocol_type]" id="protocol_protocol_type_in_repository_private">
<%= t("my_modules.protocols.copy_to_repository_modal.type_private") %> <%= t("my_modules.protocols.copy_to_repository_modal.type_private") %>
</label> </label>

2
app/views/steps/_step.html.erb
View file

@ -135,7 +135,7 @@
<div data-action="complete-step" <div data-action="complete-step"
class="pull-right" class="pull-right"
data-link-url="<%= toggle_step_state_step_path(step)%>"> data-link-url="<%= toggle_step_state_step_path(step)%>">
<button class="btn btn-success"> <button class="btn btn-toggle">
<span class="glyphicon glyphicon-ok"></span> <span class="glyphicon glyphicon-ok"></span>
<%= t("protocols.steps.options.complete_title") %> <%= t("protocols.steps.options.complete_title") %>
</button> </button>

6
config/locales/en.yml
View file

@ -1554,9 +1554,9 @@ en:
preview_title: "Protocol preview" preview_title: "Protocol preview"
preview_title_position: " | %{current} of %{total}" preview_title_position: " | %{current} of %{total}"
assets_header: "Files" assets_header: "Files"
import_current: "Import current" import_current: "Load Current"
import_all: "Import all" import_all: "Load All"
import: "Import" import: "Load"
export: export:
export_results: export_results:
title: "Export results" title: "Export results"