Skip to content

Commit 4be68a8

Browse files
Merge branch 'develop' into dependabot/pip/src/pip-2f4f9e11c7
2 parents dd3f558 + 9b350a5 commit 4be68a8

File tree

13 files changed

+249
-145
lines changed

13 files changed

+249
-145
lines changed

RELEASE_NOTES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati
44

55
This is built on the Jupyter Notebook v6.5.7 and IPython 8.28.x (more notes will follow).
66

7-
## Unreleased
7+
## Version 5.4.3
8+
URO-363 - add note to the sharing panel to contact KBase about DOIs
89

910
- Python `requirements-general.txt` and `requirements.txt` merged into a single file so that all runtime deps are installed in one place.
1011

kbase-extension/scss/all_concat.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
@import "partials/renderJSON";
6060
@import "partials/reportViewer";
6161
@import "partials/select2";
62+
@import "partials/sharePanel";
6263
@import "partials/stagingTable";
6364
@import "partials/ui";
6465
@import "partials/userMenu";
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
.kb-share-panel {
2+
text-align: center;
3+
4+
// .kb-share-panel__global_read_status
5+
&__global_read_icon {
6+
margin-right: 10px;
7+
}
8+
9+
// .kb-share-panel__global_read_status
10+
&__global_read_status {
11+
margin: 5px;
12+
padding: 10px;
13+
}
14+
15+
// .kb-share-panel__my_access
16+
&__my_access {
17+
margin: 20px 5px 5px;
18+
}
19+
20+
// .kb-share-panel__tabs
21+
&__tabs {
22+
margin: 0px 5px;
23+
24+
&__share {
25+
width: 50%;
26+
display: inline-block;
27+
padding: 10px;
28+
border: solid;
29+
border-width: 1px 1px 0px;
30+
cursor: pointer;
31+
background-color: #d8d8d8;
32+
border-bottom: 1px solid;
33+
padding-bottom: 9px;
34+
}
35+
36+
.left {
37+
border-top-left-radius: 2px;
38+
border-right: none;
39+
}
40+
41+
.right {
42+
border-top-right-radius: 2px;
43+
}
44+
45+
.selected {
46+
background-color: white;
47+
border-bottom: none;
48+
padding-bottom: 10px;
49+
}
50+
51+
&__content {
52+
border: solid;
53+
border-width: 0px 1px 1px 1px;
54+
border-radius: 0px 0px 2px 2px;
55+
padding: 25px 15px 15px;
56+
margin: 0px 5px;
57+
58+
.select2-selection--single {
59+
min-height: 32px;
60+
}
61+
62+
.select2-container {
63+
margin-left: 5px;
64+
margin-right: 5px;
65+
}
66+
}
67+
}
68+
69+
&__btn_apply_orgs {
70+
margin-left: 10px;
71+
}
72+
73+
&__orgs_table {
74+
border: 1px solid rgb(170, 170, 170);
75+
border-radius: 4px;
76+
text-align: left;
77+
width: 51%;
78+
padding: 10px;
79+
margin: auto;
80+
margin-top: 10px;
81+
}
82+
83+
&__org_owner_message {
84+
margin-top: 18px;
85+
}
86+
87+
&__org_icon {
88+
width: 40px;
89+
margin: 8px;
90+
}
91+
92+
&__shared_users_table {
93+
margin-top: 15px;
94+
max-height: 250px;
95+
overflow-y: auto;
96+
overflow-x: hidden;
97+
display: flex;
98+
justify-content: center;
99+
100+
tr {
101+
.user_icon {
102+
text-align: left;
103+
104+
}
105+
.user_name {
106+
text-align: left;
107+
padding: 6px 4px 4px;
108+
}
109+
.user_perm_select {
110+
text-align: right;
111+
}
112+
.user_remove_btn {
113+
text-align: left;
114+
}
115+
}
116+
}
117+
118+
&__share_user_selected {
119+
width: 100%;
120+
121+
&__name {
122+
white-space: normal;
123+
}
124+
}
125+
126+
// these two are used to override Select2 template selection text.
127+
&__wrap {
128+
white-space: normal;
129+
}
130+
131+
&__nowrap {
132+
white-space: nowrap;
133+
}
134+
}

kbase-extension/static/kbase/css/all_concat.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kbase-extension/static/kbase/css/all_concat.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kbase-extension/static/kbase/css/all_concat.css.map.orig

Lines changed: 5 additions & 0 deletions
Large diffs are not rendered by default.

kbase-extension/static/kbase/css/all_concat.css.orig

Lines changed: 5 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)