';
foreach($fields as $key => $field) {
if ($key == 'platform' || $key == 'view') {
diff --git a/resources/lang/.i18n-editor-metadata b/resources/lang/.i18n-editor-metadata
index 5b26cda8f..0401d6317 100644
--- a/resources/lang/.i18n-editor-metadata
+++ b/resources/lang/.i18n-editor-metadata
@@ -1,7 +1,7 @@
-flatten_json=0
-minify_resources=0
preserve_comments=0
+minify_resources=0
resource_definition={LOCALE}
resource_structure=Flat
-resource_type=JSON
use_single_quotes=0
+resource_type=JSON
+flatten_json=0
diff --git a/resources/lang/de.json b/resources/lang/de.json
index 4fc60f427..df94f1288 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -449,7 +449,6 @@
"manual:userinterface:ui_decore_lines": "Wenn aktiviert, werden Linien auf der Startseite angezeigt.",
"manual:userinterface:ui_font_size": "Geben Sie die Standardschriftgröße für die Photobooth-Oberfläche ein.",
"manual:userinterface:ui_result_buttons": "Wenn aktiviert, werden die Nachbearbeitungs-Schaltflächen auf dem Ergebnisbildschirm sichtbar. Wenn deaktiviert, wird die gesamte Schaltflächenleiste ausgeblendet.",
- "manual:userinterface:ui_rounded_corners": "Wenn diese Option aktiviert ist, verwendet die Photobooth-Benutzeroberfläche abgerundete Kanten.",
"manual:userinterface:ui_shutter_animation": "Wenn aktiviert, wird während der Aufnahme eines Fotos eine Verschlussanimation angezeigt.",
"manual:userinterface:ui_style": "Wählen Sie einen Startseitenstil. Um einen eigenen Startseitenstil zu verwenden, erstellen und verwenden Sie \"/template/custom.template.php\" und \"/resources/css/custom_style.css\", falls eine dieser Dateien nicht lesbar ist, wird auf den Standard-Startseitenstil zurückgegriffen.",
"manual:version:check_version": "Dies prüft online über das Github Projektarchiv auf die neueste Photobooth-Version.",
@@ -638,7 +637,6 @@
"userinterface:ui_decore_lines": "Dekorationslinien anzeigen",
"userinterface:ui_font_size": "Standardschriftgröße",
"userinterface:ui_result_buttons": "Schaltflächenleiste auf Ergebnisbildschirm anzeigen",
- "userinterface:ui_rounded_corners": "Abgerundete Ecken",
"userinterface:ui_shutter_animation": "Verschlussanimation",
"userinterface:ui_style": "Stil",
"using_latest_version": "Photobooth ist auf dem aktuellen Stand.",
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 175157e99..17bdc8dde 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -465,7 +465,6 @@
"manual:userinterface:ui_decore_lines": "If enabled, decorate lines will be visible on start page.",
"manual:userinterface:ui_font_size": "Enter the default font size used for the Photobooth interface.",
"manual:userinterface:ui_result_buttons": "If enabled, post-processing buttons will be visible on the on result screen. If disabled the whole button bar will be hidden.",
- "manual:userinterface:ui_rounded_corners": "If enabled, the Photobooth UI uses smooth rounded edges.",
"manual:userinterface:ui_shutter_animation": "If enabled, a shutter animation will be visible while taking a picture.",
"manual:userinterface:ui_style": "Choose a start page styling. To use custom styling please create and use \"/template/custom.template.php\" and \"/resources/css/custom_style.css\", if one of these files is not readable we will fallback to default theme.",
"manual:version:check_version": "This will check online against the Github repository for the latest Photobooth version.",
@@ -661,7 +660,6 @@
"userinterface:ui_decore_lines": "Show decorate lines",
"userinterface:ui_font_size": "Default font size",
"userinterface:ui_result_buttons": "Show button bar on result screen",
- "userinterface:ui_rounded_corners": "Rounded corners",
"userinterface:ui_shutter_animation": "Shutter animation",
"userinterface:ui_style": "Styling",
"using_latest_version": "You are using the latest version of photobooth.",
diff --git a/resources/lang/es.json b/resources/lang/es.json
index b7a32aee6..f53cbd6b6 100644
--- a/resources/lang/es.json
+++ b/resources/lang/es.json
@@ -270,7 +270,6 @@
"manual:userinterface:background_defaults": "Estilo CSS para fondo en páginas de inicio, inicio de sesión y presentación de diapositivas.",
"manual:userinterface:button_show_fs": "Si está activado, se agregará un botón para alternar el modo de pantalla completa a la pantalla de inicio.",
"manual:userinterface:ui_font_size": "Introduzca el tamaño de fuente predeterminado utilizado para la interfaz Photobooth.",
- "manual:userinterface:ui_rounded_corners": "Si está habilitada, la interfaz de usuario de Photobooth utiliza bordes redondeados suaves.",
"milliseconds": "milisegundos",
"newCollage": "Un collage más",
"newPhoto": "Una foto más",
@@ -380,6 +379,5 @@
"userinterface:colors_secondary": "Color secundario",
"userinterface:colors_start_font": "Color de fuente de la pantalla de inicio",
"userinterface:ui_font_size": "Tamaño de fuente predeterminado",
- "userinterface:ui_rounded_corners": "Esquinas redondeadas",
"using_latest_version": "Estás utilizando la última versión de photobooth"
}
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 676d248f4..a0e17fa03 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -451,7 +451,6 @@
"manual:userinterface:ui_decore_lines": "Si activé, les lignes de décoration seront visibles sur la page de démarrage.",
"manual:userinterface:ui_font_size": "Entrez la taille de police par défaut utilisée pour l'interface Photobooth.",
"manual:userinterface:ui_result_buttons": "Si activé, les boutons de post-traitement seront visibles sur l'écran de résultat. Si désactivé, la barre de boutons entière sera masquée.",
- "manual:userinterface:ui_rounded_corners": "Si activé, l'interface utilisateur du Photobooth utilise des bords arrondis lisses.",
"manual:userinterface:ui_shutter_animation": "Si activé, une animation d'obturateur sera visible lors de la prise d'une photo.",
"manual:userinterface:ui_style": "Choisissez un style de page de démarrage. Pour utiliser un style personnalisé, veuillez créer et utiliser \"/template/custom.template. hp\" et \"/resources/css/custom_style.css\", si l'un de ces fichiers n'est pas lisible, nous utiliserons le thème par défaut.",
"manual:version:check_version": "Ceci vérifiera en ligne le répertoire GitHub pour la dernière version de Photobooth.",
@@ -642,7 +641,6 @@
"userinterface:ui_decore_lines": "Afficher les lignes décoratives",
"userinterface:ui_font_size": "Taille de police par défaut",
"userinterface:ui_result_buttons": "Afficher la barre de boutons sur l'écran de résultat",
- "userinterface:ui_rounded_corners": "Angles arrondis",
"userinterface:ui_shutter_animation": "Animation d'obturation",
"userinterface:ui_style": "Stylisation",
"using_latest_version": "Vous utilisez la dernière version du Photobooth.",
diff --git a/resources/lang/it.json b/resources/lang/it.json
index bb1c89805..3c2104105 100644
--- a/resources/lang/it.json
+++ b/resources/lang/it.json
@@ -392,7 +392,6 @@
"manual:userinterface:button_show_fs": "Se abilitata, verrà aggiunto alla schermata iniziale un pulsante per attivare o disattivare la modalità schermo intero.",
"manual:userinterface:ui_decore_lines": "Se abilitata, le linee decorate saranno visibili alla pagina iniziale.",
"manual:userinterface:ui_font_size": "Inserisci la dimensione predefinita del carattere usata per l'interfaccia Photobooth.",
- "manual:userinterface:ui_rounded_corners": "Se abilitata, l'interfaccia utente di Photobooth utilizza bordi arrotondati lisci.",
"manual:userinterface:ui_style": "Scegli uno stile di pagina iniziale. Per usare lo stile personalizzato, crea e usa \"/template/custom.template.php\" e \"/resources/css/custom_style.css\", se uno di questi file non è leggibile, sarà utilizzato il tema predefinito.",
"milliseconds": "millisecondi",
"newCollage": "Nuovo Collage",
@@ -518,7 +517,6 @@
"userinterface:colors_start_font": "Colore carattere schermata iniziale",
"userinterface:ui_decore_lines": "Mostra linee decorative",
"userinterface:ui_font_size": "Grandezza carattere di default",
- "userinterface:ui_rounded_corners": "Spigoli arrotondati",
"userinterface:ui_style": "Stile",
"using_latest_version": "Stai usando l'ultima versione di photobooth."
}
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index cbcf8cd04..d0b3ab4dc 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -282,6 +282,5 @@
"userinterface:colors_secondary": "Kolor Dodatkowy",
"userinterface:colors_start_font": "Kolor czcionki ekranu startowego",
"userinterface:ui_font_size": "Domyślny rozmiar czcionki",
- "userinterface:ui_rounded_corners": "Zaokrąglone narożniki",
"using_latest_version": "Używasz najnowszej dostępnej wersji Fotobudki."
}
diff --git a/src/sass/classic_admin.scss b/src/sass/classic_admin.scss
index f9e33ddde..4812b4e22 100644
--- a/src/sass/classic_admin.scss
+++ b/src/sass/classic_admin.scss
@@ -1,6 +1,7 @@
@import 'modules/theme';
@import 'partials/basic';
@import 'partials/button_animated';
+@import 'partials/shape';
body {
display: block;
@@ -320,6 +321,27 @@ div.setting_element {
left: 4.5em;
}
+.shape--classic_rounded {
+ &.slider {
+ height: 15px;
+ border-radius: 5px;
+ }
+
+ &.slider::-webkit-slider-thumb,
+ &.slider::-moz-range-thumb {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ }
+
+ &.toggle {
+ border-radius: 0.5em;
+ }
+
+ &.toggle:before {
+ border-radius: 50%;
+ }
+}
/********************************************
* Adjust style of selectize lib for our needs - multiselects only
********************************************/
diff --git a/src/sass/classic_chromakeying.scss b/src/sass/classic_chromakeying.scss
index 634ba7622..d13a3dc37 100644
--- a/src/sass/classic_chromakeying.scss
+++ b/src/sass/classic_chromakeying.scss
@@ -3,6 +3,7 @@
@import 'partials/button';
@import 'partials/fonts';
@import 'partials/modal';
+@import 'partials/shape';
.chromawrapper {
display: block;
diff --git a/src/sass/classic_live_chromakeying.scss b/src/sass/classic_live_chromakeying.scss
index ddfb24be3..6b3b02c8f 100644
--- a/src/sass/classic_live_chromakeying.scss
+++ b/src/sass/classic_live_chromakeying.scss
@@ -7,6 +7,7 @@
@import 'partials/scrollbar';
@import 'partials/shutter_animation';
@import 'vendor/photoswipe';
+@import 'partials/shape';
.top-bar {
display: inline-block;
diff --git a/src/sass/classic_rounded_admin.scss b/src/sass/classic_rounded_admin.scss
new file mode 100644
index 000000000..a0e3c9a95
--- /dev/null
+++ b/src/sass/classic_rounded_admin.scss
@@ -0,0 +1 @@
+@import 'classic_admin';
diff --git a/src/sass/classic_rounded_chromakeying.scss b/src/sass/classic_rounded_chromakeying.scss
new file mode 100644
index 000000000..447f1e2b3
--- /dev/null
+++ b/src/sass/classic_rounded_chromakeying.scss
@@ -0,0 +1 @@
+@import 'classic_chromakeying';
diff --git a/src/sass/classic_rounded_live_chromakeying.scss b/src/sass/classic_rounded_live_chromakeying.scss
new file mode 100644
index 000000000..67a7f2438
--- /dev/null
+++ b/src/sass/classic_rounded_live_chromakeying.scss
@@ -0,0 +1 @@
+@import 'classic_live_chromakeying';
diff --git a/src/sass/classic_rounded_style.scss b/src/sass/classic_rounded_style.scss
new file mode 100644
index 000000000..a988e5803
--- /dev/null
+++ b/src/sass/classic_rounded_style.scss
@@ -0,0 +1 @@
+@import 'classic_style';
diff --git a/src/sass/classic_style.scss b/src/sass/classic_style.scss
index 189bce31b..e38083c2c 100644
--- a/src/sass/classic_style.scss
+++ b/src/sass/classic_style.scss
@@ -12,6 +12,7 @@
@import 'partials/ribbon';
@import 'partials/video_preview';
@import 'vendor/photoswipe';
+@import 'partials/shape';
#wrapper {
display: none;
@@ -117,6 +118,11 @@
text-align: center;
padding: 3rem;
+ &.shape--classic_rounded {
+ border: 0 none;
+ border-radius: 10px;
+ }
+
.names {
margin-top: 2rem;
margin-bottom: 5rem;
@@ -162,10 +168,15 @@
}
}
}
+
.fs-button {
position: fixed;
top: 5.5rem;
left: 5px;
+ &.btn--classic_rounded {
+ margin-top: auto;
+ margin-left: auto;
+ }
}
.cups-button {
@@ -179,6 +190,10 @@
position: fixed;
top: 5px;
left: 5px;
+ &.btn--classic_rounded {
+ margin-top: auto;
+ margin-left: auto;
+ }
}
.homebtn {
@@ -187,14 +202,27 @@
right: 5px;
}
+.btn,
+.gal-action-btn {
+ &.btn--classic_rounded {
+ border-radius: 10px;
+ }
+}
+
.resultInner {
.homebtn,
.gallery-button {
- &.btn--classic {
+ &.btn--classic,
+ &.btn--classic_rounded {
font-size: 0.875em;
width: 130px;
}
}
+ .btn {
+ &.btn--classic_rounded {
+ margin-left: 2px;
+ }
+ }
}
.sliderImages {
@@ -261,3 +289,10 @@
.pswp-rotary-focus {
background: $mainColor !important;
}
+
+button {
+ &.btn--classic_rounded {
+ border: 2px solid $borderColor;
+ border-radius: 10px;
+ }
+}
diff --git a/src/sass/login.scss b/src/sass/login.scss
index 7322c6838..0e5194d9f 100644
--- a/src/sass/login.scss
+++ b/src/sass/login.scss
@@ -3,6 +3,7 @@
@import 'partials/basic';
@import 'partials/button';
@import 'partials/modal';
+@import 'partials/shape';
.loginbody {
display: block;
@@ -37,6 +38,9 @@ input[type='password'] {
background: $panelColor;
position: relative;
max-width: 100%;
+ &.shape--classic_rounded {
+ border: 0 none;
+ }
}
.password-toggle {
diff --git a/src/sass/manual.scss b/src/sass/manual.scss
index 4514d77e8..1892c2860 100644
--- a/src/sass/manual.scss
+++ b/src/sass/manual.scss
@@ -3,6 +3,7 @@
@import 'partials/button';
@import 'partials/fonts';
@import 'partials/toggle';
+@import 'partials/shape';
$error: #e74c3c;
$success: #2ecc71;
@@ -30,13 +31,17 @@ $success: #2ecc71;
position: relative;
max-width: 100%;
color: $fontColor;
+ &.shape--classic_rounded {
+ border: 0 none;
+ border-radius: 10px;
+ }
}
.panel {
.panel-heading {
padding: 10px;
cursor: pointer;
- border: 1px solid $borderColor;
+
.plus {
display: inline-block;
}
@@ -47,11 +52,32 @@ $success: #2ecc71;
&:hover {
background: $hoverPanelColor;
}
+
+ &.shape--classic,
+ &.shape--classic_rounded {
+ border: 1px solid $borderColor;
+ }
+
+ &.shape--classic_rounded,
+ &.shape--modern,
+ &.shape--modern_squared {
+ margin: 5px;
+ }
}
.panel-body {
display: none;
padding: 20px;
- border: 1px solid $borderColor;
+
+ &.shape--classic,
+ &.shape--classic_rounded {
+ border: 1px solid $borderColor;
+ }
+
+ &.shape--classic_rounded,
+ &.shape--modern,
+ &.shape--modern_squared {
+ margin: 5px;
+ }
}
&.open {
@@ -70,6 +96,12 @@ $success: #2ecc71;
display: block;
}
}
+
+ &.shape--modern,
+ &.shape--modern_squared {
+ border: unset;
+ border-radius: unset;
+ }
}
.form-row {
@@ -89,6 +121,11 @@ $success: #2ecc71;
.faq-btn {
padding-top: 10px;
width: 100%;
+
+ &.btn--classic_rounded {
+ border: 2px solid $borderColor;
+ border-radius: 10px;
+ }
}
.wiki-btn {
@@ -106,6 +143,11 @@ $success: #2ecc71;
&:hover {
background: $hoverColor;
}
+
+ &.btn--classic_rounded {
+ border: 2px solid $borderColor;
+ border-radius: 10px;
+ }
}
code {
diff --git a/src/sass/modern_style.scss b/src/sass/modern_style.scss
index 40299cdc1..87005b88f 100644
--- a/src/sass/modern_style.scss
+++ b/src/sass/modern_style.scss
@@ -25,8 +25,8 @@ body {
.cups-button {
position: fixed;
- left: 0;
- top: 0;
+ left: 5px;
+ top: 5px;
bottom: auto;
}
}
diff --git a/src/sass/partials/_button.scss b/src/sass/partials/_button.scss
index f617a717a..9a772c302 100644
--- a/src/sass/partials/_button.scss
+++ b/src/sass/partials/_button.scss
@@ -9,7 +9,8 @@
width: 12.5em;
z-index: 10;
- &--classic {
+ &--classic,
+ &--classic_rounded {
padding: 20px 40px;
border: 0 none;
}
@@ -83,7 +84,8 @@
}
}
-.btn--classic {
+.btn--classic,
+.btn--classic_rounded {
&.btn--small {
padding: 12px 40px;
}
@@ -102,14 +104,16 @@
.btn {
margin-top: 3px;
}
- .btn--classic {
+ .btn--classic,
+ .btn--classic_rounded {
width: auto;
margin-top: 3px;
}
@media (max-width: 1024px) {
.btn {
- &.btn--classic {
+ &.btn--classic,
+ &.btn--classic_rounded {
font-size: 0.8em;
margin-top: 1px;
width: 80%;
@@ -124,12 +128,21 @@
z-index: 100;
}
+.fs-button {
+ &.btn--modern_squared {
+ span {
+ font-size: 0.6em;
+ }
+ }
+}
+
.livechroma-gallery-btn {
position: fixed;
top: 1em;
left: 0;
- &.btn--classic {
+ &.btn--classic,
+ &.btn--classic_rounded {
width: auto;
padding: 12px 40px;
}
@@ -150,7 +163,8 @@
top: 1em;
right: 0;
- &.btn--classic {
+ &.btn--classic,
+ &.btn--classic_rounded {
width: auto;
padding: 12px 40px;
}
@@ -185,7 +199,8 @@
}
@media (max-width: 1280px) and (orientation: landscape) {
- &.btn--classic {
+ &.btn--classic,
+ &.btn--classic_rounded {
&.takeChroma,
&.reloadPage,
&.deletebtn {
@@ -206,7 +221,8 @@
}
.chroma-control-bar {
- .btn--classic {
+ .btn--classic,
+ .btn--classic_rounded {
&#save-chroma-btn,
&#print-btn,
&#close-btn {
@@ -220,7 +236,8 @@
.btn--modern_squared {
display: inline-block;
}
- .btn--classic {
+ .btn--classic,
+ .btn--classic_rounded {
width: auto;
padding: 20px 0;
text-align: center;
@@ -261,7 +278,8 @@
}
}
-.btn--classic.gal-action-btn {
+.btn--classic.gal-action-btn,
+.btn--classic_rounded.gal-action-btn {
background: $hoverColor;
}
@@ -311,7 +329,8 @@
@media (max-width: 1024px) {
.takePic,
.takeCollage {
- &.btn--classic {
+ &.btn--classic,
+ &.btn--classic_rounded {
padding: 10px 10px;
}
}
diff --git a/src/sass/partials/_gallery.scss b/src/sass/partials/_gallery.scss
index 1363e7ea6..5334371ae 100644
--- a/src/sass/partials/_gallery.scss
+++ b/src/sass/partials/_gallery.scss
@@ -83,6 +83,13 @@
figure {
margin: 0;
}
+
+ &__close,
+ &__reload {
+ &.btn--classic_rounded {
+ border-radius: 5px;
+ }
+ }
}
figcaption {
diff --git a/src/sass/partials/_shape.scss b/src/sass/partials/_shape.scss
new file mode 100644
index 000000000..50af938bd
--- /dev/null
+++ b/src/sass/partials/_shape.scss
@@ -0,0 +1,22 @@
+.shape--classic_rounded {
+ border: 0 none;
+ border-radius: 10px;
+}
+
+.shape--modern {
+ border: 2px solid $borderColor;
+ border-radius: 10px;
+}
+
+.shape--modern_squared {
+ border: 2px solid $fontColor;
+ border-radius: 10px;
+}
+
+.shape--modern,
+.shape--modern_squared {
+ &.noborder {
+ border: 0;
+ border-radius: 0;
+ }
+}
diff --git a/src/sass/partials/_sidenav.scss b/src/sass/partials/_sidenav.scss
index 712f9954f..c8bca00b8 100644
--- a/src/sass/partials/_sidenav.scss
+++ b/src/sass/partials/_sidenav.scss
@@ -49,6 +49,10 @@
&:hover {
background: $hoverColor;
}
+
+ &.btn--classic_rounded {
+ border-radius: 5px;
+ }
}
.activeSidenavBtn {
diff --git a/src/sass/rounded.scss b/src/sass/rounded.scss
deleted file mode 100644
index 5ba78bf60..000000000
--- a/src/sass/rounded.scss
+++ /dev/null
@@ -1,85 +0,0 @@
-@import 'modules/theme';
-
-#start {
- .startInner {
- border: 0 none;
- border-radius: 10px;
- }
-}
-
-.resultInner {
- .btn {
- margin-left: 2px;
- }
-}
-
-.sidenav {
- .closebtn {
- border-radius: 5px;
- }
-}
-
-.btn,
-.gal-action-btn {
- border-radius: 10px;
-}
-
-.gallery {
- &__close,
- &__reload {
- border-radius: 5px;
- }
-}
-
-.gallery-button,
-.fs-button {
- &.round-btn {
- margin-top: auto;
- margin-left: auto;
- }
-}
-
-.admin-panel,
-.manual-panel,
-.login-panel {
- border: 0 none;
- border-radius: 10px;
-}
-
-.panel {
- .panel-heading,
- .panel-body {
- margin-top: 2px;
- border-radius: 5px;
- }
-
-button {
- border: 2px solid $borderColor;
- border-radius: 10px;
-}
-
-.faq-btn,
-.wiki-btn {
- border: 2px solid $borderColor;
- border-radius: 10px;
-}
-
-.slider {
- height: 15px;
- border-radius: 5px;
-}
-
-.slider::-webkit-slider-thumb,
-.slider::-moz-range-thumb {
- width: 20px;
- height: 20px;
- border-radius: 50%;
-}
-
-.toggle {
- border-radius: 0.5em;
-}
-
-.toggle:before {
- border-radius: 50%;
-}
diff --git a/src/sass/update.scss b/src/sass/update.scss
index 1f058f966..49f44aa3e 100644
--- a/src/sass/update.scss
+++ b/src/sass/update.scss
@@ -3,6 +3,7 @@
@import 'partials/button';
@import 'partials/fonts';
@import 'partials/modal';
+@import 'partials/shape';
.updatewrapper {
display: block;
diff --git a/template/classic.template.php b/template/classic.template.php
index 05402bf2b..413d8ff9b 100644
--- a/template/classic.template.php
+++ b/template/classic.template.php
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/template/classic_rounded.template.php b/template/classic_rounded.template.php
new file mode 100644
index 000000000..2834066d0
--- /dev/null
+++ b/template/classic_rounded.template.php
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fork me on GitHub
+
+
+
+
CUPS
+
+
+
+
+
diff --git a/template/modern.template.php b/template/modern.template.php
index a853b5bb0..4065a685f 100644
--- a/template/modern.template.php
+++ b/template/modern.template.php
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/template/modern_squared.template.php b/template/modern_squared.template.php
index a853b5bb0..4065a685f 100644
--- a/template/modern_squared.template.php
+++ b/template/modern_squared.template.php
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/update.php b/update.php
index 52dfd3375..ffcaca5fb 100644
--- a/update.php
+++ b/update.php
@@ -44,9 +44,6 @@
-
-
-
@@ -54,7 +51,7 @@
-