Commit 45e4483d authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "Minor theming fixes for buttons and long headings"

parents 1e245a8c 2b9576b5
......@@ -60,7 +60,8 @@
{/if}
</td>
{/if}
<td class="right s">
<!-- Ensure space for 3 buttons (in the case of a really long single line string in a user input field -->
<td class="right s btns3">
{if $editable && !$file->isparent}
{if $file->artefacttype == 'archive'}<a href="{$WWWROOT}artefact/file/extract.php?file={$file->id}"><img src="{theme_url filename="images/unzip.gif"}" alt="{str tag=Unzip section=artefact.file}"/></a>{/if}
{if $file->locked}
......
......@@ -65,6 +65,18 @@ img {
.main-column h6 {
font-size: .9167em; /* 10px */
}
/* Wrap un-spaced titles if they get too long for the containing object */
.main-column h1:first-child, .main-column h2:first-child, .main-column h3:first-child, .main-column h4:first-child, .main-column h5:first-child, .main-column h6:first-child, td.filedescription {
word-break: break-all;
white-space: normal;
word-wrap: break-word;
}
/* For Browsers which do not support first-child */
* html .main-column h1, * html .main-column h2, * html .main-column h3, * html .main-column h4, * html .main-column h5, * html .main-column h6 {
word-break: break-all;
white-space: normal;
word-wrap:break-word;
}
p {
margin: 10px 0;
}
......@@ -626,6 +638,14 @@ div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.
position: relative;
float: left;
}
/* Add space for multiple icons. */
.btns2 {
width: 36px; /* 2 16px with 4 pixels of padding. Icons*/
}
.btns3 {
width: 54px; /* 3 16px with 6 pixels of padding. Icons*/
}
/* Search buttons */
#usf_submit {
border-color: #a3a3a3 #a3a3a3 #a3a3a3 #e3e3e3;
......
......@@ -7,7 +7,7 @@
{foreach from=$views.views item=view}
<tr class="{cycle values='r0,r1'}">
{if $views.count > 1}
<td class="displayordercontrols" width="40">
<td class="displayordercontrols btns2">
{if $view->displayorder == $views.min}
<div id="viewdisplayorder_{$view->view}" class="justdown">
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=down"><img src="{theme_url filename='images/move-down.gif'}" alt="Move Down" ></a>
......
......@@ -45,7 +45,7 @@
<div class="videsc">{$view.description|str_shorten_html:110:true|strip_tags|safe}</div>
{/if}
</td>
<td class="right buttonscell">
<td class="right buttonscell btns2">
{if !$view.submittedto}
<a href="{$WWWROOT}view/blocks.php?id={$view.id}" title="{str tag ="editcontentandlayout" section="view"}"><img src="{theme_url filename='images/edit.gif'}" alt="{str tag=edit}"></a>
{/if}
......
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