diff options
author | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2018-01-17 09:35:23 +0100 |
---|---|---|
committer | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2018-01-25 15:16:50 +0100 |
commit | b14f6c7ac546061aed4f2a5d8e33e9853c509000 (patch) | |
tree | 69ee711a6fb5f556d99ed92e43ba8cd1cb30113b /server/sonar-web/src | |
parent | b3a593c103415e903db6974cc293c3dce462e20f (diff) | |
download | sonarqube-b14f6c7ac546061aed4f2a5d8e33e9853c509000.tar.gz sonarqube-b14f6c7ac546061aed4f2a5d8e33e9853c509000.zip |
Fix styling issue on some commands in the project creation tutorial
Diffstat (limited to 'server/sonar-web/src')
10 files changed, 36 insertions, 36 deletions
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js index a7c32e421fc..249c8cc2976 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/ClangGCC.js @@ -67,8 +67,8 @@ export default function ClangGCC(props /*: Props */) { __html: translate('onboarding.analysis.sq_scanner.execute.text') }} /> - <Command command={command1} isWindows={props.os === 'win'} /> - <Command command={command2} isWindows={props.os === 'win'} /> + <Command command={command1} isOneLine={true} /> + <Command command={command2} isOneLine={props.os === 'win'} /> <p className="big-spacer-top markdown" dangerouslySetInnerHTML={{ __html: translate('onboarding.analysis.sq_scanner.docs') }} diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Command.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Command.js index 23d728a407e..ab46a73e512 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Command.js +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Command.js @@ -26,7 +26,7 @@ import { translate } from '../../../../helpers/l10n'; /*:: type Props = { command: string | Array<?string>, - isWindows?: boolean + isOneLine?: boolean }; */ @@ -36,13 +36,13 @@ export default class Command extends React.PureComponent { /*:: props: Props; */ render() { - const { command, isWindows } = this.props; + const { command, isOneLine } = this.props; const commandArray = Array.isArray(command) ? command.filter(line => line != null) : [command]; - const finalCommand = isWindows ? commandArray.join(' ') : commandArray.join(s); + const finalCommand = isOneLine ? commandArray.join(' ') : commandArray.join(s); return ( <div - className={classNames('onboarding-command', { 'onboarding-command-windows': isWindows })}> + className={classNames('onboarding-command', { 'onboarding-command-oneline': isOneLine })}> <pre>{finalCommand}</pre> <ClipboardButton copyValue={finalCommand} tooltipPlacement="top" /> </div> diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js index 8e2832d1bdd..493eb4f690b 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/DotNet.js @@ -58,9 +58,9 @@ export default function DotNet(props /*: Props */) { __html: translate('onboarding.analysis.msbuild.execute.text') }} /> - <Command command={command1} isWindows={true} /> - <Command command={command2} isWindows={true} /> - <Command command={command3} isWindows={true} /> + <Command command={command1} isOneLine={true} /> + <Command command={command2} isOneLine={true} /> + <Command command={command3} isOneLine={true} /> <p className="big-spacer-top markdown" dangerouslySetInnerHTML={{ __html: translate('onboarding.analysis.msbuild.docs') }} diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js index 3dca446d7d4..c8fc8106595 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Msvc.js @@ -61,9 +61,9 @@ export default function Msvc(props /*: Props */) { __html: translate('onboarding.analysis.msbuild.execute.text') }} /> - <Command command={command1} isWindows={true} /> - <Command command={command2} isWindows={true} /> - <Command command={command3} isWindows={true} /> + <Command command={command1} isOneLine={true} /> + <Command command={command2} isOneLine={true} /> + <Command command={command3} isOneLine={true} /> <p className="big-spacer-top markdown" dangerouslySetInnerHTML={{ __html: translate('onboarding.analysis.msbuild.docs') }} diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js index 42558d54eef..2698d23cd09 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/Other.js @@ -56,7 +56,7 @@ export default function Other(props /*: Props */) { __html: translate('onboarding.analysis.sq_scanner.execute.text') }} /> - <Command command={command} isWindows={props.os === 'win'} /> + <Command command={command} isOneLine={props.os === 'win'} /> <p className="big-spacer-top markdown" dangerouslySetInnerHTML={{ __html: translate('onboarding.analysis.sq_scanner.docs') }} diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap index c462b767acf..42680367bee 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/ClangGCC-test.js.snap @@ -24,7 +24,7 @@ exports[`renders correctly 1`] = ` /> <Command command="build-wrapper-win-x86-64.exe --out-dir bw-output make clean all" - isWindows={true} + isOneLine={true} /> <Command command={ @@ -38,7 +38,7 @@ exports[`renders correctly 1`] = ` "-Dsonar.login=token", ] } - isWindows={true} + isOneLine={true} /> <p className="big-spacer-top markdown" @@ -75,7 +75,7 @@ exports[`renders correctly 2`] = ` /> <Command command="build-wrapper-linux-x86-64 --out-dir bw-output make clean all" - isWindows={false} + isOneLine={true} /> <Command command={ @@ -89,7 +89,7 @@ exports[`renders correctly 2`] = ` "-Dsonar.login=token", ] } - isWindows={false} + isOneLine={false} /> <p className="big-spacer-top markdown" @@ -126,7 +126,7 @@ exports[`renders correctly 3`] = ` /> <Command command="build-wrapper-linux-x86-64 --out-dir bw-output make clean all" - isWindows={false} + isOneLine={true} /> <Command command={ @@ -140,7 +140,7 @@ exports[`renders correctly 3`] = ` "-Dsonar.login=token", ] } - isWindows={false} + isOneLine={false} /> <p className="big-spacer-top markdown" diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap index b82b31b3cc1..56d2150cae2 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/DotNet-test.js.snap @@ -26,11 +26,11 @@ exports[`renders correctly 1`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <Command command="MsBuild.exe /t:Rebuild" - isWindows={true} + isOneLine={true} /> <Command command={ @@ -39,7 +39,7 @@ exports[`renders correctly 1`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <p className="big-spacer-top markdown" @@ -78,11 +78,11 @@ exports[`renders correctly 2`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <Command command="MsBuild.exe /t:Rebuild" - isWindows={true} + isOneLine={true} /> <Command command={ @@ -91,7 +91,7 @@ exports[`renders correctly 2`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <p className="big-spacer-top markdown" diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap index e27a0b48d83..c5260a8f2e7 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Msvc-test.js.snap @@ -31,11 +31,11 @@ exports[`renders correctly 1`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <Command command="build-wrapper-win-x86-64.exe --out-dir bw-output MsBuild.exe /t:Rebuild" - isWindows={true} + isOneLine={true} /> <Command command={ @@ -44,7 +44,7 @@ exports[`renders correctly 1`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <p className="big-spacer-top markdown" @@ -88,11 +88,11 @@ exports[`renders correctly 2`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <Command command="build-wrapper-win-x86-64.exe --out-dir bw-output MsBuild.exe /t:Rebuild" - isWindows={true} + isOneLine={true} /> <Command command={ @@ -101,7 +101,7 @@ exports[`renders correctly 2`] = ` "/d:sonar.login=\\"token\\"", ] } - isWindows={true} + isOneLine={true} /> <p className="big-spacer-top markdown" diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap index 060600bb1bc..ba21667f2f5 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Other-test.js.snap @@ -29,7 +29,7 @@ exports[`renders correctly 1`] = ` "-Dsonar.login=token", ] } - isWindows={true} + isOneLine={true} /> <p className="big-spacer-top markdown" @@ -71,7 +71,7 @@ exports[`renders correctly 2`] = ` "-Dsonar.login=token", ] } - isWindows={false} + isOneLine={false} /> <p className="big-spacer-top markdown" @@ -113,7 +113,7 @@ exports[`renders correctly 3`] = ` "-Dsonar.login=token", ] } - isWindows={false} + isOneLine={false} /> <p className="big-spacer-top markdown" diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/styles.css b/server/sonar-web/src/main/js/apps/tutorials/onboarding/styles.css index c4b04edf2de..d5e4ba2fcb9 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/styles.css +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/styles.css @@ -91,11 +91,11 @@ color: #404040; } -.onboarding-command-windows pre { +.onboarding-command-oneline pre { padding-bottom: 40px; } -.onboarding-command-windows button { +.onboarding-command-oneline button { top: auto; top: 40px; } |