Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	examples/useContext.html
es6
guy 2 years ago
parent
commit
7146b4b453
  1. 18
      examples/useContext.html
  2. 2
      package.json

18
examples/useContext.html

@ -6,12 +6,10 @@
<script src="../dist/2.0/fineui.js"></script> --> <script src="../dist/2.0/fineui.js"></script> -->
<link rel="stylesheet" type="text/css" href="http://fanruan.design/fineui/2.0/fineui.min.css"/> <link rel="stylesheet" type="text/css" href="http://fanruan.design/fineui/2.0/fineui.min.css"/>
<script src="http://fanruan.design/fineui/2.0/fineui.min.js"></script> <script src="http://fanruan.design/fineui/2.0/fineui.min.js"></script>
<!-- <script src="http://localhost:9001/fineui.js"></script>-->
</head> </head>
<style> <style>
.my-parent { .my-parent {
--css-scale: 1; --css-scale: 1;
font-size: calc(var(--css-scale) * 14px);
} }
</style> </style>
<body> <body>
@ -100,22 +98,6 @@
ref: function (_ref) { ref: function (_ref) {
child = _ref; child = _ref;
} }
}, {
type: "bi.time_periods",
width: 400,
height: 24,
value: {
start: {
hour: 7,
minute: 3,
second: 16
},
end: {
hour: 21,
minute: 3,
second: 35
}
}
}] }]
}; };
}; };

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20221019101409", "version": "2.0.20221019202245",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

Loading…
Cancel
Save