Merge branch 'develop' into 'develop'

Develop See merge request !65

Merge branch 'develop' into 'develop'
Develop See merge request !65
Marcelo Puebla
2 parents 5b34ba606e c880672f84
Showing 2 changed files Show diff stats
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts
src/scss/styles-bootstrap.scss
-import { Component, OnInit, Input, HostListener, Output, EventEmitter } from '@angular/core';
+import { Component, OnInit, HostListener, Output, EventEmitter } from '@angular/core';
 import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { CategoriaService } from 'src/app/services/categoria/categoria.service';
@@ -40,18 +40,28 @@ $border-radius-sm: 0.5rem;
   height: 100% !important;
 }
  
+.custom-checkbox .custom-control-label::before {
+  border-radius: 50% !important;
+}
+
 .custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
   background-color: $primary !important;
 }
  
-.custom-control-input:checked ~ .custom-control-label::before {
-  border-color: $primary !important;
-  background-color: $primary !important;
+.custom-checkbox .custom-control-input:checked:focus ~ .custom-control-label::before {
+  box-shadow: none !important;
+}
+.custom-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+  box-shadow: none !important;
 }
  
 .custom-control-input:checked ~ .custom-control-label::before {
-  color: #fff;
-  border-color: $primary !important;
+  background-color: white !important;
+  border-color: white !important;
+  border-width: 2px;
+}
+
+.custom-checkbox .custom-control-input:active ~ .custom-control-label::before {
   background-color: $primary !important;
 }
1		-import { Component, OnInit, Input, HostListener, Output, EventEmitter } from '@angular/core';
	1	+import { Component, OnInit, HostListener, Output, EventEmitter } from '@angular/core';
2	2	import { ICategoria } from 'src/app/interfaces/ICategoria';
3	3	import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
4	4	import { CategoriaService } from 'src/app/services/categoria/categoria.service';
...	...	@@ -40,18 +40,28 @@ $border-radius-sm: 0.5rem;
40	40	height: 100% !important;
41	41	}
42	42
	43	+.custom-checkbox .custom-control-label::before {
	44	+ border-radius: 50% !important;
	45	+}
	46	+
43	47	.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
44	48	background-color: $primary !important;
45	49	}
46	50
47		-.custom-control-input:checked ~ .custom-control-label::before {
48		- border-color: $primary !important;
49		- background-color: $primary !important;
	51	+.custom-checkbox .custom-control-input:checked:focus ~ .custom-control-label::before {
	52	+ box-shadow: none !important;
	53	+}
	54	+.custom-checkbox .custom-control-input:focus ~ .custom-control-label::before {
	55	+ box-shadow: none !important;
50	56	}
51	57
52	58	.custom-control-input:checked ~ .custom-control-label::before {
53		- color: #fff;
54		- border-color: $primary !important;
	59	+ background-color: white !important;
	60	+ border-color: white !important;
	61	+ border-width: 2px;
	62	+}
	63	+
	64	+.custom-checkbox .custom-control-input:active ~ .custom-control-label::before {
55	65	background-color: $primary !important;
56	66	}
57	67