Commit cdab4e8f0c110aec589b7dfded12135371a31dc1
Exists in
master
Merge branch 'master' into 'develop'
Master See merge request !107
Showing
5 changed files
Show diff stats
src/sass/_bootstrap.scss
src/sass/_botonera-lateral.scss
src/sass/_constants.scss
src/sass/_paginador-abm.scss
src/sass/general.scss
| 1 | -$primary-color: #e09125; | |
| 1 | +@import 'constants'; | |
| 2 | 2 | @import 'admin-seguimiento'; |
| 3 | 3 | @import 'bootstrap'; |
| 4 | 4 | @import 'botonera'; |
| ... | ... | @@ -40,17 +40,25 @@ input::-webkit-inner-spin-button { |
| 40 | 40 | |
| 41 | 41 | .btn-outline-debo{ |
| 42 | 42 | background-color: transparent; |
| 43 | - color: $primary-color; | |
| 44 | - border-color: $primary-color; | |
| 43 | + color: $primary; | |
| 44 | + border-color: $primary; | |
| 45 | 45 | &:hover{ |
| 46 | 46 | color: #FFF; |
| 47 | 47 | border-color: transparent; |
| 48 | - background-color: $primary-color; | |
| 48 | + background-color: $primary; | |
| 49 | + } | |
| 50 | + &:focus { | |
| 51 | + box-shadow: none !important; | |
| 52 | + } | |
| 53 | + &:active{ | |
| 54 | + color: #FFF; | |
| 55 | + background-color: $primary !important; | |
| 56 | + box-shadow: 0px 0px 0px 3px $primaryTransparency !important; | |
| 49 | 57 | } |
| 50 | 58 | } |
| 51 | 59 | |
| 52 | 60 | .btn-brown { |
| 53 | - background-color:#Cd9035; | |
| 61 | + background-color:$primary; | |
| 54 | 62 | -webkit-appearance: none; |
| 55 | 63 | border-color: transparent; |
| 56 | 64 | &:focus { |
| ... | ... | @@ -66,45 +74,57 @@ input::-webkit-inner-spin-button { |
| 66 | 74 | .page-item.active .page-link { |
| 67 | 75 | z-index: 1; |
| 68 | 76 | color: #fff; |
| 69 | - background-color: #Cd9035; | |
| 70 | - border-color: #Cd9035; | |
| 77 | + background-color: $primary; | |
| 78 | + border-color: $primary; | |
| 71 | 79 | } |
| 72 | 80 | |
| 73 | 81 | .foca-input { |
| 74 | 82 | &:focus { |
| 75 | - border-color: #Cd9035; | |
| 76 | - box-shadow: 0 0 5px #Cd9035; | |
| 83 | + border-color: $primary; | |
| 84 | + box-shadow: 0 0 5px $primary; | |
| 77 | 85 | } |
| 78 | 86 | } |
| 79 | 87 | |
| 80 | -.btn-info { | |
| 81 | - background-color: #Cd9035; | |
| 82 | - border-color: #Cd9035; | |
| 88 | +.btn-primary { | |
| 89 | + background-color: $primary !important; | |
| 90 | + border-color: $primary !important; | |
| 83 | 91 | &:focus { |
| 84 | - box-shadow: none; | |
| 92 | + box-shadow: none !important; | |
| 85 | 93 | } |
| 86 | 94 | &:hover { |
| 87 | - background-color: #Cd9035; | |
| 95 | + border-color: $primaryTransparency !important; | |
| 96 | + background-color: $primaryTransparency !important; | |
| 97 | + } | |
| 98 | + &:active{ | |
| 99 | + background-color: $primary !important; | |
| 100 | + box-shadow: 0px 0px 0px 3px $primaryTransparency !important; | |
| 88 | 101 | } |
| 89 | 102 | } |
| 90 | 103 | |
| 91 | -.btn-primary { | |
| 92 | - background-color: #Cd9035; | |
| 93 | - border-color: #Cd9035; | |
| 104 | +.btn-default { | |
| 105 | + color: #FFF; | |
| 106 | + background-color: $default !important; | |
| 107 | + border-color: $default !important; | |
| 94 | 108 | &:focus { |
| 95 | - box-shadow: none; | |
| 109 | + box-shadow: none !important; | |
| 96 | 110 | } |
| 97 | 111 | &:hover { |
| 98 | - background-color: #Cd9035; | |
| 112 | + color: #FFF; | |
| 113 | + border-color: $defaultTransparency !important; | |
| 114 | + background-color: $defaultTransparency !important; | |
| 115 | + } | |
| 116 | + &:active{ | |
| 117 | + background-color: $default !important; | |
| 118 | + box-shadow: 0px 0px 0px 3px $defaultTransparency !important; | |
| 99 | 119 | } |
| 100 | 120 | } |
| 101 | 121 | |
| 102 | 122 | .table-celda-total { |
| 103 | - background-color: #E09524; | |
| 123 | + background-color: $highlightedArea; | |
| 104 | 124 | } |
| 105 | 125 | |
| 106 | 126 | marquee { |
| 107 | - background-color: #E09524; | |
| 127 | + background-color: $highlightedArea; | |
| 108 | 128 | } |
| 109 | 129 | |
| 110 | 130 | .front-index{ |
| ... | ... | @@ -147,3 +167,32 @@ button.clear-input{ |
| 147 | 167 | outline: none; |
| 148 | 168 | } |
| 149 | 169 | } |
| 170 | +.custom-control-input { | |
| 171 | + &:checked ~ .custom-control-label::before { | |
| 172 | + border: none !important; | |
| 173 | + color: $primary !important; | |
| 174 | + background-color: $primary !important; | |
| 175 | + box-shadow: 0px 0px 0px 2px $primaryTransparency !important; | |
| 176 | + } | |
| 177 | + &:active ~ .custom-control-label::before { | |
| 178 | + border: none !important; | |
| 179 | + color: $primary !important; | |
| 180 | + background-color: $primary !important; | |
| 181 | + } | |
| 182 | + &:focus ~ .custom-control-label::before { | |
| 183 | + border: none !important; | |
| 184 | + box-shadow: 0px 0px 0px 2px $primaryTransparency !important; | |
| 185 | + } | |
| 186 | + &:focus:not(:checked) ~ .custom-control-label::before { | |
| 187 | + border: none !important; | |
| 188 | + } | |
| 189 | + &:not(:disabled):active ~ .custom-control-label::before { | |
| 190 | + border: none !important; | |
| 191 | + color: $primary !important; | |
| 192 | + box-shadow: 0px 0px 0px 2px $primaryTransparency !important; | |
| 193 | + } | |
| 194 | + &:hover ~ .custom-control-label::before { | |
| 195 | + border: none !important; | |
| 196 | + background-color: $primaryTransparency; | |
| 197 | + } | |
| 198 | +} |