diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-28 11:02:10 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-28 14:27:58 +0100 |
commit | 9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224 (patch) | |
tree | c8f043dde3a6bdd653aac7136d742f6ed8c49b84 /app | |
parent | 34ea7be6228c633ef8da703994eed034026e9c18 (diff) | |
download | wallabag-9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224.tar.gz wallabag-9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224.tar.zst wallabag-9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224.zip |
Added list view
Diffstat (limited to 'app')
-rw-r--r-- | app/DoctrineMigrations/Version20161128084725.php | 49 | ||||
-rwxr-xr-x | app/Resources/static/themes/_global/img/list.png | bin | 0 -> 201 bytes | |||
-rwxr-xr-x | app/Resources/static/themes/_global/img/table.png | bin | 0 -> 229 bytes | |||
-rwxr-xr-x | app/Resources/static/themes/baggy/css/main.css | 15 | ||||
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 10 |
5 files changed, 64 insertions, 10 deletions
diff --git a/app/DoctrineMigrations/Version20161128084725.php b/app/DoctrineMigrations/Version20161128084725.php new file mode 100644 index 00000000..347a4256 --- /dev/null +++ b/app/DoctrineMigrations/Version20161128084725.php | |||
@@ -0,0 +1,49 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | /** | ||
11 | * Added view_mode in user config. | ||
12 | */ | ||
13 | class Version20161128084725 extends AbstractMigration implements ContainerAwareInterface | ||
14 | { | ||
15 | /** | ||
16 | * @var ContainerInterface | ||
17 | */ | ||
18 | private $container; | ||
19 | |||
20 | public function setContainer(ContainerInterface $container = null) | ||
21 | { | ||
22 | $this->container = $container; | ||
23 | } | ||
24 | |||
25 | private function getTable($tableName) | ||
26 | { | ||
27 | return $this->container->getParameter('database_table_prefix').$tableName; | ||
28 | } | ||
29 | |||
30 | /** | ||
31 | * @param Schema $schema | ||
32 | */ | ||
33 | public function up(Schema $schema) | ||
34 | { | ||
35 | $configTable = $schema->getTable($this->getTable('config')); | ||
36 | $this->skipIf($configTable->hasColumn('view_mode'), 'It seems that you already played this migration.'); | ||
37 | |||
38 | $configTable->addColumn('view_mode', 'integer'); | ||
39 | } | ||
40 | |||
41 | /** | ||
42 | * @param Schema $schema | ||
43 | */ | ||
44 | public function down(Schema $schema) | ||
45 | { | ||
46 | $configTable = $schema->getTable($this->getTable('config')); | ||
47 | $configTable->dropColumn('view_mode'); | ||
48 | } | ||
49 | } | ||
diff --git a/app/Resources/static/themes/_global/img/list.png b/app/Resources/static/themes/_global/img/list.png new file mode 100755 index 00000000..bd5aff5a --- /dev/null +++ b/app/Resources/static/themes/_global/img/list.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/_global/img/table.png b/app/Resources/static/themes/_global/img/table.png new file mode 100755 index 00000000..859c4cd8 --- /dev/null +++ b/app/Resources/static/themes/_global/img/table.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 4f48f8ca..126c451b 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -297,18 +297,14 @@ h2::after { | |||
297 | text-decoration: none; | 297 | text-decoration: none; |
298 | } | 298 | } |
299 | 299 | ||
300 | #listmode a:hover { | ||
301 | opacity: 1; | ||
302 | } | ||
303 | |||
304 | #listmode.tablemode { | 300 | #listmode.tablemode { |
305 | background-image: url("../img/baggy/table.png"); | 301 | background-image: url("../../_global/img/table.png"); |
306 | background-repeat: no-repeat; | 302 | background-repeat: no-repeat; |
307 | background-position: bottom; | 303 | background-position: bottom; |
308 | } | 304 | } |
309 | 305 | ||
310 | #listmode.listmode { | 306 | #listmode.listmode { |
311 | background-image: url("../img/baggy/list.png"); | 307 | background-image: url("../../_global/img/list.png"); |
312 | background-repeat: no-repeat; | 308 | background-repeat: no-repeat; |
313 | background-position: bottom; | 309 | background-position: bottom; |
314 | } | 310 | } |
@@ -352,9 +348,9 @@ footer a { | |||
352 | letter-spacing: -5px; | 348 | letter-spacing: -5px; |
353 | } | 349 | } |
354 | 350 | ||
355 | .listmode .entry { | 351 | .listmode.entry { |
356 | width: 100% !important; | 352 | width: 100%; |
357 | margin-left: 0 !important; | 353 | height: inherit; |
358 | } | 354 | } |
359 | 355 | ||
360 | .card-entry-labels { | 356 | .card-entry-labels { |
@@ -588,6 +584,7 @@ div.pagination ul { | |||
588 | text-align: left; | 584 | text-align: left; |
589 | font-style: italic; | 585 | font-style: italic; |
590 | color: #999; | 586 | color: #999; |
587 | display: inline-flex; | ||
591 | } | 588 | } |
592 | 589 | ||
593 | div.pagination ul > * { | 590 | div.pagination ul > * { |
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 82a74c23..76423409 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -194,7 +194,6 @@ main, | |||
194 | 194 | ||
195 | .results { | 195 | .results { |
196 | height: 1em; | 196 | height: 1em; |
197 | line-height: 30px; | ||
198 | } | 197 | } |
199 | 198 | ||
200 | .results .nb-results, | 199 | .results .nb-results, |
@@ -203,6 +202,14 @@ main, | |||
203 | margin-bottom: 0; | 202 | margin-bottom: 0; |
204 | } | 203 | } |
205 | 204 | ||
205 | .results .nb-results { | ||
206 | display: inline-flex; | ||
207 | } | ||
208 | |||
209 | .results a { | ||
210 | color: #444; | ||
211 | } | ||
212 | |||
206 | .pagination { | 213 | .pagination { |
207 | float: right; | 214 | float: right; |
208 | } | 215 | } |
@@ -593,6 +600,7 @@ a.original { | |||
593 | background-position: 50%; | 600 | background-position: 50%; |
594 | } | 601 | } |
595 | 602 | ||
603 | |||
596 | /* ========================================================================== | 604 | /* ========================================================================== |
597 | 5 = Article | 605 | 5 = Article |
598 | ========================================================================== */ | 606 | ========================================================================== */ |