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

Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles

Browse source 
Update colors and buttons
This commit is contained in:
aignatov-bio 2020-01-08 12:30:51 +01:00 committed by GitHub
commit 54c78cf4d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 1110 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/favicon-16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 481 B

BIN
app/assets/images/favicon-32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 912 B

BIN
app/assets/images/favicon-48.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 1,012 B

BIN
app/assets/images/favicon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

4
app/assets/javascripts/projects/canvas.js.erb
View file

@ -496,6 +496,10 @@ function animateReposition(el, left, top) {
function bindModeChange() {
var buttons = $('#diagram-buttons').find("a[type='button']");
$('.change-canvas-view').off().on('click', '.sci-toggle-item', function() {
$(this).next().click();
})
buttons.on('click', function() {
var action = $(this).data("action");

24
app/assets/javascripts/projects/index.js
View file

@ -510,16 +510,20 @@
}
function initProjectsViewModeSwitch() {
$('input[name=projects-view-mode-selector]').off().on('change', function() {
if ($(this).val() === projectsViewMode) {
return;
}
projectsViewMode = $(this).val();
if (projectsChanged) {
refreshCurrentView();
}
projectsChanged = false;
});
$('input[name=projects-view-mode-selector]').off()
.on('change', function() {
if ($(this).val() === projectsViewMode) {
return;
}
projectsViewMode = $(this).val();
if (projectsChanged) {
refreshCurrentView();
}
projectsChanged = false;
})
.on('click', function() {
$(this).next().click();
});
}
function initSorting() {

4
app/assets/javascripts/sidebar_toggle.js.erb
View file

@ -7,7 +7,7 @@
$('#wrapper').removeClass('hidden2');
$('#wrapper').css('paddingLeft', '280px');
$('.navbar-secondary').css(
{ 'margin-left': '-280px', 'padding-left': '294px' }
{ 'margin-left': '-280px', 'padding-left': '280px' }
);
$('#sidebar-arrow').attr('data-shown', '');
sessionStorage.setItem(STORAGE_TOGGLE_KEY, "un-toggled");
@ -18,7 +18,7 @@
$('#wrapper').css('paddingLeft', '0');
$('.navbar-secondary').css({
'margin-left': '0',
'padding-left': '14px'
'padding-left': '0'
});
$('#sidebar-arrow').removeAttr('data-shown');
sessionStorage.setItem(STORAGE_TOGGLE_KEY, "toggled");

10
app/assets/javascripts/sitewide/avatar_modal.js
View file

@ -31,7 +31,7 @@ var avatarsModal = (function() {
reader.readAsDataURL(inputField.files[0]);
reader.onload = function() {
var avatarContainer = $(modal).find('.avatar-preview-container');
$(modal).find('.save-button').removeClass('disabled');
$(modal).find('.save-button').attr('disabled', false);
$(modal).find('#new_avatar').val(reader.result);
avatarContainer.show().children().remove();
@ -50,7 +50,7 @@ var avatarsModal = (function() {
function initPredefinedAvatars() {
$(modal).find('.avatar-collection .avatar').click(function() {
$(modal).find('.save-button').removeClass('disabled');
$(modal).find('.save-button').attr('disabled', false);
$(modal).find('#raw_avatar')[0].value = null;
$(modal).find('.avatar-preview-container').hide();
$(modal).find('.current-avatar').show().find('img')
@ -61,9 +61,9 @@ var avatarsModal = (function() {
function initUpdateButton() {
$(modal).find('.save-button').click(function() {
if ($(this).hasClass('disabled')) return;
if ($(this).is('[disabled=disabled]')) return;
$(this).addClass('disabled');
$(this).attr('disabled', true);
$.ajax({
url: $(modal).data('update-url'),
type: 'PUT',
@ -76,7 +76,7 @@ var avatarsModal = (function() {
location.reload();
},
error: () => {
$(this).removeClass('disabled');
$(this).attr('disabled', false);
}
});
});

1
app/assets/javascripts/sitewide/comments.js
View file

@ -65,6 +65,7 @@ var Comments = (function() {
$el.find('textarea'),
$el.find('.new-comment-button')
);
$el.find('textarea').focus().blur();
$el.find('.new-comment-button').off('click').click(() => {
var errorField = $el.find('.new-message-error');
var newButton = this;

19
app/assets/stylesheets/application.scss
View file

@ -1,27 +1,36 @@
/*
*= require highlightjs-github-theme
*= require_self
*= require_tree .
*= require jquery-ui/draggable
*= require rails_bootstrap_forms
*= require bootstrap-select
*= require constants
*= stub reports_pdf
*/
@import "shared_styles/constants/*";
@import "constants";
@import "bootstrap-sprockets";
@import "bootstrap";
@import "bootstrap-datetimepicker";
@import "bootstrap-colorselector";
@import "bootstrap-tagsinput";
@import "bootstrap-tagsinput-typeahead";
@import "shared_styles/elements/*";
@import "handsontable.full.min";
@import "ajax-bootstrap-select.min";
@import "extend/bootstrap";
@import "themes/scinote";
@import "extend/perfect-scrollbar";
@import "extend/*";
@import "hooks/*";
@import "partials/*";
@import "my_modules/protocols/*";
@import "my_modules/results/*";
@import "protocols/*";
@import "hooks/*";
@import "settings/*";
@import "shared/*";
@import "themes/*";
@import "*"

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

@ -5,7 +5,7 @@
//==============================================================================
// Grayscale colors
$color-white: #fff;
/*$color-white: #fff;
$color-alabaster: #fcfcfc;
$color-concrete: #f2f2f2;
$color-gainsboro: #e3e3e3;
@ -41,7 +41,7 @@ $office-ms-powerpoint: #d24726;
// MarvinJS color:
$marvinjs-color: #29999c;
*/
//==============================================================================
// Other
//==============================================================================
@ -62,14 +62,14 @@ $gray-light: $color-dove-gray;
$gray-lighter: $color-concrete;
// Scaffolding
$body-bg: $color-concrete;
$text-color: $color-emperor;
$link-color: $brand-primary;
$link-hover-color: darken($link-color, 15%);
$link-hover-decoration: underline;
// $body-bg: $color-concrete;
// $text-color: $color-emperor;
// $link-color: $brand-primary;
// $link-hover-color: darken($link-color, 15%);
// $link-hover-decoration: underline;
// Typography
$font-family-lato: Lato, "Open Sans", Arial, Helvetica, sans-serif;
/*$font-family-lato: Lato, "Open Sans", Arial, Helvetica, sans-serif;
$font-family-sans-serif: "Open Sans", Arial, Helvetica, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@ -89,7 +89,7 @@ $line-height-computed: floor(($font-size-base * $line-height-base));
$headings-font-family: inherit;
$headings-font-weight: 500;
$headings-line-height: 1.1;
$headings-color: inherit;
$headings-color: inherit;*/
// Components
$padding-base-vertical: 6px;
@ -125,17 +125,17 @@ $btn-default-color: $gray-dark;
$btn-default-bg: $brand-default;
$btn-default-border: $color-silver;
$btn-primary-color: $color-white;
$btn-primary-bg: $brand-success;
$btn-primary-bg: $brand-primary;
$btn-primary-border: darken($btn-primary-bg, 5%);
$btn-primary-new-color: $color-white;
$btn-primary-new-bg: $brand-primary-new;
$btn-primary-new-border: darken($brand-primary-new, 5%);
$btn-primary-new-bg: $brand-primary;
$btn-primary-new-border: darken($brand-primary , 5%);
$btn-success-color: $color-white;
$btn-success-bg: $brand-success;
$btn-success-bg: $brand-primary;
$btn-success-border: darken($btn-success-bg, 5%);
$btn-info-color: $color-white;
$btn-info-bg: $brand-info;
$btn-info-border: darken($btn-info-bg, 5%);
$btn-info-bg: $brand-primary;
$btn-info-border: $brand-primary;
$btn-warning-color: $color-white;
$btn-warning-bg: $brand-warning;
$btn-warning-border: darken($btn-warning-bg, 5%);

14
app/assets/stylesheets/extend/perfect-scrollbar.scss
View file

@ -14,10 +14,10 @@
*/
.ps__rail-x {
display: none;
opacity: 0;
transition: background-color .2s linear, opacity .2s linear;
-webkit-transition: background-color .2s linear, opacity .2s linear;
height: 16px;
opacity: 0.6;
/* there must be 'bottom' or 'top' for ps__rail-x */
bottom: 0px;
/* please don't change 'position' */
@ -26,10 +26,10 @@
.ps__rail-y {
display: none;
opacity: 0;
transition: background-color .2s linear, opacity .2s linear;
-webkit-transition: background-color .2s linear, opacity .2s linear;
width: 16px;
opacity: 0.6;
/* there must be 'right' or 'left' for ps__rail-y */
right: 0;
/* please don't change 'position' */
@ -80,10 +80,10 @@
.ps__thumb-y {
background-color: $color-silver-chalice;
border-radius: 4px;
border-radius: 3px;
transition: background-color .2s linear, width .2s ease-in-out;
-webkit-transition: background-color .2s linear, width .2s ease-in-out;
width: 4px;
width: 6px;
/* there must be 'right' for ps__thumb-y */
right: 2px;
/* please don't change 'position' */
@ -93,15 +93,13 @@
.ps__rail-x:hover > .ps__thumb-x,
.ps__rail-x:focus > .ps__thumb-x,
.ps__rail-x.ps--clicking .ps__thumb-x {
background-color: $brand-primary;
height: 12px;
height: 10px;
}
.ps__rail-y:hover > .ps__thumb-y,
.ps__rail-y:focus > .ps__thumb-y,
.ps__rail-y.ps--clicking .ps__thumb-y {
background-color: $brand-primary;
width: 12px;
width: 10px;
}
/* MS supports */

16
app/assets/stylesheets/global_activities.scss
View file

@ -34,22 +34,6 @@
display: flex;
height: 42px;
.hide-actions {
align-items: center;
color: $color-silver-chalice;
display: flex;
margin-right: 20px;
&:hover {
text-decoration: none;
}
.fas {
font-size: 18px;
margin-right: 5px;
}
}
.ga-search-container {
display: none;
flex-grow: 1;

1
app/assets/stylesheets/marvinjs.scss
View file

@ -140,6 +140,7 @@
}
.new-marvinjs-upload-button {
padding: 2px 16px;
.new-marvinjs-upload-icon {
display: inline-block;

1
app/assets/stylesheets/my_modules/protocols/index.scss
View file

@ -259,6 +259,7 @@
.my-module-recent-protocols {
flex-grow: 1;
height: 36px;
margin-bottom: 5px;
position: relative;

12
app/assets/stylesheets/my_modules/results/index.scss
View file

@ -8,10 +8,14 @@
#results-toolbar {
.help_tooltips {
.btn-default {
border: 0;
color: inherit;
margin-left: 10px;
align-items: center;
display: flex;
.add-result-text {
display: inline-block;
line-height: 36px;
margin-bottom: 5px;
margin-right: 5px;
}
}
}

4
app/assets/stylesheets/partials/_sidebar.scss
View file

@ -26,7 +26,7 @@ $toggle-btn-size: 50px;
border-bottom-right-radius: 10px;
border-top-right-radius: 10px;
bottom: 50%;
box-shadow: 2px 0 4px $color-alto;
box-shadow: $flyout-shadow;
display: block;
position: absolute;
right: -18px;
@ -54,7 +54,7 @@ $toggle-btn-size: 50px;
#sidebar-wrapper {
background-color: $color-white;
box-shadow: 1px 3px 6px $color-alto;
box-shadow: $flyout-shadow;
height: 100%;
margin-left: -$wrapper-width;
position: fixed;

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

@ -40,7 +40,7 @@ $color-module-hover: $brand-primary;
}
.projects-view-mode-switch {
margin: 10px;
margin: 8px 10px 12px;
}
}
@ -48,26 +48,38 @@ $color-module-hover: $brand-primary;
/* Canvas index page */
#canvas-container:not(.canvas-container-edit-mode) {
margin-top: 20px;
margin-top: 5px;
}
/**********************************
* jsPlumb CANVAS RELATED STYLING *
*********************************/
#diagram-buttons {
margin-bottom: 10px;
align-items: center;
display: flex;
#edit-canvas-button {
margin-right: 5px;
}
.actions-button {
margin-right: 15px;
}
.toolbarButtons {
align-items: center;
display: flex;
.zoom-text {
margin-right: 5px;
}
}
}
#update-canvas {
#canvas-new-module {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.btn-group > .btn:first-child {
border-bottom-left-radius: 0;
}
.btn-group > .btn:last-child {
border-bottom-right-radius: 0;
.canvas-header {
margin-bottom: 5px;
}
}
@ -552,9 +564,9 @@ li.module-hover {
}
.experiment-no-description {
@include font-h3;
color: $color-alto;
display: block;
font-size: $font-size-large;
font-weight: bold;
margin-top: 10px;
text-align: center;

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

@ -226,6 +226,7 @@
align-items: center;
display: flex;
height: 30px;
margin-top: 5px;
.info-line.button {
flex-grow: 1;
@ -355,15 +356,6 @@
}
}
.external-import-btn {
background-color: $brand-primary;
border: 0;
color: $color-white;
font-size: 12px;
padding-bottom: 3px;
padding-top: 3px;
}
.footer {
background: $color-white;
bottom: -30px;

1
app/assets/stylesheets/reports.scss
View file

@ -12,7 +12,6 @@
border-bottom: 1px solid $color-gainsboro;
border-left: 0;
border-right: 0;
border-top: 15px solid $color-concrete;
margin-bottom: 15px;
min-width: 320px;
padding: 25px 20px;

1
app/assets/stylesheets/shared/comments.scss
View file

@ -220,6 +220,7 @@
border: 1px solid transparent;
box-shadow: none;
outline: none;
overflow: hidden;
width: 100%;
&:focus {

13
app/assets/stylesheets/shared_styles/constants/borders.scss Normal file
View file

@ -0,0 +1,13 @@
@import "colors";
$border-radius-default: 4px;
$border-radius-modal: 6px;
$border-radius-tag: 2px;
$border-default: 1px solid $color-silver-chalice;
$border-secondary: 1px solid $color-volcano;
$border-tertiary: 1px solid $color-alto;
$border-focus: 1px solid $brand-focus;
$border-danger: 1px solid $brand-danger;
$border-transparent: 1px solid transparent;

55
app/assets/stylesheets/shared_styles/constants/colors.scss Normal file
View file

@ -0,0 +1,55 @@
// Grayscale colors
$color-white: #fff;
$color-concrete: #f0f0f6;
$color-alto: #d0d0d8;
$color-silver-chalice: #a0a0a8;
$color-volcano: #404048;
$color-black: #231f20;
// Theme colors
$brand-primary: #104da9;
$brand-primary-hover: #0c3a80;
$brand-primary-press: #07244f;
$brand-academy: #a52068;
$brand-academy-dark: #8c1b58;
$brand-focus: #609fff;
$brand-focus-light: #dfecff;
$brand-success: #2dbe61;
$brand-success-light: #cbefd7;
$brand-danger: #e72525;
$brand-danger-hover: #b21d1d;
$brand-danger-press: #801515;
$brand-danger-light: #f9c9c9;
$brand-warning: #f0ad4e;
$brand-warning-light: #fbebd3;
// MS Office colors:
$office-ms-word: #2b579a;
$office-ms-excel: #217346;
$office-ms-powerpoint: #d24726;
// MarvinJS color:
$marvinjs-color: #29999c;
// Don't use them
$color-alabaster: $color-concrete;
$color-gainsboro: $color-concrete;
$color-silver: $color-alto;
$color-dove-gray: $color-volcano;
$color-emperor: $color-volcano;
$brand-default: $color-white;
$brand-info: $brand-focus;
$brand-other: $brand-success;
$brand-extra: $brand-focus;
$brand-primary-light: $brand-focus-light;
$brand-light-blue: $brand-focus-light;

67
app/assets/stylesheets/shared_styles/constants/fonts.scss Normal file
View file

@ -0,0 +1,67 @@
$font-family-lato: Lato, "Open Sans", Arial, Helvetica, sans-serif;
$font-family-sans-serif: "Open Sans", Arial, Helvetica, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-lato;
$font-family-icons: "Font Awesome 5 Free";
$font-size-base: 16px;
$font-size-h1: 24px;
$font-size-h2: 18px;
$font-size-h3: $font-size-base;
$font-size-h4: $font-size-base;
$font-size-h5: $font-size-base;
$font-size-h6: $font-size-base;
$font-fas-check: "\f00c";
$font-fas-exclamation-triangle: "\f071";
@mixin font-h1 {
font-size: 24px;
font-weight: bold;
}
@mixin font-h2 {
font-size: 18px;
font-weight: bold;
}
@mixin font-h3 {
font-size: $font-size-base;
font-weight: bold;
}
@mixin font-main {
font-size: $font-size-base;
}
@mixin font-button {
font-size: 14px;
}
@mixin font-small {
font-size: 12px;
}
@mixin font-awesome {
font-family: "Font Awesome 5 Free";
font-weight: 501;
}
// $font-size-large: ceil(($font-size-base * 1.1)); //16px
// $font-size-small: ceil(($font-size-base * .9)); //13px
// $font-size-h1: floor(($font-size-base * 2.6)); //36px
// $font-size-h2: floor(($font-size-base * 2.15)); //30px
// $font-size-h3: ceil(($font-size-base * 1.7)); //24px
// $font-size-h4: ceil(($font-size-base * 1.25)); //18px
// $font-size-h5: $font-size-base; //14px
// $font-size-h6: ceil(($font-size-base * .85)); //12px
// $line-height-base: 1.428571429;
// $line-height-computed: floor(($font-size-base * $line-height-base));
// $headings-font-family: inherit;
// $headings-font-weight: 500;
// $headings-line-height: 1.1;
// $headings-color: inherit;

2
app/assets/stylesheets/shared_styles/constants/shadows.scss Normal file
View file

@ -0,0 +1,2 @@
$flyout-shadow: 0px 1px 4px rgba(35, 31, 32, 0.15);
$modal-shadow: 0px 4px 16px rgba(35, 31, 32, 0.15);

4
app/assets/stylesheets/shared_styles/constants/transition.scss Normal file
View file

@ -0,0 +1,4 @@
$timing-function-deceleration: cubic-bezier(0, 0, .2, 1) !default;
$timing-function-standard: cubic-bezier(.4, 0, .2, 1) !default;
$timing-function-acceleration: cubic-bezier(.4, 0, 1, 1) !default;
$timing-function-sharp: cubic-bezier(.4, 0, .6, 1) !default;

170
app/assets/stylesheets/shared_styles/elements/buttons.scss Normal file
View file

@ -0,0 +1,170 @@
// scss-lint:disable NestingDepth
.btn{
@include font-button;
animation-timing-function: $timing-function-sharp;
border-radius: $border-radius-default;
cursor: pointer;
display: inline-block;
line-height: 20px;
outline: 0;
padding: 7px 16px;
position: relative;
text-align: center;
text-decoration: none;
transition: .3s;
user-select: none;
.fas {
color: inherit;
margin-right: 5px;
}
&:hover {
text-decoration: none;
}
&:active {
text-decoration: none;
}
&:focus {
outline: 0;
text-decoration: none;
}
&.btn-primary {
background: $brand-primary;
border: 1px solid $brand-primary;
color: $color-white;
&:hover {
background: $brand-primary-hover;
color: $color-white;
}
&:active {
background: $brand-primary-press;
color: $color-white;
}
&:focus {
box-shadow: 0 0 0 1px $brand-focus;
color: $color-white;
}
}
&.btn-secondary {
background: $color-white;
border: $border-default;
color: $color-black;
&:hover {
background: $color-concrete;
border: $border-secondary;
color: $color-black;
}
&:active {
background: $color-alto;
border: $border-secondary;
color: $color-black;
}
&:focus {
box-shadow: 0 0 0 1px $brand-focus;
color: $color-black;
}
}
&.btn-light {
background: transparent;
border: $border-transparent;
color: $color-black;
&:hover {
background: $color-concrete;
border: $border-transparent;
color: $color-black;
}
&:active {
background: $color-alto;
border: $border-transparent;
color: $color-black;
}
&:focus {
box-shadow: 0 0 0 1px $brand-focus;
color: $color-black;
}
}
&.btn-danger {
background: $brand-danger;
border: $border-danger;
color: $color-white;
&:hover {
background: $brand-danger-hover;
color: $color-white;
}
&:active {
background: $brand-danger-press;
color: $color-white;
}
&:focus {
box-shadow: 0 0 0 1px $brand-focus;
color: $color-white;
}
}
&.icon-btn {
padding: 7px;
width: 36px;
.fas {
margin: 0;
}
}
&:disabled {
background: $color-alto;
border: $border-tertiary;
color: $color-silver-chalice;
opacity: .5;
&.btn-secondary,
&.btn-light {
background: $color-white;
&:hover {
background: $color-white;
border: $border-tertiary;
color: $color-silver-chalice;
}
}
&.btn-danger {
&:hover {
background: $color-alto;
}
}
}
}
.sci-btn-group {
display: inline-block;
position: relative;
.btn {
float: left;
margin: 2px 4px 2px 0;
&:nth-last-child(1) {
margin-right: 0;
}
}
}

63
app/assets/stylesheets/shared_styles/elements/checkboxes.scss Normal file
View file

@ -0,0 +1,63 @@
// scss-lint:disable SelectorDepth QualifyingElement
:root {
--sci-checkbox-size: 16px;
}
input[type="checkbox"].sci-checkbox {
cursor: pointer;
flex-shrink: 0;
height: var(--sci-checkbox-size);
margin: 0;
opacity: 0;
position: relative;
width: var(--sci-checkbox-size);
z-index: 2;
+ .sci-checkbox-label {
display: inline-block;
flex-shrink: 0;
height: var(--sci-checkbox-size);
margin-left: calc((var(--sci-checkbox-size) * -1) - 3px);
position: relative;
width: var(--sci-checkbox-size);
&::before {
@include font-awesome;
animation-timing-function: $timing-function-sharp;
background: $color-white;
border: $border-default;
border-radius: 1px;
color: $color-white;
content: "";
font-size: calc(var(--sci-checkbox-size) - var(--sci-checkbox-size) * .375);
height: var(--sci-checkbox-size);
left: 0;
line-height: calc(var(--sci-checkbox-size) - 2px);
position: absolute;
text-align: center;
top: 1px;
transition: .2s;
width: var(--sci-checkbox-size);
}
}
&.hidden + .sci-checkbox-label {
display: none;
}
&:checked + .sci-checkbox-label {
&::before {
background: $brand-primary;
border: 1px solid $brand-primary;
content: $font-fas-check;
}
}
&:disabled + .sci-checkbox-label {
&::before {
background: $color-alto;
border: $border-tertiary;
}
}
}

132
app/assets/stylesheets/shared_styles/elements/input_fields.scss Normal file
View file

@ -0,0 +1,132 @@
// scss-lint:disable NestingDepth
.sci-input-container {
display: inline-block;
position: relative;
label {
@include font-small;
display: inline-block;
font-weight: bold;
margin-bottom: 5px;
}
.sci-input-field {
@include font-button;
animation-timing-function: $timing-function-sharp;
border: $border-default;
border-radius: $border-radius-default;
height: 36px;
outline: 0;
padding: 0 0 0 10px;
transition: .3s;
width: 100%;
&:focus {
border: $border-focus;
}
&:disabled {
background: transparent;
}
}
.fas {
bottom: 0;
line-height: 36px;
position: absolute;
text-align: center;
width: 25px;
}
&.left-icon {
.sci-input-field {
padding: 0 0 0 30px;
}
.fas {
left: 5px;
}
}
&.right-icon {
.sci-input-field {
padding: 0 30px 0 10px;
}
.fas {
right: 5px;
}
}
&.success,
&.error {
.sci-input-field {
padding: 0 30px 0 10px;
}
&::after {
@include font-awesome;
bottom: 0;
line-height: 36px;
position: absolute;
right: 5px;
text-align: center;
width: 25px;
}
&.right-icon {
.sci-input-field {
padding: 0 60px 0 10px;
}
&::after {
right: 35px;
}
}
}
&.success {
&::after {
color: $brand-success;
content: $font-fas-check;
}
}
&.error {
.sci-input-field {
border: $border-danger;
}
&::after {
color: $brand-danger;
content: $font-fas-exclamation-triangle;
}
&::before {
@include font-small;
bottom: -15px;
color: $brand-danger;
content: attr(data-error-text);
left: 0;
line-height: 15px;
position: absolute;
width: 100%;
}
}
&.disabled {
label {
color: $color-alto;
}
.sci-input-field {
border: $border-tertiary;
color: $color-alto;
&::placeholder {
color: inherit;
}
}
}
}

81
app/assets/stylesheets/shared_styles/elements/radio_buttons.scss Normal file
View file

@ -0,0 +1,81 @@
// scss-lint:disable SelectorDepth QualifyingElement
:root {
--sci-radio-size: 16px;
}
input[type="radio"].sci-radio {
cursor: pointer;
flex-shrink: 0;
height: var(--sci-radio-size);
margin: 0;
opacity: 0;
position: relative;
width: var(--sci-radio-size);
z-index: 2;
+ .sci-radio-label {
display: inline-block;
flex-shrink: 0;
height: var(--sci-radio-size);
margin-left: calc((var(--sci-radio-size) * -1) - 3px);
position: relative;
width: var(--sci-radio-size);
&::before {
animation-timing-function: $timing-function-sharp;
border: $border-default;
border-radius: 50%;
color: $color-white;
content: "";
font-size: calc(var(--sci-radio-size) - var(--sci-radio-size) * .375);
height: var(--sci-radio-size);
left: 0;
line-height: calc(var(--sci-radio-size) - 2px);
position: absolute;
text-align: center;
top: 1px;
transition: .2s;
width: var(--sci-radio-size);
}
&::after {
animation-timing-function: $timing-function-sharp;
background: $color-white;
border-radius: 50%;
content: "";
display: inline-block;
height: calc(var(--sci-radio-size) - 6px);
left: 3px;
position: absolute;
top: 4px;
transition: .2s;
width: calc(var(--sci-radio-size) - 6px);
}
}
&.hidden + .sci-radio-label {
display: none;
}
&:checked + .sci-radio-label {
&::before {
border: 1px solid $brand-primary;
}
&::after {
background: $brand-primary;
}
}
&:disabled + .sci-radio-label {
&::before {
background: $color-alto;
border: $border-tertiary;
}
&::after {
display: none;
}
}
}

104
app/assets/stylesheets/shared_styles/elements/toggles.scss Normal file
View file

@ -0,0 +1,104 @@
// scss-lint:disable SelectorDepth QualifyingElement NestingDepth
input[type="checkbox"].sci-toggle-checkbox {
cursor: pointer;
flex-shrink: 0;
height: 16px;
margin: 0;
opacity: 0;
position: relative;
width: 24px;
z-index: 2;
+ .sci-toggle-checkbox-label {
animation-timing-function: $timing-function-sharp;
background: $color-alto;
border-radius: 8px;
display: inline-block;
flex-shrink: 0;
height: 16px;
margin-left: -27px;
position: relative;
transition: .2s;
width: 24px;
&::before {
animation-timing-function: $timing-function-sharp;
background: $color-white;
border-radius: 7px;
content: "";
height: 12px;
left: 0;
margin: 2px;
position: absolute;
transition: .2s;
width: 12px;
}
}
&.hidden + .sci-toggle-checkbox-label {
display: none;
}
&:checked + .sci-toggle-checkbox-label {
background: $brand-primary;
&::before {
left: 8px;
}
}
&:disabled + .sci-toggle-checkbox-label {
&::before {
background: $color-silver-chalice;
}
}
}
.sci-toggles-group {
align-items: center;
display: flex;
position: relative;
input[type="radio"].sci-toggle-item {
cursor: pointer;
height: 36px;
margin: 0;
opacity: 0;
position: relative;
width: 48px;
z-index: 2;
+ .sci-toggle-item-label {
animation-timing-function: $timing-function-sharp;
background: $color-white;
border: $border-default;
border-left-color: transparent;
color: $color-black;
display: inline-block;
height: 36px;
line-height: 34px;
margin-left: -48px;
position: relative;
text-align: center;
transition: .2s;
width: 48px;
&:first-of-type {
border-left-color: $color-silver-chalice;
border-radius: $border-radius-default 0 0 $border-radius-default;
}
&:last-of-type {
border-radius: 0 $border-radius-default $border-radius-default 0;
}
}
&:checked + .sci-toggle-item-label {
background: $brand-primary;
border: 1px solid $brand-primary;
color: $color-white;
}
}
}

82
app/assets/stylesheets/shared_styles/global_elements.scss Normal file
View file

@ -0,0 +1,82 @@
// scss-lint:disable Comment
@import "constants/*";
@import "elements/*";
// Examples
/*
<div class="demo-container" style="background: white; padding: 20px;">
<div>
<input type="checkbox" class="sci-checkbox">
<span class="sci-checkbox-label"></span>
<span style="display: inline-block; width: 20px"></span>
<input type="checkbox" class="sci-checkbox" disabled>
<span class="sci-checkbox-label"></span>
<span style="display: inline-block; width: 20px"></span>
<input type="checkbox" class="sci-checkbox" disabled checked>
<span class="sci-checkbox-label"></span>
</div>
<hr>
<div>
<input type="radio" name="test" class="sci-radio">
<span class="sci-radio-label"></span>
<span style="display: inline-block; width: 20px"></span>
<input type="radio" name="test" class="sci-radio">
<span class="sci-radio-label"></span>
<span style="display: inline-block; width: 20px"></span>
<input type="radio" name="test" class="sci-radio" disabled>
<span class="sci-radio-label"></span>
</div>
<hr>
<div>
<input type="checkbox" class="sci-toggle-checkbox">
<span class="sci-toggle-checkbox-label"></span>
<span style="display: inline-block; width: 20px"></span>
<input type="checkbox" class="sci-toggle-checkbox" disabled>
<span class="sci-toggle-checkbox-label"></span>
</div>
<hr>
<div class="sci-toggles-group">
<input type="radio" name="test1" class="sci-toggle-item">
<span class="sci-toggle-item-label"><i class="fas fa-th-large"></i></span>
<input type="radio" name="test1" class="sci-toggle-item">
<span class="sci-toggle-item-label"><i class="fas fa-th-list"></i></span>
<input type="radio" name="test1" class="sci-toggle-item">
<span class="sci-toggle-item-label"><i class="fas fa-th"></i></span>
</div>
<hr>
<div class="sci-input-container" style="width: 300px">
<input type="text" class="sci-input-field" placeholder="Placeholder"></input>
</div>
<hr>
<div class="sci-input-container left-icon" style="width: 300px">
<input type="text" class="sci-input-field" placeholder="Placeholder"></input>
<i class="fas fa-search"></i>
</div>
<hr>
<div class="sci-input-container right-icon" style="width: 300px">
<label>Right icon</label>
<input type="text" class="sci-input-field" placeholder="Placeholder"></input>
<i class="fas fa-search"></i>
</div>
<hr>
<div class="sci-input-container right-icon success" style="width: 300px">
<label>Success and icon</label>
<input type="text" class="sci-input-field" placeholder="Placeholder"></input>
<i class="fas fa-search"></i>
</div>
<hr>
<div class="sci-input-container error" data-error-text="Error text" style="width: 300px">
<label>Error</label>
<input type="text" class="sci-input-field" placeholder="Placeholder"></input>
</div>
<hr>
<div class="sci-input-container disabled" style="width: 300px">
<label>Disabled</label>
<input type="text" class="sci-input-field" placeholder="Placeholder" disabled></input>
</div>
</div>
*/

23
app/assets/stylesheets/steps.scss
View file

@ -42,28 +42,17 @@
.complete-step-btn {
display: inline-block;
line-height: 39px;
button {
display: block;
font-size: 12px;
margin: auto 0;
padding: 3px 10px;
span {
font-size: 15px;
}
}
}
.panel-heading {
height: 39px;
border: 0;
height: 46px;
padding-bottom: 0;
padding-top: 0;
.panel-options {
bottom: 0;
line-height: 39px;
line-height: 46px;
}
span.step-number {
@ -76,19 +65,19 @@
.left-floats {
align-items: center;
display: flex;
height: 39px;
height: 100%;
padding-right: 15px;
.step-name-link {
display: flex;
flex-shrink: 1;
line-height: 39px;
line-height: 100%;
overflow: hidden;
.name-block {
display: flex;
flex-shrink: 1;
height: 39px;
height: 100%;
overflow: hidden;
@media (max-width: 1188px) {

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

@ -2,7 +2,7 @@
@import "mixins";
#main-nav {
box-shadow: 0 3px 6px $color-alto;
box-shadow: $flyout-shadow;
margin-bottom: 0;
}
@ -11,7 +11,7 @@
padding-left: 15px;
.fa-bell {
font-size: $font-size-large;
font-size: 16px;
}
#count-notifications {
@ -40,10 +40,12 @@
}
.navbar-default .navbar-brand {
& > img {
margin-top: -7px;
max-width: 55px;
max-height: 38px;
align-items: center;
display: flex;
padding: 0 15px;
#logo {
max-height: 22px;
}
}
@ -394,10 +396,6 @@
#search-bar {
padding-right: 0;
.btn-default[type="submit"] {
height: 34px;
}
}
@media (max-width: 768px) {
@ -419,7 +417,7 @@
#system-notifications-dropdown {
.fa-gift {
font-size: $font-size-large;
font-size: 16px;
}
#count-system-notifications {

4
app/assets/stylesheets/themes/menu_bar.scss
View file

@ -3,7 +3,7 @@
.menu-bar {
background-color: $color-white;
box-shadow: 1px 3px 6px 0 $color-alto;
box-shadow: $flyout-shadow;
height: 100%;
left: 0;
padding-bottom: 50px;
@ -22,9 +22,9 @@
& > a,
& > span {
@include font-small;
color: $color-silver-chalice;
display: grid;
font-size: $font-size-h6;
margin-left: auto;
margin-right: auto;
padding: 10px 0;

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

@ -286,8 +286,8 @@ a[data-toggle="tooltip"] {
.navbar-secondary {
background: $color-concrete !important;
margin-left: -280px;
padding-left: 294px;
padding-right: 97px;
padding-left: 280px;
padding-right: 82px;
margin-bottom: 0;
border-color: transparent;
border-bottom: 0;
@ -310,7 +310,8 @@ a[data-toggle="tooltip"] {
#secondary-menu {
background: $color-white;
border-bottom: 1px solid $color-gainsboro;
margin-top: 15px;
padding-left: 29px;
padding-top: 15px;
.open > a,
.open > a:hover,
@ -398,11 +399,11 @@ a[data-toggle="tooltip"] {
}
.navbar-without-sidebar{
padding-left: 15px;
margin-left: 0px;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
padding-left: 0;
-o-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-webkit-transition: all 0.5s ease;
transition: all 0.5s ease;
}
@ -422,9 +423,6 @@ a[data-toggle="tooltip"] {
.tab-pane-settings {
background-color: $color-white;
padding: 15px;
border-left: 1px solid $color-alto;
border-right: 1px solid $color-alto;
border-bottom: 1px solid $color-alto;
}
.breadcrumb-teams {
@ -498,7 +496,7 @@ a[data-toggle="tooltip"] {
margin-bottom: 15px;
}
& > .btn-group {
> .sci-btn-group {
margin-right: 30px;
}
}
@ -918,13 +916,15 @@ ul.content-activities {
margin-bottom: 5px;
.protocol-button {
margin-bottom: 5px;
.sci-btn-group {
float: left;
}
}
.protocol-status-bar {
display: flex;
height: 33px;
margin-bottom: 5px;
height: 40px;
margin-right: 15px;
}
@ -932,7 +932,8 @@ ul.content-activities {
border-color: $color-silver;
box-shadow: none;
display: inline-block;
height: 33px;
height: 36px;
margin: 2px 0;
& > .panel-body {
padding: 0 0 0 15px;
@ -944,7 +945,7 @@ ul.content-activities {
.link-button,
.link-toggle {
height: 33px;
height: 36px;
position: relative;
right: -1px;
top: -1px;
@ -1851,6 +1852,14 @@ th.custom-field .modal-tooltiptext {
color: $color-white;
font: bold;
}
.res-description {
color: $color-white;
}
.res-type {
border-color: $color-white;
}
}
ul {

4
app/helpers/search_helper.rb
View file

@ -25,11 +25,11 @@ module SearchHelper
if search_team != current_team
link_to text,
path,
class: 'btn btn-success',
class: 'btn btn-primary',
data: { confirm: t('users.settings.changed_team_in_search',
team: search_team.name) }
else
link_to text, path, class: 'btn btn-success'
link_to text, path, class: 'btn btn-primary'
end
end
end

2
app/views/assets/marvinjs/_create_marvin_sketch_button.html.erb
View file

@ -1,5 +1,5 @@
<span
class="btn btn-default new-marvinjs-upload-button"
class="btn btn-light new-marvinjs-upload-button"
data-object-id="<%= element_id %>"
data-object-type="<%= element_type %>"
data-marvin-url="<%= marvin_js_assets_path %>"

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

@ -8,7 +8,7 @@
data-can-edit-connections="<%= can_manage_experiment?(@experiment) ? "yes" : "no" %>"
data-unsaved-work-text="<%=t "experiments.canvas.edit.unsaved_work" %>"
>
<%= bootstrap_form_tag url: canvas_experiment_url, method: "post" do |f| %>
<%= bootstrap_form_tag url: canvas_experiment_url, method: "post", html: {class: "canvas-header"} do |f| %>
<% if can_manage_experiment?(@experiment) %>
<%=link_to "", type: "button", class: "btn btn-primary help_tooltips", id: "canvas-new-module",
data: { tooltiplink: I18n.t('tooltips.link.task.new'),
@ -24,12 +24,12 @@
</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 %>
<div class="sci-btn-group pull-right" role="group">
<%= link_to canvas_experiment_path(@experiment), type: "button", class: "btn btn-secondary cancel-edit-canvas" do %>
<span class="hidden-xs"><%= t("experiments.canvas.edit.cancel") %></span>
<span class="fas fa-times visible-xs" style="height: 16px;margin-top: 4px;">&nbsp;</span>
<% end %>
<%= f.submit class: "btn btn-success", id: "canvas-save" do %>
<%= f.submit class: "btn btn-primary", id: "canvas-save" do %>
<span class="visibile-xs"><%= t("experiments.canvas.edit.save_short") %></span>
<span class="hidden-xs"><%= t("experiments.canvas.edit.save") %></span>
<% end %>

2
app/views/canvas/edit/modal/_delete_module.html.erb
View file

@ -10,7 +10,7 @@
<span id="delete-message"></span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-danger" data-dismiss="modal" data-action="confirm">
<%=t "experiments.canvas.edit.modal_delete_module.confirm" %>
</button>

2
app/views/canvas/edit/modal/_delete_module_group.html.erb
View file

@ -10,7 +10,7 @@
<span id="delete-message"></span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-danger" data-dismiss="modal" data-action="confirm">
<%=t "experiments.canvas.edit.modal_delete_module_group.confirm" %>
</button>

4
app/views/canvas/edit/modal/_edit_module.html.erb
View file

@ -11,8 +11,8 @@
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="confirm"><%=t "experiments.canvas.edit.modal_edit_module.confirm" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_edit_module.confirm" %></button>
</div>
</div>
</div>

4
app/views/canvas/edit/modal/_move_module.html.erb
View file

@ -23,9 +23,9 @@
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<% if experiments.count > 1 %>
<button type="button" class="btn btn-success" data-action="confirm">
<button type="button" class="btn btn-primary" data-action="confirm">
<%=t "experiments.canvas.edit.modal_move_module.confirm" %>
</button>
<% end %>

4
app/views/canvas/edit/modal/_move_module_group.html.erb
View file

@ -24,8 +24,8 @@
</div>
<div class="modal-footer">
<% if experiments.count > 1 %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="confirm">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-primary" data-action="confirm">
<%=t "experiments.canvas.edit.modal_move_module_group.confirm" %>
</button>
<% end %>

4
app/views/experiments/_clone_modal.html.erb
View file

@ -26,8 +26,8 @@
{}, {class: "form-control selectpicker", "data-role" => "clear"} %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.clone.modal_submit"), class: "btn btn-success" %>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.clone.modal_submit"), class: "btn btn-primary" %>
</div>
</div>
</div>

4
app/views/experiments/_edit_modal.html.erb
View file

@ -15,8 +15,8 @@
<%= render partial: "form.html.erb", locals: { form: f } %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.edit.modal_create"), class: "btn btn-success" %>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.edit.modal_create"), class: "btn btn-primary" %>
</div>
</div>
</div>

4
app/views/experiments/_move_modal.html.erb
View file

@ -27,9 +27,9 @@
<%= t("experiments.move.notice") %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<% if !@projects.blank? %>
<%= f.submit t("experiments.move.modal_submit"), class: "btn btn-success" %>
<%= f.submit t("experiments.move.modal_submit"), class: "btn btn-primary" %>
<% end %>
</div>
</div>

4
app/views/experiments/_new_modal.html.erb
View file

@ -11,8 +11,8 @@
<%= render partial: "form.html.erb", locals: { form: f } %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.new.modal_create"), class: "btn btn-success" %>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("experiments.new.modal_create"), class: "btn btn-primary" %>
</div>
</div>
</div>

17
app/views/experiments/canvas.html.erb
View file

@ -17,8 +17,8 @@
<span class="hidden-xs"><%=t 'experiments.canvas.canvas_edit' %></span>
<% end %>
<!-- experiment actions -->
<span class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="exActionsMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="dropdown actions-button">
<button class="btn btn-secondary dropdown-toggle" type="button" id="exActionsMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="hidden-xs"><%= t'experiments.canvas.actions' %></span>
<span class="visible-xs-inline"><i class="fas fa-sort"></i></span>
<span class="caret"></span>
@ -28,15 +28,18 @@
</span>
<% end %>
<div class="toolbarButtons">
<span class="hidden-xs"><%=t 'experiments.canvas.zoom' %></span>
<div id="zoom-level-buttons" class="btn-group" data-toggle="buttons">
<%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default active", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %>
<span class="hidden-xs zoom-text"><%=t 'experiments.canvas.zoom' %></span>
<div id="zoom-level-buttons" class="sci-toggles-group change-canvas-view" data-toggle="buttons">
<input type="radio" name="canvas-format" class="sci-toggle-item" checked>
<%=link_to canvas_full_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax sci-toggle-item-label", "data-action" => "full_zoom", "data-toggle" => "button", "aria-pressed" => true do %>
<span class="fas fa-th-large" aria-hidden="true" ></span>
<% end %>
<%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "medium_zoom" do %>
<input type="radio" name="canvas-format" class="sci-toggle-item" >
<%=link_to canvas_medium_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax sci-toggle-item-label", "data-action" => "medium_zoom" do %>
<span class="fas fa-th-list" aria-hidden="true"></span>
<% end %>
<%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax btn btn-default", "data-action" => "small_zoom" do %>
<input type="radio" name="canvas-format" class="sci-toggle-item" >
<%=link_to canvas_small_zoom_experiment_path(@experiment), remote: true, type: "button", class: "ajax sci-toggle-item-label", "data-action" => "small_zoom" do %>
<span class="fas fa-th" aria-hidden="true"></span>
<% end %>
</div>

18
app/views/global_activities/_top_pane.html.erb
View file

@ -1,13 +1,15 @@
<h3 class="ga-title">
<h4 class="ga-title">
<%= t('activities.index.global_activities_title') %>
</h3>
</h4>
<div class="ga-actions">
<a id="global-activities-expand-all" class="hide-actions" href="#" data-turbolinks="false">
<i class="fas fa-chevron-down"></i><%= t('activities.index.expand_all') %>
</a>
<a id="global-activities-colapse-all" class="hide-actions" href="#" data-turbolinks="false">
<i class="fas fa-chevron-up"></i><%= t('activities.index.collapse_all') %>
</a>
<div class="sci-btn-group">
<a id="global-activities-expand-all" class="hide-actions btn btn-light" href="#" data-turbolinks="false">
<i class="fas fa-chevron-down"></i><%= t('activities.index.expand_all') %>
</a>
<a id="global-activities-colapse-all" class="hide-actions btn btn-light" href="#" data-turbolinks="false">
<i class="fas fa-chevron-up"></i><%= t('activities.index.collapse_all') %>
</a>
</div>
<div class="ga-search-container">
<input type="text" class="search-field" placeholder="Search..." aria-describedby="basic-addon1">
<i class="fas fa-search"></i>

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

@ -1,4 +1,4 @@
<button class="btn btn-toggle">
<span class="fas fa-check"></span>
<button class="btn btn-primary">
<i class="fas fa-check"></i>
<%= t("my_modules.buttons.complete") %>
</button>

4
app/views/my_modules/_state_button_uncomplete.html.erb
View file

@ -1,4 +1,4 @@
<button class="btn btn-default">
<span class="fas fa-undo-alt"></span>
<button class="btn btn-secondary ">
<i class="fas fa-undo-alt"></i>
<%= t("my_modules.buttons.uncomplete") %>
</button>

2
app/views/my_modules/modals/_manage_module_tags_modal.html.erb
View file

@ -7,7 +7,7 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.close" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.close" %></button>
</div>
</div>
</div>

2
app/views/my_modules/modals/_manage_users_modal.html.erb
View file

@ -15,7 +15,7 @@
<i><%=t "experiments.canvas.full_zoom.modal_manage_users.contact_admins", team: @experiment.project.team.name %></i>
<% end %>
</span>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.close" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.close" %></button>
</div>
</div>
</div>

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

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

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

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

28
app/views/my_modules/protocols/_protocol_buttons.html.erb
View file

@ -1,6 +1,6 @@
<div class="btn-group protocol-button" role="group" aria-label="">
<div class="btn-group">
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
<div class="sci-btn-group">
<a class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
<span class="fas fa-download"></span>
<span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.load_protocol") %></span>
</a>
@ -25,17 +25,17 @@
<li class="disabled"><a href="#"><span class="fas fa-paperclip"></span>&nbsp;<%= t("my_modules.protocols.buttons.load_protocol_from_file") %></a></li>
<% end %>
</ul>
<% if can_read_experiment?(@my_module.experiment) %>
<%= link_to raw("<span class=\"fas fa-upload\"></span><span class=\"hidden-xs-custom\">&nbsp;" + t('my_modules.protocols.buttons.export') + "</span>"), export_protocols_path(protocol_ids: @protocol.id, my_module_id: @my_module.id), class: "btn btn-secondary", data: { turbolinks: false } %>
<% else %>
<a href="#" class="btn btn-secondary disabled"><span class="fas fa-upload"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.export") %></span></a>
<% end %>
<% if can_read_protocol_in_module?(@protocol) && can_create_protocols_in_repository?(@protocol.team) %>
<a id="protocol-copy-to-repository" class="btn btn-secondary" data-action="copy-to-repository" data-hook="protocol-copy-to-repository" data-remote="true" href="<%= copy_to_repository_modal_protocol_path(@protocol, format: :json) %>">
<span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span>
</a>
<% else %>
<a href="#" class="btn btn-secondary disabled"><span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span></a>
<% end %>
</div>
<% if can_read_experiment?(@my_module.experiment) %>
<%= link_to raw("<span class=\"fas fa-upload\"></span><span class=\"hidden-xs-custom\">&nbsp;" + t('my_modules.protocols.buttons.export') + "</span>"), export_protocols_path(protocol_ids: @protocol.id, my_module_id: @my_module.id), class: "btn btn-default", data: { turbolinks: false } %>
<% else %>
<a href="#" class="btn btn-default disabled"><span class="fas fa-upload"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.export") %></span></a>
<% end %>
<% if can_read_protocol_in_module?(@protocol) && can_create_protocols_in_repository?(@protocol.team) %>
<a id="protocol-copy-to-repository" class="btn btn-default" data-action="copy-to-repository" data-hook="protocol-copy-to-repository" data-remote="true" href="<%= copy_to_repository_modal_protocol_path(@protocol, format: :json) %>">
<span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span>
</a>
<% else %>
<a href="#" class="btn btn-default disabled"><span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span></a>
<% end %>
</div>

62
app/views/my_modules/results.html.erb
View file

@ -6,45 +6,47 @@
<div class="content-pane">
<div id="results-toolbar">
<div class="pull-right">
<button class="btn btn-default" id="results-collapse-btn">
<div class="pull-right sci-btn-group">
<button class="btn btn-secondary" id="results-collapse-btn">
<span class="fas fa-caret-square-up"></span>
<span class="hidden-xs-custom"><%= t'my_modules.results.collapse_label' %></button></span>
<button class="btn btn-default" id="results-expand-btn">
<button class="btn btn-secondary" id="results-expand-btn">
<span class="fas fa-caret-square-down"></span>
<span class="hidden-xs-custom"><%= t'my_modules.results.expand_label' %></button></span>
</div>
<% if can_manage_module?(@my_module) %>
<div class="help_tooltips" style="display:inline-block"
<div class="help_tooltips"
data-tooltiplink="<%= I18n.t('tooltips.link.task.results') %>"
data-tooltipcontent="<%= I18n.t('tooltips.text.task.results') %>">
<span class="hidden-xs"><%= t'my_modules.results.add_label' %></span>
<a class="btn btn-primary"
id="new-result-text"
data-href="<%= new_my_module_result_text_path(my_module_id: @my_module.id) %>"
href="#">
<span class="fas fa-font"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_text_result") %></span>
</a>
<a class="btn btn-primary"
id="new-result-table"
data-href="<%= new_my_module_result_table_path(my_module_id: @my_module.id) %>"
href="#">
<span class="fas fa-table"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_table_result") %></span>
</a>
<a class="btn btn-primary"
id="new-result-asset"
data-href="<%= new_my_module_result_asset_path(my_module_id: @my_module.id) %>"
href="#">
<span class="fas fa-paperclip"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_asset_result") %></span>
</a>
<%= render partial: '/assets/marvinjs/create_marvin_sketch_button.html.erb',
locals: { element_id: @my_module.id, element_type: 'Result', sketch_container: "#results[data-module-id=#{@my_module.id}]" } %>
<%= render partial: "assets/wopi/create_wopi_file_button",
locals: { element_id: @my_module.id, element_type: 'Result' } %>
<span class="hidden-xs add-result-text"><%= t'my_modules.results.add_label' %></span>
<div class="sci-btn-group">
<a class="btn btn-primary"
id="new-result-text"
data-href="<%= new_my_module_result_text_path(my_module_id: @my_module.id) %>"
href="#">
<span class="fas fa-font"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_text_result") %></span>
</a>
<a class="btn btn-primary"
id="new-result-table"
data-href="<%= new_my_module_result_table_path(my_module_id: @my_module.id) %>"
href="#">
<span class="fas fa-table"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_table_result") %></span>
</a>
<a class="btn btn-primary"
id="new-result-asset"
data-href="<%= new_my_module_result_asset_path(my_module_id: @my_module.id) %>"
href="#">
<span class="fas fa-paperclip"></span>
<span class="hidden-xs"><%= t("my_modules.results.new_asset_result") %></span>
</a>
<%= render partial: '/assets/marvinjs/create_marvin_sketch_button.html.erb',
locals: { element_id: @my_module.id, element_type: 'Result', sketch_container: "#results[data-module-id=#{@my_module.id}]" } %>
<%= render partial: "assets/wopi/create_wopi_file_button",
locals: { element_id: @my_module.id, element_type: 'Result' } %>
</div>
</div>
<% end %>
</div>

23
app/views/projects/index.html.erb
View file

@ -1,5 +1,6 @@
<% provide(:head_title, t("projects.index.head_title")) %>
<% provide(:head_title, t("projects.index.head_title")) %>
<% if current_team %>
<%= render partial: "shared/sidebar", locals: { page: 'project' } %>
<%= render partial: "shared/secondary_navigation" %>
@ -18,8 +19,8 @@
<%= render partial: "new.html.erb", locals: { form: f, teams: @teams } %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("projects.index.modal_new_project.create"), class: "btn btn-success help_tooltips",
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("projects.index.modal_new_project.create"), class: "btn btn-primary help_tooltips",
data: {
tooltiplink: I18n.t('tooltips.link.new_project'),
tooltipcontent: I18n.t('tooltips.text.new_project')
@ -42,8 +43,8 @@
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "projects.index.modal_edit_project.submit" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-primary" data-action="submit"><%=t "projects.index.modal_edit_project.submit" %></button>
</div>
</div>
</div>
@ -74,11 +75,11 @@
<div class="modal-body">
</div>
<div class="modal-footer">
<button id="export-projects-modal-close" type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.close" %></button>
<button id="export-projects-modal-cancel" type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button id="export-projects-modal-close" type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.close" %></button>
<button id="export-projects-modal-cancel" type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button id="export-projects-modal-submit"
type="button"
class="btn btn-success"
class="btn btn-primary"
data-export-projects-submit-url="<%= export_projects_team_path(current_team) %>">
<%=t "projects.export_projects.modal_submit" %>
</button>
@ -95,7 +96,7 @@
<% if @teams.exists? && can_create_projects?(current_team) %>
<h2><strong><%=t 'projects.index.no_projects.title' %></strong></h2>
<br />
<a class="btn btn-primary btn-lg new-project-btn">
<a class="btn btn-primary new-project-btn">
<span class="fas fa-plus"></span>
<span class="hidden-xs"><%= t('projects.index.no_projects.create_new_button') %></span>
</a>
@ -121,7 +122,7 @@
<!-- project sort -->
<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-light dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span><%= t("general.sort.#{@current_sort}_html") %></span>
<span class="caret"></span>
</button>
@ -139,7 +140,7 @@
</div>
<!-- export projects button -->
<button type="button" class="btn btn-default pull-right"
<button type="button" class="btn btn-secondary pull-right"
id="export-projects-button"
data-export-projects-modal-url="<%= export_projects_modal_team_path(current_team) %>"
disabled>

2
app/views/projects/show.html.erb
View file

@ -11,7 +11,7 @@
<div class="col-sm-12">
<!-- experiment sort -->
<div class="dropdown pull-left">
<button class="btn btn-default dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-secondary dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span><%= t("general.sort.#{@current_sort}_html") %></span>
<span class="caret"></span>
</button>

2
app/views/protocol_importers/_preview_modal_footer.html.erb
View file

@ -1,3 +1,3 @@
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-primary" data-action="import_protocol" data-import_type="in_repository_public"><%=t "protocols.import_export.import_modal.import_to_team_protocols_label" %></button>
<button type="button" class="btn btn-primary" data-action="import_protocol" data-import_type="in_repository_private"><%=t "protocols.import_export.import_modal.import_to_private_protocols_label" %></button>

2
app/views/protocol_importers/_protocol_card.html.erb
View file

@ -19,7 +19,7 @@
</div>
<div class='info-line button'>
<% if show_import_button %>
<button type="button" class='external-import-btn btn btn-primary pull-right'><%= t('protocol_importers.card.import_button_text') %></button>
<button type="button" class='external-import-btn btn btn-secondary pull-right'><%= t('protocol_importers.card.import_button_text') %></button>
<% end %>
</div>
</div>

4
app/views/protocols/_steps.html.erb
View file

@ -10,10 +10,10 @@
</a>
</div>
<div class="pull-right expand-all-steps" style="margin: 0 15px 20px 0; display: <%= 'none' if @protocol.steps.empty? %>">
<a class="btn btn-default" data-action="collapse-steps">
<a class="btn btn-secondary" data-action="collapse-steps">
<span class="fas fa-caret-square-up"></span>
<span class="hidden-xs"><%= t("protocols.steps.collapse_label") %></a></span>
<a class="btn btn-default" data-action="expand-steps">
<a class="btn btn-secondary" data-action="expand-steps">
<span class="fas fa-caret-square-down"></span>
<span class="hidden-xs"><%= t("protocols.steps.expand_label") %></a></span>
</div>

45
app/views/protocols/index.html.erb
View file

@ -28,39 +28,38 @@
<div class="protocols-description">
<%= t(@type == :public ? "protocols.index.public_description" : "protocols.index.private_description") %>
</div>
<div class="btn-group" role="group">
<a class="btn btn-primary" <%= can_create_protocols_in_repository?(@current_team) ? "data-action=create-new" : "disabled=disabled" %> data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>">
<div class="sci-btn-group" role="group">
<button class="btn btn-primary" <%= can_create_protocols_in_repository?(@current_team) ? "data-action=create-new" : "disabled" %> data-url="<%= create_new_modal_protocols_path(team: @current_team, type: @type) %>">
<span class="fas fa-plus"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.create_new") %></span>
</a>
<a class="btn btn-default" data-action="edit">
</button>
<button class="btn btn-secondary" data-action="edit" disabled>
<span class="fas fa-pencil-alt"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.edit") %></span>
</a>
<a class="btn btn-default" data-action="clone">
</button>
<button class="btn btn-secondary" data-action="clone" disabled>
<span class="fas fa-copy"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.clone_btn") %></span>
</a>
</button>
<% if @type == :public %>
<a class="btn btn-default" data-action="make-private" data-url="<%= make_private_protocols_path %>">
<button class="btn btn-secondary" data-action="make-private" data-url="<%= make_private_protocols_path %>" disabled>
<span class="fas fa-eye-slash"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.make_private") %></span>
</a>
</button>
<% elsif @type == :private %>
<a class="btn btn-default" data-action="publish" data-url="<%= publish_protocols_path %>">
<button class="btn btn-secondary" data-action="publish" data-url="<%= publish_protocols_path %>" disabled>
<span class="fas fa-eye"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.publish") %></span>
</a>
</button>
<% end %>
</div>
<div id="import-export-protocols" class="btn-group" role="group">
<a class="btn btn-default btn-open-file"
<div id="import-export-protocols" class="sci-btn-group" role="group">
<button class="btn btn-secondary btn-open-file"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
href="#"
<%= 'disabled' unless can_create_protocols_in_repository?(@current_team) %>>
<span class="fas fa-download"></span><span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span></a>
<span class="fas fa-download"></span><span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span></button>
<% if can_create_protocols_in_repository?(@current_team) %>
<ul class="dropdown-menu">
<li>
@ -81,27 +80,27 @@
</li>
</ul>
<% end %>
<a class="btn btn-default" data-action="export" data-export-url="<%= export_protocols_path() %>">
<button class="btn btn-secondary" data-action="export" data-export-url="<%= export_protocols_path() %>" disabled>
<span class="fas fa-upload"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.export") %></span>
</a>
</button>
</div>
<div class="btn-group" role="group">
<a class="btn btn-default" data-action="archive" data-url="<%= archive_protocols_path %>">
<div class="sci-btn-group" role="group">
<button class="btn btn-secondary" data-action="archive" data-url="<%= archive_protocols_path %>" disabled>
<span class="fas fa-archive"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.archive_action") %></span>
</a>
</button>
</div>
<% elsif @type == :archive %>
<div class="protocols-description">
<%= t("protocols.index.archive.description") %>
</div>
<div class="btn-group" role="group">
<a class="btn btn-default" data-action="restore" data-url="<%= restore_protocols_path %>">
<div class="sci-btn-group" role="group">
<button class="btn btn-secondary" data-action="restore" data-url="<%= restore_protocols_path %>" disabled>
<span class="fas fa-sync-alt"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.restore") %></span>
</a>
</button>
</div>
<% end %>

4
app/views/protocols/index/_create_new_modal.html.erb
View file

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

4
app/views/protocols/index/_protocol_preview_modal.html.erb
View file

@ -3,8 +3,8 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h2 class="modal-title" id="protocol-preview-modal-label">
</h2>
<h4 class="modal-title" id="protocol-preview-modal-label">
</h4>
</div>
<div class="modal-body"></div>
<div class="modal-footer"></div>

2
app/views/protocols/index/_protocol_preview_modal_body.html.erb
View file

@ -3,7 +3,7 @@
<div data-role="steps-container">
<div class="row">
<div class="col-xs-8">
<h2><%= t("protocols.steps.subtitle") %></h2>
<h4><%= t("protocols.steps.subtitle") %></h4>
</div>
</div>
<div id="steps">

2
app/views/protocols/index/_protocol_preview_modal_footer.html.erb
View file

@ -1,4 +1,4 @@
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.close" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.close" %></button>
<% if can_manage_protocol_in_repository?(@protocol) %>
<%= route_to_other_team_btn edit_protocol_path(protocol),
protocol.team,

8
app/views/reports/index.html.erb
View file

@ -14,11 +14,11 @@
<span class="fas fa-plus" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.new" %></span>
<% end %>
<%= link_to "", remote: true, class: "btn btn-default", id: "edit-report-btn" do %>
<%= link_to "", remote: true, class: "btn btn-secondary", id: "edit-report-btn" do %>
<span class="fas fa-pencil-alt" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.edit" %></span>
<% end %>
<%= link_to "", remote: true, class: "btn btn-default", id: "delete-reports-btn" do %>
<%= link_to "", remote: true, class: "btn btn-secondary", id: "delete-reports-btn" do %>
<span class="fas fa-times" aria-hidden="true"></span>
<span class="hidden-xs"><%=t "projects.reports.index.delete" %></span>
<% end %>
@ -97,9 +97,9 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button id="new-report-reports-btn"
class="btn btn-success"
class="btn btn-primary"
data-new-report-path="<%= @visible_projects.first.path if @visible_projects.first %>"
<%= 'disabled' unless @visible_projects&.length > 0 %>
><%=t 'projects.reports.index.modal_new.create' %></button>

8
app/views/reports/new.html.erb
View file

@ -50,8 +50,8 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="add" class="btn btn-success"><%=t "projects.reports.elements.modals.add" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="add" class="btn btn-primary"><%=t "projects.reports.elements.modals.add" %></button>
</div>
</div>
</div>
@ -67,8 +67,8 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="save" class="btn btn-success"><%=t "projects.reports.elements.modals.save_report.save" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" data-action="save" class="btn btn-primary"><%=t "projects.reports.elements.modals.save_report.save" %></button>
</div>
</div>
</div>

12
app/views/reports/new/_report_navigation.html.erb
View file

@ -2,7 +2,7 @@
<div class="center-block" id="report-menu">
<div class="dropdown" id="sort-report">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="fas fa-sort visible-xs-inline"></span>
<span class="hidden-xs"><%= t'projects.reports.new.nav_sort_by' %></span>
<span class="caret"></span>
@ -13,14 +13,14 @@
</ul>
</div>
<%= link_to "", class: "btn btn-default", remote: true, id: "print-report" do %>
<%= link_to "", class: "btn btn-secondary", remote: true, id: "print-report" do %>
<span class="fas fa-print"></span>
<span class="hidden-xs"><%=t "projects.reports.new.nav_print" %></span>
<% end %>
<div class="dropdown" id="download-report">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="fas fa-download"></span>
<span class="hidden-xs"><%= t("projects.reports.new.nav_download") %><span>
<span class="caret"></span>
@ -33,17 +33,17 @@
<button
onclick="$('#savePDFtoInventory').modal('show')"
class="btn btn-default">
class="btn btn-secondary">
<span class="fas fa-save">
</span>
<%=t 'projects.reports.new.save_PDF_to_inventory'%>
</button>
<div class="pull-right">
<%= link_to reports_path, data: { no_turbolink: false }, id: "cancel-report-link", class: "btn btn-default" do %>
<%= link_to reports_path, data: { no_turbolink: false }, id: "cancel-report-link", class: "btn btn-secondary" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_close" %></span>
<% end %>
<%= link_to "", class: "btn btn-success", remote: true, id: "save-report-link" do %>
<%= link_to "", class: "btn btn-primary", remote: true, id: "save-report-link" do %>
<span class="hidden-xs"><%=t "projects.reports.new.nav_save" %></span>
<% end %>
</div>

2
app/views/reports/new/_save_PDF_to_inventory_modal.html.erb
View file

@ -41,7 +41,7 @@
<div class="save-PDF-to-inventory-alerts" id="save-PDF-to-inventory-warnings"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
<% if @available_repositories && @available_repositories.length > 0 %>
<button
id="savePDFtoInventorySubmit"

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

@ -11,11 +11,11 @@
<% end %>
<hr>
<div class="align-right">
<button type="button" class="btn btn-default cancel-edit">
<button type="button" class="btn btn-secondary cancel-edit">
<%= t("general.cancel")%>
</button>
<%= f.submit t("general.save"),
class: 'btn btn-success save-result',
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.FILE);" %>
</div>
<% end %>

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

@ -22,10 +22,10 @@
<br />
<div class="align-right">
<%= f.submit t('general.cancel'),
class: 'btn btn-default cancel-new',
class: 'btn btn-secondary cancel-new',
onclick: 'DragNDropResults.destroyAll();' %>
<%= f.submit t('result_assets.new.create'),
class: 'btn btn-success save-result',
class: 'btn btn-primary save-result',
onclick: 'DragNDropResults.processResult(event);',
disabled: true,
data: { href: my_module_result_assets_path(format: :json) } %>

4
app/views/result_tables/_edit.html.erb
View file

@ -12,11 +12,11 @@
</div>
<hr>
<div class="align-right">
<button type="button" class="btn btn-default cancel-edit">
<button type="button" class="btn btn-secondary cancel-edit">
<%= t("general.cancel")%>
</button>
<%= f.submit t("general.save"),
class: 'btn btn-success save-result',
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TABLE);" %>
</div>
<% end %>

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

@ -11,11 +11,11 @@
<% end %>
</div>
<div class="align-right">
<button type="button" class="btn btn-default cancel-new">
<button type="button" class="btn btn-secondary cancel-new">
<%= t("general.cancel")%>
</button>
<%= f.submit t("result_tables.new.create"),
class: 'btn btn-success save-result',
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TABLE);" %>
</div>
<% end %>

4
app/views/result_texts/_edit.html.erb
View file

@ -14,11 +14,11 @@
last_updated: @result.updated_at.to_i * 1000 }) %>
<% end %><br />
<div class="align-right">
<button type="button" class="btn btn-default cancel-edit">
<button type="button" class="btn btn-secondary cancel-edit">
<%= t("general.cancel")%>
</button>
<%= f.submit t("general.save"),
class: 'btn btn-success save-result',
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TEXT);" %>
</div>
<% end %>

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

@ -13,11 +13,11 @@
last_updated: @result.updated_at.to_i * 1000 }) %>
<% end %><br />
<div class="align-right">
<button type="button" class="btn btn-default cancel-new">
<button type="button" class="btn btn-secondary cancel-new">
<%= t("general.cancel")%>
</button>
<%= f.submit t("result_texts.new.create"),
class: 'btn btn-success save-result',
class: 'btn btn-primary save-result',
onclick: "Results.processResult(event, Results.ResultTypeEnum.TEXT);" %>
</div>
<% end %>

6
app/views/shared/_invite_users_modal.html.erb
View file

@ -115,12 +115,12 @@ invite_to_team = type.in?(%w(invite_to_team invite_to_team_with_role))
<div class="modal-footer">
<div data-role="step-form">
<button type="button" class="btn btn-default" data-dismiss="modal">
<button type="button" class="btn btn-secondary" data-dismiss="modal">
<%= t('general.cancel') %>
</button>
<!-- Invite buttons -->
<button type="button" class="btn btn-success help_tooltips"
<button type="button" class="btn btn-primary help_tooltips"
data-tooltiplink="<%= I18n.t('tooltips.link.invite_to_sci') %>"
data-tooltipcontent="<%= I18n.t('tooltips.text.invite_to_sci') %>"
data-role="invite-btn" data-action="invite"
@ -129,7 +129,7 @@ invite_to_team = type.in?(%w(invite_to_team invite_to_team_with_role))
</button>
<div class="btn-group" data-role="invite-with-role-div">
<button type="button" class="btn btn-success dropdown-toggle help_tooltips"
<button type="button" class="btn btn-primary dropdown-toggle help_tooltips"
data-tooltiplink="<%= I18n.t('tooltips.link.invite_to_sci') %>"
data-tooltipcontent="<%= I18n.t('tooltips.text.invite_to_sci') %>"
data-toggle="dropdown" data-id="invite-btn" aria-haspopup="true"

2
app/views/shared/_navigation.html.erb
View file

@ -10,7 +10,7 @@
<span class="icon-bar"></span>
</button>
<%= link_to(root_path, class: 'navbar-brand', title: t('nav.label.scinote')) do %>
<%= image_tag('/images/scinote_icon.jpg', id: 'logo') %>
<%= image_tag('/images/scinote_icon.svg', id: 'logo') %>
<% end %>
</div>

14
app/views/shared/_secondary_navigation.html.erb
View file

@ -43,15 +43,11 @@
<li>
<ul class="list-unstyled">
<li>
<div class="btn-group projects-view-mode-switch" data-toggle="buttons">
<a class="btn btn-toggle active" href="#projects-cards-view" data-toggle="tab" data-mode="cards">
<input type="radio" name="projects-view-mode-selector" value="cards">
<i class="fas fa-th-large"></i>
</a>
<a class="btn btn-toggle" href="#projects-table-view" data-toggle="tab" data-mode="table">
<input type="radio" name="projects-view-mode-selector" value="table">
<i class="fas fa-th-list"></i>
</a>
<div class="projects-view-mode-switch sci-toggles-group" data-toggle="buttons">
<input type="radio" name="projects-view-mode-selector" value="cards" class="sci-toggle-item" checked>
<a href="#projects-cards-view" data-toggle="tab" data-mode="cards" class="sci-toggle-item-label"><i class="fas fa-th-large"></i></a>
<input type="radio" name="projects-view-mode-selector" class="sci-toggle-item">
<a class="sci-toggle-item-label" href="#projects-table-view" data-toggle="tab" data-mode="table"><i class="fas fa-th-list"></i></a>
</div>
</li>
</ul>

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

@ -3,10 +3,10 @@
<h4><%= t("protocols.steps.edit.edit_step_title") %></h4>
<%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
<div class="align-right">
<a type="button" data-action="cancel-edit" class="btn btn-default" href="<%= step_path(id: @step, format: :json) %>" data-remote="true">
<a type="button" data-action="cancel-edit" class="btn btn-secondary" href="<%= step_path(id: @step, format: :json) %>" data-remote="true">
<%= t("general.cancel")%>
</a>
<%= f.submit t("protocols.steps.edit.edit_step"), class: 'btn btn-success step-save', onclick: "processStep(event, true);" %>
<%= f.submit t("protocols.steps.edit.edit_step"), class: 'btn btn-primary step-save', onclick: "processStep(event, true);" %>
</div>
<% end %>
</div>

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

@ -3,10 +3,10 @@
<h4><%= t("protocols.steps.new.add_step_title") %></h4>
<%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
<div class="align-right">
<button type="button" data-action="cancel-new" class="btn btn-default">
<button type="button" data-action="cancel-new" class="btn btn-secondary">
<%= t("general.cancel")%>
</button>
<%= f.submit t("protocols.steps.new.add_step"), class: 'btn btn-success step-save', onclick: "processStep(event, false);" %>
<%= f.submit t("protocols.steps.new.add_step"), class: 'btn btn-primary step-save', onclick: "processStep(event, false);" %>
</div>
<% end %>
</div>

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

@ -9,7 +9,7 @@
<div data-action="uncomplete-step"
class="complete-step-btn"
data-link-url="<%= toggle_step_state_step_path(step)%>">
<button class="btn btn-default">
<button class="btn btn-secondary">
<span class="fas fa-times"></span>
<%= t("protocols.steps.options.uncomplete_title") %>
</button>
@ -18,7 +18,7 @@
<div data-action="complete-step"
class="complete-step-btn"
data-link-url="<%= toggle_step_state_step_path(step)%>">
<button class="btn btn-toggle">
<button class="btn btn-secondary">
<span class="fas fa-check"></span>
<%= t("protocols.steps.options.complete_title") %>
</button>
@ -29,25 +29,25 @@
<% if (can_manage_protocol_in_module?(@protocol) ||
can_manage_protocol_in_repository?(@protocol)) && !(preview) %>
<a data-action="move-step"
class="btn btn-link"
class="btn btn-light icon-btn"
href="<%= move_up_step_path(step, format: :json) %>"
title="<%= t("protocols.steps.options.up_arrow_title") %>"
data-remote="true">
<span class="fas fa-arrow-up"></span></a>
<a data-action="move-step"
class="btn btn-link"
class="btn btn-light icon-btn"
href="<%= move_down_step_path(step, format: :json) %>"
title="<%= t("protocols.steps.options.down_arrow_title") %>"
data-remote="true">
<span class="fas fa-arrow-down"></span></a>
<a data-action="edit-step"
class="btn btn-link"
class="btn btn-light icon-btn"
title="<%= t("protocols.steps.options.edit_title") %>"
href="<%= edit_step_path(step, format: :json) %>"
data-remote="true" >
<span class="fas fa-pencil-alt"></span>
</a>
<%= link_to(step_path(step), title: t("protocols.steps.options.delete_title"), method: "delete", class: "btn btn-link",
<%= link_to(step_path(step), title: t("protocols.steps.options.delete_title"), method: "delete", class: "btn btn-light icon-btn",
data: {action: "delete-step", confirm: t("protocols.steps.destroy.confirm", step: step.name)}) do %>
<span class="fas fa-trash-alt"></span>
<% end %>

2
app/views/users/shared/_user_avatars_modal.html.erb
View file

@ -32,7 +32,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary save-button disabled"><%= t('general.save') %></button>
<button type="button" disabled class="btn btn-primary save-button"><%= t('general.save') %></button>
</div>
</div>
</div>

5
public/images/scinote_icon.svg Normal file
View file

@ -0,0 +1,5 @@
<svg width="202" height="40" viewBox="0 0 202 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M186.738 0H199.399C200.452 0 201.306 0.85327 201.306 1.90576V15.6806L186.738 0Z" fill="#104DA9"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M133.795 35.4726C135.312 34.6027 136.497 33.3676 137.35 31.764C138.202 30.1612 138.629 28.3367 138.629 26.2903C138.629 24.244 138.202 22.4202 137.35 20.8166C136.497 19.2138 135.312 17.9779 133.795 17.1081C132.277 16.239 130.563 15.8038 128.653 15.8038C126.743 15.8038 125.03 16.239 123.513 17.1081C121.995 17.9779 120.801 19.2138 119.932 20.8166C119.062 22.4202 118.628 24.244 118.628 26.2903C118.628 28.3367 119.062 30.1612 119.932 31.764C120.801 33.3676 121.995 34.6027 123.513 35.4726C125.03 36.3416 126.743 36.7776 128.653 36.7776C130.563 36.7776 132.277 36.3416 133.795 35.4726ZM121.645 38.2346C119.564 37.0588 117.928 35.4305 116.735 33.3503C115.54 31.2701 114.944 28.9163 114.944 26.2903C114.944 23.6644 115.54 21.3113 116.735 19.2304C117.928 17.1509 119.564 15.5309 121.645 14.3709C123.725 13.2124 126.061 12.632 128.653 12.632C131.245 12.632 133.581 13.2124 135.662 14.3709C137.742 15.5309 139.371 17.1509 140.547 19.2304C141.724 21.3113 142.312 23.6644 142.312 26.2903C142.312 28.9163 141.724 31.2701 140.547 33.3503C139.371 35.4305 137.742 37.0588 135.662 38.2346C133.581 39.4111 131.245 39.9998 128.653 39.9998C126.061 39.9998 123.725 39.4111 121.645 38.2346ZM162.849 38.107C162.166 38.7212 161.323 39.1903 160.317 39.5144C159.311 39.8376 158.262 40 157.171 40C154.647 40 152.703 39.3189 151.339 37.9537C149.975 36.5899 149.294 34.6631 149.294 32.1732V15.9055H144.484V12.836H149.294V6.95403H152.925V12.836H161.11V15.9055H152.925V31.9687C152.925 33.5723 153.325 34.7909 154.127 35.6261C154.928 36.4629 156.079 36.8786 157.58 36.8786C158.33 36.8786 159.055 36.7606 159.754 36.5208C160.453 36.2832 161.058 35.9419 161.57 35.4983L162.849 38.107ZM172.214 18.2336C170.457 19.8882 169.46 22.0451 169.221 24.7049H188.302C188.063 22.0451 187.066 19.8882 185.31 18.2336C183.553 16.5804 181.362 15.7527 178.737 15.7527C176.144 15.7527 173.97 16.5804 172.214 18.2336ZM191.73 27.4158H169.221C169.426 30.2124 170.5 32.4715 172.444 34.1939C174.388 35.9162 176.844 36.7777 179.811 36.7777C181.481 36.7777 183.016 36.4793 184.415 35.8816C185.812 35.2862 187.024 34.4074 188.047 33.2474L190.092 35.6012C188.899 37.0333 187.407 38.1249 185.617 38.8744C183.826 39.6255 181.857 39.9999 179.709 39.9999C176.946 39.9999 174.498 39.4112 172.368 38.2347C170.236 37.0589 168.573 35.4298 167.38 33.3504C166.186 31.2702 165.59 28.9164 165.59 26.2904C165.59 23.6644 166.16 21.3114 167.304 19.2304C168.446 17.151 170.015 15.5309 172.01 14.3709C174.004 13.2124 176.247 12.6321 178.737 12.6321C181.226 12.6321 183.459 13.2124 185.438 14.3709C187.415 15.5309 188.967 17.142 190.092 19.2056C191.218 21.2693 191.781 23.6299 191.781 26.2904L191.73 27.4158ZM110.261 3.93579V39.7445H107.14L84.1208 10.6883V39.7445H80.3348V3.93579H83.4555L106.526 32.9921V3.93579H110.261Z" fill="#231F20"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.27961 38.7182C3.67319 37.9619 1.58024 36.9778 0 35.7674L2.77407 29.6141C4.2874 30.7238 6.08565 31.6154 8.17109 32.2875C10.2558 32.9603 12.3405 33.2956 14.4251 33.2956C16.7451 33.2956 18.4607 32.9513 19.5703 32.2619C20.6799 31.5733 21.2348 30.6569 21.2348 29.5134C21.2348 28.6729 20.9062 27.9753 20.2507 27.4204C19.5951 26.8656 18.7539 26.4198 17.7292 26.083C16.703 25.7477 15.316 25.3771 13.5681 24.9734C10.8775 24.3359 8.67553 23.6961 6.96073 23.0571C5.24592 22.4188 3.77468 21.3927 2.54703 19.9808C1.31937 18.5682 0.705921 16.6858 0.705921 14.3312C0.705921 12.2811 1.26073 10.4227 2.37036 8.75826C3.47999 7.09383 5.1527 5.77445 7.38924 4.79864C9.62503 3.82434 12.357 3.33568 15.5859 3.33568C17.8382 3.33568 20.0402 3.60557 22.1925 4.14309C24.3441 4.68136 26.2281 5.45419 27.8414 6.46308L25.3199 12.6675C22.058 10.8181 18.796 9.8927 15.5348 9.8927C13.2479 9.8927 11.5579 10.2633 10.4663 11.0023C9.37243 11.7428 8.82664 12.7171 8.82664 13.9275C8.82664 15.1386 9.45739 16.0385 10.7181 16.6264C11.9796 17.215 13.9034 17.7954 16.4933 18.366C19.1832 19.0058 21.3859 19.6448 23.1007 20.283C24.8155 20.9221 26.286 21.9309 27.5144 23.3097C28.7413 24.6885 29.3547 26.5551 29.3547 28.9082C29.3547 30.9252 28.7916 32.7663 27.6647 34.4308C26.5386 36.0952 24.8486 37.4153 22.5962 38.3904C20.3432 39.3647 17.6029 39.8526 14.3748 39.8526C11.5834 39.8526 8.88528 39.4745 6.27961 38.7182ZM39.7191 37.8607C37.4157 36.6676 35.6167 35.0115 34.3229 32.8929C33.0275 30.7744 32.381 28.3702 32.381 25.6796C32.381 22.9905 33.0275 20.5856 34.3229 18.467C35.6167 16.3485 37.4157 14.6931 39.7191 13.4993C42.0218 12.3062 44.62 11.7085 47.5121 11.7085C50.3696 11.7085 52.8663 12.3062 55.0021 13.4993C57.1371 14.6931 58.6918 16.3989 59.6676 18.6182L53.5647 21.8974C52.1521 19.409 50.117 18.1641 47.4617 18.1641C45.4101 18.1641 43.7118 18.8377 42.3669 20.1826C41.022 21.5275 40.3499 23.3596 40.3499 25.6796C40.3499 27.9996 41.022 29.8332 42.3669 31.1774C43.7118 32.5231 45.4101 33.1952 47.4617 33.1952C50.1508 33.1952 52.1851 31.9517 53.5647 29.4626L59.6676 32.7922C58.6918 34.9438 57.1371 36.6248 55.0021 37.8351C52.8663 39.0463 50.3696 39.6514 47.5121 39.6514C44.62 39.6514 42.0218 39.0545 39.7191 37.8607ZM64.2064 39.7731H72.0745V12.6376H64.2064V39.7731ZM64.6094 7.59316C63.702 6.75342 63.2479 5.7107 63.2479 4.46651C63.2479 3.22231 63.702 2.18034 64.6094 1.3391C65.5175 0.498614 66.6948 0.0783691 68.1405 0.0783691C69.5861 0.0783691 70.7634 0.482075 71.6708 1.28873C72.579 2.09539 73.033 3.10428 73.033 4.31465C73.033 5.6265 72.579 6.71132 71.6708 7.56835C70.7634 8.42538 69.5861 8.85464 68.1405 8.85464C66.6948 8.85464 65.5175 8.4344 64.6094 7.59316Z" fill="#104DA9"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB