Skip to content

Commit

Permalink
Merge pull request #35 from mendix/develop
Browse files Browse the repository at this point in the history
Updated framework to 2.0.0
  • Loading branch information
wegiswes authored Jul 9, 2019
2 parents 112658b + 46fca12 commit cbcdf85
Show file tree
Hide file tree
Showing 147 changed files with 17,610 additions and 728 deletions.
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"singleQuote": true,
"printWidth": 120,
"proseWrap": "always",
"tabWidth": 4,
"useTabs": false,
"trailingComma": "all",
"bracketSpacing": true,
"semi": true,
"arrowParens": "avoid"
}
32 changes: 32 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"extends": "stylelint-config-standard",
"rules": {
"indentation": 4,
"string-quotes": "single",
"no-duplicate-selectors": true,
"color-hex-case": "upper",
"color-hex-length": "short",
"selector-combinator-space-after": "always",
"selector-attribute-operator-space-before": "always",
"selector-attribute-operator-space-after": "always",
"selector-attribute-brackets-space-inside": "always",
"declaration-block-trailing-semicolon": "always",
"declaration-colon-space-before": "never",
"declaration-colon-space-after": "always",
"number-leading-zero": "never",
"function-url-quotes": "always",
"font-family-name-quotes": "always-unless-keyword",
"comment-whitespace-inside": "always",
"comment-empty-line-before": "always",
"rule-empty-line-before": "always-multi-line",
"selector-pseudo-element-colon-notation": "single",
"media-feature-range-operator-space-after": "always",
"media-feature-colon-space-after": "always",
"no-descending-specificity": null,
"declaration-colon-newline-after": null,
"value-list-comma-newline-after": null,
"at-rule-no-unknown": [true, {
"ignoreAtRules": ["function", "if", "each", "include", "mixin"]
}]
}
}
1 change: 1 addition & 0 deletions com.mendix.charts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
8 changes: 7 additions & 1 deletion components.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
{"files":{"css":["lib/bootstrap/css/bootstrap.min.css","mxclientsystem/mxui/ui/mxui.css","styles/css/lib/lib.css","styles/css/custom/custom.css"],"js":["mxclientsystem/mxui/mxui.js"]},"cachebust":"{{cachebust}}"}
{
"files": {
"css": ["styles/web/css/main.css"],
"js": ["mxclientsystem/mxui/mxui.js"]
},
"cachebust": "{{cachebust}}"
}
19 changes: 0 additions & 19 deletions config.rb

This file was deleted.

Empty file modified favicon.ico
100644 → 100755
Empty file.
42 changes: 20 additions & 22 deletions index-phone-preview.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Mendix - Phone preview</title>
<link rel="stylesheet" type="text/css" href="styles/web/css/main.css?{{ cachebust }}" />
</head>

<head>
<meta charset="utf-8" />
<title>Mendix - Phone preview</title>
<link rel="stylesheet" type="text/css" href="styles/css/lib/lib.css?{{cachebust}}">
</head>

<body>
<div class="content">
<div class="devicephone">
<iframe id="frame" class="deviceframe"></iframe>
<div class="devicedisclaimer">
This is not a simulator but just a resized view surrounded with an image to give an impression of what the app might look like on a phone.
<body>
<div class="content">
<div class="devicephone">
<iframe id="frame" class="deviceframe"></iframe>
<div class="devicedisclaimer">
This is not a simulator but just a resized view surrounded with an image to give an impression of what the app might look like on a phone.
</div>
</div>
</div>
</div>

<script type="text/javascript">
// Firefox does not add a history item if the page is not loaded
// from the cache, and the src is set as attribute on the iframe
document.getElementById("frame").src = "index.html" + window.location.search + window.location.hash;
</script>
</body>

</html>
<script type="text/javascript">
// Firefox does not add a history item if the page is not loaded
// from the cache, and the src is set as attribute on the iframe
document.getElementById('frame').src = 'index.html' + window.location.search + window.location.hash;
</script>
</body>
</html>
4 changes: 1 addition & 3 deletions index-rtl.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
<title>Mendix</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
<link rel="stylesheet" href="lib/bootstrap-rtl/css/bootstrap-rtl.min.css?{{cachebust}}">
<link rel="stylesheet" href="mxclientsystem/mxui/ui/mxui.css?{{cachebust}}">

{{themecss}}

</head>
<body dir="rtl">
<div id="content"></div>
Expand Down
42 changes: 20 additions & 22 deletions index-tablet-preview.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Mendix - Tablet preview</title>
<link rel="stylesheet" type="text/css" href="styles/web/css/main.css?{{ cachebust }}" />
</head>

<head>
<meta charset="utf-8" />
<title>Mendix - Tablet preview</title>
<link rel="stylesheet" type="text/css" href="styles/css/lib/lib.css?{{cachebust}}">
</head>

<body>
<div class="content">
<div class="devicetablet">
<iframe id="frame" class="deviceframe"></iframe>
<div class="devicedisclaimer">
This is not a simulator but just a resized view surrounded with an image to give an impression of what the app might look like on a tablet.
<body>
<div class="content">
<div class="devicetablet">
<iframe id="frame" class="deviceframe"></iframe>
<div class="devicedisclaimer">
This is not a simulator but just a resized view surrounded with an image to give an impression of what the app might look like on a tablet.
</div>
</div>
</div>
</div>

<script type="text/javascript">
// Firefox does not add a history item if the page is not loaded
// from the cache, and the src is set as attribute on the iframe
document.getElementById("frame").src = "index.html" + window.location.search + window.location.hash;
</script>
</body>

</html>
<script type="text/javascript">
// Firefox does not add a history item if the page is not loaded
// from the cache, and the src is set as attribute on the iframe
document.getElementById('frame').src = 'index.html' + window.location.search + window.location.hash;
</script>
</body>
</html>
2 changes: 0 additions & 2 deletions index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<title>Mendix</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?{{cachebust}}">
<link rel="stylesheet" href="mxclientsystem/mxui/ui/mxui.css?{{cachebust}}">

{{themecss}}

Expand Down
Loading

0 comments on commit cbcdf85

Please sign in to comment.