Merge branch 'develop' into 'master'

Develop See merge request !10

Merge branch 'develop' into 'master'
Develop See merge request !10
Eric Fernandez
2 parents 2898e6720b 051801ecc6
Showing 1 changed file Show diff stats
src/views/cabecera.html
@@ -19,7 +19,7 @@
                             <i class="fa fa-search"></i>
                         </button>
                         </div>
-                        <div class="col-7 col-sm border border-white align-middle">
+                        <div class="input-group col-7 col-sm border border-white align-middle">
                             Fecha:
                             <span
                                 ng-show="!datepickerAbierto"
@@ -42,7 +42,7 @@
                                 ng-focus="datepickerOpen = true"
                             />
                             <button
-                                class="btn btn-xs btn-outline-light"
+                                class="btn btn-xs btn-outline-light float-right"
                                 ng-click="datepickerAbierto = true"
                             >
                                 <i class="fa fa-calendar"></i>
...	...	@@ -19,7 +19,7 @@
19	19	<i class="fa fa-search"></i>
20	20	</button>
21	21	</div>
22		- <div class="col-7 col-sm border border-white align-middle">
	22	+ <div class="input-group col-7 col-sm border border-white align-middle">
23	23	Fecha:
24	24	<span
25	25	ng-show="!datepickerAbierto"
...	...	@@ -42,7 +42,7 @@
42	42	ng-focus="datepickerOpen = true"
43	43	/>
44	44	<button
45		- class="btn btn-xs btn-outline-light"
	45	+ class="btn btn-xs btn-outline-light float-right"
46	46	ng-click="datepickerAbierto = true"
47	47	>
48	48	<i class="fa fa-calendar"></i>