verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 68 Releases Wiki Activity

añadidas las fuentes 

modificado el title para incluir las fuentes
añadido el componente card
modificado parte del diseño para incluir el componente card
This commit is contained in:
nelo 2017-01-04 14:22:30 +01:00
parent 1bcf91f58f
commit 3e8c898816
23 changed files with 123 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
@salix/app/src/app.js
View File

@ -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();

2
@salix/app/src/components/app/app.html
View File

@ -1,4 +1,4 @@
<vn-vertical full-height>
<vn-vertical full-height class="bg-content">
<vn-main-menu></vn-main-menu>
<vn-vertical ui-view scrollable class="main-view"></vn-vertical>
</vn-vertical>

8
@salix/app/src/components/left-menu/left-menu.html
View File

@ -1,3 +1,5 @@
<vn-vertical>
<vn-actions items = "menu.items"></vn-actions>
</vn-vertical>
<vn-card >
<vn-vertical pad-medium-top pad-medium-bottom>
<vn-actions items = "menu.items"></vn-actions>
</vn-vertical>
</vn-card>

2
@salix/app/src/components/left-menu/style.css
View File

@ -1,4 +1,4 @@
vn-menu-item a:hover {
color: white !important;
background-color: #424242;
}
}

3
@salix/app/src/styles/display.css Normal file
View File

@ -0,0 +1,3 @@
.display-block{
display: block;
}

25
@salix/app/src/styles/font-family.css
View File

@ -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);
}

2
@salix/app/src/styles/font-style.scss
View File

@ -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;

BIN
@salix/app/src/styles/fonts/Raleway-Bold.ttf Executable file
View File

Binary file not shown.

BIN
@salix/app/src/styles/fonts/Raleway-Italic.ttf Executable file
View File

Binary file not shown.

BIN
@salix/app/src/styles/fonts/Raleway-Regular.ttf Executable file
View File

Binary file not shown.

BIN
@salix/app/src/styles/fonts/Raleway-SemiBold.ttf Executable file
View File

Binary file not shown.

BIN
@salix/app/src/styles/fonts/Raleway-Thin.ttf Executable file
View File

Binary file not shown.

6
@salix/app/src/styles/title.css
View File

@ -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 {

20
@salix/core/src/card/card.js Normal file
View File

@ -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);

1
@salix/core/src/card/card.mdl.html Normal file
View File

@ -0,0 +1 @@
<div class="display-block demo-card-wide mdl-shadow--2dp bg-panel" *[foo]* ng-transclude></div>

16
@salix/core/src/card/card.mdl.js Normal file
View File

@ -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);

2
@salix/core/src/core.js
View File

@ -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';

2
@salix/core/src/title/title.html
View File

@ -1,2 +1,2 @@
<h3 style="margin-top: 0;" class="border-solid-bottom margin-medium-bottom" level="*[level]*" ng-transclude>
<h3 style="margin-top: 0;" class="margin-medium-bottom" level="*[level]*" ng-transclude>
</h3>

54
@salix/crud/src/client/basic-data/index.html
View File

@ -1,26 +1,30 @@
<form name="form" ng-submit="form.$valid && basicData.submit()" pad-large>
<vn-title>Datos básicos</vn-title>
<vn-horizontal>
<vn-textfield vn-one label="Nombre" field="basicData.client.name" focus></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" field="basicData.client.fi"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield autofocus vn-one label="Razón social" field="basicData.client.socialName"></vn-textfield>
<vn-date-picker vn-one label="Fecha alta" field="basicData.client.dischargeDate"></vn-date-picker>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Teléfono" field="basicData.client.telefono"></vn-textfield>
<vn-textfield vn-one label="Fax" field="basicData.client.fax"></vn-textfield>
<vn-textfield vn-one label="Email" field="basicData.client.email"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-combo vn-one label="Comercial" field="basicData.client.salesPerson">
<option ng-repeat="p in basicData.sales" value="{{p.id}}">{{p.name}}</ng-repeat>
</vn-combo>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-submit label="Guardar" id="save"></vn-submit>
</vn-one>
</vn-horizontal>
<form name="form" ng-submit="form.$valid && basicData.submit()" pad-medium>
<vn-card >
<vn-vertical pad-large>
<vn-title>Datos básicos</vn-title>
<vn-horizontal>
<vn-textfield vn-one label="Nombre" field="basicData.client.name" focus></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" field="basicData.client.fi"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield autofocus vn-one label="Razón social" field="basicData.client.socialName"></vn-textfield>
<vn-date-picker vn-one label="Fecha alta" field="basicData.client.dischargeDate"></vn-date-picker>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Teléfono" field="basicData.client.telefono"></vn-textfield>
<vn-textfield vn-one label="Fax" field="basicData.client.fax"></vn-textfield>
<vn-textfield vn-one label="Email" field="basicData.client.email"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-combo vn-one label="Comercial" field="basicData.client.salesPerson">
<option ng-repeat="p in basicData.sales" value="{{p.id}}">{{p.name}}</ng-repeat>
</vn-combo>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-submit label="Guardar" id="save"></vn-submit>
</vn-one>
</vn-horizontal>
</vn-vertical>
</vn-card>
</form>

4
@salix/crud/src/client/card/card.html
View File

@ -1,8 +1,8 @@
<vn-vertical class="full-height">
<vn-topbar></vn-topbar>
<vn-horizontal class="full-height">
<vn-empty class="bg-content" style="width: 18em">
<vn-descriptor descriptor="card.descriptor"></vn-descriptor>
<vn-empty style="width: 18em" pad-medium-left >
<vn-descriptor descriptor="card.descriptor" class="display-block" ></vn-descriptor>
<vn-left-menu items="card.items"></vn-left-menu>
</vn-empty>
<vn-auto >

22
@salix/crud/src/client/descriptor/descriptor.html
View File

@ -1,10 +1,12 @@
<vn-horizontal class="margin-large">
<vn-one>
<i class="material-icons" style="font-size:60px;">person</i>
</vn-one>
<vn-vertical>
<vn-one class="margin-right: .4em;" class="margin-none">{{descriptor.descriptor.clientId}}</vn-one>
<vn-one class="margin-none">{{descriptor.descriptor.name}}</vn-one>
<vn-one class="margin-none">{{descriptor.descriptor.phone}}</vn-one>
</vn-vertical>
</vn-horizontal>
<vn-card>
<vn-horizontal class="margin-medium" pad-medium-top pad-medium-bottom>
<vn-one>
<i class="material-icons" style="font-size:60px;">person</i>
</vn-one>
<vn-vertical vn-two>
<div class="margin-right: .4em;" class="margin-none">{{descriptor.descriptor.clientId}}</div>
<div class="margin-none">{{descriptor.descriptor.name}}</div>
<div class="margin-none">{{descriptor.descriptor.phone}}</div>
</vn-vertical>
</vn-horizontal>
</vn-card>

14
@salix/crud/src/client/web-access/index.html
View File

@ -1,6 +1,10 @@
<form name="form" ng-submit="form.$valid && web.submit()" pad-large>
<vn-title>Acceso Web</vn-title>
<vn-check label="Acceso web activo" field="web.client.active"></vn-check>
<vn-textfield label="Usuario" class="padd-medium-top" field="web.client.user" focus></vn-textfield>
<vn-submit label="Guardar"></vn-submit>
<form name="form" ng-submit="form.$valid && web.submit()" pad-medium >
<vn-card>
<vn-vertical pad-large>
<vn-title>Acceso Web</vn-title>
<vn-check label="Acceso web activo" field="web.client.active"></vn-check>
<vn-textfield label="Usuario" class="padd-medium-top margin-medium-top margin-medium-bottom" field="web.client.user" focus></vn-textfield>
<vn-submit label="Guardar"></vn-submit>
</vn-vertical>
</vn-card>
</form>

2
@salix/webpack.config.js
View File

@ -37,7 +37,7 @@ var config = {
test: /\.scss$/,
loader: 'style!css!sass'
},{
test: /\.(svg|png)$/,
test: /\.(svg|png|ttf)$/,
loader: 'file'
}
]