Commit cbca2b46 authored by merlinofchaos's avatar merlinofchaos

#242419: More UI tweaks from yoroy

parent 107d1fdb
......@@ -16,13 +16,10 @@
* First column: display drawers
*/
.views-tabset .views-tabs {
background: #efefef;
float: left;
width: 118px;
margin-right: 0;
padding-bottom: 1em;
border-left: #ccc 1px solid;
border-bottom: #ccc 1px solid;
}
* html .views-tabset .views-tabs {
......@@ -44,15 +41,14 @@
list-style-image: none;
line-height: 100%;
border-bottom: #ADB7BE 1px solid;
background: #e6e6e6;
background: transparent;
margin: 0;
padding: 0.5em;
position: relative;
}
.views-tabset .views-tabs ul li.active {
background: #fff;
border-bottom: #ADB7BE 3px solid;
background: #CFD7DC;
border-right: 0;
margin-left: 0;
position: relative;
......@@ -66,6 +62,7 @@
.views-tabset .views-tabs ul li.active a {
font-weight: bold;
color: #494949;
}
.views-tabset .extra {
......@@ -85,8 +82,7 @@
border: #ccc 1px solid;
border-top: 0;
margin-left: 117px; /* 118 -1 causes borders to overlap */
// min-height: 302px;
// _height: 300px; /*stupid IE hack */
/* _height: 300px; stupid IE hack */
}
* html .views-tabset .views-display {
......@@ -129,7 +125,9 @@ div.views-display-deleted div.tab-section {
padding: 0;
margin: 0;
float: left;
/*
min-height: 273px;
*/
_height: 274px;
}
......@@ -189,6 +187,8 @@ div.views-display-deleted div.tab-section {
#views-ajax-pad {
background: transparent;
margin-top: 0px;
max-height: 240px;
_height: 240px; /* stupid IE */
}
#views-ajax-title {
......@@ -205,7 +205,7 @@ div.views-display-deleted div.tab-section {
margin-left: 117px;
border: #ADB7BE 1px solid;
border-top: 0;
/* padding: 3em 0em; */
padding: 2em 0em;
text-align: center;
background: transparent;
font-style: italic;
......@@ -230,7 +230,6 @@ div.views-display-deleted div.tab-section {
#views-ajax-pad .form-buttons {
margin: 0;
padding: 0.5em 1em;
background: #efefef;
clear: left;
}
......@@ -245,7 +244,7 @@ div.views-display-deleted div.tab-section {
#views-ajax-pad .form-item {
margin: 0.5em;
padding: 0em 0.5em;
padding: 0.25em 1em 0.25em 1em;
}
/* These put checkboxes closer together */
......@@ -274,6 +273,7 @@ div.views-display-deleted div.tab-section {
#views-ajax-pad .form-checkboxes .description,
#views-ajax-pad .form-radios .description {
margin-left: 2em;
margin-top: -0.25em;
}
#views-ajax-pad {
......@@ -316,33 +316,39 @@ html.js #views-ajax-pad {
#views-ajax-pad .views-left-25 {
float: left;
width: 25%;
border-right: #ddd 1px solid;
}
#views-ajax-pad .views-left-30 {
float: left;
width: 30%;
border-right: #ddd 1px solid;
}
#views-ajax-pad .views-left-40 {
float: left;
width: 40%;
border-right: #ddd 1px solid;
}
#views-ajax-pad .views-left-50 {
float: left;
width: 50%;
border-right: #ddd 1px solid;
}
#views-ajax-pad .views-left-75 {
float: left;
width: 75%;
border-right: #ddd 1px solid;
}
#views-ajax-pad .views-radio-box {
overflow: auto;
max-height: 180px;
max-height: 220px;
}
#views-ajax-pad fieldset {
margin: 0 .5em;
}
......@@ -461,7 +467,6 @@ div.changed div.view-changed {
}
.hilited {
color: #000;
font-weight: bold;
background-color: #ffd;
padding-left: 10px;
......@@ -477,17 +482,63 @@ form#views-add-display-form {
}
#views-ui-edit-view-form {
margin: 0 0 0 117px;
margin: 0;
padding: 0 0 0 1em;
}
.form-button, .form-submit {
margin: 0.5em;
}
.view-locked {
color: red;
border: 1px solid red;
padding: 1em;
}
/* Hide by default only with js */
html.js .views-hidden {
display: none;
}
/* wrap the enclosing div around the summaries now that min-height is removed */
span.clear {
display: block;
clear: left;
height: 1px;
margin-top: -1px;
}
/*
* Live preview section
*/
div#views-live-preview {
border-top: #ADB7BE 1px solid;
border-bottom: #ADB7BE 1px solid;
}
div.views-query-info {
margin: 0;
padding: 0;
}
div.views-query-info pre {
margin: 0;
}
form#views-ui-preview-form,
#center form#views-ui-preview-form {
border: 1px solid black;
margin: 0 0 .5em 0;
margin: 0;
padding: .5em;
}
div#views-live-preview div.view {
margin: 1em;
background: #fff;
}
form#views-ui-preview-form div#preview-display-id-wrapper,
form#views-ui-preview-form div#preview-args-wrapper {
float: left;
......
......@@ -22,4 +22,5 @@ html.js a.views-throbbing,
html.js span.views-throbbing {
background:url(../images/status-active.gif) no-repeat right center;
padding-right:18px;
border: 0;
}
......@@ -789,7 +789,7 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
$created = $values->{$this->aliases['created']};
$changed = $values->{$this->aliases['changed']};
$last_comment = module_exists('comment') ? $values->{$this->aliases['last_comment']} : 0;
$last_comment = module_exists('comment') && !empty($this->options['comments']) ? $values->{$this->aliases['last_comment']} : 0;
if (!$last_read && $created > NODE_NEW_LIMIT) {
$mark = MARK_NEW;
......
......@@ -75,5 +75,6 @@
</div>
</div>
</div>
<span class="clear"></span>
</div>
\ No newline at end of file
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