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

Implement missing style guide changes

Browse source
This commit is contained in:
Mojca Lorber 2020-01-31 14:11:37 +01:00
parent c8cf47823b
commit e70bc67146
11 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/repositories/repository_datatable.js
View file

@ -638,9 +638,8 @@ var RepositoryDatatable = (function(global) {
global.onClickToggleAssignedRecords = function() {
$('.repository-assign-group > .btn').click(function() {
$('.btn-group > .btn').removeClass('active btn-toggle');
$('.btn-group > .btn').addClass('btn-default');
$(this).addClass('active btn-toggle');
$('.btn-group > .btn').removeClass('active');
$(this).addClass('active');
});
$('#assigned-repo-records').on('click', function() {

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

@ -731,6 +731,7 @@ var dropdownSelector = (function() {
$.get(selector.data('ajax-url'), ajaxParams, (data) => {
loadData(selector, container, data);
PerfectSb().update_all();
});
// For local options we convert options element from select to correct array
} else if (selector.data('select-by-group')) {

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

@ -142,9 +142,6 @@ $btn-warning-border: darken($btn-warning-bg, 5%);
$btn-danger-color: $color-white;
$btn-danger-bg: $brand-danger;
$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-border-radius-base: $border-radius-base;
$btn-border-radius-large: $border-radius-large;

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

@ -309,8 +309,8 @@
width: 100%;
.title {
@include font-small;
float: left;
font-size: 16px;
line-height: 20px;
margin-bottom: 5px;
width: calc(100% - 50px);

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

@ -7,16 +7,6 @@
$color-group-hover: $color-alabaster;
$color-module-hover: $brand-primary;
#new-project-modal,
#edit-project-modal,
#copy-to-repository-modal {
.btn-group label.btn-toggle:not(.active) {
background-color: $color-white;
border-color: $color-silver;
color: $color-emperor;
}
}
#sortMenu {
border-color: $color-white;
@ -32,13 +22,6 @@ $color-module-hover: $brand-primary;
/* Secondary navigation */
.navbar-nav {
.btn-group .btn-toggle:not(.active) {
background-color: $color-white;
border-color: $color-silver;
color: $color-emperor;
}
.projects-view-mode-switch {
margin: 8px 10px 12px;
}

4
app/assets/stylesheets/shared_styles/constants/fonts.scss
View file

@ -5,6 +5,7 @@ $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;
$headings-font-weight: bold;
$font-size-h1: 24px;
$font-size-h2: 18px;
@ -52,9 +53,6 @@ $font-fas-exclamation-circle: "\f06a";
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

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

@ -30,7 +30,20 @@ table {
}
.btn-toggle {
@include button-variant($btn-toggle-color, $btn-toggle-bg, $btn-toggle-border);
background: $color-white;
border: $border-default;
color: $color-volcano;
&.active {
background: $brand-primary;
border: 1px solid $brand-primary;
box-shadow: none;
color: $color-white;
&.focus {
outline: 0;
}
}
}
#no-teams-jumbotron {

2
app/views/assets/wopi/_create_wopi_file_modal.html.erb
View file

@ -55,7 +55,7 @@
<div class='col-md-4'></div>
<div class='col-md-4' id='submit-btn-cont'>
<%= f.submit t('assets.create_wopi_file.create_document_button'),
class: 'btn btn-toggle' %>
class: 'btn btn-primary' %>
</div>
</div>
</div>

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

@ -14,7 +14,7 @@
<div id="show-assigned-buttons" class="btn-group repository-assign-group" data-toggle="buttons">
<button type="button" class="active btn btn-toggle" id="assigned-repo-records"><%= t("repositories.view_assigned_records") %></button>
<button type="button" class="btn btn-default" id="all-repo-records"><%= t("repositories.view_all_records") %></button>
<button type="button" class="btn btn-toggle" id="all-repo-records"><%= t("repositories.view_all_records") %></button>
</div>
<div class="repo-datatables-buttons pull-right" style="display: inline;">

2
app/views/users/registrations/new.html.erb
View file

@ -1,7 +1,7 @@
<% provide(:head_title, t('users.registrations.new.head_title')) %>
<div class="center-block center-block-narrow">
<h2>Sign up</h2>
<h1><%= t 'users.registrations.new.head_title' %></h1>
<div data-hook="sign-up-form-hook">
<%= form_for(:user, as: resource_name, url: registration_path(resource_name), html: { id: "sign-up-form" } ) do |f| %>

2
app/views/users/sessions/new.html.erb
View file

@ -1,7 +1,7 @@
<% provide(:head_title, t("devise.sessions.new.head_title")) %>
<div class="center-block center-block-narrow">
<h2><%=t "devise.sessions.new.title" %></h2>
<h1><%=t "devise.sessions.new.title" %></h1>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="input-group">