VSinerva/freesewing
1
0
Fork 0
Code Activity

🚧 Changes to components and css

Browse source
This commit is contained in:
Joost De Cock 2019-05-30 15:36:58 +02:00
parent 1d487077ff
commit 341d5fdb8b
7 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/dependencies.yaml
View file

@ -76,9 +76,9 @@ components:
"@freesewing/i18n": "^{{version}}" "@freesewing/i18n": "^{{version}}"
"@freesewing/utils": "^{{version}}" "@freesewing/utils": "^{{version}}"
"react-intl": "^2.8.0" "react-intl": "^2.8.0"
"@material-ui/core": "^3.9.3" "@material-ui/core": "^4.0.1"
"@material-ui/icons": "^3.0.2" "@material-ui/icons": "^4.0.1"
"@material-ui/lab": "^3.0.0-alpha.30" "@material-ui/lab": "^v4.0.0-alpha.14"
"prismjs": "1.16.0" "prismjs": "1.16.0"
core: core:
_: _:

8
packages/components/package.json
View file

@ -16,7 +16,7 @@
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
"clean": "rimraf Blockquote && rimraf Draft && rimraf DraftConfigurator && rimraf Emblem && rimraf Example && rimraf Footer && rimraf Icon && rimraf Logo && rimraf Navbar && rimraf Ogol && rimraf Robot && rimraf SampleConfigurator && rimraf withGist && rimraf withLanguage && rimraf Workbench", "clean": "rimraf Blockquote && rimraf Draft && rimraf DraftConfigurator && rimraf Emblem && rimraf Example && rimraf Footer && rimraf Icon && rimraf Logo && rimraf Navbar && rimraf Ogol && rimraf Robot && rimraf SampleConfigurator && rimraf withGist && rimraf withLanguage && rimraf Workbench",
"nodebuild": "BABEL_ENV=production rollup -c -o dist/index.js -f cjs", "nodebuild": "BABEL_ENV=production rollup -c",
"build": "npm run clean && npm run nodebuild", "build": "npm run clean && npm run nodebuild",
"test": "echo \"components: No tests configured. Perhaps you'd like to do this?\" && exit 0", "test": "echo \"components: No tests configured. Perhaps you'd like to do this?\" && exit 0",
"pubtest": "npm publish --registry http://localhost:6662", "pubtest": "npm publish --registry http://localhost:6662",
@ -38,9 +38,9 @@
"@freesewing/i18n": "^2.0.0-beta.9", "@freesewing/i18n": "^2.0.0-beta.9",
"@freesewing/utils": "^2.0.0-beta.9", "@freesewing/utils": "^2.0.0-beta.9",
"react-intl": "^2.8.0", "react-intl": "^2.8.0",
"@material-ui/core": "^3.9.3", "@material-ui/core": "^4.0.1",
"@material-ui/icons": "^3.0.2", "@material-ui/icons": "^4.0.1",
"@material-ui/lab": "^3.0.0-alpha.30", "@material-ui/lab": "^v4.0.0-alpha.14",
"prismjs": "1.16.0" "prismjs": "1.16.0"
}, },
"dependencies": {}, "dependencies": {},

3
packages/components/rollup.config.js
View file

@ -34,7 +34,8 @@ const createConfig = (component, module) => {
const config = []; const config = [];
for (let component of components) { for (let component of components) {
config.push(createConfig(component, false)); config.push(createConfig(component, false));
config.push(createConfig(component, true)); // Webpack doesn't handle .mjs very well
//config.push(createConfig(component, true));
} }
export default config; export default config;

8
packages/components/src/Footer/index.js
View file

@ -1,4 +1,5 @@
import React from "react"; import React from "react";
import PropTypes from "prop-types";
import Logo from "../Logo"; import Logo from "../Logo";
import { FormattedMessage, FormattedHTMLMessage } from "react-intl"; import { FormattedMessage, FormattedHTMLMessage } from "react-intl";
import IconButton from "@material-ui/core/IconButton"; import IconButton from "@material-ui/core/IconButton";
@ -37,7 +38,9 @@ const Footer = props => {
}; };
return ( return (
<footer> <footer>
<Logo size={101} /> <a href={props.home}>
<Logo size={101} />
</a>
<p> <p>
{Object.keys(icons).map(i => ( {Object.keys(icons).map(i => (
<IconButton href={icons[i]} className={i} title={i} key={i}> <IconButton href={icons[i]} className={i} title={i} key={i}>
@ -72,4 +75,7 @@ const Footer = props => {
); );
}; };
Footer.defaultProps = {
home: "/"
};
export default Footer; export default Footer;

2
packages/css-theme/src/components/_fab.scss
View file

@ -6,6 +6,8 @@ button.fab {
background: $fc-text-light!important; background: $fc-text-light!important;
z-index: 20; z-index: 20;
font-size: 2rem; font-size: 2rem;
border: 1px solid $oc-gray-7;
border-radius: 50%;
} }
button.fab.primary { button.fab.primary {
right: 1rem; right: 1rem;

10
packages/css-theme/src/components/_topicstoc.scss
View file

@ -2,7 +2,7 @@ ul.topics {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
ul.topics > li.topic { ul.topics > li {
@include title-font; @include title-font;
list-style-type: none; list-style-type: none;
//text-transform: uppercase; //text-transform: uppercase;
@ -19,13 +19,13 @@ ul.topics > li.topic {
text-decoration: none!important; text-decoration: none!important;
} }
} }
ul.topics > li.topic.active { ul.topics > li.active {
font-weight: bold; font-weight: bold;
a.topic { a.topic {
border-left: 4px solid $fc-link-light; border-left: 4px solid $fc-link-light;
} }
} }
ul.topics > li.topic > ul.topics.l1 { ul.topics > li > ul.topics.l1 {
font-weight: normal; font-weight: normal;
a { a {
color: $fc-text-light!important; color: $fc-text-light!important;
@ -55,7 +55,7 @@ ul.topics > li.topic > ul.topics.l1 {
} }
.theme-wrapper.dark { .theme-wrapper.dark {
ul.topics > li.topic { ul.topics > li {
a.topic { a.topic {
color: $fc-text-dark!important; color: $fc-text-dark!important;
} }
@ -63,7 +63,7 @@ ul.topics > li.topic > ul.topics.l1 {
background: $oc-gray-6; background: $oc-gray-6;
} }
} }
ul.topics > li.topic > ul.topics.l1 { ul.topics > li > ul.topics.l1 {
a { a {
color: $fc-text-dark!important; color: $fc-text-dark!important;
} }

2
packages/css-theme/src/elements/_code.scss
View file

@ -57,7 +57,7 @@ pre.language-svg:before {
pre code[class*="language-"], pre code[class*="language-"],
pre[class*="language-"] { pre[class*="language-"] {
white-space: pre-wrap; white-space: pre-wrap;
border-radius: 4px; border-radius: 6px;
margin: 2rem 0; margin: 2rem 0;
padding: 1.5rem 0; padding: 1.5rem 0;
} }