Skip to content

Commit

Permalink
Merge pull request #595 from ucscXena/mui-dev
Browse files Browse the repository at this point in the history
Replace React-Toolbox CSS framework / library. #481.
  • Loading branch information
acthp authored Jul 11, 2022
2 parents 16ed7e0 + e5cf35a commit 8cd4a43
Show file tree
Hide file tree
Showing 135 changed files with 2,792 additions and 3,955 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
- checkout
- attach_workspace:
at: ~/ucscXena/ucsc-xena-client
- run: HOST=ec2-18-208-128-81.compute-1.amazonaws.com ./deploy
- run: HOST=ec2-3-95-182-133.compute-1.amazonaws.com ./deploy
deploy-beta:
working_directory: ~/ucscXena/ucsc-xena-client
docker:
Expand Down Expand Up @@ -155,7 +155,7 @@ workflows:
- build
filters:
branches:
only: cc-staging
only: mui-dev
- deploy-beta:
requires:
- build
Expand Down
21 changes: 3 additions & 18 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,16 @@
* UCSC Xena Client
* http://xena.ucsc.edu
*
* Root styling file to be included at app top level. Includes CSS reset, fonts and globals.
*
* Based on React Toolbox demo version at https://github.com/alexhisen/mobx-forms-demo/blob/master/src/scss/index.scss.
* Root styling file to be included at app top level. Includes CSS reset and globals.
*/

/*
* Base CSS reset.
* This is a populate CSS reset, used to create a standardized, cross-browser base to build app-specific styles on
* top of. Required as React Toolbox 2.0 does not include a reset.
* top of.
*/
@import '~normalize.css';

/*
* React Toolbox Reset.
* Custom CSS resets to be used in addition to base CSS reset (normalize.css).
*/
@import './rtbReset.css';

/**
* Global Xena styles.
* Required for applying styles that are outside of the React component hierarchy.
Expand All @@ -28,13 +20,6 @@

/*
* Fonts.
* Local font files for Roboto and Material Icons. Required as React Toolbox 2.0 does not include font files (either
* locally or hosted by a service such as Google Fonts).
* Local font files for Material Icons.
*/
@import '../fonts/index.css';

/*
* Typography.
* Core typography styles that match with Material Design specs (https://material.io/guidelines/style/typography.html).
*/
@import './typography.css';
73 changes: 0 additions & 73 deletions css/rtbReset.css

This file was deleted.

64 changes: 0 additions & 64 deletions css/typography.css

This file was deleted.

140 changes: 0 additions & 140 deletions css/typography.module.css

This file was deleted.

40 changes: 0 additions & 40 deletions css/variables.css

This file was deleted.

Loading

0 comments on commit 8cd4a43

Please sign in to comment.