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

Merge branch 'develop' into ai-sci-4380-saving-navigation-state

Browse source
This commit is contained in:
aignatov-bio 2020-02-28 14:14:08 +01:00
commit 6dcb8be849
4 changed files with 28 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/partials/_tree_view.scss
View file

@ -24,6 +24,11 @@
height: 50px; height: 50px;
position: relative; position: relative;
.btn-secondary {
background: transparent;
margin-left: 20px;
}
.tree-toggle { .tree-toggle {
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;

56
app/assets/stylesheets/repository/repository_table.scss
View file

@ -6,13 +6,6 @@
.repository-table { .repository-table {
margin-top: 20px; margin-top: 20px;
&.editing {
tbody>tr.blocked {
opacity: .4;
pointer-events: none;
}
}
.dataTables_filter { .dataTables_filter {
float: right; float: right;
} }
@ -32,28 +25,28 @@
// Assigned // Assigned
.assigned-column { .assigned-column {
padding: 1px 8px;
position: relative; position: relative;
.fas {
line-height: 35px;
text-align: center;
width: 30px;
}
.repository-row-edit-icon { .repository-row-edit-icon {
cursor: pointer; cursor: pointer;
display: none; display: none;
width: 30px;
}
.repository-row-lock-icon {
width: 30px;
} }
.assign-counter-container { .assign-counter-container {
border-radius: $border-radius-tag; border-radius: $border-radius-tag;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
height: calc(100% - 2px); line-height: 35px;
margin-left: 30px;
padding-top: 7px;
position: absolute; position: absolute;
top: 1px; right: 0;
width: calc(100% - 38px); width: calc(100% - 40px);
.assign-counter { .assign-counter {
margin-left: 5px; margin-left: 5px;
@ -69,7 +62,7 @@
} }
.circle-icon { .circle-icon {
margin-left: 30px; margin: 9px 30px;
} }
} }
@ -206,40 +199,31 @@
.repository-row-edit-icon { .repository-row-edit-icon {
display: inline-block; display: inline-block;
} }
.assign-counter-container,
.circle-icon {
margin-left: 0;
}
} }
} }
.editing { .editing {
border: 1px solid; border: 1px solid;
} }
tr[data-editable=false] {
.assign-counter-container {
margin-left: 0;
}
}
}
table[data-editable=false] {
.assign-counter-container {
margin-left: 30px !important;
}
} }
&.editing { &.editing {
tbody { tbody {
tr.blocked {
opacity: .4;
pointer-events: none;
}
tr:hover { tr:hover {
.assigned-column { .assigned-column {
.repository-row-edit-icon { .repository-row-edit-icon {
display: none; display: none;
} }
.assign-counter-container, .assign-counter-container {
background-color: transparent;
}
.circle-icon { .circle-icon {
margin-left: 30px; margin-left: 30px;
} }

2
app/assets/stylesheets/shared/dropdown_selector.scss
View file

@ -119,7 +119,7 @@
transition: .2s; transition: .2s;
transition-property: top, bottom, box-shadow; transition-property: top, bottom, box-shadow;
width: 100%; width: 100%;
z-index: 10; z-index: 100;
.empty-dropdown { .empty-dropdown {
opacity: .6; opacity: .6;

4
app/views/repositories/_sidebar.html.erb
View file

@ -5,9 +5,9 @@
<% if can_create_repositories?(current_team) %> <% if can_create_repositories?(current_team) %>
<li class="branch"> <li class="branch">
<span class="tree-link no-indent"> <span class="tree-link no-indent">
<a class="sidebar-button create-new-repository" data-remote="true" <a class="btn btn-secondary create-new-repository" data-remote="true"
href="<%= create_modal_team_repositories_path(current_team) %>"> href="<%= create_modal_team_repositories_path(current_team) %>">
<span class="fas fa-plus"></span> <i class="fas fa-plus"></i>
<%= t('libraries.index.no_libraries.create_new_button') %> <%= t('libraries.index.no_libraries.create_new_button') %>
</a> </a>
</span> </span>