From 3c84e7dd4d5a408836cdccfc6236938a74791429 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 16 Oct 2017 13:23:15 +0200 Subject: [PATCH] Cleaning and refactoring --- app/locales/cn.yml | 1 + app/locales/de.yml | 1 + app/locales/en.yml | 1 + app/locales/es.yml | 1 + app/locales/fr.yml | 1 + bower.json | 3 +- src/Gist/Resources/views/View/embed.html.twig | 17 ++---- .../Resources/views/View/revisions.html.twig | 14 ----- src/Gist/Resources/views/View/view.html.twig | 26 +++------ src/Gist/Resources/views/base.html.twig | 9 +++ web/app/css/app.css | 56 +++++++++++++++++++ web/app/css/prism.css | 35 +++++++++++- web/app/css/themes/dark.css | 49 ---------------- web/app/css/themes/light.css | 39 ------------- web/app/js/app.js | 10 ++++ web/app/js/prism.js | 23 +++++++- 16 files changed, 150 insertions(+), 136 deletions(-) create mode 100644 web/app/css/app.css diff --git a/app/locales/cn.yml b/app/locales/cn.yml index 9af2b92..2565198 100644 --- a/app/locales/cn.yml +++ b/app/locales/cn.yml @@ -38,6 +38,7 @@ gist: download: '下载' clone: '克隆' embed: '引用' + embed_copy: '复制' add: '新建' date: diff --git a/app/locales/de.yml b/app/locales/de.yml index 28a0314..31f8f3f 100644 --- a/app/locales/de.yml +++ b/app/locales/de.yml @@ -38,6 +38,7 @@ gist: download: 'Herunterladen' clone: 'Klonen' embed: 'Einfügen' + embed_copy: 'Kopieren' add: 'Hinzufügen' date: diff --git a/app/locales/en.yml b/app/locales/en.yml index dd99aba..80a8360 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -39,6 +39,7 @@ gist: download: 'Download' clone: 'Clone' embed: 'Embed' + embed_copy: 'Copy' add: 'New' date: diff --git a/app/locales/es.yml b/app/locales/es.yml index 679d0f1..11d89ed 100644 --- a/app/locales/es.yml +++ b/app/locales/es.yml @@ -38,6 +38,7 @@ gist: download: 'Descargar' clone: 'Clonar' embed: 'Insertar' + embed_copy: 'Dupdo' add: 'Añadir' date: diff --git a/app/locales/fr.yml b/app/locales/fr.yml index 68759cd..e80d9cb 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -38,6 +38,7 @@ gist: download: 'Télécharger' clone: 'Clôner' embed: 'Insérer' + embed_copy: 'Copier' add: 'Ajouter' date: diff --git a/bower.json b/bower.json index 464be4d..53891e7 100644 --- a/bower.json +++ b/bower.json @@ -16,7 +16,6 @@ "bootstrap": "3.3.4", "flag-icon-css": "0.7.1", "iframe-resizer": "2.8.6", - "jsdiff": "~2.2.2", - "Prism": "~1.8.1" + "jsdiff": "~2.2.2" } } diff --git a/src/Gist/Resources/views/View/embed.html.twig b/src/Gist/Resources/views/View/embed.html.twig index 44ff7df..4e74e30 100644 --- a/src/Gist/Resources/views/View/embed.html.twig +++ b/src/Gist/Resources/views/View/embed.html.twig @@ -3,14 +3,6 @@ {% block css %} {{ parent() }} - - - {% if theme_settings.name == 'dark' %} - - {% else %} - - {% endif %} -