summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-11-17 14:04:22 +0300
committerAndrew Dolgov <[email protected]>2010-11-17 14:06:20 +0300
commitf8ce21fc722361adab5ce8c812065fb9dde62727 (patch)
tree765a7bf4362cfeea9b8dd425e527bd90d36edb20
parenta17d721902118b5fa0cc1e7ab7346e42238e730b (diff)
ui: use dijit.Toolbar
-rw-r--r--tt-rss.css4
-rw-r--r--tt-rss.js1
-rw-r--r--tt-rss.php4
3 files changed, 7 insertions, 2 deletions
diff --git a/tt-rss.css b/tt-rss.css
index a9897b80a..40ea68099 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -929,7 +929,7 @@ html, body#ttrssPrefs, #main {
#toolbar div.actionChooser {
display : table-cell;
text-align : right;
- padding-right : 5px;
+ padding-right : 3px;
}
/* preferences layout */
@@ -1478,7 +1478,7 @@ div.fatalError textarea {
}
#toolbar {
- padding : 5px 0px 0px 5px;
+ padding : 0px;
margin : 0px;
border-width : 0px;
white-space: nowrap;
diff --git a/tt-rss.js b/tt-rss.js
index f408197d2..47ccf4154 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -280,6 +280,7 @@ function init() {
dojo.require("dojo.data.ItemFileWriteStore");
dojo.require("dijit.Tree");
dojo.require("dijit.form.Select");
+ dojo.require("dijit.Toolbar");
dojo.require("dojo.parser");
if (typeof themeBeforeLayout == 'function') {
diff --git a/tt-rss.php b/tt-rss.php
index b1f43506f..286ebf9d9 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -129,6 +129,8 @@
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
+ <div id="main-toolbar" dojoType="dijit.Toolbar">
+
<form id="main_toolbar_form" action="" onsubmit='return false'>
<button id="collapse_feeds_btn" onclick="collapse_feedlist()"
@@ -188,6 +190,8 @@
</select>
</div>
+ </div>
+
</div>
<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">