Skip to content

Commit

Permalink
Correções e ajustes para lançamento da versão v3
Browse files Browse the repository at this point in the history
  • Loading branch information
jprodrigues70 committed Mar 17, 2018
1 parent 0c0d351 commit 3bf288e
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 26 deletions.
19 changes: 14 additions & 5 deletions factory/js/gainTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ function ask(e) {

function preformat(e, text) {
var n = text ? e.textContent: e.value;

var a = "";
var a = n;
var s = text ? text: e.dataset.validate;
if (n) {
switch (s) {
Expand Down Expand Up @@ -160,6 +159,12 @@ function formater(e) {
case "date":
onlyNumbers(t);
break;
case "num":
onlyNumbers(t);
break;
case "text":
blockNum(t);
break;
}
})

Expand All @@ -176,6 +181,13 @@ function onlyNumbers(t) {
}
}

function blockNum(t) {
if (!isNaN(t.key) && 0 != t.keyCode && 8 != t.keyCode && 46 != t.keyCode && !t.ctrlKey && t.key != "Tab" && t.key != "ArrowLeft" && t.key != "ArrowRight" && t.key != "ArrowDown" && t.key != "ArrowUp" && t.key != "Enter" && " " != t.key) {
t.preventDefault();
return false;
}
}

function ctrlButtons(t) {
return 0 != t.keyCode && 8 != t.keyCode && 46 != t.keyCode;
}
Expand Down Expand Up @@ -261,9 +273,6 @@ function switchValidations(e) {
case "num":
searcher(e, /^[\d]*$/g);
break;
case "email":
searcher(e, /^(([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+(\.([A-Za-z]{2,4}))*)*$/);
break;
case "cpf":
validateCpf(e.value) || "" == e.value ? validsIt(e) : invalidsIt(e, "Este CPF é inválido.");
break;
Expand Down
2 changes: 2 additions & 0 deletions factory/sass/components/_banner.sass
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
width: 100%
height: 100%
z-index: 0
left: 0
top: 0
.cover
background-position: right
background-attachment: fixed
Expand Down
6 changes: 0 additions & 6 deletions factory/sass/components/_cards.sass
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
transition: all .2s
overflow: hidden

.card.hoverable:hover
cursor: pointer
border-bottom-color: #959595
border-top-color: #959595
background-color: #f6f6f6cc

.card-img
width: 100%
background-size: 100%
Expand Down
4 changes: 4 additions & 0 deletions factory/sass/components/_dropdowns.sass
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
&.btn
&::after
right: -5px
&.sm
&::after
right: 0

& > *
display: inline-block
vertical-align: middle
Expand Down
2 changes: 1 addition & 1 deletion factory/sass/helpers/_grid.sass
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $columns: 12
+col-factory("min-width: 993px", md)
+col-factory("min-width: 1201px", lg)

.false-gutter
.false-gutter >
+float-col-to-false-gutter(xs)
+float-col-to-false-gutter(sm)
+float-col-to-false-gutter(md)
Expand Down
56 changes: 51 additions & 5 deletions factory/sass/helpers/_singles.sass
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
.left
left: 0!important
float: left!important
.right
float: right!important
right: 0!important

.scrollable-y
overflow: auto

.hidden
display: none!important
Expand All @@ -10,13 +15,38 @@

.padding
padding: 15px
&-l
padding-left: 15px
&-r
padding-right: 15px
&-lr
padding-left: 15px
padding-right: 15px
&-t
padding-top: 15px
&-b
padding-bottom: 15px
&-tb
padding-top: 15px
padding-bottom: 15px

.margin
margin: 15px
&-l
margin-left: 15px
&-r
margin-right: 15px
&-lr
margin-left: 15px
margin-right: 15px
&-t
margin-top: 15px
&-b
margin-bottom: 15px
&-tb
margin-top: 15px
margin-bottom: 15px

.vertical-list
& > *
display: block!important
Expand Down Expand Up @@ -44,13 +74,10 @@
max-height: 100px

.small
width: 300px
max-width: 300px
.medium
width: 700px
max-width: 700px
.large
width: 1200px
max-width: 1200px
.full
width: 100%
Expand All @@ -59,15 +86,34 @@
.fixed
position: fixed

.first
margin-top: 60px
.vertical-full
height: 100%

.no-margin
margin: 0!important
.no-padding
padding: 0!important

.first
margin-top: 60px

.center
display: block
margin-left: auto
margin-right: auto

.border
border: 1px solid rgba(23, 67, 104, 0.35)

.hoverable:hover
cursor: pointer
background-color: #e6e6e6e6
background-clip: border-box

.lg
font-size: 18px
padding: 12px 30px

.sm
font-size: 12px
padding: 2.5px 5px
3 changes: 3 additions & 0 deletions factory/sass/helpers/_text.sass
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
white-space: nowrap
overflow: hidden
text-overflow: ellipsis

abbr[title]
cursor: help
12 changes: 3 additions & 9 deletions factory/sass/layouts/_base.sass
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,18 @@ body
position: absolute
> footer, main > footer
padding: 15px 5%

article, aside, nav, section
h1
font-size: 2em

%container
.container
margin: 30px auto
padding: 30px
width: calc(100% - 10%)
+box-shadow (0 1px 1px 0 rgba(0,0,0,0.06),0 2px 5px 0 rgba(0,0,0,0.2))
.painel
section
@extend %container

.container
@extend %container

body > section, .gt-section
body > section, main > section, .gt-section
width: 100%
padding: 30px 5%
margin: 0
Expand Down
5 changes: 5 additions & 0 deletions factory/sass/layouts/_tables.sass
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
img
height: 35px
width: 35px
&.bordered
border: 1px solid rgba(23, 67, 104, 0.35)
tr > td, tr > th
border-left: 1px solid rgba(23, 67, 104, 0.35)

&.striped
tbody tr:nth-child(even)
background-color: #E6E6E6
Expand Down

0 comments on commit 3bf288e

Please sign in to comment.