diff --git a/.env.example b/.env.example index f79ff3a4..fb086224 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ RAILS_GROUPS=assets DELEGATE=athshe.sutty.nl HAINISH=../haini.sh/haini.sh DATABASE= -RAILS_ENV= +RAILS_ENV=development IMAP_SERVER= DEFAULT_FROM= EXCEPTION_TO= diff --git a/Makefile b/Makefile index 18914f43..1f0ca914 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ commit ?= origin/rails## Commit desde el que actualizar env ?= staging## Entorno del nodo delegado sutty ?= $(SUTTY)## Dirección local 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. # Dependiendo del entorno que elijamos, se van a generar los assets y el diff --git a/app/assets/stylesheets/editor.scss b/app/assets/stylesheets/editor.scss index e0886533..30fab60a 100644 --- a/app/assets/stylesheets/editor.scss +++ b/app/assets/stylesheets/editor.scss @@ -71,6 +71,10 @@ strong, em, del, u, sub, sup, small { background: #0002; } a { background: #13fefe50; } [data-editor-selected] { outline: #f206f9 solid thick; } + p[data-multimedia-inner] { + // Ignorar clicks en el párrafo placeholder + pointer-events: none; + } } *[data-editor-loading] {