Commit 567c81c8 authored by D’jalmar Gutierrez Titirico's avatar D’jalmar Gutierrez Titirico 🚲

Merge branch 'iss4051-añadir-fecha-comentarios' into 'desarrollo'

Fecha Comentarios, Lista postulaciones

Se añadieron varios cambios a la interfaz grafica, se añadio la fecha  a los comentarios asi como tambien se mejoro el aspecto a la lista de postulaciones

See merge request !61
parents 2b96829c 1a540213
$brand-primary: #0275d8;
$brand-success: #5cb85c;
$brand-info: #5bc0de;
$brand-warning: #f0ad4e;
$brand-danger: #d9534f;
$gray-dark: #373a3c !default;
$btn-secondary-color: $gray-dark !default;
$btn-secondary-bg: #fff !default;
$btn-secondary-border: #ccc !default;
$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
@import '../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';
$fa-font-path: "../bower_components/font-awesome/fonts";
@import '../bower_components/font-awesome/scss/font-awesome';
$enable-hover-media-query: false !default;
@mixin hover {
@if $enable-hover-media-query {
// See Media Queries Level 4: http://drafts.csswg.org/mediaqueries/#hover
// Currently shimmed by https://github.com/twbs/mq4-hover-shim
@media (hover: hover) {
&:hover {
@content
}
}
} @else {
&:hover {
@content
}
}
}
@mixin button-outline-variant($color) {
color: $color;
background-image: none;
background-color: transparent;
border-color: $color;
&:focus,
&.focus,
&:active,
&.active,
.open > &.dropdown-toggle {
color: #fff;
background-color: $color;
border-color: $color;
}
@include hover {
color: #fff;
background-color: $color;
border-color: $color;
}
&.disabled,
&:disabled {
&:focus,
&.focus {
border-color: lighten($color, 20%);
}
@include hover {
border-color: lighten($color, 20%);
}
}
}
/**
* App-wide Styles
*/
$femenino-color: #ff81e3;
$masculino-color: #57b6ff;
// Remove all backgrounds
.btn-primary-outline {
@include button-outline-variant($btn-primary-bg);
}
.btn-secondary-outline {
@include button-outline-variant($btn-secondary-border);
}
.btn-info-outline {
@include button-outline-variant($btn-info-bg);
}
.btn-success-outline {
@include button-outline-variant($btn-success-bg);
}
.btn-warning-outline {
@include button-outline-variant($btn-warning-bg);
}
.btn-danger-outline {
@include button-outline-variant($btn-danger-bg);
}
blockquote.blockquote-primary {
border-left-color: $brand-primary;
font-size: 14px;
p {
text-align: justify;
}
p.fecha {
text-align: right;
}
}
//tags
tags-input.primary .tags .tag-item {
color: #fff;
background: $brand-primary;
border: 1px solid $brand-primary;
border-radius: 4px;
}
//titulos
h4.color-primary {
color: $brand-primary;
}
.browserupgrade {
margin: 0.2em 0;
......@@ -15,15 +123,18 @@ $masculino-color: #57b6ff;
color: #000;
padding: 0.2em 0;
}
.sub-header {
padding-bottom: 10px;
border-bottom: 1px solid #eee;
}
.input-group {
margin-bottom: 10px;
}
.header-button{
margin-top: 20px;
.header-button {
margin-top: 14px;
margin-bottom: 10px;
}
......
......@@ -8,7 +8,7 @@
</div>
<div class="col-sm-3 col-sm-offset-5">
<div class="pull-right">
<button class="btn btn-success header-button" ng-click="vm.crearCargos()">
<button class="btn btn-success-outline header-button" ng-click="vm.crearCargos()">
<i class="fa fa-plus"></i> Crear Cargo
</button>
</div>
......@@ -30,7 +30,7 @@
<tr ng-repeat="cargo in vm.cargos">
<td>{{cargo.nombre}}</td>
<td width="150">
<a class="btn btn-info btn-xs" href="#" role="button" ng-click="vm.editar(cargo._id)"><i
<a class="btn btn-info-outline btn-xs" href="#" role="button" ng-click="vm.editar(cargo._id)"><i
class="fa fa-edit fa-lg"></i></a>
</td>
<!--Mostrar un dialogo de eliminar-->
......
......@@ -18,7 +18,7 @@
<input type="text" name="nombre" class="form-control" ng-model="vm.cargo.nombre"
placeholder="Nombre de cargo" required>
<span class="input-group-btn">
<button type="button" class="btn btn-primary" ng-click="vm.guardarCargo(form,'nombre')"
<button type="button" class="btn btn-primary-outline" ng-click="vm.guardarCargo(form,'nombre')"
ng-disabled="!form.nombre.$dirty"><i class="fa fa-save"></i></button>
</span>
</p>
......@@ -53,7 +53,7 @@
<td>{{postulante.apellidos}}</td>
<td>{{postulante.ci}}</td>
<td>
<button type="button" class="btn btn-danger" ng-click="vm.eliminarPostulacion(postulante)"><i
<button type="button" class="btn btn-danger-outline" ng-click="vm.eliminarPostulacion(postulante)"><i
class="fa fa-trash" title="Eliminar postulación"></i></button>
</td>
</tr>
......@@ -65,7 +65,7 @@
<div class="row">
<div class="col-md-10">
<div class="pull-right">
<button class="btn btn-success" ng-click="vm.crearPostulanteACargo()" type="button"><i
<button class="btn btn-success-outline" ng-click="vm.crearPostulanteACargo()" type="button"><i
class="fa fa-plus"></i>
Nueva Postulación
</button>
......
......@@ -18,7 +18,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit" ng-disabled="!(form.nombre.$dirty) || form.$invalid">
<button class="btn btn-primary-outline" type="submit" ng-disabled="!(form.nombre.$dirty) || form.$invalid">
Guardar
</button>
<button class="btn btn-default" type="button" ng-click="vm.modal.dismiss()">Cancelar</button>
......
......@@ -30,7 +30,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit" ng-disabled="!form.contenido.$dirty">
<button class="btn btn-primary-outline" type="submit" ng-disabled="!form.contenido.$dirty">
Guardar
</button>
<button class="btn btn-default" type="button" ng-click="vm.modal.dismiss()">Cancelar</button>
......
......@@ -32,7 +32,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit" ng-disabled="!(form.tiposDato.$dirty ||form.valor.$dirty)">
<button class="btn btn-primary-outline" type="submit" ng-disabled="!(form.tiposDato.$dirty ||form.valor.$dirty)">
Guardar
</button>
<button class="btn btn-default" type="button" ng-click="vm.modal.dismiss()">Cancelar</button>
......
......@@ -50,7 +50,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit" ng-disabled="!(form.postulante.$dirty || form.presentacion.$dirty) || form.$invalid">
<button class="btn btn-primary-outline" type="submit" ng-disabled="!(form.postulante.$dirty || form.presentacion.$dirty) || form.$invalid">
Guardar
</button>
<button class="btn btn-default" type="button" ng-click="vm.modal.dismiss()">Cancelar</button>
......
......@@ -32,7 +32,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit" ng-disabled="!(form.cargos.$dirty ||form.presentacion.$dirty)">
<button class="btn btn-primary-outline" type="submit" ng-disabled="!(form.cargos.$dirty ||form.presentacion.$dirty)">
Guardar
</button>
<button class="btn btn-default" type="button" ng-click="vm.modal.dismiss()">Cancelar</button>
......
......@@ -38,7 +38,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit"
<button class="btn btn-primary-outline" type="submit"
ng-disabled="!(form.nombres.$dirty ||form.apellidos.$dirty|| form.apellidos.$dirty)">
Guardar
</button>
......
......@@ -8,7 +8,7 @@
</div>
<div class="col-sm-3 col-sm-offset-5">
<div class="pull-right">
<button class="btn btn-success header-button" ng-click="vm.crear()">
<button class="btn btn-success-outline header-button" ng-click="vm.crear()">
<i class="fa fa-plus"></i> Crear Postulante
</button>
</div>
......@@ -45,10 +45,10 @@
<td>{{postulante.apellidos}}</td>
<td class="text-center">
<div class="btn-group" role="group">
<a class="btn btn-info btn-xs" href="#" role="button" ng-click="vm.editar(postulante._id)">
<a class="btn btn-info-outline btn-xs" href="#" role="button" ng-click="vm.editar(postulante._id)">
<i class="fa fa-edit fa-lg"></i>
</a>
<a class="btn btn-danger btn-xs" href="#" role="button" ng-click="vm.eliminar(postulante)">
<a class="btn btn-danger-outline btn-xs" href="#" role="button" ng-click="vm.eliminar(postulante)">
<i class="fa fa-trash fa-lg"></i>
</a>
</div>
......
<div class="row">
<div ui-view class="container"></div>
<div class="container"><div ui-view class="container"></div></div>
</div>
<div class="row">
<h2 class="sub-header">Tipos de dato</h2>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Propiedad</th>
<th>Nombre</th>
<th colspan="2">Opciones</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="tipoDato in vm.tiposDato">
<td>{{tipoDato.propiedad}}</td>
<td>{{tipoDato.nombre}}</td>
<td><a ng-click="vm.editar(tipoDato._id)">Editar</a></td>
<!--TODO Mostrar un dialogo de eliminar-->
<td><a ng-click="vm.eliminar(tipoDato._id)">Eliminar</a></td>
</tr>
</tbody>
</table>
<div class="container">
<h2 class="sub-header">Tipos de dato</h2>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Propiedad</th>
<th>Nombre</th>
<th colspan="2">Opciones</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="tipoDato in vm.tiposDato">
<td>{{tipoDato.propiedad}}</td>
<td>{{tipoDato.nombre}}</td>
<td><a ng-click="vm.editar(tipoDato._id)">Editar</a></td>
<!--TODO Mostrar un dialogo de eliminar-->
<td><a ng-click="vm.eliminar(tipoDato._id)">Eliminar</a></td>
</tr>
</tbody>
</table>
</div>
<uib-pagination
total-items="vm.totalElementos"
items-per-page="15"
max-size="8"
force-ellipses="true"
ng-model="vm.paginaActual"
ng-change="vm.cambiarPagina()"
next-text="Siguiente"
previous-Text="Anterior"></uib-pagination>
</div>
<uib-pagination
total-items="vm.totalElementos"
items-per-page="15"
max-size="8"
force-ellipses="true"
ng-model="vm.paginaActual"
ng-change="vm.cambiarPagina()"
next-text="Siguiente"
previous-Text="Anterior"></uib-pagination>
</div>
......@@ -44,7 +44,7 @@ angular.module('moduloPersonalApp')
title: 'Confirmar eliminación',
html: '<p>Esta seguro que quiere eliminar <strong>' + name + '</strong> ?</p>',
buttons: [{
classes: 'btn-danger',
classes: 'btn-danger-outline',
text: 'Eliminar',
click: function(e) {
eliminarModal.close(e);
......@@ -76,7 +76,7 @@ angular.module('moduloPersonalApp')
title: 'Edición',
modelo: args[0],
buttons: [{
classes: 'btn-success',
classes: 'btn-success-outline',
text: 'Guardar',
click: function(e) {
editarModal.close(e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment