Commit 8f634d49 authored by merlinofchaos's avatar merlinofchaos

Some UI improvements from yoroy

parent b7d23d7c
......@@ -11,7 +11,7 @@
.views-tabset .views-tabs ul {
list-style-type: none !important;
list-style-image: none !important;
border-bottom: #5C707E 1px solid;
border-bottom: #ADB7BE 1px solid;
padding: 0;
margin: 0;
}
......@@ -20,26 +20,26 @@
list-style-type: none;
list-style-image: none;
background: #B3BEC6;
border-top: #5C707E 1px solid;
border-right: #5C707E 1px solid;
border-left: #5C707E 0px solid;
border-top: #ADB7BE 1px solid;
border-right: #ADB7BE 1px solid;
border-left: #ADB7BE 0px solid;
margin: 0;
padding: 3px 3px 3px 6px;
}
.views-tabset .views-tabs ul li.active {
background: #fff;
border-top: #5C707E 2px solid;
border-top: #ADB7BE 1px solid;
border-right: 0;
border-bottom: #5C707E 1px solid;
border-bottom: #ADB7BE 2px solid;
margin-left: 0;
font-weight: bold;
}
.views-tabset .views-tabs {
border-bottom: #5C707E 1px solid;
border-left: #5C707E 1px solid;
border-bottom: #ADB7BE 1px solid;
border-left: #ADB7BE 1px solid;
background: #E0E5E8; float: left;
width: 118px;
}
......@@ -53,7 +53,7 @@
}
.views-tabset .views-display {
border: #5C707E 1px solid;
border: #ADB7BE 1px solid;
border-bottom: 0px;
margin-left: 118px; /* 120 -1 causes borders to overlap */
min-height: 302px;
......@@ -66,6 +66,11 @@ div.views-display-deleted div.tab-section {
background-color: #eee;
}
.views-display div {
font-size: 8pt;
line-height: 12pt;
}
.views-display .top {
padding: 0.5em 0em 0em 1em;
background: #fff;
......@@ -84,7 +89,7 @@ div.views-display-deleted div.tab-section {
.views-display .tab-section {
background: #fff;
width: 33%;
width: 32.5%;
padding: 0;
margin: 0;
float: left;
......@@ -93,10 +98,22 @@ div.views-display-deleted div.tab-section {
}
.views-display .tab-section .inside {
margin: 0;
padding: 2px 5px;
margin: 0.5em 0.5em 0.5em 0.5em;
}
.views-display .tab-section .inside .views-category {
padding: 0.25em 0.5em;
margin-bottom: 1em;
background: #F0F2F4;
border: 1px #F0F2F4 solid;
}
.views-display .tab-section .inside .views-category-title {
font-size: 9pt;
font-weight: bold;
}
.views-display .tab-section .links {
float: right;
font-size: 6pt;
......@@ -125,10 +142,6 @@ div.views-display-deleted div.tab-section {
}
.views-display dl {
margin: 0;
}
.views-basic-info {
margin: 0.5em 0em 0 0;
padding: 0.5em;
......@@ -136,32 +149,6 @@ div.views-display-deleted div.tab-section {
background: transparent;
}
.views-display dl {
margin: 0.25em;
display: block;
padding: 0.25em 0.5em 0.5em 0.25em;
background: #F0F2F4;
}
.views-display dt {
font-weight: bold;
padding: 0 0 0em 0.5em;
}
.views-display dd,
.views-display dd a {
font-size: 8pt;
line-height: 12pt;
}
.views-display dd {
padding: 0 0 0 1.7em;
margin: 0;
text-indent: -1em;
}
#views-ajax-pad {
background: transparent;
......@@ -176,14 +163,14 @@ div.views-display-deleted div.tab-section {
margin-top: 0;
margin-left: 118px;
padding: 0.25em 1em;
border-left: #5C707E 1px solid;
border-right: #5C707E 1px solid;
border-left: #ADB7BE 1px solid;
border-right: #ADB7BE 1px solid;
font-weight: bold;
}
#views-ajax-pad .message {
margin-left: 118px;
border: #5C707E 1px solid;
border: #ADB7BE 1px solid;
padding: 3em 0em;
text-align: center;
background: #ffd;
......@@ -192,7 +179,7 @@ div.views-display-deleted div.tab-section {
#views-ajax-pad form {
background: #ffd;
margin-left: 118px;
border: #5C707E 1px solid;
border: #ADB7BE 1px solid;
border-top: #D1D8DD 1px solid;
}
......@@ -354,6 +341,8 @@ div.changed {
div.view-changed {
display: none;
float: right;
font-style: italic;
color: #f93;
}
div.changed div.view-changed {
......@@ -361,9 +350,11 @@ div.changed div.view-changed {
}
.hilited {
padding: 0.25em;
background: #ffd;
}
.overridden {
font-style: italic;
background: #fff;
padding-left: 0.5em;
}
......@@ -8,20 +8,20 @@
?>
<?php print $rearrange; ?>
<?php print $add; ?>
<dt<?php if ($overridden) { print ' class="overridden"'; }?>>
<div class="views-category-title" <?php if ($overridden) { print ' class="overridden"'; }?>>
<?php print $title; ?>
</dt>
</div>
<?php if (empty($fields)): ?>
<dd><?php print t('None defined'); ?></dd>
<div><?php print t('None defined'); ?></div>
<?php else: ?>
<?php foreach ($fields as $field): ?>
<?php if (!empty($fields['links'])): ?>
<?php print $field['links']; ?>
<?php endif; ?>
<dd class="<?php print $field['class']; ?>">
<div class="<?php print $field['class']; ?>">
<?php print $field['title']; ?>
<?php print $field['info']; ?>
</dd>
</div>
<?php endforeach; ?>
<?php endif; ?>
......@@ -22,47 +22,57 @@
<?php // left section ?>
<div class="left tab-section">
<div class="inside">
<dl>
<?php // If this is the default display, add some basic stuff here. ?>
<?php if ($default): ?>
<dt><?php print t('View settings'); ?></dt>
<dd class="<?php $details_class; ?>">
<?php print $details ?>
</dd>
<?php endif; ?>
<?php // If this is the default display, add some basic stuff here. ?>
<?php if ($default): ?>
<div class="views-category">
<div class="views-category-title"><?php print t('View settings'); ?></div>
<div class="<?php $details_class; ?>">
<?php print $details ?>
</div>
</div>
<?php endif; ?>
<?php foreach ($categories as $category_id => $category): ?>
<dt class="views-category-' <?php print $category_id; ?>">
<?php print $category['title']; ?>
</dt>
<?php foreach ($category['data'] as $data): ?>
<dd class="<?php print $data['class']; if (!empty($data['overridden'])) { print ' overridden'; }?>">
<?php print $data['links'] . $data['content'] ?>
</dd>
<?php endforeach; ?>
<?php endforeach; ?>
</dl>
</div>
<?php foreach ($categories as $category_id => $category): ?>
<div class="views-category">
<div class="views-category-title views-category-<?php print $category_id; ?>">
<?php print $category['title']; ?>
</div>
<?php foreach ($category['data'] as $data): ?>
<div class="<?php print $data['class']; if (!empty($data['overridden'])) { print ' overridden'; }?>">
<?php print $data['links'] . $data['content'] ?>
</div>
<?php endforeach; ?>
</div>
<?php endforeach; ?>
</div>
</div>
<?php // middle section ?>
<div class="middle tab-section">
<div class="inside">
<dl>
<div class="views-category">
<?php print $relationships; ?>
</div>
<div class="views-category">
<?php print $arguments; ?>
<?php print $fields; ?>
</dl>
</div>
<?php if (!empty($fields)): ?>
<div class="views-category">
<?php print $fields; ?>
</div>
<?php endif; ?>
</div>
</div>
<?php // right section ?>
<div class="right tab-section">
<div class="inside">
<dl>
<div class="views-category">
<?php print $sorts; ?>
</div>
<div class="views-category">
<?php print $filters; ?>
</dl>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment