diff --git a/.gitignore b/.gitignore index c32ac8f1..14cd44ed 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ babel_cache/ *~ *.swp *.swo -.tern-port \ No newline at end of file +.tern-port +.tern-project.js \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index a0f8b8a9..8376ee95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ before_install: - echo $DOCKER_PASSWORD | docker login -u=$DOCKER_USERNAME --password-stdin script: - - sed -i "s/application_url/$APPLICATION_URL/g" config.js - - sed -i "s/gdrive_client_id/$GOOGLE_CLIENTID/" config.js - - sed -i "s/gdrive_client_secret/$GOOGLE_CLIENTSECRET/" config.js - - sed -i "s/dropbox_client_id/$DROPBOX_CLIENTID/" config.js + - sed -i "s/application_url/$APPLICATION_URL/g" config_server.js + - sed -i "s/gdrive_client_id/$GOOGLE_CLIENTID/" config_server.js + - sed -i "s/gdrive_client_secret/$GOOGLE_CLIENTSECRET/" config_server.js + - sed -i "s/dropbox_client_id/$DROPBOX_CLIENTID/" config_server.js - npm run image - npm run publish \ No newline at end of file diff --git a/client/assets/css/reset.scss b/client/assets/css/reset.scss index 7d1b21da..5fbcb601 100644 --- a/client/assets/css/reset.scss +++ b/client/assets/css/reset.scss @@ -4,16 +4,18 @@ --emphasis: #375160; --primary: #9AD1ED; - --emphasis-primary: #2b71bc; + --emphasis-primary: #c5e2f1; --secondary: #466372; --emphasis-secondary: #466372; - --super-light: #ecf1f6; + --light: #909090; + --super-light: #f4f4f4; --error: #f26d6d; --success: #63d9b1; } +// --super-light: #ecf1f6; html { font-family:"San Francisco","Roboto","Arial",sans-serif; @@ -68,8 +70,6 @@ input[type="checkbox"]{position: relative; top: 1px; margin: 0; padding: 0;} border-color: rgb(154, 209, 237)!important; } - - .drag-drop{ z-index: 2; } @@ -97,26 +97,3 @@ body, body > div, body > div > div, body > div > div > div{ height: 100%;} .login-form button.active{ box-shadow: 0px 1px 5px rgba(0,0,0,0.20); } - - - - - -/* ANIMATION */ -.example-enter { - opacity: 0.01; -} - -.example-enter.example-enter-active { - opacity: 1; - transition: opacity 500ms ease-in; -} - -.example-leave { - opacity: 1; -} - -.example-leave.example-leave-active { - opacity: 0.01; - transition: opacity 300ms ease-in; -} diff --git a/client/assets/img/folder.svg b/client/assets/img/folder.svg index f1b08731..06d8befa 100644 --- a/client/assets/img/folder.svg +++ b/client/assets/img/folder.svg @@ -1,6 +1,69 @@ - - - - + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/client/assets/img/link.svg b/client/assets/img/link.svg index f1b08731..c956fa66 100644 --- a/client/assets/img/link.svg +++ b/client/assets/img/link.svg @@ -1,6 +1,69 @@ - - - - + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/client/components/breadcrumb.js b/client/components/breadcrumb.js index ca176b53..df8f6d0a 100644 --- a/client/components/breadcrumb.js +++ b/client/components/breadcrumb.js @@ -66,41 +66,28 @@ BreadCrumb.propTypes = { const BreadCrumbContainer = (props) => { - let style1 = {background: 'white', margin: '0 0 0px 0', padding: '6px 0', boxShadow: '0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.2)', zIndex: '1000', position: 'relative'}; - let style2 = {margin: '0 auto', width: '95%', maxWidth: '800px', padding: '0', color: 'rgba(#6f6f6f, 0.8)'}; return ( -
-