fix merge conflict (44fa2e6f) · Commits · github_fork / Clip

src/libfnord/fnord-webcomponents/components/fn-timeinput.html

+0 −54

Original line number	Diff line number	Diff line
		@@ -14,23 +14,13 @@
		<style>
		#timeinput_container {
		margin:auto;
		<<<<<<< HEAD
		height: 35px;
		width: 114px;
		=======
		height: 30px;
		width: 126px;
		>>>>>>> 401a974820d725476578f94e11b1b84a1a15caaf
		}

		input {
		float: left;
		<<<<<<< HEAD
		width: 20px;
		=======
		<<<<<<< HEAD
		width: 50px;
		>>>>>>> 195134c29877ca5317c596d1f4d24a5f1fb82d88
		font-size: 1rem;
		outline: none;
		-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
		@@ -83,35 +73,14 @@
		border-color: #dbb1b1;
		color: #d95c5c;
		box-shadow: none;
		=======
		width: 30px;
		height: 25px;
		line-height: 25px;
		padding: 0 8px;
		font-size: 12px;
		border-radius: 4px;
		border: 1px solid #b3c2d0;
		color: #545758;
		background: #fff;
		}

		input.highlighted {
		border: 1px solid rgba(230, 126, 34,1.0);
		background: rgba(230, 126, 34,0.1);
		>>>>>>> 401a974820d725476578f94e11b1b84a1a15caaf
		}

		b {
		line-height: 1.2142em;
		padding-top: 0.60861em;
		float:left;
		<<<<<<< HEAD
		margin: 0 5px;

		=======
		margin-left: 5px;
		margin-right: 5px;
		>>>>>>> 401a974820d725476578f94e11b1b84a1a15caaf
		}
		</style>

		@@ -132,7 +101,6 @@
		var hours_input = this.shadowRoot.querySelector("#hours");
		var minutes_input = this.shadowRoot.querySelector("#minutes");

		<<<<<<< HEAD
		if (this.hasAttribute('data-hours-value')) {
		this.setHoursValue(this.getAttribute('data-hours-value'));
		}
		@@ -142,12 +110,7 @@
		if (this.hasAttribute('data-state')) {
		this.setState();
		}
		if (this.hasAttribute('data-size')) {
		this.setsize();
		}

		=======
		>>>>>>> 401a974820d725476578f94e11b1b84a1a15caaf
		hours_input.addEventListener('focus', function() {
		base.validateHoursInput();
		}, false);
		@@ -156,7 +119,6 @@
		}, false);
		};

		<<<<<<< HEAD
		this.attributeChangedCallback = function(attr, old_val, new_val) {
		switch (attr) {
		case "data-minutes-value":
		@@ -167,22 +129,12 @@
		this.setHoursValue(new_val);
		break;

		case "data-size":
		this.setSize();
		break;

		default:
		break;
		}
		}

		this.setSize = function() {
		console.log("st size");
		this.shadowRoot.querySelector("#hours")
		.setAttribute('data-size', this.getAttribute('data-size'));
		this.shadowRoot.querySelector("#minutes")
		.setAttribute('data-size', this.getAttribute('data-size'));
		}

		this.validateHoursInput = function() {
		var base = this;
		@@ -276,7 +228,6 @@
		input.value = this.appendLeadingZero(value);
		};

		=======
		this.validateHoursInput = function() {
		var base = this;
		var input = this.shadowRoot.querySelector("#hours");
		@@ -333,7 +284,6 @@
		input.value = FnordMetric.util.appendLeadingZero(value);
		};

		>>>>>>> 401a974820d725476578f94e11b1b84a1a15caaf
		this.getValues = function() {
		return {
		'hours' : this.shadowRoot.querySelector("#hours").value,
		@@ -341,11 +291,7 @@
		};

		this.fireTimeInputSubmitEvent = function() {
		<<<<<<< HEAD
		this.dispatchEvent(new Event("fn-input-time-submit"));
		=======
		this.dispatchEvent(new Event("fn-timeinput-submit"));
		>>>>>>> 401a974820d725476578f94e11b1b84a1a15caaf
		};
		}

Admin message