aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20190117131816.php32
-rw-r--r--app/Resources/static/themes/material/css/cards.scss38
-rw-r--r--app/config/security.yml4
-rw-r--r--app/config/wallabag.yml2
4 files changed, 52 insertions, 24 deletions
diff --git a/app/DoctrineMigrations/Version20190117131816.php b/app/DoctrineMigrations/Version20190117131816.php
new file mode 100644
index 00000000..6548b9fa
--- /dev/null
+++ b/app/DoctrineMigrations/Version20190117131816.php
@@ -0,0 +1,32 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Schema\Schema;
6use Wallabag\CoreBundle\Doctrine\WallabagMigration;
7
8/**
9 * Add updated_at fields to site_credential table.
10 */
11final class Version20190117131816 extends WallabagMigration
12{
13 public function up(Schema $schema): void
14 {
15 $siteCredentialTable = $schema->getTable($this->getTable('site_credential'));
16
17 $this->skipIf($siteCredentialTable->hasColumn('updated_at'), 'It seems that you already played this migration.');
18
19 $siteCredentialTable->addColumn('updated_at', 'datetime', [
20 'notnull' => false,
21 ]);
22 }
23
24 public function down(Schema $schema): void
25 {
26 $siteCredentialTable = $schema->getTable($this->getTable('site_credential'));
27
28 $this->skipIf(!$siteCredentialTable->hasColumn('updated_at'), 'It seems that you already played this migration.');
29
30 $siteCredentialTable->dropColumn('updated_at');
31 }
32}
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index 52872220..1acc03dc 100644
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -116,18 +116,6 @@ main {
116 height: 13.5em; 116 height: 13.5em;
117 } 117 }
118 118
119 .card-image .preview,
120 .card-fullimage .preview {
121 height: 100%;
122 background: no-repeat 50%/cover;
123 background-color: #efefef;
124 display: block;
125
126 &--default {
127 background-size: contain;
128 }
129 }
130
131 &.sw { 119 &.sw {
132 max-width: 370px; 120 max-width: 370px;
133 margin-left: auto; 121 margin-left: auto;
@@ -142,6 +130,19 @@ a.original:not(.waves-effect) {
142 display: block; 130 display: block;
143} 131}
144 132
133.card .card-image .preview,
134.card .card-fullimage .preview,
135.card-stacked .preview {
136 height: 100%;
137 background: no-repeat 50%/cover;
138 background-color: #efefef;
139 display: block;
140
141 &--default {
142 background-size: contain;
143 }
144}
145
145.card-entry-labels li, 146.card-entry-labels li,
146.card-tag-labels li { 147.card-tag-labels li {
147 margin: 10px 10px 10px auto; 148 margin: 10px 10px 10px auto;
@@ -221,24 +222,21 @@ a.original:not(.waves-effect) {
221 text-align: right; 222 text-align: right;
222 } 223 }
223 224
224 .preview { 225 .card-preview {
225 max-width: 100px; 226 max-width: 100px;
226 height: auto; 227 max-height: 50px;
227 margin-right: 10px; 228 margin-right: 10px;
228 flex: 1; 229 flex: 1;
229
230 img {
231 max-width: 100%;
232 max-height: 100%;
233 }
234 } 230 }
235 231
236 div.metadata { 232 div.metadata {
237 .chip { 233 .chip {
238 background-color: $blueAccentColor; 234 background-color: $blueAccentColor;
239 padding: 0 15px 0 10px; 235 padding: 0 7px;
240 margin: auto 2px; 236 margin: auto 2px;
241 border-radius: 6px; 237 border-radius: 6px;
238 line-height: 22px;
239 height: 22px;
242 240
243 a, 241 a,
244 i { 242 i {
diff --git a/app/config/security.yml b/app/config/security.yml
index 0318fce1..96489e26 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -57,9 +57,7 @@ security:
57 target: / 57 target: /
58 58
59 access_control: 59 access_control:
60 - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } 60 - { path: ^/api/(doc|version|info|user), roles: IS_AUTHENTICATED_ANONYMOUSLY }
61 - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }
62 - { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY }
63 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } 61 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
64 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } 62 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
65 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } 63 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 6354b22f..09b2f3a2 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
1wallabag_core: 1wallabag_core:
2 version: 2.3.4 2 version: 2.3.7-dev
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages: 4 languages:
5 en: 'English' 5 en: 'English'