22 Julio Commit3

1/8/2020 Visual (1279a486) · Commits · Guillermo Agudelo / apptalento · GitLab
Please ensure your account's recovery settings are up to date.
Commit 1279a486 authored 1 week ago by Guillermo Agudelo
Visual
parent acc3153d master
No related merge requests found
Showing 69 changed files  with 15450 additions and 18346 deletions
  composer.lock
This diff is collapsed.
  public/argon/css/argon-dashboard.css.map 0 → 100644
  public/argon/css/argon.css
  public/argon/css/argon.css.map 0 → 100644
  public/argon/css/argon.min.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
  public/argon/scss/argon-dashboard/bootstrap/_variables.scss
... ... @@ -70,8 +70,8 @@ $colors: map-merge(
70 70 $colors
71 71 );
72 72
73 - $primary: $blue !default;
74 - $secondary: $gray-600 !default;
73 + $primary: #231969 !default;
74 + $secondary: #00E1B4 !default;
75 75 $success: $green !default;
76 76 $info: $cyan !default;
77 77 $warning: $yellow !default;
... ...
  public/argon/scss/argon-dashboard/custom/_variables.scss
... ... @@ -99,14 +99,14 @@ $colors: map-merge((
99 99 ), $colors);
100 100
101 101 $default: #172b4d !default;
102 - $primary: #5e72e4 !default;
102 + $primary: #0FAAF0 !default;
103 103 $secondary: #f7fafc !default;
104 104 $success: $green !default;
105 - $info: $teal !default;
105 + $info: #0FAAF0 !default;
106 106 $warning: $orange !default;
107 107 $danger: $red !default;
108 108 $light: $gray-500 !default;
https://gitlab.com/guille.agudelo/apptalento/-/commit/1279a486ae6d52cad97f2cc49fb3677adebddf11 1/28
109 - $dark: $gray-900 !default;

109 + $dark: #231969 !default;
110 110 $darker: darken($gray-900, 15%) !default;
111 111
112 112 $facebook: #3b5999 !default;
... ... @@ -415,7 +415,7 @@ $lead-font-weight: 300 !default;
415 415
416 416 $small-font-size: 80% !default;
417 417
418 - $text-muted: $gray-600 !default;
418 + $text-muted: $white !default;
419 419
420 420 $blockquote-small-color: $gray-600 !default;
421 421 $blockquote-font-size: ($font-size-base * 1.25) !default;
... ...
  public/argon/scss/argon-dashboard.scss → public/argon/scss/argon.scss
File moved
  public/font/Ubuntu/Ubuntu/Ubuntu-Bold.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-BoldItalic.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-Italic.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-Light.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-LightItalic.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-Medium.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-MediumItalic.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/Ubuntu-Regular.ttf 0 → 100644
File added
  public/font/Ubuntu/Ubuntu/UbuntuCondensed-Regular.ttf 0 → 100644
File added
 public/images/icons/Icono 10 2.png 0 → 100644

public/images/icons/Icono_10_2.png 0 → 100644
10.5 KB
 public/images/icons/Icono_11.png 0 → 100644
9.52 KB
 public/images/icons/Icono_11_1.png 0 → 100644
10.4 KB
9.36 KB
10.4 KB
10.3 KB
10.2 KB
9.71 KB
9.58 KB
7.93 KB
9.61 KB
9.6 KB
7.7 KB
9.49 KB
9.5 KB
9.56 KB
10.2 KB
10.9 KB
11 KB
10.9 KB
6.09 KB
9.77 KB
9.98 KB
9.71 KB
5.27 KB
7.84 KB
8.97 KB
8.93 KB
9.66 KB
9.63 KB
6.46 KB
9.51 KB
9.74 KB
9.63 KB
9.45 KB
9.57 KB
9.51 KB
 public/images/icons/instituciones.png 0 → 100644
10.5 KB
 public/images/icons/instituciones1.png 0 → 100644
10.6 KB
 public/images/icons/parametros.png 0 → 100644
9.5 KB
 public/images/icons/roles.png 0 → 100644
7.68 KB
 public/images/icons/roles1.png 0 → 100644
9.74 KB
 public/images/icons/user.png 0 → 100644
6.74 KB
 public/images/icons/user1.png 0 → 100644
9.63 KB
  resources/sass/_variables.scss deleted 100644 → 0

1 - // Body
2 - $body-bg: #f8fafc;
3 -
4 - // Typography
5 - $font-family-sans-serif: 'Nunito', sans-serif;
6 - $font-size-base: 0.9rem;
7 - $line-height-base: 1.6;
8 -
9 - // Colors
10 - $blue: #3490dc;
11 - $indigo: #6574cd;
12 - $purple: #9561e2;
13 - $pink: #f66d9b;
14 - $red: #e3342f;
15 - $orange: #f6993f;
16 - $yellow: #ffed4a;
17 - $green: #38c172;
18 - $teal: #4dc0b5;
19 - $cyan: #6cb2eb;
  resources/sass/app.scss deleted 100644 → 0

1 - // Fonts
2 - @import url('https://fonts.googleapis.com/css?family=Nunito');
3 -
4 - // Variables
5 - @import 'variables';
6 -
7 - // Bootstrap
8 - @import '~bootstrap/scss/bootstrap';
  resources/views/_includes/dashboard/superadmin.blade.php
1 1 <x-table>
2 2 <x-slot name="headerLeft">
3 - ACCESO DE USUARIOS
3 + <h3> ACCESO DE USUARIOS </h3>
4 4 </x-slot>
5 5 <table class="table table-hover">
6 6 <thead>
... ...
  resources/views/admin/institutions/create.blade.php
... ... @@ -92,7 +92,7 @@
92 92 </div>
93 93
94 94 <div class="text-center text-md-right mb-5">
95 - <a href="javascript:window.history.go(-1);" class="btn btn-secondary">Cancelar</a>
95 + <a href="javascript:window.history.go(-1);" class="btn btn-danger">Cancelar</a>
96 96 <button class="btn btn-primary" type="submit">Guardar</button>
97 97 </div>
98 98 </form>
... ...
  resources/views/admin/roles/index.blade.php
... ... @@ -108,7 +108,7 @@
108 108 </div>
109 109
110 110 <div class="modal-footer">
111 - <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
111 + <button type="button" class="btn btn-danger" data-dismiss="modal">Cerrar</button>
112 112 <button type="button" class="btn btn-primary" @click="save">
113 113 <i class="fa fa-save"></i> Guardar
114 114 </button>
... ...
  resources/views/layouts/app.blade.php
... ... @@ -22,14 +22,20 @@
22 22 
23 23 {{-- <link href="{{ asset('argon') }}/img/brand/favicon.png" rel="icon" type="image/png"> --}}
24 24 
25 - <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
25 + <link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet">
26 26 
27 27 <link href="{{ asset('argon') }}/vendor/nucleo/css/nucleo.css" rel="stylesheet">
28 28 <link href="{{ asset('argon') }}/vendor/@fortawesome/fontawesome-free/css/all.min.css"
rel="stylesheet">
29 29 
30 - <link type="text/css" href="{{ asset('argon') }}/css/argon.css?v=1.0.0" rel="stylesheet">
30 + <link type="text/css" href="{{ asset('argon') }}/css/argon.css?v=1.0.1" rel="stylesheet">
31 31 
32 32 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-

select@1.13.14/dist/css/bootstrap-select.min.css">
33 +
34 + <style>
35 + h1,h2,h3,h4,h5,h6,i,a,p{
36 + font-family: 'Ubuntu', sans-serif;
37 + }
38 + </style>
33 39 @include('layouts._includes.css')
34 40 @laravelPWA
35 41 @stack('css')
... ...
  resources/views/layouts/headers/cards.blade.php
... ... @@ -9,7 +9,7 @@
9 9 <div class="card-body">
10 10 <div class="row mb-2">
11 11 <div class="col d-flex align-items-center">
12 - <h4 class="card-title text-uppercase text-muted mb-0">
12 + <h4 class="card-title text-uppercase text-primary mb-0">
13 13 Pruebas
14 14 </h4>
15 15 </div>
... ... @@ -21,16 +21,16 @@
21 21 </div>
22 22
23 23 <p class="mb-0 d-flex justify-content-between">
24 - <span class="text-muted"><small>Pot. de Aprendizaje</small></span>
24 + <span class="text-primary"><small>Pot. de Aprendizaje</small></span>
25 25 <span class="h3 font-weight-bold mb-0">300</span>
26 26 </p>
28 - <span class="text-muted"><small>Campo de Talento</small></span>
28 + <span class="text-primary"><small>Campo de Talento</small></span>
30 30 </p>
31 31 <p class="mt-3 mb-0 text-muted text-sm">
32 32 <span class="text-success mr-2"><i class="fa fa-arrow-up"></i> 3.4%</span>
33 - <span class="text-nowrap"><small>Desde el mes pasado</small></span>
33 + <span class="text-primary"><small>Desde el mes pasado</small></span>
34 34 </p>
35 35 </div>
36 36 </div>
... ... @@ -40,7 +40,7 @@
44 44 Planes
45 45 </h4>
46 46 </div>
... ... @@ -51,16 +51,16 @@
51 51 </div>
52 52 </div>
54 - <span class="text-muted"><small>Institucionales</small></span>
54 + <span class="text-primary"><small>Institucionales</small></span>
56 56 </p>
58 - <span class="text-muted"><small>Familiares</small></span>
58 + <span class="text-primary"><small>Familiares</small></span>
60 60 </p>
61 - <p class="mt-3 mb-0 text-muted text-sm">
61 + <p class="mt-3 mb-0 text-primary text-sm">
62 62 <span class="text-danger mr-2"><i class="fas fa-arrow-down"></i> 3.4%
</span>
63 - <span class="text-nowrap"><small>Desde la sem. pasada</small></span>
63 + <span class="text-primary"><small>Desde la sem. pasada</small></span>
64 64 </p>
65 65 </div>
66 66 </div>
... ... @@ -70,7 +70,7 @@

74 74 Fuentes
75 75 </h4>
76 76 </div>
... ... @@ -81,16 +81,16 @@
81 81 </div>
82 82 </div>
84 - <span class="text-muted"><small>Estudiantes/Docentes</small></span>
84 + <span class="text-primary"><small>Estudiantes/Docentes</small></span>
86 86 </p>
88 - <span class="text-muted"><small>Familiares/Cuidadores</small></span>
88 + <span class="text-primary"><small>Familiares/Cuidadores</small></span>
90 90 </p>
91 - <p class="mt-3 mb-0 text-muted text-sm">
91 + <p class="mt-3 mb-0 text-primaryd text-sm">
92 92 <span class="text-warning mr-2"><i class="fas fa-arrow-down"></i> 1.10%
</span>
93 - <span class="text-nowrap"><small>Desde ayer</small></span>
93 + <span class="text-primary"><small>Desde ayer</small></span>
94 94 </p>
95 95 </div>
96 96 </div>
... ... @@ -100,7 +100,7 @@
104 104 Instituciones
105 105 </h4>
106 106 </div>
... ... @@ -111,16 +111,16 @@
111 111 </div>
112 112 </div>
114 - <span class="text-muted"><small>Públicas</small></span>
114 + <span class="text-primary"><small>Públicas</small></span>
116 116 </p>
118 - <span class="text-muted"><small>Privadas</small></span>
118 + <span class="text-primary"><small>Privadas</small></span>
120 120 </p>
121 121 <p class="mt-3 mb-0 text-muted text-sm">
122 122 <span class="text-success mr-2"><i class="fas fa-arrow-up"></i> 12%</span>
123 - <span class="text-nowrap"><small>Desde el mes pasado</small></span>
123 + <span class="text-primary"><small>Desde el mes pasado</small></span>
124 124 </p>
125 125 </div>
126 126 </div>
... ...
  resources/views/layouts/navbars/sidebar.blade.php
... ... @@ -111,6 +111,11 @@
111 111 <i class="ni ni-shop"></i>Instituciones
112 112 </a>
113 113 </li>
114 + <li class="nav-item">
115 + <a class="nav-link" href="#">
116 + <i class="ni ni-settings"></i>Parámetros
117 + </a>
118 + </li>
114 119 </ul>
115 120 @endadminplus
116 121 </div>

... ...
Write a comment or drag your files here…
Markdown and quick actions are supported

22 Julio Commit3

Загружено:

Сведения о документе

Авторское право

Доступные форматы

Поделиться этим документом

Поделиться или встроить документ

Параметры публикации

Этот документ был вам полезен?

Это неприемлемый материал?

Авторское право:

Доступные форматы

22 Julio Commit3

Загружено:

Авторское право:

Доступные форматы

1/8/2020 Visual (1279a486) · Commits · Guillermo Agudelo / apptalento · GitLab

Please ensure your account's recovery settings are up to date.

Commit 1279a486 authored 1 week ago by Guillermo Agudelo

parent acc3153d master

No related merge requests found

Showing 69 changed ﬁles  with 15450 additions and 18346 deletions

This diﬀ is collapsed.

This diﬀ is collapsed.

This diﬀ is collapsed.

This diﬀ is collapsed.

  public/argon/css/argon.min.css deleted 100644 → 0

109 - $dark: $gray-900 !default;

 public/images/icons/Icono 10 2.png 0 → 100644

  resources/sass/_variables.scss deleted 100644 → 0

  resources/sass/app.scss deleted 100644 → 0

32 32 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-

... ... @@ -70,7 +70,7 @@

116 121 </div>

Write a comment or drag your files here…

Markdown and quick actions are supported

Вам также может понравиться