Merge branch 'master' into personalizacion
This commit is contained in:
commit
1665db4348
2 changed files with 6 additions and 3 deletions
5
Makefile
5
Makefile
|
@ -22,7 +22,7 @@ include .env
|
|||
export
|
||||
|
||||
help: always ## Ayuda
|
||||
@grep "^[^\t]\+:.*##" Makefile | sed -re "s/(.*):.*##(.*)/\1;\2/" | column -s ";" -t | sed -re "s/^([^ ]+) /\x1B[38;5;197m\1\x1B[0m/"
|
||||
@grep "^[^[:space:]]\+:.*##" Makefile | sed -re "s/(.*):.*##(.*)/\1;\2/" | column -s ";" -t | sed -re "s/^([^ ]+) /\x1B[38;5;197m\1\x1B[0m/"
|
||||
|
||||
all: install fa serve build ## Todas las tareas necesarias para desarrollar
|
||||
|
||||
|
@ -64,6 +64,9 @@ fa-%: always ## Agregar un ícono de Fork Awesome (reemplazar % por el nombre)
|
|||
@echo Agregando $* a la lista de íconos
|
||||
@grep -q "$*" fa.txt || grep '^$$fa-var-$*: ' node_modules/fork-awesome/scss/_variables.scss | sed -re "s/^.*: \"\\\(.*)\";/\1 $*/" >> fa.txt
|
||||
|
||||
fonts := $(patsubst %.otf,%-subset.woff2,$(wildcard assets/fonts/*))
|
||||
fonts: $(fonts) ## Minifica todas las tipografías
|
||||
|
||||
gfont: ## Descarga tipografías de Google Fonts (css="url del css")
|
||||
@test -n "$(css)"
|
||||
wget "$(css)" -nv -kO /tmp/gfont
|
||||
|
|
|
@ -97,7 +97,7 @@ $sizes: (
|
|||
80: 80%,
|
||||
90: 90%,
|
||||
50vh: 50vh,
|
||||
75vh: 75vh
|
||||
75vh: 75vh,
|
||||
100vh: 100vh,
|
||||
100vw: 100vw
|
||||
);
|
||||
|
@ -115,7 +115,7 @@ $opacities: (
|
|||
/// Resetear algunos margins y paddings por defecto a cero
|
||||
$paragraph-margin-bottom: 0;
|
||||
$headings-margin-bottom: 0;
|
||||
$label-margin-bottom: 0;
|
||||
$label-margin-bottom: 0;
|
||||
|
||||
/// Redefinir variables de Boostrap acá. Se las puede ver en
|
||||
/// node_modules/bootstrap/scss/_variables.scss
|
||||
|
|
Loading…
Reference in a new issue