more antd conversion; but also some reverting back due to push/pull

Author: williamstein

src/packages/frontend/antd-bootstrap.tsx

@@ -304,9 +304,11 @@ export function Col(props: {
   className?: string;
   onClick?;
   children?: any;
+  push?;
+  pull?;
 }) {
   const props2: any = {};
-  for (const p of ["xs", "sm", "md", "lg"]) {
+  for (const p of ["xs", "sm", "md", "lg", "push", "pull"]) {
     if (props[p] != null) {
       if (props2[p] == null) {
         props2[p] = {};

src/packages/frontend/project/explorer/file-listing/file-row.tsx

@@ -5,7 +5,8 @@
 
 import { Button, Popover } from "antd";
 import memoizeOne from "memoize-one";
-import { Col, Row } from "@cocalc/frontend/antd-bootstrap";
+// tricky to convert to antd due to use of smPull and smPush
+import { Col, Row } from "react-bootstrap";
 import { CSS, React, useState } from "@cocalc/frontend/app-framework";
 import { Icon, IconName, TimeAgo, Tip } from "@cocalc/frontend/components";
 import { useStudentProjectFunctionality } from "@cocalc/frontend/course";
@@ -201,7 +202,7 @@ export const FileRow: React.FC<Props> = React.memo((props) => {
       props.actions.open_file({
         path,
         foreground,
-        explicit: true,
+        explicit:true,
       });
       if (foreground) {
         props.actions.set_file_search("");
@@ -355,7 +356,7 @@ export const FileRow: React.FC<Props> = React.memo((props) => {
       <Col sm={1} xs={3} onClick={handle_click}>
         {render_icon()}
       </Col>
-      <Col sm={4} xs={6}>
+      <Col sm={4} smPush={5} xs={6}>
         {render_timestamp()}
         {props.isdir ? (
           <>
@@ -368,7 +369,7 @@ export const FileRow: React.FC<Props> = React.memo((props) => {
           </span>
         )}
       </Col>
-      <Col sm={5} xs={12} onClick={handle_click}>
+      <Col sm={5} smPull={4} xs={12} onClick={handle_click}>
         {render_name()}
       </Col>
     </Row>

src/packages/frontend/project/explorer/file-listing/listing-header.tsx

@@ -6,7 +6,8 @@
 import React from "react";
 import { TypedMap } from "@cocalc/frontend/app-framework";
 import { Icon, Gap } from "@cocalc/frontend/components";
-import { Col, Row } from "@cocalc/frontend/antd-bootstrap";
+// tricky to convert to antd due to use of smPull and smPush
+import { Col, Row } from "react-bootstrap";
 
 // TODO: Flatten active_file_sort for easy PureComponent use
 interface Props {
@@ -59,13 +60,13 @@ export const ListingHeader: React.FC<Props> = (props: Props) => {
       <Col sm={1} xs={3}>
         {render_sort_link("type", "Type")}
       </Col>
-      <Col sm={4} xs={6}>
+      <Col sm={4} smPush={5} xs={6}>
         {render_sort_link("time", "Date Modified")}
         <span className="pull-right">
           {render_sort_link("size", "Size/Download/View")}
         </span>
       </Col>
-      <Col sm={5} xs={12}>
+      <Col sm={5} smPull={4} xs={12}>
         {render_sort_link("name", "Name")}
       </Col>
     </Row>

src/packages/frontend/project/settings/body.tsx

@@ -4,7 +4,7 @@
  */
 
 import React from "react";
-import { Col, Row } from "react-bootstrap";
+import { Col, Row } from "@cocalc/frontend/antd-bootstrap";
 import { redux, useTypedRedux } from "@cocalc/frontend/app-framework";
 import { Icon } from "@cocalc/frontend/components";
 import { getStudentProjectFunctionality } from "@cocalc/frontend/course";

src/packages/frontend/project/settings/sagews-control.tsx

@@ -4,8 +4,7 @@
  */
 
 import React from "react";
-import { Button } from "react-bootstrap";
-
+import { Button } from "@cocalc/frontend/antd-bootstrap";
 import { alert_message } from "@cocalc/frontend/alerts";
 import { useIsMountedRef } from "@cocalc/frontend/app-framework";
 import {