mirror of
				https://gitlab.nic.cz/turris/reforis/foris-js.git
				synced 2025-11-03 23:00:31 +01:00 
			
		
		
		
	Merge branch 'datepicker' into 'dev'
Display datepicker above input Closes reforis#153 See merge request turris/reforis/foris-js!63
This commit is contained in:
		
							
								
								
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "foris",
 | 
					  "name": "foris",
 | 
				
			||||||
  "version": "2.1.0",
 | 
					  "version": "2.1.1",
 | 
				
			||||||
  "lockfileVersion": 1,
 | 
					  "lockfileVersion": 1,
 | 
				
			||||||
  "requires": true,
 | 
					  "requires": true,
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "foris",
 | 
					  "name": "foris",
 | 
				
			||||||
  "version": "2.1.0",
 | 
					  "version": "2.1.1",
 | 
				
			||||||
  "description": "Set of components and utils for Foris and its plugins.",
 | 
					  "description": "Set of components and utils for Foris and its plugins.",
 | 
				
			||||||
  "author": "CZ.NIC, z.s.p.o.",
 | 
					  "author": "CZ.NIC, z.s.p.o.",
 | 
				
			||||||
  "repository": {
 | 
					  "repository": {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								src/bootstrap/DataTimeInput.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								src/bootstrap/DataTimeInput.css
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					/* Override defaults from "react-datetime" - display picker above input */
 | 
				
			||||||
 | 
					.rdtPicker {
 | 
				
			||||||
 | 
					    bottom: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -10,6 +10,7 @@ import PropTypes from "prop-types";
 | 
				
			|||||||
import Datetime from "react-datetime/DateTime";
 | 
					import Datetime from "react-datetime/DateTime";
 | 
				
			||||||
import moment from "moment/moment";
 | 
					import moment from "moment/moment";
 | 
				
			||||||
import "react-datetime/css/react-datetime.css";
 | 
					import "react-datetime/css/react-datetime.css";
 | 
				
			||||||
 | 
					import "./DataTimeInput.css";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { Input } from "./Input";
 | 
					import { Input } from "./Input";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user