diff --git a/.hound.yml b/.hound.yml index 079bcf510..9101758bf 100644 --- a/.hound.yml +++ b/.hound.yml @@ -3,7 +3,7 @@ ruby: eslint: enabled: true - config_file: .eslintrc.json + config_file: app/assets/.eslintrc.json scss: config_file: .scss-lint.yml diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 0d40731bb..68cb915ad 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -623,8 +623,6 @@ ul.double-line > li { color: $brand-primary; } -#projects-index, -#project-archive, #project-show, #experiment-archive, #module-archive, @@ -651,15 +649,26 @@ ul.double-line > li { } .panel-project { + box-shadow: 0 3px 6px $color-alto; color: $color-silver-chalice; + &:not(.selected) .panel-heading .project-card-selector, + &:not(.selected) .panel-heading .dropdown { + display: none; + } + + &:not(.selected):hover .project-card-selector, + &:not(.selected):hover .dropdown { + display: block; + } + .nav .btn-link { padding: 10px 5px; } &.selected { border-color: $brand-primary; - box-shadow: 0px 3px 10px $brand-primary !important; + box-shadow: 0 3px 10px $brand-primary; } &.archived { @@ -674,10 +683,12 @@ ul.double-line > li { .panel-heading { background-color: $color-white; + border-top-left-radius: 4px; + border-top-right-radius: 4px; color: $color-silver-chalice; - .dropdown-toggle { - padding: 6px; + .fas { + margin-right: 10px; } } @@ -689,12 +700,25 @@ ul.double-line > li { } } - .panel-body .row { - padding: 5px; + .panel-body { + padding: 10px 15px; + + .row { + padding: 2px; + } } - .panel-footer .nav { - padding: 0 10px; + .panel-footer { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + + .nav { + padding: 0 10px; + } + + .nav-tabs { + border-bottom: 0; + } } } diff --git a/app/permissions/project.rb b/app/permissions/project.rb index c6aecbd83..74ec68e18 100644 --- a/app/permissions/project.rb +++ b/app/permissions/project.rb @@ -1,6 +1,7 @@ Canaid::Permissions.register_for(Project) do # Project must be active for all the specified permissions - %i(manage_project + %i(read_project + manage_project archive_project create_experiments create_comments_in_project diff --git a/app/views/projects/index/_project.html.erb b/app/views/projects/index/_project.html.erb index 956aadf0f..8b6877a09 100644 --- a/app/views/projects/index/_project.html.erb +++ b/app/views/projects/index/_project.html.erb @@ -11,29 +11,28 @@ -

+
+ <% if active %> - <%= link_to project.name, project_path(project), id: "#{project.id}-project-canvas-link" %> <% else %> - <%= project.name %> <% end %> -

+
<% if project.hidden? %>
- +
<%= t("projects.index.hidden") %>
<% else %>
- +