Merge pull request #2382 from mlorb/ml-sci-4283

Implement missing style guide changes [SCI-4283]
This commit is contained in:
mlorb 2020-02-04 09:37:48 +01:00 committed by GitHub
commit 415abf8968
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 32 deletions

View file

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

View file

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

View file

@ -142,9 +142,6 @@ $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;

View file

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

View file

@ -7,16 +7,6 @@
$color-group-hover: $color-alabaster; $color-group-hover: $color-alabaster;
$color-module-hover: $brand-primary; $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 { #sortMenu {
border-color: $color-white; border-color: $color-white;
@ -32,13 +22,6 @@ $color-module-hover: $brand-primary;
/* Secondary navigation */ /* Secondary navigation */
.navbar-nav { .navbar-nav {
.btn-group .btn-toggle:not(.active) {
background-color: $color-white;
border-color: $color-silver;
color: $color-emperor;
}
.projects-view-mode-switch { .projects-view-mode-switch {
margin: 8px 10px 12px; margin: 8px 10px 12px;
} }

View file

@ -5,6 +5,7 @@ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-lato; $font-family-base: $font-family-lato;
$font-family-icons: "Font Awesome 5 Free"; $font-family-icons: "Font Awesome 5 Free";
$font-size-base: 16px; $font-size-base: 16px;
$headings-font-weight: bold;
$font-size-h1: 24px; $font-size-h1: 24px;
$font-size-h2: 18px; $font-size-h2: 18px;
@ -52,9 +53,6 @@ $font-fas-exclamation-circle: "\f06a";
font-weight: 501; font-weight: 501;
} }
// $font-size-large: ceil(($font-size-base * 1.1)); //16px // $font-size-large: ceil(($font-size-base * 1.1)); //16px
// $font-size-small: ceil(($font-size-base * .9)); //13px // $font-size-small: ceil(($font-size-base * .9)); //13px
// $font-size-h1: floor(($font-size-base * 2.6)); //36px // $font-size-h1: floor(($font-size-base * 2.6)); //36px

View file

@ -30,7 +30,20 @@ table {
} }
.btn-toggle { .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 { #no-teams-jumbotron {

View file

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

View file

@ -14,7 +14,7 @@
<div id="show-assigned-buttons" class="btn-group repository-assign-group" data-toggle="buttons"> <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="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>
<div class="repo-datatables-buttons pull-right" style="display: inline;"> <div class="repo-datatables-buttons pull-right" style="display: inline;">

View file

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

View file

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