summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-08-27 00:22:39 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-08-27 00:22:39 +0200
commite472be480960b324d83ee9a5875dc00a2f1d4d2b (patch)
treecbc0e416a4a48ef3fc873fab3cc8ae0dd56e7f0b /templates
parent6711caea1c5fc341131cd530aecbcc2560ce436d (diff)
navigation style fixes
Diffstat (limited to 'templates')
-rw-r--r--templates/main.php1
-rw-r--r--templates/part.addnew.php16
-rw-r--r--templates/part.listfeed.php2
3 files changed, 8 insertions, 11 deletions
diff --git a/templates/main.php b/templates/main.php
index b0b450493..9185eb2f7 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -10,7 +10,6 @@
\OCP\Util::addStyle('news', 'bootstrap/tooltip');
\OCP\Util::addStyle('news', 'app');
-\OCP\Util::addStyle('news', 'oc8');
\OCP\Util::addStyle('news', 'navigation');
\OCP\Util::addStyle('news', 'content');
\OCP\Util::addStyle('news', 'settings');
diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index af07dc566..afbbec642 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -1,8 +1,8 @@
<li class="add-new">
- <div class="list-title list-title-with-icon heading">
+ <div class="heading icon-add">
<button
data-apps-slide-toggle=".add-new-popup"
- news-focus="[ng-model='feedUrl']">+ <?php p($l->t('Add Website'))?></button>
+ news-focus="[ng-model='feedUrl']"><?php p($l->t('Add Website'))?></button>
</div>
<div class="add-new-popup">
@@ -15,19 +15,13 @@
<?php p($l->t('Error: folder exists already')); ?>
</span>
</p>
- <form>
+ <form>
<input type="text"
ng-model="feedUrl"
placeholder="<?php p($l->t('Address')); ?>"
name="address"
autofocus>
- <button title="<?php p($l->t('Add')); ?>"
- class="primary"
- ng-disabled="!feedUrl.trim()"
- ng-click="createFeed(feedUrl, folderId.id)"><?php p($l->t('Add')); ?></button>
- </form>
- <form>
<select name="folder"
data-create="<?php p($l->t('New folder')); ?>"
title="<?php p($l->t('Folder')); ?>"
@@ -59,6 +53,10 @@
ng-class="{loading: Navigation.isAddingFolder()}"
class="action-button create-button action">
</button>
+ <button title="<?php p($l->t('Add')); ?>"
+ class="primary"
+ ng-disabled="!feedUrl.trim()"
+ ng-click="createFeed(feedUrl, folderId.id)"><?php p($l->t('Add')); ?></button>
</form>
</div>
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 964d2f7e2..0d3fcc761 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -54,7 +54,7 @@
</ul>
</div>
- <div class="app-navigation-entry-options" ng-class="{'app-navigation-entry-options-open': optionsId == feed.id}">
+ <div class="app-navigation-entry-menu" ng-class="{'app-navigation-entry-menu-open': optionsId == feed.id}">
<ul>
<li><button class="icon-rename" title="<?php p($l->t('Rename feed')); ?>"></button></li>
<li><button class="icon-delete" title="<?php p($l->t('Delete website')); ?>"></button></li>