Merge pull request
Do you really want to merge?
++
diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json new file mode 100644 index 0000000000..71090a83cf --- /dev/null +++ b/scm-ui/ui-styles/package.json @@ -0,0 +1,26 @@ +{ + "name": "@scm-manager/ui-styles", + "version": "2.0.0-SNAPSHOT", + "description": "Styles for SCM-Manager", + "main": "src/scm.scss", + "license": "BSD-3-Clause", + "private": false, + "scripts": { + "serve": "webpack-dev-server" + }, + "dependencies": { + "@fortawesome/fontawesome-free": "^5.11.2", + "bulma": "^0.7.5", + "bulma-popover": "^1.0.0", + "bulma-tooltip": "^3.0.0", + "react-diff-view": "^1.8.1" + }, + "devDependencies": { + "css-loader": "^3.2.0", + "node-sass": "^4.12.0", + "sass-loader": "^8.0.0", + "style-loader": "^1.0.0", + "webpack": "^4.41.0", + "webpack-dev-server": "^3.8.2" + } +} diff --git a/scm-ui/ui-styles/public/index.html b/scm-ui/ui-styles/public/index.html new file mode 100644 index 0000000000..89a20ae397 --- /dev/null +++ b/scm-ui/ui-styles/public/index.html @@ -0,0 +1,991 @@ + + +
+| Class | +Color (100%) | +Color (75%) | +Color (50%) | +Color (25%) | +
|---|---|---|---|---|
.has-background-dark+ .has-background-dark-75+ .has-background-dark-50+ .has-background-dark-25 |
+ + + #363636 |
+ + + #686868 |
+ + + #9a9a9a |
+ + + #cdcdcd |
+
.has-background-info+ .has-background-info-75+ .has-background-info-50+ .has-background-info-25 |
+ + + #33b2e8 |
+ + + #66c5ee |
+ + + #99d8f3 |
+ + + #ccecf9 |
+
.has-background-link+ .has-background-link-75+ .has-background-link-50+ .has-background-link-25 |
+ + + #33b2e8 |
+ + + #66c5ee |
+ + + #99d8f3 |
+ + + #ccecf9 |
+
.has-background-primary+ .has-background-primary-75+ .has-background-primary-50+ .has-background-primary-25 |
+ + + #00d1df |
+ + + #40dde7 |
+ + + #7fe8ef |
+ + + #bff3f7 |
+
.has-background-success+ .has-background-success-75+ .has-background-success-50+ .has-background-success-25 |
+ + + #00c79b |
+ + + #40d5b4 |
+ + + #7fe3cd |
+ + + #bff1e6 |
+
.has-background-warning+ .has-background-warning-75+ .has-background-warning-50+ .has-background-warning-25 |
+ + + #ffdd57 |
+ + + #ffe681 |
+ + + #ffeeab |
+ + + #fff6d5 |
+
.has-background-danger+ .has-background-danger-75+ .has-background-danger-50+ .has-background-danger-25 |
+ + + #ff3860 |
+ + + #ff6a88 |
+ + + #ff9baf |
+ + + #ffcdd7 |
+
| Class | +Text | +
|---|---|
.has-text-dark |
+ Beispieltext | +
.has-text-info |
+ Beispieltext | +
.has-text-link |
+ Beispieltext | +
.has-text-primary |
+ Beispieltext | +
.has-text-success |
+ Beispieltext | +
.has-text-warning Attention: Has color #FFB600 because of readability issues with the original color #ffdd57. |
+ Beispieltext | +
.has-text-danger |
+ Beispieltext | +

+ +
++ +
++ +
++ +
++ +
++ +
++ +
+.modal-content and .modal-card to ensure a constant layout. Buttons inside the modals should use the standard button formats.Cannot be merged automatically
+ +git checkout master
+ 2. Update workspace
+ git pull
+ 3. Merge source branch
+ git merge feature/e
+ 4. Resolve merge conflicts and add corrected files to index
+ git add <conflict file>
+ 5. Commit
+ git commit -m "Merge feature/e into master"
+ 6. Push your merge
+ git push
+ | Name | +G1 | +
| Description | +Awesome | +
| Type | +xml | +
| Creation Date | +5 days ago | +
| Last Modified | +15 minutes ago | +
| Username | +Display Name | +Admin | +|
|---|---|---|---|
| anonymous | +SCM Anonymous | +scm-anonymous@scm-manager.org | ++ |
| dhuchthausen | +Daniel Huchthausen | +daniel.huchthausen@cloudogu.com | ++ |
| fscholdei | +Florian Scholdei | +florian.scholdei@cloudogu.com | ++ |
Sebastian Sdorra s.sdorra@gmail.com
+Changeset e7468dd was committed 2 months ago
+
+
+
++
+Members
+
|
+