diff --git a/client/client/src/card/style.css b/client/client/src/card/style.css index 195879409..30d68e782 100644 --- a/client/client/src/card/style.css +++ b/client/client/src/card/style.css @@ -1,3 +1,3 @@ vn-descriptor { - font-family: raleway-bold; + font-family: vn-font-bold; } \ No newline at end of file diff --git a/client/client/src/index/style.css b/client/client/src/index/style.css index b30351f09..123a0bf97 100644 --- a/client/client/src/index/style.css +++ b/client/client/src/index/style.css @@ -12,5 +12,5 @@ vn-item-client a:hover { } .vn-item-client-name { - font-family: raleway-bold; + font-family: vn-font-bold; } diff --git a/client/core/src/autocomplete/style.scss b/client/core/src/autocomplete/style.scss index 1472dbcf3..5b68a465b 100644 --- a/client/core/src/autocomplete/style.scss +++ b/client/core/src/autocomplete/style.scss @@ -18,7 +18,7 @@ ul.vn-autocomplete { } &.load-more { color: #ffa410; - font-weight: bold; + font-family: vn-font-bold; padding: .4em .8em; } } diff --git a/client/core/src/confirm/style.css b/client/core/src/confirm/style.css index 7177560fd..b19288ecb 100644 --- a/client/core/src/confirm/style.css +++ b/client/core/src/confirm/style.css @@ -1,5 +1,5 @@ - -vn-confirm .dialog-title { - color:#424242; - font-family: raleway-bold; -} + +vn-confirm .dialog-title { + color:#424242; + font-family: vn-font-bold; +} diff --git a/client/core/src/dialog/style.scss b/client/core/src/dialog/style.scss index 1b30f5e98..73bd5ba19 100644 --- a/client/core/src/dialog/style.scss +++ b/client/core/src/dialog/style.scss @@ -1,68 +1,68 @@ -.vn-dialog { - display: none; - z-index: 100; - position: fixed; - left: 0; - top: 0; - height: 100%; - width: 100%; - background-color: rgba(1,1,1,.4); - - button.close { - position: absolute; - top: 0; - right: 0; - border-style: none; - background-color: transparent; - padding: .3em; - cursor: pointer; - - vn-icon { - display: block; - - i { - display: block; - } - } - - &:hover { - background-color: rgba(0, 0, 0, .1); - } - } - & > div { - position: relative; - box-shadow: 0 0 .4em rgba(1,1,1,.4); - background-color: white; - border-radius: .2em; - overflow: auto; - top: 50%; - left: 50%; - padding: 2em; - box-sizing: border-box; - - width: 28em; - margin-top: -10em; - margin-left: -14em; - } - .button-bar { - margin-top: 1.5em; - text-align: right; - - button { - background: none; - border: none; - text-transform: uppercase; - font-size: 1.1em; - color: #ffa410; - font-weight: bold; - cursor: pointer; - padding: .5em; - margin: -0.5em; - margin-left: .5em; - - &:hover { - background-color: rgba(1,1,1,.1); - } - } - } -} +.vn-dialog { + display: none; + z-index: 100; + position: fixed; + left: 0; + top: 0; + height: 100%; + width: 100%; + background-color: rgba(1,1,1,.4); + + button.close { + position: absolute; + top: 0; + right: 0; + border-style: none; + background-color: transparent; + padding: .3em; + cursor: pointer; + + vn-icon { + display: block; + + i { + display: block; + } + } + + &:hover { + background-color: rgba(0, 0, 0, .1); + } + } + & > div { + position: relative; + box-shadow: 0 0 .4em rgba(1,1,1,.4); + background-color: white; + border-radius: .2em; + overflow: auto; + top: 50%; + left: 50%; + padding: 2em; + box-sizing: border-box; + + width: 28em; + margin-top: -10em; + margin-left: -14em; + } + .button-bar { + margin-top: 1.5em; + text-align: right; + + button { + background: none; + border: none; + text-transform: uppercase; + font-size: 1.1em; + color: #ffa410; + font-family: vn-font-bold; + cursor: pointer; + padding: .5em; + margin: -0.5em; + margin-left: .5em; + + &:hover { + background-color: rgba(1,1,1,.1); + } + } + } +} diff --git a/client/core/src/mdl-override.css b/client/core/src/mdl-override.css index 83043a144..3a1f391a2 100644 --- a/client/core/src/mdl-override.css +++ b/client/core/src/mdl-override.css @@ -1,60 +1,60 @@ -/** - * Rewrited CSS rules from Material Design Lite. - * TODO: don't use !important - */ - -.mdl-textfield { - width: 100%; -} - -.mdl-button { - font-weight: bolder; - color: #ffa410; -} -.mdl-button--colored { - color: white !important; -} -.mdl-button--colored, -.mdl-button--colored:focus, -.mdl-button--colored:active { - background-color: #ffa410 !important; -} -.mdl-button--colored:hover, -.mdl-button--raised:hover { - background-color: #ffa410 !important; -} -.mdl-button--fab{ - color: white !important; - background-color: #ff9400 !important; -} - -.mdl-dialog__actions--full-width>*{ - text-align: center; -} - -.mdl-dialog{ - width: 400px; - font-family: raleway-regular; - line-height:60px; - text-align: center; -} - -.mdl-textfield__error { - visibility: visible; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - width: 100%; -} -.mdl-textfield.invalid .mdl-textfield__input { - border-color: #d50000; - box-shadow: none; -} -.mdl-textfield.invalid .mdl-textfield__label::after { - background-color: #d50000; -} -.mdl-textfield--floating-label.invalid .mdl-textfield__label { - color: #d50000; - font-size: 12px; - top: 4px; -} +/** + * Rewrited CSS rules from Material Design Lite. + * TODO: don't use !important + */ + +.mdl-textfield { + width: 100%; +} + +.mdl-button { + font-weight: bolder; + color: #ffa410; +} +.mdl-button--colored { + color: white !important; +} +.mdl-button--colored, +.mdl-button--colored:focus, +.mdl-button--colored:active { + background-color: #ffa410 !important; +} +.mdl-button--colored:hover, +.mdl-button--raised:hover { + background-color: #ffa410 !important; +} +.mdl-button--fab{ + color: white !important; + background-color: #ff9400 !important; +} + +.mdl-dialog__actions--full-width>*{ + text-align: center; +} + +.mdl-dialog{ + width: 400px; + font-family: vn-font; + line-height:60px; + text-align: center; +} + +.mdl-textfield__error { + visibility: visible; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; +} +.mdl-textfield.invalid .mdl-textfield__input { + border-color: #d50000; + box-shadow: none; +} +.mdl-textfield.invalid .mdl-textfield__label::after { + background-color: #d50000; +} +.mdl-textfield--floating-label.invalid .mdl-textfield__label { + color: #d50000; + font-size: 12px; + top: 4px; +} diff --git a/client/salix/src/styles/display.css b/client/salix/src/styles/display.css index 982432252..c296eec69 100644 --- a/client/salix/src/styles/display.css +++ b/client/salix/src/styles/display.css @@ -24,9 +24,9 @@ } .popover-label { - font-weight: bold; - color: black; - padding-top:5px; + font-family: vn-font-bold; + color: black; + padding-top:5px; } /* Icon cuadrado */ diff --git a/client/salix/src/styles/font-family.css b/client/salix/src/styles/font-family.css index 3fc6b8fcd..21a5219c8 100644 --- a/client/salix/src/styles/font-family.css +++ b/client/salix/src/styles/font-family.css @@ -1,21 +1,12 @@ -@font-face { - font-family: raleway-italic; - src: url(./fonts/Raleway-Italic.ttf); -} -@font-face { - font-family: raleway-thin; - src: url(./fonts/Raleway-Thin.ttf); -} -@font-face { - font-family: raleway-regular; - src: url(./fonts/Raleway-Regular.ttf); -} -@font-face { - font-family: raleway-bold; - src: url(./fonts/Raleway-Bold.ttf); -} -@font-face { - font-family: raleway-semi-bold; - src: url(./fonts/Raleway-SemiBold.ttf); -} - +@font-face { + font-family: vn-font-medium; + src: url(./fonts/Roboto-Medium.ttf); +} +@font-face { + font-family: vn-font; + src: url(./fonts/Roboto.ttf); +} +@font-face { + font-family: vn-font-bold; + src: url(./fonts/Roboto-Bold.ttf); +} diff --git a/client/salix/src/styles/font-style.scss b/client/salix/src/styles/font-style.scss index fb4b055d3..db0198cde 100644 --- a/client/salix/src/styles/font-style.scss +++ b/client/salix/src/styles/font-style.scss @@ -1,12 +1,12 @@ -@import "colors"; -@import "font-family"; - -$font-color: $color-dark-grey; - -body { - color: $font-color; - font-family: raleway-regular; -} -html [uppercase], .uppercase { - text-transform: uppercase; +@import "colors"; +@import "font-family"; + +$font-color: $color-dark-grey; + +body { + color: $font-color; + font-family: vn-font; +} +html [uppercase], .uppercase { + text-transform: uppercase; } \ No newline at end of file diff --git a/client/salix/src/styles/fonts/Roboto-Bold.ttf b/client/salix/src/styles/fonts/Roboto-Bold.ttf new file mode 100644 index 000000000..072b84292 Binary files /dev/null and b/client/salix/src/styles/fonts/Roboto-Bold.ttf differ diff --git a/client/salix/src/styles/fonts/Roboto-Medium.ttf b/client/salix/src/styles/fonts/Roboto-Medium.ttf new file mode 100644 index 000000000..d0f6e2b64 Binary files /dev/null and b/client/salix/src/styles/fonts/Roboto-Medium.ttf differ diff --git a/client/salix/src/styles/fonts/Roboto.ttf b/client/salix/src/styles/fonts/Roboto.ttf new file mode 100644 index 000000000..d0f6e2b64 Binary files /dev/null and b/client/salix/src/styles/fonts/Roboto.ttf differ diff --git a/client/salix/src/styles/misc.scss b/client/salix/src/styles/misc.scss index 8168b6781..068717911 100644 --- a/client/salix/src/styles/misc.scss +++ b/client/salix/src/styles/misc.scss @@ -64,7 +64,7 @@ html [vn-center], .vn-center{ .tooltip { .list-header{ border-bottom: 3px solid $color-medium-grey; - font-weight: bold; + font-family: vn-font-bold; text-align: center } .list-element{ @@ -72,7 +72,7 @@ html [vn-center], .vn-center{ } } .list-footer{ - font-weight: bold; + font-family: vn-font-bold; border-top: 3px solid $color-medium-grey; } .list-element.warning{ diff --git a/client/salix/src/styles/title.css b/client/salix/src/styles/title.css index 4589f0b9c..1fe3e45ca 100644 --- a/client/salix/src/styles/title.css +++ b/client/salix/src/styles/title.css @@ -1,25 +1,25 @@ - -h1 { - font-size: 32pt; -} -h2 { - font-size: 28pt; -} -h3 { - font-size: 24pt; -} -h4 { - font-size: 20pt; -} -h5 { - font-size: 16pt; -} -h6 { - font-size: 12pt; -} - -h1, h2, h3, h4, h5, h6 { - padding: 0; - margin: .4em 0; - font-family: raleway-semi-bold; + +h1 { + font-size: 32pt; +} +h2 { + font-size: 28pt; +} +h3 { + font-size: 24pt; +} +h4 { + font-size: 20pt; +} +h5 { + font-size: 16pt; +} +h6 { + font-size: 12pt; +} + +h1, h2, h3, h4, h5, h6 { + padding: 0; + margin: .4em 0; + font-family: vn-font-bold; } \ No newline at end of file