Commit 5e05273a authored by merlinofchaos's avatar merlinofchaos

#242419: UI CSS improvements by yoroy.

parent 95bda3fe
......@@ -4,8 +4,6 @@
* Summary pad
*/
.views-tabset {
border-top: #ccc 1px solid;
margin-top: 0.5em;
}
.views-tabset .views-tab fieldset {
......@@ -16,13 +14,13 @@
* First column: display drawers
*/
.views-tabset .views-tabs {
background: #efefef;
background: #F6F6F6;
border-top: #D6DBDE 1px solid;
border-left: #EFEFEF 1px solid;
border-bottom: #EFEFEF 1px solid;
float: left;
width: 118px;
width: 116px;
margin-right: 0;
padding-bottom: 1em;
border-left: #ccc 1px solid;
border-bottom: #ccc 1px solid;
}
* html .views-tabset .views-tabs {
......@@ -40,21 +38,18 @@
}
.views-tabset .views-tabs ul li {
background: #fff;
list-style-type: none;
list-style-image: none;
line-height: 100%;
border-bottom: #ADB7BE 1px solid;
background: #e6e6e6;
border-bottom: #D6DBDE 1px solid;
margin: 0;
padding: 0.5em;
position: relative;
}
.views-tabset .views-tabs ul li.active {
background: #fff;
border-bottom: #ADB7BE 3px solid;
border-right: 0;
margin-left: 0;
background: #D6DBDE;
position: relative;
}
......@@ -65,6 +60,7 @@
}
.views-tabset .views-tabs ul li.active a {
color: #000;
font-weight: bold;
}
......@@ -82,8 +78,7 @@
* Three columns with setting-summaries
*/
.views-tabset .views-display {
border: #ccc 1px solid;
border-top: 0;
border: #D6DBDE 1px solid;
margin-left: 117px; /* 118 -1 causes borders to overlap */
// min-height: 302px;
// _height: 300px; /*stupid IE hack */
......@@ -138,15 +133,22 @@ div.views-display-deleted div.tab-section {
}
.views-display .tab-section .inside .views-category {
padding: 0.25em 0.25em 0.5em 1em;
margin-bottom: 1em;
background: #f6f6f6;
border: 1px #efefef solid;
}
.views-display .tab-section .inside .views-category-content {
padding: 0em 0em 0.5em 1em;
}
.views-display .tab-section .inside .views-category-title {
padding: .1em .1em .1em .3em;
margin: 0 0 .1em 0;
font-size: 9pt;
font-weight: bold;
background-color: #efefef;
border-bottom: 1px #efefef solid;
}
.views-display .tab-section .links {
......@@ -169,7 +171,6 @@ div.views-display-deleted div.tab-section {
.views-display #views-add-display-form {
float: right;
margin-bottom: 0;
margin-right: 0.5em;
}
.views-display .middle {
......@@ -180,7 +181,6 @@ div.views-display-deleted div.tab-section {
margin: 0.5em 0em 0 0;
padding: 0.5em;
font-weight: bold;
background-position: 0px -8px;
}
/*
......@@ -192,45 +192,44 @@ div.views-display-deleted div.tab-section {
}
#views-ajax-title {
background: transparent;
background-position: 0px -7px;
background: #f6f6f6;
border-left: #D6DBDE 1px solid;
border-right: #D6DBDE 1px solid;
margin: 0 0 0 117px;
padding: 1em 1em 0em 1em;
border-left: #ADB7BE 1px solid;
border-right: #ADB7BE 1px solid;
font-weight: bold;
}
#views-ajax-pad .message {
background: #f6f6f6;
margin-left: 117px;
border: #ADB7BE 1px solid;
border: #D6DBDE 1px solid;
border-top: 0;
/* padding: 3em 0em; */
text-align: center;
background: transparent;
font-style: italic;
}
#views-ajax-pad form {
background: #fff;
margin-left: 117px;
border: #ADB7BE 1px solid;
border-top: 0;
border: #D6DBDE 1px solid;
padding-top: 3px;
border-top: 0;
}
#views-ajax-pad .views-messages {
background: transparent;
margin-left: 117px;
border-top: 0;
padding: 5px;
border-left: #ADB7BE 1px solid;
border-right: #ADB7BE 1px solid;
border: #D6DBDE 1px solid;
border-top: 0;
}
#views-ajax-pad .form-buttons {
margin: 0;
padding: 0.5em 1em;
background: #efefef;
background: #f6f6f6;
clear: left;
}
......@@ -372,7 +371,8 @@ a.views-button-remove {
height: 12px;
width: 16px;
margin: 2px 0px 1px 0px;
border: #666 1px solid;
border-bottom: #C2C9CE 1px solid;
border-right: #C2C9CE 1px solid;
}
a.views-button-remove {
......@@ -441,7 +441,7 @@ html.js a.views-button-remove {
}
div.changed {
background: #ffe;
background-color: #ffe;
font-weight: bold;
}
......@@ -461,8 +461,11 @@ div.changed div.view-changed {
display: block;
}
.overridden {
background: transparent url(/themes/garland/images/menu-leaf.gif) no-repeat left;
.views-display .tab-section .inside .overridden {
/* all this so we odn't mess up background-color */
background-image: url(/themes/garland/images/menu-leaf.gif);
background-repeat: no-repeat;
background-position: left;
padding-left: 10px;
}
......@@ -494,9 +497,13 @@ form#views-add-display-form {
padding: 0 0 0 1em;
}
#views-live-preview {
margin: 0 0 0 117px;
}
form#views-ui-preview-form,
#center form#views-ui-preview-form {
border: 1px solid black;
border: 1px solid #D6DBDE;
margin: 0 0 .5em 0;
padding: .5em;
}
......@@ -531,8 +538,11 @@ html.js .views-hidden {
float: right;
}
.views-quick-links ul.links li {
padding-left: 1em;
}
.views-quick-links li.last {
padding-right: 0;
}
.views-edit-view .advanced-help-link {
......
......@@ -13,16 +13,18 @@
<?php print $title; ?>
</div>
<?php if (empty($fields)): ?>
<div><?php print t('None defined'); ?></div>
<?php else: ?>
<?php foreach ($fields as $pid => $field): ?>
<?php if (!empty($field['links'])): ?>
<?php print $field['links']; ?>
<?php endif; ?>
<div class="<?php print $field['class']; if (!empty($field['changed'])) { print ' changed'; } ?>">
<?php print $field['title']; ?>
<?php print $field['info']; ?>
</div>
<?php endforeach; ?>
<?php endif; ?>
<div class="views-category-content">
<?php if (empty($fields)): ?>
<div><?php print t('None defined'); ?></div>
<?php else: ?>
<?php foreach ($fields as $pid => $field): ?>
<?php if (!empty($field['links'])): ?>
<?php print $field['links']; ?>
<?php endif; ?>
<div class="<?php print $field['class']; if (!empty($field['changed'])) { print ' changed'; } ?>">
<?php print $field['title']; ?>
<?php print $field['info']; ?>
</div>
<?php endforeach; ?>
<?php endif; ?>
</div>
......@@ -27,22 +27,26 @@
<?php if ($default): ?>
<div class="views-category">
<div class="views-category-title"><?php print t('View settings'); ?></div>
<div class="<?php $details_class; if (!empty($details_changed)) { print ' changed'; }?>">
<?php print $details ?>
<div class="views-category-content">
<div class="<?php $details_class; if (!empty($details_changed)) { print ' changed'; }?>">
<?php print $details ?>
</div>
</div>
</div>
<?php endif; ?>
<?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'; } if (!empty($data['changed'])) { print ' changed'; }?>">
<?php print $data['links'] . $data['content'] ?>
<div class="views-category-title views-category-<?php print $category_id; ?>">
<?php print $category['title']; ?>
</div>
<div class="views-category-content">
<?php foreach ($category['data'] as $data): ?>
<div class="<?php print $data['class']; if (!empty($data['overridden'])) { print ' overridden'; } if (!empty($data['changed'])) { print ' changed'; }?>">
<?php print $data['links'] . $data['content'] ?>
</div>
<?php endforeach; ?>
</div>
<?php endforeach; ?>
</div>
<?php endforeach; ?>
</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