Merge pull request #963 from kbase/develop

Develop->Master (1.8.3)

Dockerfile

@@ -4,17 +4,9 @@
 FROM alpine:3.9 as builder
 
 # add deps for building kbase-ui
-RUN apk upgrade --update-cache --available \
-    && apk add --update --no-cache \
-    nodejs=10.14.2-r0 \
-    npm=10.14.2-r0 \
-    git=2.20.1-r0 \
-    make=4.2.1-r2 \
-    bash=4.4.19-r1 \
-    g++=8.2.0-r2 \
-    python2=2.7.15-r3 \
-    chromium=71.0.3578.98-r2 \
-    && mkdir -p /kb
+RUN apk upgrade --update-cache --available && \
+    apk add --update --no-cache bash chromium g++ git make nodejs npm python2 && \
+    mkdir -p /kb
 
 COPY ./package.json /kb
 WORKDIR /kb
@@ -38,12 +30,9 @@ LABEL stage=intermediate
 # ------------------------------
 FROM alpine:3.9
 
-RUN apk upgrade --update-cache --available \
-    && apk add --update --no-cache \
-    bash=4.4.19-r1 \
-    ca-certificates=20190108-r0 \
-    nginx=1.14.2-r0 \        
-    && mkdir -p /kb
+RUN apk upgrade --update-cache --available && \
+    apk add --update --no-cache bash ca-certificates nginx && \
+    mkdir -p /kb
 
 WORKDIR /kb
 

config/app/dev/plugins.yml

@@ -251,7 +251,7 @@ plugins:
       bower: {}
   - name: organizations
     globalName: kbase-ui-plugin-organizations
-    version: 0.15.67
+    version: 0.15.72
     cwd: src/plugin
     source:
       bower: {}

config/app/prod/plugins.yml

@@ -200,7 +200,7 @@ plugins:
       bower: {}
   - name: organizations
     globalName: kbase-ui-plugin-organizations
-    version: 0.15.67
+    version: 0.15.72
     cwd: src/plugin
     source:
       bower: {}

config/release.yml

@@ -6,4 +6,4 @@
 ---
 # Note that this file is merged into the master config in the release namespace.
 release:
-  version: 1.8.2
+  version: 1.8.3

release-notes/RELEASE_NOTES_1.8.3.md

@@ -0,0 +1,17 @@
+# KBase kbase-ui 1.8.3 Release Notes
+
+## CHANGES
+
+### NEW
+
+### REMOVED
+
+### UNRELEASED
+
+### IMPROVEMENTS
+
+### FIXES
+
+- orgs ui: ui improvements and fixes
+
+## Dependency Changes

release-notes/index.md

@@ -6,6 +6,7 @@
 
 | Version                           | Date       | Notes               |
 |-----------------------------------|------------|---------------------|
+| [1.8.3](RELEASE_NOTES_1.8.3.md) | 2019-02-23 |  |
 | [1.8.2](RELEASE_NOTES_1.8.2.md) | 2019-02-21 |  |
 | [1.8.1](RELEASE_NOTES_1.8.1.md) | 2019-02-20 |  |
 | [1.8.0](RELEASE_NOTES_1.8.0.md) | 2019-02-20 |  |

src/client/modules/app/styles/kb-ui.css

@@ -46,7 +46,6 @@
     font-style: normal;
 }
 
-
 /* H1 should only be used on the title area of the UI. The total height is 70px with 5px lower border, so the font size, 
    padding, and margin are arranged to center it vertically within this height.*/
 
@@ -59,7 +58,6 @@
     margin: 8px 0px;
 }
 
-
 /* H2 should be used for main panel titles. It may be used for the primary title for the panel, or if there 
    are multiple sub-panels or areas, for each of them. */
 
@@ -91,7 +89,6 @@
     font-size: 17px;
 }
 
-
 /*@media screen and (max-width: 768px){
     body{font-size: 12px;}
 }
@@ -113,6 +110,8 @@ i b {}
 body.kbase-ui {
     font-family: 'Oxygen', Arial, sans-serif;
     color: #333333;
+    /* for scrolling in older FF (<= 65) */
+    min-height: 0;
 }
 
 html,
@@ -146,7 +145,6 @@ hr.ws-hr {
     margin: 2px 10px 0 10px;
 }
 
-
 /* fix styling issues */
 
 #signin-button {
@@ -167,7 +165,6 @@ hr.ws-hr {
     text-decoration: none;
 }
 
-
 /*
  *  Slide-Down Notifications
 */
@@ -457,7 +454,6 @@ hr.ws-hr {
     margin: 10px 0 0 0;
 }
 
-
 /*
  *  Narrative Pages
 */
@@ -542,7 +538,6 @@ hr.ws-hr {
     margin: 0 3px 0 0;
 }
 
-
 /*
  * text overflow 
 */
@@ -561,7 +556,6 @@ hr.ws-hr {
     overflow: hidden;
 }
 
-
 /* custom checkboxes (prototyped) */
 
 .ncheck {
@@ -614,7 +608,6 @@ hr.ws-hr {
     margin: 7px 0 0 20px;
 }
 
-
 /******************	narrative     ***************/
 
 #login-form {
@@ -765,14 +758,12 @@ hr.ws-hr {
     margin: 10px 0 0 50px;
 }
 
-
 /* provide underlines in prettyprinted links */
 
 .prettyprinted a {
     text-decoration: underline;
 }
 
-
 /* more subtle buttons...*/
 
 .btn.btn-kbase-subtle {
@@ -791,7 +782,6 @@ hr.ws-hr {
     padding: 3px 6px;
 }
 
-
 /* Safari fixes */
 
 div::-webkit-scrollbar {

src/plugins/mainwindow/modules/mainWindow.css

@@ -9,13 +9,13 @@
     margin-right: 0;
 }
 
-
 /* NEW LAYOUT */
 
 .plugin-mainwindow.widget-mainwindow.-main {
     display: flex;
     flex-direction: column;
     height: 100vh;
+    min-height: 0;
 }
 
 .plugin-mainwindow.widget-mainwindow.-main .-header {
@@ -27,6 +27,7 @@
     flex: 1 1 0px;
     display: flex;
     flex-direction: row;
+    min-height: 0;
 }
 
 .plugin-mainwindow.widget-mainwindow.-main>.-body>.-nav {
@@ -56,7 +57,7 @@
 .plugin-mainwindow.widget-mainwindow.-main>.-body>.-content-area>.-plugin-content {
     flex: 1 1 0px;
     overflow: auto;
-    display:flex;
+    display: flex;
     flex-direction: column;
     padding-top: 1em;
 }
@@ -150,10 +151,8 @@
     display: flex;
 }
 
-
 /* Navbar */
 
-
 /* 
  *  Main Navigation Bar
 */
@@ -176,7 +175,6 @@
     z-index: 3;
 }
 
-
 /* Own */
 
 .plugin-mainwindow.widget-mainwindow .-navbar .navbar-title {
@@ -224,7 +222,6 @@
     margin-top: -5px;
 }
 
-
 /* Give the menu icons a blue color, whilst leaving the menu text what it is (black) */
 
 .plugin-mainwindow.widget-mainwindow .-navbar .fa::before {
@@ -243,7 +240,6 @@
     color: green;
 }
 
-
 /* Enable background hover for navbar buttons. It is disabled for other buttons */
 
 .plugin-mainwindow.widget-mainwindow .-navbar .kb-nav-btn:hover {
@@ -271,10 +267,8 @@
     color: #2196F3;
 }
 
-
 /* Body */
 
-
 /* Tweak navbar, sidebar and main content areas to fit together 
 The navbar and sidebar are fixed -- so out of flow and need absolute positioning 
 Although the sidebar is partially positioned with part of the navbar.
@@ -283,7 +277,6 @@ The content area is normal flow and just needs to have a matching top margin.
 
 .navbar-kbase {}
 
-
 /* Top bar nav buttons
    --------------------------
 */
@@ -299,7 +292,6 @@ The content area is normal flow and just needs to have a matching top margin.
     margin-right: 0;
 }
 
-
 /*.xbtn-xs {
     border: 0;
     box-shadow: none;
@@ -322,4 +314,5 @@ The content area is normal flow and just needs to have a matching top margin.
 }
 
 .fa-color-success::before {
-    color: green;
+    color: green;
+}

tools/proxy/Dockerfile

@@ -11,13 +11,7 @@ ARG TAG
 # used for processing the config file templates
 ENV DOCKERIZE_VERSION v0.6.1
 RUN apk --update upgrade && \
-    apk add --no-cache \
-    ca-certificates=20190108-r0 \
-    nginx=1.14.2-r0 \
-    openssl=1.1.1a-r1 \
-    bash=4.4.19-r1 \
-    bash-completion=2.8-r0 && \
-    update-ca-certificates && \
+    apk add --no-cache bash bash-completion ca-certificates nginx openssl && \
     mkdir -p /kb/deployment && \
     openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /kb/deployment/test.key -out /kb/deployment/test.crt -subj "/C=US/ST=California/L=Berkeley/O=LBNL/OU=KBase/CN=ci.kbase.us" && \
     wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \