remove seemingly useless bordercontainer from main layout
This commit is contained in:
parent
5b3d5a28f2
commit
2cd1ec5816
|
@ -605,11 +605,6 @@ body.ttrss_main div.fatalError textarea {
|
|||
width: 565px;
|
||||
height: 200px;
|
||||
}
|
||||
body.ttrss_main #header-wrap {
|
||||
border-width: 0px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
body.ttrss_main #content-wrap {
|
||||
padding: 0px;
|
||||
border-width: 0px;
|
||||
|
@ -779,12 +774,6 @@ body.ttrss_main #header {
|
|||
top: 0px;
|
||||
z-index: 5;
|
||||
}
|
||||
body.ttrss_main #footer {
|
||||
text-align: center;
|
||||
color: #555555;
|
||||
padding: 4px 4px 8px 4px;
|
||||
border-width: 0px;
|
||||
}
|
||||
body.ttrss_main #content-insert {
|
||||
padding: 0px;
|
||||
border-color: #ddd;
|
||||
|
@ -1342,9 +1331,20 @@ body.ttrss_prefs {
|
|||
}
|
||||
body.ttrss_prefs #footer,
|
||||
body.ttrss_prefs #header {
|
||||
padding: 8px;
|
||||
font-size: 13px;
|
||||
}
|
||||
body.ttrss_prefs #header {
|
||||
float: right;
|
||||
}
|
||||
body.ttrss_prefs #footer_splitter {
|
||||
display: none;
|
||||
}
|
||||
body.ttrss_prefs #footer {
|
||||
background-color: #f5f5f5;
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
font-size: 13px;
|
||||
border: 0px;
|
||||
text-align: center;
|
||||
}
|
||||
body.ttrss_prefs #header a:hover {
|
||||
color: black;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -4,9 +4,23 @@ body.ttrss_prefs {
|
|||
font-size: 14px;
|
||||
|
||||
#footer, #header {
|
||||
padding : 8px;
|
||||
font-size : 13px;
|
||||
}
|
||||
|
||||
#header {
|
||||
float : right;
|
||||
}
|
||||
|
||||
#footer_splitter {
|
||||
display : none;
|
||||
}
|
||||
|
||||
#footer {
|
||||
background-color : #f5f5f5;
|
||||
padding-left : 8px;
|
||||
padding-right : 8px;
|
||||
font-size : 13px;
|
||||
border : 0px;
|
||||
text-align : center;
|
||||
}
|
||||
|
||||
#header a:hover {
|
||||
|
|
|
@ -709,12 +709,6 @@ body.ttrss_main {
|
|||
}
|
||||
}
|
||||
|
||||
#header-wrap {
|
||||
border-width : 0px;
|
||||
margin : 0px;
|
||||
padding : 0px;
|
||||
}
|
||||
|
||||
#content-wrap {
|
||||
padding : 0px;
|
||||
border-width : 0px;
|
||||
|
@ -917,13 +911,6 @@ body.ttrss_main {
|
|||
z-index : 5;
|
||||
}
|
||||
|
||||
#footer {
|
||||
text-align : center;
|
||||
color : @default-text;
|
||||
padding : 4px 4px 8px 4px;
|
||||
border-width : 0px;
|
||||
}
|
||||
|
||||
#content-insert {
|
||||
padding : 0px;
|
||||
border-color : #ddd;
|
||||
|
|
21
index.php
21
index.php
|
@ -150,18 +150,15 @@
|
|||
<div id="cmdline" style="display : none"></div>
|
||||
|
||||
<div id="main" dojoType="dijit.layout.BorderContainer">
|
||||
|
||||
<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
|
||||
<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
|
||||
<div id="feedlistLoading">
|
||||
<img src='images/indicator_tiny.gif'/>
|
||||
<?php echo __("Loading, please wait..."); ?></div>
|
||||
<div id="feedTree"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
|
||||
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
|
||||
|
||||
<div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top">
|
||||
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
|
||||
<div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top">
|
||||
<div id="toolbar" dojoType="dijit.Toolbar">
|
||||
|
||||
<?php
|
||||
|
@ -260,25 +257,19 @@
|
|||
</button>
|
||||
</div>
|
||||
</div> <!-- toolbar -->
|
||||
</div> <!-- toolbar pane -->
|
||||
|
||||
</div> <!-- toolbar pane -->
|
||||
<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
|
||||
|
||||
<div id="floatingTitle" style="display : none"></div>
|
||||
|
||||
<div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
|
||||
region="center">
|
||||
<div id="headlinesInnerContainer">
|
||||
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
|
||||
style="height : 50%" splitter="true"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
|
29
prefs.php
29
prefs.php
|
@ -115,41 +115,39 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="header" dojoType="dijit.layout.ContentPane" region="top">
|
||||
<div id="header">
|
||||
<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
|
||||
<a href="#" onclick="document.location.href = 'index.php'"><?php echo __('Exit preferences') ?></a>
|
||||
</div>
|
||||
|
||||
<div id="main" dojoType="dijit.layout.BorderContainer">
|
||||
|
||||
<div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
|
||||
<div id="genConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
<div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
|
||||
<div id="genConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
href="backend.php?op=pref-prefs"
|
||||
title="<?php echo __('Preferences') ?>"></div>
|
||||
<div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
<div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
href="backend.php?op=pref-feeds"
|
||||
title="<?php echo __('Feeds') ?>"></div>
|
||||
<div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
<div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
href="backend.php?op=pref-filters"
|
||||
title="<?php echo __('Filters') ?>"></div>
|
||||
<div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
<div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
href="backend.php?op=pref-labels"
|
||||
title="<?php echo __('Labels') ?>"></div>
|
||||
<?php if ($_SESSION["access_level"] >= 10) { ?>
|
||||
<?php if ($_SESSION["access_level"] >= 10) { ?>
|
||||
<div id="userConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
href="backend.php?op=pref-users"
|
||||
title="<?php echo __('Users') ?>"></div>
|
||||
<div id="systemConfigTab" dojoType="dijit.layout.ContentPane"
|
||||
href="backend.php?op=pref-system"
|
||||
title="<?php echo __('System') ?>"></div>
|
||||
<?php } ?>
|
||||
<?php
|
||||
<?php } ?>
|
||||
<?php
|
||||
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
|
||||
"hook_prefs_tabs", false);
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
|
||||
?>
|
||||
</div>
|
||||
<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
|
||||
<a class="insensitive" target="_blank" href="http://tt-rss.org/">
|
||||
Tiny Tiny RSS</a>
|
||||
<?php if (!defined('HIDE_VERSION')) { ?>
|
||||
|
@ -158,8 +156,7 @@
|
|||
© 2005-<?php echo date('Y') ?>
|
||||
<a class="insensitive" target="_blank"
|
||||
href="http://fakecake.org/">Andrew Dolgov</a>
|
||||
</div> <!-- footer -->
|
||||
|
||||
</div> <!-- footer -->
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
|
|
@ -605,11 +605,6 @@ body.ttrss_main div.fatalError textarea {
|
|||
width: 565px;
|
||||
height: 200px;
|
||||
}
|
||||
body.ttrss_main #header-wrap {
|
||||
border-width: 0px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
body.ttrss_main #content-wrap {
|
||||
padding: 0px;
|
||||
border-width: 0px;
|
||||
|
@ -779,12 +774,6 @@ body.ttrss_main #header {
|
|||
top: 0px;
|
||||
z-index: 5;
|
||||
}
|
||||
body.ttrss_main #footer {
|
||||
text-align: center;
|
||||
color: #555555;
|
||||
padding: 4px 4px 8px 4px;
|
||||
border-width: 0px;
|
||||
}
|
||||
body.ttrss_main #content-insert {
|
||||
padding: 0px;
|
||||
border-color: #ddd;
|
||||
|
@ -1342,9 +1331,20 @@ body.ttrss_prefs {
|
|||
}
|
||||
body.ttrss_prefs #footer,
|
||||
body.ttrss_prefs #header {
|
||||
padding: 8px;
|
||||
font-size: 13px;
|
||||
}
|
||||
body.ttrss_prefs #header {
|
||||
float: right;
|
||||
}
|
||||
body.ttrss_prefs #footer_splitter {
|
||||
display: none;
|
||||
}
|
||||
body.ttrss_prefs #footer {
|
||||
background-color: #f5f5f5;
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
font-size: 13px;
|
||||
border: 0px;
|
||||
text-align: center;
|
||||
}
|
||||
body.ttrss_prefs #header a:hover {
|
||||
color: black;
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue