Author: sevein
Date: Wed Apr 11 13:32:40 2012
New Revision: 11433
Log:
Issue 2288. A bunch of changes regarding to the #navigation sidebar and its
treeview, mostly CSS
Modified:
branches/2.0/apps/qubit/config/view.yml
branches/2.0/apps/qubit/modules/informationobject/actions/treeViewAction.class.php
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php
branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
branches/2.0/apps/qubit/modules/informationobject/templates/treeViewSuccess.php
branches/2.0/apps/qubit/templates/layout.php
branches/2.0/js/dominion.js
branches/2.0/lib/helper/QubitHelper.php
branches/2.0/plugins/qtDominionPlugin/config/qtDominionPluginConfiguration.class.php
branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less
Modified: branches/2.0/apps/qubit/config/view.yml
==============================================================================
--- branches/2.0/apps/qubit/config/view.yml Wed Apr 11 13:11:12 2012
(r11432)
+++ branches/2.0/apps/qubit/config/view.yml Wed Apr 11 13:32:40 2012
(r11433)
@@ -6,7 +6,7 @@
content-type: text/html
http_metas:
- X-UA-Compatible: IE=edge
+ X-UA-Compatible: IE=Edge,chrome=1
metas:
title: Qubit
Modified:
branches/2.0/apps/qubit/modules/informationobject/actions/treeViewAction.class.php
==============================================================================
---
branches/2.0/apps/qubit/modules/informationobject/actions/treeViewAction.class.php
Wed Apr 11 13:11:12 2012 (r11432)
+++
branches/2.0/apps/qubit/modules/informationobject/actions/treeViewAction.class.php
Wed Apr 11 13:32:40 2012 (r11433)
@@ -23,18 +23,22 @@
{
$this->resource = $this->getRoute()->resource;
+ $query = new Elastica_Query();
+
if ('all' == $request->show)
{
- $query = new Elastica_Query_Term(array('parentId' =>
QubitInformationObject::ROOT_ID));
- $this->resultSet =
QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
+ $query->setQuery(new Elastica_Query_Term(array('parentId' =>
QubitInformationObject::ROOT_ID)));
+ $this->resultSet = QubitSearch::getInstance()->index->search($query);
}
else if ('item' == $request->show)
{
- $query = new Elastica_Query_Ids('QubitInformationObject',
array($request->id));
+ $query->setQuery(new Elastica_Query_Ids('QubitInformationObject',
array($request->id)));
$this->current = QubitSearch::getInstance()->index->search($query);
- $query = new Elastica_Query_Term(array('parentId' => $request->id));
+ $query->setQuery(new Elastica_Query_Term(array('parentId' =>
$request->id)));
$this->children =
QubitSearch::getInstance()->index->getType('QubitInformationObject')->search($query);
}
+
+ $this->setLayout(false);
}
}
Modified:
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php
==============================================================================
---
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php
Wed Apr 11 13:11:12 2012 (r11432)
+++
branches/2.0/apps/qubit/modules/informationobject/templates/_contextMenu.php
Wed Apr 11 13:32:40 2012 (r11433)
@@ -1,7 +1,7 @@
<div id="navigation">
- <?php if (sfConfig::get('app_multi_repository')): ?>
- <div id="left-column" class="row">
+ <?php if (true || sfConfig::get('app_multi_repository')): ?>
+ <div id="institution">
<div class="span5">
<div class="institution maxi">
<h2 class="filltext">
@@ -12,209 +12,43 @@
</div>
<?php endif; ?>
- <!--
- <div class="row">
- <div class="span5">
- <ul class="nav nav-tabs">
- <li class="active"><a href="#treeview"
data-toggle="tab">Holdings</a></li>
- <li><a href="#facets" data-toggle="tab">Browse</a></li>
- <li><a href="#" id="searchfocus"><i class="icon-search
icon-white"></i></a></li>
- <li class="detailed-view pull-right">
- <label class="checkbox inline">
- <input type="checkbox" id="inlineCheckbox1" value="option1">
Detailed view
- </label>
- </li>
- </ul>
- </div>
- </div>
- -->
-
- <div class="row tab-content">
-
- <h2 class="mobileonly widebtn btn-huge indent" data-toggle="collapse"
data-target="#treeview">Holdings</h2>
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="#treeview" data-toggle="tab">Treeview</a></li>
+ <li><a href="#facets" data-toggle="tab">Browse</a></li>
+ </ul>
+ <div class="tab-content">
+ <h2 class="visible-phone widebtn btn-huge indent" data-toggle="collapse"
data-target="#treeview">Treeview</h2>
<?php echo get_component('informationobject', 'treeView') ?>
-
- <!--
<div class="span5 tree tab-pane" id="facets">
- <div class="section">
- <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse"
data-target="#subjects">Subjects</h2>
-
- <h2 class="desktoponly">Subjects</h2>
-
- <div class="scrollable" id="subjects">
- <ul>
- <li class="active"><a href="#">All</a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
-
- <li><a href="#">Agriculture<span>223</span></a></li>
-
- <li><a href="#">Arts and Culture<span>54</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
- </ul>
- </div>
- </div>
-
- <div class="section">
- <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse"
data-target="#mediatypes">Media Types</h2>
-
- <h2 class="desktoponly">Media Types</h2>
-
- <div class="scrollable" id="mediatypes">
- <ul>
- <li class="active"><a href="#">All Results</a></li>
-
- <li><a href="#">Any media type<span>1,122</span></a></li>
-
- <li><a href="#">Images<span>1,001</span></a></li>
-
- <li><a href="#">Videos<span>100</span></a></li>
-
- <li><a href="#">Audio<span>44</span></a></li>
-
- <li><a href="#">Texts<span>1</span></a></li>
-
- <li><a href="#">Buildings<span>3</span></a></li>
- </ul>
- </div>
- </div>
-
- <div class="section">
- <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse"
data-target="#dates">Creation Date</h2>
-
- <h2 class="desktoponly">Creation Date</h2>
-
- <div class="scrollable dates" id="dates">
- <input type="text" value="1877" name="from" /> - <input type="text"
value="1999" name="to" />
- </div>
- </div>
-
-
- <div class="section">
- <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse"
data-target="#places">Places</h2>
-
- <h2 class="desktoponly">Places</h2>
-
- <div class="scrollable" id="places">
- <ul>
- <li class="active"><a href="#">All</a></li>
-
- <li><a href="#">Comox<span>1,122</span></a></li>
-
- <li><a href="#">Charleston<span>1,001</span></a></li>
-
- <li><a href="#">British Columbia<span>100</span></a></li>
-
- <li><a href="#">Seligenstadt<span>44</span></a></li>
-
- <li><a href="#">Frankfurt<span>1</span></a></li>
-
- <li><a href="#">Bad Homburg vor der Hohe<span>3</span></a></li>
- </ul>
- </div>
- </div>
-
-
- <div class="section">
- <h2 class="mobileonly widebtn gray btn-huge" data-toggle="collapse"
data-target="#names">Names</h2>
-
- <h2 class="desktoponly">Names</h2>
-
- <div class="scrollable" id="names">
- <ul>
- <li class="active"><a href="#">All</a></li>
-
- <li><a href="#">James T. Kirk<span>1,122</span></a></li>
-
- <li><a href="#">Karla<span>1,001</span></a></li>
-
- <li><a href="#">Frasier<span>100</span></a></li>
- </ul>
- </div>
- </div>
+ <p>Working in progress...</p>
</div>
- -->
-
- </div>
+ </div>
</div>
- <!--
- <div class="row">
+<?php if (false): ?>
- <?php echo get_component('informationobject', 'creator',
array('resource' => $resource)) ?>
+ <div>
- <?php echo get_component('digitalobject', 'imageflow', array('resource'
=> $resource)) ?>
+ <?php echo get_component('informationobject', 'creator', array('resource'
=> $resource)) ?>
- <div>
- <h3>
- <?php if
(isset($resource->getCollectionRoot()->levelOfDescription)): ?>
- <?php echo $resource->getCollectionRoot()->levelOfDescription ?>
- <?php else: ?>
- <?php echo sfConfig::get('app_ui_label_collection') ?>
- <?php endif; ?>
- </h3>
- </div>
+ <?php echo get_component('digitalobject', 'imageflow', array('resource' =>
$resource)) ?>
- <?php echo get_partial('informationobject/format', array('resource' =>
$resource)) ?>
+ <div>
+ <h3>
+ <?php if (isset($resource->getCollectionRoot()->levelOfDescription)):
?>
+ <?php echo $resource->getCollectionRoot()->levelOfDescription ?>
+ <?php else: ?>
+ <?php echo sfConfig::get('app_ui_label_collection') ?>
+ <?php endif; ?>
+ </h3>
+ </div>
- <?php echo get_component('physicalobject', 'contextMenu',
array('resource' => $resource)) ?>
+ <?php echo get_partial('informationobject/format', array('resource' =>
$resource)) ?>
- </div>
+ <?php echo get_component('physicalobject', 'contextMenu', array('resource'
=> $resource)) ?>
</div>
- -->
+
+<?php endif; ?>
Modified:
branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
==============================================================================
--- branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
Wed Apr 11 13:11:12 2012 (r11432)
+++ branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
Wed Apr 11 13:32:40 2012 (r11433)
@@ -1,32 +1,25 @@
-<div class="span5 tree tab-pane active" id="treeview" data-xhr-location="<?php
echo url_for(array($resource, 'module' => 'informationobject', 'action' =>
'treeView')) ?>">
+<div class="tab-pane active" id="treeview" data-xhr-location="<?php echo
url_for(array($resource, 'module' => 'informationobject', 'action' =>
'treeView')) ?>">
<ul class="unstyled">
<li class="back"><i></i><?php echo link_to(__('Show all'), array('module'
=> 'informationobject', 'action' => 'browse')) ?></li>
<?php $resultSet = $current->getResults() ?>
- <?php $doc = $resultSet[0]->getData() ?>
- <?php foreach ($doc['i18n'] as $i18n): ?>
- <?php $doc[$i18n['culture']] = $i18n ?>
- <?php endforeach; ?>
- <?php unset($doc['i18n']); // continue; ?>
-
+ <?php $doc = build_i18n_doc($resultSet[0]) ?>
<?php foreach($doc['ancestors'] as $id): ?>
<?php if ($id == QubitInformationObject::ROOT_ID) continue; ?>
<?php $ancestor = QubitInformationObject::getById($id) ?>
- <li class="ancestor" data-id="<?php echo $id ?>"><i></i><?php echo
link_to($ancestor, array($ancestor, 'module' => 'informationobject')) ?></li>
+ <li class="ancestor" data-id="<?php echo $id ?>">
+ <i></i>
+ <?php echo link_to($ancestor->__toString(), array($ancestor, 'module'
=> 'informationobject')) ?>
+ <strong>Foobar</strong>
+ </li>
<?php endforeach; ?>
- <li class="active"><i></i><?php echo $resource ?></li>
+ <li class="active"><i></i><?php echo $resource->__toString() ?></li>
<?php foreach ($children->getResults() as $hit): ?>
-
- <?php $doc = $hit->getData() ?>
- <?php foreach ($doc['i18n'] as $i18n): ?>
- <?php $doc[$i18n['culture']] = $i18n ?>
- <?php endforeach; ?>
- <?php unset($doc['i18n']) // continue; ?>
-
+ <?php $doc = build_i18n_doc($hit) ?>
<?php $title = $doc[$sf_user->getCulture()]['title'] ?:
$doc[$doc['sourceCulture']]['title'] ?>
<?php $expand = 0 < count(@$doc['children']) ? ' expand' : '' ?>
<?php if ($hit->getId() == $resource->id): ?>
@@ -34,7 +27,6 @@
<?php else: ?>
<li class="<?php echo $expand ?>"><?php echo link_to('<i></i>'.$title,
array('module' => 'informationobject', 'slug' => $doc['slug'])) ?></li>
<?php endif; ?>
-
<?php endforeach; ?>
</ul>
Modified:
branches/2.0/apps/qubit/modules/informationobject/templates/treeViewSuccess.php
==============================================================================
---
branches/2.0/apps/qubit/modules/informationobject/templates/treeViewSuccess.php
Wed Apr 11 13:11:12 2012 (r11432)
+++
branches/2.0/apps/qubit/modules/informationobject/templates/treeViewSuccess.php
Wed Apr 11 13:32:40 2012 (r11433)
@@ -2,11 +2,7 @@
<?php foreach ($resultSet->getResults() as $hit): ?>
- <?php $doc = $hit->getData() ?>
- <?php foreach ($doc['i18n'] as $i18n): ?>
- <?php $doc[$i18n['culture']] = $i18n ?>
- <?php endforeach; ?>
- <?php unset($doc['i18n']); // continue; ?>
+ <?php $doc = build_i18n_doc($hit) ?>
<?php $title = $doc[$sf_user->getCulture()]['title'] ?:
$doc[$doc['sourceCulture']]['title'] ?>
<?php $count = count(@$doc['children']) ?>
@@ -25,7 +21,7 @@
<?php elseif ('item' == $sf_request->show): ?>
<?php $resultSet = $current->getResults() ?>
- <?php $doc = $resultSet[0]->getData() ?>
+ <?php $doc = build_i18n_doc($resultSet[0]) ?>
<?php foreach ($doc['ancestors'] as $id): ?>
<?php if (QubitInformationObject::ROOT_ID == $id) continue; ?>
@@ -33,11 +29,6 @@
<li class="ancestor" data-id="<?php echo $id ?>"><?php echo
link_to('<i></i>'.$item, array($item, 'module' => 'informationobject')) ?></li>
<?php endforeach; ?>
- <?php foreach ($doc['i18n'] as $i18n): ?>
- <?php $doc[$i18n['culture']] = $i18n ?>
- <?php endforeach; ?>
- <?php unset($doc['i18n']); // continue; ?>
-
<?php $title = $doc[$sf_user->getCulture()]['title'] ?:
$doc[$doc['sourceCulture']]['title'] ?>
<?php $count = count(@$doc['children']) ?>
<?php $active = $resultSet[0]->getId() == $resource->id ?>
@@ -54,11 +45,7 @@
<?php if ($hit->getId() == $resource->id) continue; ?>
- <?php $doc = $hit->getData() ?>
- <?php foreach ($doc['i18n'] as $i18n): ?>
- <?php $doc[$i18n['culture']] = $i18n ?>
- <?php endforeach; ?>
- <?php unset($doc['i18n']); // continue; ?>
+ <?php $doc = build_i18n_doc($hit) ?>
<?php $title = $doc[$sf_user->getCulture()]['title'] ?:
$doc[$doc['sourceCulture']]['title'] ?>
<?php $count = count(@$doc['children']) ?>
Modified: branches/2.0/apps/qubit/templates/layout.php
==============================================================================
--- branches/2.0/apps/qubit/templates/layout.php Wed Apr 11 13:11:12
2012 (r11432)
+++ branches/2.0/apps/qubit/templates/layout.php Wed Apr 11 13:32:40
2012 (r11433)
@@ -5,6 +5,9 @@
<?php include_metas() ?>
<?php include_title() ?>
<link rel="shortcut icon" href="/favicon.ico"/>
+ <script type="text/javascript">
+ less = {}; less.env = 'development';
+ </script>
<?php include_stylesheets() ?>
<?php include_javascripts() ?>
</head>
Modified: branches/2.0/js/dominion.js
==============================================================================
--- branches/2.0/js/dominion.js Wed Apr 11 13:11:12 2012 (r11432)
+++ branches/2.0/js/dominion.js Wed Apr 11 13:32:40 2012 (r11433)
@@ -4,6 +4,28 @@
/****
****
+ **** Generic
+ ****
+ ****/
+
+ $(function ()
+ {
+
+ var $navigation = $('#navigation');
+ $navigation.hover(
+ function()
+ {
+ $navigation.addClass('expanded');
+ },
+ function()
+ {
+ $navigation.removeClass('expanded');
+ });
+
+ });
+
+ /****
+ ****
**** Autocomplete plugin
****
****/
@@ -278,11 +300,7 @@
e.preventDefault();
e.stopPropagation();
- if ($li.hasClass('ancestor'))
- {
- return this.showItem($li);
- }
- else if ($li.hasClass('expand'))
+ if ($li.hasClass('ancestor') || $li.hasClass('expand'))
{
return this.showItem($li);
}
Modified: branches/2.0/lib/helper/QubitHelper.php
==============================================================================
--- branches/2.0/lib/helper/QubitHelper.php Wed Apr 11 13:11:12 2012
(r11432)
+++ branches/2.0/lib/helper/QubitHelper.php Wed Apr 11 13:32:40 2012
(r11433)
@@ -157,3 +157,17 @@
return round(($val / pow(1024, $i)), 1).' '.$units[$i];
}
+
+function build_i18n_doc(Elastica_Result $hit)
+{
+ $doc = $hit->getData();
+
+ foreach ($doc['i18n'] as $i18n)
+ {
+ $doc[$i18n['culture']] = $i18n;
+ }
+
+ unset($doc['i18n']);
+
+ return $doc;
+}
Modified:
branches/2.0/plugins/qtDominionPlugin/config/qtDominionPluginConfiguration.class.php
==============================================================================
---
branches/2.0/plugins/qtDominionPlugin/config/qtDominionPluginConfiguration.class.php
Wed Apr 11 13:11:12 2012 (r11432)
+++
branches/2.0/plugins/qtDominionPlugin/config/qtDominionPluginConfiguration.class.php
Wed Apr 11 13:32:40 2012 (r11433)
@@ -32,7 +32,7 @@
if ($context->getConfiguration()->isDebug())
{
$context->response->addJavaScript('/vendor/less/dist/less-1.3.0.js');
-
$context->response->addStylesheet('/plugins/qtDominionPlugin/css/main.less',
'last', array('rel' => 'stylesheet/less', 'type' => 'text/css'));
+
$context->response->addStylesheet('/plugins/qtDominionPlugin/css/main.less',
'last', array('rel' => 'stylesheet/less', 'type' => 'text/css'));
}
else
{
Modified:
branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
Wed Apr 11 13:11:12 2012 (r11432)
+++ branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
Wed Apr 11 13:32:40 2012 (r11433)
@@ -1,80 +1,119 @@
-body.sfRadPlugin {
+#navigation {
- #navigation {
-
- position: fixed;
- top: 0;
- width: 250px;
- height: 100%;
- overflow-y: hidden;
- overflow-x: hidden;
- z-index: 100;
- // clip: rect(auto, 220px, auto, auto);
+ position: fixed;
+ top: 0;
+ width: 240px;
+ height:100%;
+ overflow-y: hidden;
+ overflow-x: hidden;
+ z-index: 100;
+ // clip: rect(auto, 220px, auto, auto);
- .institution a {
+ .nav-tabs {
- font-size: 26px;
- height: 134px;
+ margin-bottom: 0 !important;
- }
+ }
- #facets .scrollable {
+ &.expanded {
- max-height: none !important;
+ overflow-y: auto !important;
+ width: 400px !important;
+ // clip:auto !important;
+ background-image: url(../../images/background.png);
+ border-right: 2px solid white;
+ @shadow: 4px 4px 10px @gray;
+ .box-shadow(@shadow);
- }
+ }
- .nav-tabs {
+ > div:first-child {
- margin-bottom: 0 !important;
+ margin-top: 125px;
- .detailed-view {
+ }
- margin-left:75px;
- margin-top:10px;
+}
- }
+#treeview {
+ white-space: nowrap;
- }
+ ul {
+ li {
+ padding:5px 0 5px 17px;
+ #translucent > .background(@black, .2);
- }
+ a {
+ color: @white;
+ font-family: @smallFontFamily;
-}
+ }
+ &:hover {
+ #translucent > .background(@white, .2);
+ text-decoration: none;
+ }
+ .adminbuttons a:hover {
+ color: @black !important;
+ }
+ }
-.expandednav {
- overflow-y: auto !important;
- width: 400px !important;
- // clip:auto !important;
- background-image: url(../../images/background.png);
- @shadow: 4px 4px 10px @gray;
- border-right: 2px solid white;
- .box-shadow(@shadow);
- //.transition(clip .3s linear);
-}
+ .expand {
+ padding-left:2px !important;
+ }
+ .up {
+ border-bottom: 1px solid @white;
+ padding-left:2px !important;
+ background:none;
+ }
+ .back {
+ border-bottom: 1px solid @white;
+ padding-left:2px !important;
+ background:none;
+ }
-.btn:hover {
- color:@black !important;
+ .active {
+ background-color: @white;
- i {
- background-image: url(../../js/bootstrap/img/glyphicons-halflings.png);
+ a {
+ color: @orange;
+ }
+ }
}
}
-.tab-content h2 { .hide; }
-
-
-
#export {
margin-left: 10px;
margin-top: 20px;
}
-#mediadisplay {
+// Arrow Icons for Tree
+[class^="arrow-"] {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ vertical-align: middle;
+ margin-right:3px;
+ background-image: url(../../images/arrow-sprites.png);
+ background-position: 10px 10px;
+ background-repeat: no-repeat;
+ .ie7-restore-right-whitespace();
+}
+
+.arrow-down { background-position: 0 -10px; }
+.arrow-left { background-position: -10px -10px; }
+.arrow-right { background-position: -20px -10px; }
+
+#treeview .active a {
+ .arrow-down { background-position: 0 0; }
+ .arrow-left { background-position: -10px 0; }
+ .arrow-right { background-position: -20px 0; }
+}
+#mediadisplay {
background-color: @black;
padding:10px;
color:@white;
@@ -239,10 +278,6 @@
}
}
-#left-column {
- margin-top:125px;
-}
-
#right-column {
h3 {
color: @white;
@@ -269,23 +304,13 @@
@media (max-width: 768px) {
- .nav-tabs, #left-column #facets, #left-column .institution, .breadcrumb,
.map, #searchfocus, #export, #mediaactions {
- .hide;
- }
- .institutionX {
- width: 100px;
- height: 100px;
- h2 {
- font-size: 14px;
- line-height: 110%;
- a {
+ #institution,
+ .nav-tabs,
+ .breadcrumb {
+
+ .hide;
- height: 95px;
- width: 95px;
- padding:3px;
- }
- }
}
.img {
@@ -316,7 +341,7 @@
margin: auto 10px !important;
}
- #treeview {
+ #holdings {
margin: auto 10px !important;
white-space: normal;
}
@@ -327,21 +352,22 @@
margin:5px !important;
}
- .tab-content h2 { display:block !important; }
+ .tab-content h2, #headline2 { display:block !important; }
}
-// Portrait tablet to landscape and desktop
+
@media (min-width: 768px) and (max-width: 980px) {
- #navigation { width:190px; }
- #mediadisplay #image img { max-width:80%; }
+
+ #navigation { width: 184px !important; }
+
}
-// Large desktop
@media (min-width: 1200px) {
- #navigation { width:310px; }
+
+ #navigation { width: 310px !important; }
}
Modified: branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less Wed Apr
11 13:11:12 2012 (r11432)
+++ branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less Wed Apr
11 13:32:40 2012 (r11433)
@@ -8,11 +8,14 @@
padding: 5px 0 5px 17px;
#translucent > .background(@black, .2);
+ overflow: hidden;
+ text-overflow: ellipsis;
a {
color: @white;
font-family: @smallFontFamily;
+ text-overflow: ellipsis;
}
@@ -23,12 +26,6 @@
}
- .adminbuttons a:hover {
-
- color: @black !important;
-
- }
-
&.expand {
padding-left: 2px !important;
@@ -58,9 +55,7 @@
}
- &.ancestor i,
- &.back i,
- &.expand i {
+ i {
display: inline-block;
width: 10px;
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
