diff --git a/@salix/app/src/app.js b/@salix/app/src/app.js index a4f3636b4d..81835fd890 100644 --- a/@salix/app/src/app.js +++ b/@salix/app/src/app.js @@ -14,5 +14,6 @@ import background from './styles/background.scss' import border from './styles/border.scss' import fontStyle from './styles/font-style.scss' import misc from './styles/misc.scss' +import display from './styles/display.css' bootstrap(); diff --git a/@salix/app/src/components/app/app.html b/@salix/app/src/components/app/app.html index 374f98e144..5013ce9cfb 100644 --- a/@salix/app/src/components/app/app.html +++ b/@salix/app/src/components/app/app.html @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/@salix/app/src/components/left-menu/left-menu.html b/@salix/app/src/components/left-menu/left-menu.html index dd68d8a7ec..13b34f5647 100644 --- a/@salix/app/src/components/left-menu/left-menu.html +++ b/@salix/app/src/components/left-menu/left-menu.html @@ -1,3 +1,5 @@ - - - \ No newline at end of file + + + + + diff --git a/@salix/app/src/components/left-menu/style.css b/@salix/app/src/components/left-menu/style.css index 9be0073a90..31f3d8578c 100644 --- a/@salix/app/src/components/left-menu/style.css +++ b/@salix/app/src/components/left-menu/style.css @@ -1,4 +1,4 @@ vn-menu-item a:hover { color: white !important; background-color: #424242; -} \ No newline at end of file +} diff --git a/@salix/app/src/styles/display.css b/@salix/app/src/styles/display.css new file mode 100644 index 0000000000..b1fe0fb3db --- /dev/null +++ b/@salix/app/src/styles/display.css @@ -0,0 +1,3 @@ +.display-block{ + display: block; +} \ No newline at end of file diff --git a/@salix/app/src/styles/font-family.css b/@salix/app/src/styles/font-family.css index 2122baa095..818c286f00 100644 --- a/@salix/app/src/styles/font-family.css +++ b/@salix/app/src/styles/font-family.css @@ -1,24 +1,21 @@ @font-face { - font-family: roboto-italic; - src: url(./fonts/Roboto-Italic.ttf); + font-family: raleway-italic; + src: url(./fonts/Raleway-Italic.ttf); } @font-face { - font-family: roboto-thin; - src: url(./fonts/Roboto-Thin.ttf); + font-family: raleway-thin; + src: url(./fonts/Raleway-Thin.ttf); } @font-face { - font-family: roboto-regular; - src: url(./fonts/Roboto-Regular.ttf); + font-family: raleway-regular; + src: url(./fonts/Raleway-Regular.ttf); } @font-face { - font-family: roboto-condensed-italic; - src: url(./fonts/Roboto-CondensedItalic.ttf); + font-family: raleway-bold; + src: url(./fonts/Raleway-Bold.ttf); } @font-face { - font-family: roboto-bold; - src: url(./fonts/Roboto-Bold.ttf); -} -@font-face { - font-family: roboto-bold-condensed; - src: url(./fonts/Roboto-BoldCondensed.ttf); + font-family: raleway-semi-bold; + src: url(./fonts/Raleway-SemiBold.ttf); } + diff --git a/@salix/app/src/styles/font-style.scss b/@salix/app/src/styles/font-style.scss index 59755abf4f..11f797d61c 100644 --- a/@salix/app/src/styles/font-style.scss +++ b/@salix/app/src/styles/font-style.scss @@ -1,9 +1,11 @@ @import "colors"; +@import "font-family"; $font-color: $color-dark-grey; body { color: $font-color; + font-family: raleway-regular; } html [uppercase], .uppercase { text-transform: uppercase; diff --git a/@salix/app/src/styles/fonts/Raleway-Bold.ttf b/@salix/app/src/styles/fonts/Raleway-Bold.ttf new file mode 100755 index 0000000000..38c099cc85 Binary files /dev/null and b/@salix/app/src/styles/fonts/Raleway-Bold.ttf differ diff --git a/@salix/app/src/styles/fonts/Raleway-Italic.ttf b/@salix/app/src/styles/fonts/Raleway-Italic.ttf new file mode 100755 index 0000000000..237d88d901 Binary files /dev/null and b/@salix/app/src/styles/fonts/Raleway-Italic.ttf differ diff --git a/@salix/app/src/styles/fonts/Raleway-Regular.ttf b/@salix/app/src/styles/fonts/Raleway-Regular.ttf new file mode 100755 index 0000000000..e570a2d5c3 Binary files /dev/null and b/@salix/app/src/styles/fonts/Raleway-Regular.ttf differ diff --git a/@salix/app/src/styles/fonts/Raleway-SemiBold.ttf b/@salix/app/src/styles/fonts/Raleway-SemiBold.ttf new file mode 100755 index 0000000000..ed0a8b9941 Binary files /dev/null and b/@salix/app/src/styles/fonts/Raleway-SemiBold.ttf differ diff --git a/@salix/app/src/styles/fonts/Raleway-Thin.ttf b/@salix/app/src/styles/fonts/Raleway-Thin.ttf new file mode 100755 index 0000000000..a497b98a86 Binary files /dev/null and b/@salix/app/src/styles/fonts/Raleway-Thin.ttf differ diff --git a/@salix/app/src/styles/title.css b/@salix/app/src/styles/title.css index 97dec56b46..33fe0e6a01 100644 --- a/@salix/app/src/styles/title.css +++ b/@salix/app/src/styles/title.css @@ -1,21 +1,27 @@ h1 { font-size: 32pt; + font-family: raleway-semi-bold; } h2 { font-size: 28pt; + font-family: raleway-semi-bold; } h3 { font-size: 24pt; + font-family: raleway-semi-bold; } h4 { font-size: 20pt; + font-family: raleway-semi-bold; } h5 { font-size: 16pt; + font-family: raleway-semi-bold; } h6 { font-size: 12pt; + font-family: raleway-semi-bold; } h1, h2, h3, h4, h5, h6 { diff --git a/@salix/core/src/card/card.js b/@salix/core/src/card/card.js new file mode 100644 index 0000000000..132d6f0558 --- /dev/null +++ b/@salix/core/src/card/card.js @@ -0,0 +1,20 @@ +import {module as _module} from '../module'; +import * as resolveFactory from '../resolveDefaultComponents'; +import * as util from '../util'; + +const _NAME = 'card'; +export const NAME = util.getName(_NAME); + +directive.$inject = [resolveFactory.NAME]; +export function directive(resolve) { + return { + require: 'E', + transclude: true, + template: function(_, attr) { + return resolve.getTemplate(_NAME, attr); + } + }; +} + +_module.directive(NAME, directive); + diff --git a/@salix/core/src/card/card.mdl.html b/@salix/core/src/card/card.mdl.html new file mode 100644 index 0000000000..e0d9f5b825 --- /dev/null +++ b/@salix/core/src/card/card.mdl.html @@ -0,0 +1 @@ +
diff --git a/@salix/core/src/card/card.mdl.js b/@salix/core/src/card/card.mdl.js new file mode 100644 index 0000000000..3467ecaca3 --- /dev/null +++ b/@salix/core/src/card/card.mdl.js @@ -0,0 +1,16 @@ +import {module as _module} from '../module'; +import * as util from '../util'; +import * as constant from '../constants'; +import template from './card.mdl.html'; + +const _NAME = 'card'; + +export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK); + +export function factory() { + return { + template: template + } +} + +_module.factory(NAME, factory); diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js index dc985b04b1..45eeb58bcd 100644 --- a/@salix/core/src/core.js +++ b/@salix/core/src/core.js @@ -40,6 +40,8 @@ export {NAME as COMBO, directive as ComboDirective} from './combo/combo'; export {NAME as COMBO_MDL, factory as comboMdl} from './combo/combo.mdl'; export {NAME as DATE_PICKER, directive as DatePickerDirective} from './date-picker/date-picker'; export {NAME as DATE_PICKER_MDL, factory as datePickerMdl} from './date-picker/date-picker.mdl'; +export {NAME as CARD, directive as CardDirective} from './card/card'; +export {NAME as CARD_MDL, factory as cardMdl} from './card/card.mdl'; export {directive as Popover} from './popover/popover'; export {factory as PopoverMdl} from './popover/popover.mdl'; diff --git a/@salix/core/src/title/title.html b/@salix/core/src/title/title.html index bf40c9a3b7..7649bccbfd 100644 --- a/@salix/core/src/title/title.html +++ b/@salix/core/src/title/title.html @@ -1,2 +1,2 @@ -

+

\ No newline at end of file diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html index abec4103db..b999d55099 100644 --- a/@salix/crud/src/client/basic-data/index.html +++ b/@salix/crud/src/client/basic-data/index.html @@ -1,26 +1,30 @@ -
- Datos básicos - - - - - - - - - - - - - - - - - - - - - - + + + + Datos básicos + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/@salix/crud/src/client/card/card.html b/@salix/crud/src/client/card/card.html index 5b64102102..84cae97d39 100644 --- a/@salix/crud/src/client/card/card.html +++ b/@salix/crud/src/client/card/card.html @@ -1,8 +1,8 @@ - - + + diff --git a/@salix/crud/src/client/descriptor/descriptor.html b/@salix/crud/src/client/descriptor/descriptor.html index d4e10065aa..2f103ed592 100644 --- a/@salix/crud/src/client/descriptor/descriptor.html +++ b/@salix/crud/src/client/descriptor/descriptor.html @@ -1,10 +1,12 @@ - - - person - - - {{descriptor.descriptor.clientId}} - {{descriptor.descriptor.name}} - {{descriptor.descriptor.phone}} - - + + + + person + + +
{{descriptor.descriptor.clientId}}
+
{{descriptor.descriptor.name}}
+
{{descriptor.descriptor.phone}}
+ + + diff --git a/@salix/crud/src/client/web-access/index.html b/@salix/crud/src/client/web-access/index.html index 2e36902ab2..84f10f1ef1 100644 --- a/@salix/crud/src/client/web-access/index.html +++ b/@salix/crud/src/client/web-access/index.html @@ -1,6 +1,10 @@ -
- Acceso Web - - - + + + + Acceso Web + + + + +
\ No newline at end of file diff --git a/@salix/webpack.config.js b/@salix/webpack.config.js index ee67c4f410..e6c73ed36a 100644 --- a/@salix/webpack.config.js +++ b/@salix/webpack.config.js @@ -37,7 +37,7 @@ var config = { test: /\.scss$/, loader: 'style!css!sass' },{ - test: /\.(svg|png)$/, + test: /\.(svg|png|ttf)$/, loader: 'file' } ]