aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-28 12:08:51 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-28 16:10:21 +0100
commit9aa991281ddd315f607cabcfc3b917401d3d2104 (patch)
tree278c6a17d808bd3d9aa132d9ef93d7e54842de58 /app
parent56a7ce17f3a9a22e0bfc8651cb690a14447e0afd (diff)
downloadwallabag-9aa991281ddd315f607cabcfc3b917401d3d2104.tar.gz
wallabag-9aa991281ddd315f607cabcfc3b917401d3d2104.tar.zst
wallabag-9aa991281ddd315f607cabcfc3b917401d3d2104.zip
Renamed view_mode by list_mode and hide excerpt
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20161128084725.php8
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css8
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css9
3 files changed, 16 insertions, 9 deletions
diff --git a/app/DoctrineMigrations/Version20161128084725.php b/app/DoctrineMigrations/Version20161128084725.php
index 347a4256..242d5900 100644
--- a/app/DoctrineMigrations/Version20161128084725.php
+++ b/app/DoctrineMigrations/Version20161128084725.php
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface; 8use Symfony\Component\DependencyInjection\ContainerInterface;
9 9
10/** 10/**
11 * Added view_mode in user config. 11 * Added list_mode in user config.
12 */ 12 */
13class Version20161128084725 extends AbstractMigration implements ContainerAwareInterface 13class Version20161128084725 extends AbstractMigration implements ContainerAwareInterface
14{ 14{
@@ -33,9 +33,9 @@ class Version20161128084725 extends AbstractMigration implements ContainerAwareI
33 public function up(Schema $schema) 33 public function up(Schema $schema)
34 { 34 {
35 $configTable = $schema->getTable($this->getTable('config')); 35 $configTable = $schema->getTable($this->getTable('config'));
36 $this->skipIf($configTable->hasColumn('view_mode'), 'It seems that you already played this migration.'); 36 $this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.');
37 37
38 $configTable->addColumn('view_mode', 'integer'); 38 $configTable->addColumn('list_mode', 'integer');
39 } 39 }
40 40
41 /** 41 /**
@@ -44,6 +44,6 @@ class Version20161128084725 extends AbstractMigration implements ContainerAwareI
44 public function down(Schema $schema) 44 public function down(Schema $schema)
45 { 45 {
46 $configTable = $schema->getTable($this->getTable('config')); 46 $configTable = $schema->getTable($this->getTable('config'));
47 $configTable->dropColumn('view_mode'); 47 $configTable->dropColumn('list_mode');
48 } 48 }
49} 49}
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index 6d656c21..e16846ea 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -617,6 +617,10 @@ div.pagination ul .current {
617 background-color: #ccc; 617 background-color: #ccc;
618} 618}
619 619
620.hide {
621 display: none;
622}
623
620/* ========================================================================== 624/* ==========================================================================
621 2.1 = "save a link" related styles 625 2.1 = "save a link" related styles
622 ========================================================================== */ 626 ========================================================================== */
@@ -1203,10 +1207,6 @@ pre code {
1203} 1207}
1204 1208
1205@media screen and (max-width: 500px) { 1209@media screen and (max-width: 500px) {
1206 .hide {
1207 display: none;
1208 }
1209
1210 .entry { 1210 .entry {
1211 width: 100%; 1211 width: 100%;
1212 margin-left: 0; 1212 margin-left: 0;
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 76423409..8f7b7a3d 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -555,6 +555,14 @@ a.original {
555 margin-right: 5px !important; 555 margin-right: 5px !important;
556} 556}
557 557
558.card-stacked:hover ul.tools-list {
559 display: block;
560}
561
562.card-stacked ul.tools-list {
563 display: none;
564}
565
558.card .card-action a { 566.card .card-action a {
559 color: #fff; 567 color: #fff;
560 margin: 0; 568 margin: 0;
@@ -600,7 +608,6 @@ a.original {
600 background-position: 50%; 608 background-position: 50%;
601} 609}
602 610
603
604/* ========================================================================== 611/* ==========================================================================
605 5 = Article 612 5 = Article
606 ========================================================================== */ 613 ========================================================================== */