mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-16 21:56:21 +00:00
Merge branch 'rails' of 0xacab.org:sutty/sutty into rails
This commit is contained in:
commit
d3ed9bff7b
3 changed files with 6 additions and 2 deletions
|
@ -2,7 +2,7 @@ RAILS_GROUPS=assets
|
||||||
DELEGATE=athshe.sutty.nl
|
DELEGATE=athshe.sutty.nl
|
||||||
HAINISH=../haini.sh/haini.sh
|
HAINISH=../haini.sh/haini.sh
|
||||||
DATABASE=
|
DATABASE=
|
||||||
RAILS_ENV=
|
RAILS_ENV=development
|
||||||
IMAP_SERVER=
|
IMAP_SERVER=
|
||||||
DEFAULT_FROM=
|
DEFAULT_FROM=
|
||||||
EXCEPTION_TO=
|
EXCEPTION_TO=
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -18,7 +18,7 @@ commit ?= origin/rails## Commit desde el que actualizar
|
||||||
env ?= staging## Entorno del nodo delegado
|
env ?= staging## Entorno del nodo delegado
|
||||||
sutty ?= $(SUTTY)## Dirección local
|
sutty ?= $(SUTTY)## Dirección local
|
||||||
delegate ?= $(DELEGATE)## Cambia el nodo delegado
|
delegate ?= $(DELEGATE)## Cambia el nodo delegado
|
||||||
hain ?= $(HAINISH)## Ubicación de Hainish
|
hain ?= ENV_FILE=.env $(HAINISH)## Ubicación de Hainish
|
||||||
|
|
||||||
# El nodo delegado tiene dos entornos, production y staging.
|
# El nodo delegado tiene dos entornos, production y staging.
|
||||||
# Dependiendo del entorno que elijamos, se van a generar los assets y el
|
# Dependiendo del entorno que elijamos, se van a generar los assets y el
|
||||||
|
|
|
@ -71,6 +71,10 @@
|
||||||
strong, em, del, u, sub, sup, small { background: #0002; }
|
strong, em, del, u, sub, sup, small { background: #0002; }
|
||||||
a { background: #13fefe50; }
|
a { background: #13fefe50; }
|
||||||
[data-editor-selected] { outline: #f206f9 solid thick; }
|
[data-editor-selected] { outline: #f206f9 solid thick; }
|
||||||
|
p[data-multimedia-inner] {
|
||||||
|
// Ignorar clicks en el párrafo placeholder
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
*[data-editor-loading] {
|
*[data-editor-loading] {
|
||||||
|
|
Loading…
Reference in a new issue