Commit 5da644b0 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes Ia5751377,Iaf5af0bc,I72e30cc7

* changes:
  Design fix for Ultima theme and tertiary dropdown menus (Bug #1433776)
  Latest design changes for 15.04 - from Evonne (Bug #1433776)
  Design changes for 1504 - from Evonne (Bug #1433776)
parents b44b1032 7b56365e
......@@ -196,14 +196,13 @@ $form = pieform(array(
'initfunction' => 'translate_ids_to_names',
'multiple' => true,
'ajaxextraparams' => array(),
'width' => '400px',
'rules' => array('required' => true),
),
'subject' => array(
'title' => get_string('titlesubject', 'artefact.multirecipientnotification'),
'type' => 'text',
'name' => 'subject',
'size' => '80',
'size' => '40',
'defaultvalue' => $subject,
'rules' => array('required' => true),
),
......
......@@ -88,7 +88,7 @@ class FormRendererMultiColumnTable {/*{{{*/
}
$toggle = 0;
$datatable = false;
$result = "<table cellspacing=\"0\" border=\"0\"><tbody>\n";
$result = "<table cellspacing=\"0\" border=\"0\" class=\"fullwidth\"><tbody>\n";
foreach ($this->elements as $title => $data) {
if ($datatable) {
$toggle = 1 - $toggle;
......
......@@ -34,6 +34,10 @@ a:hover,
a:focus {
text-decoration: underline;
}
.bar-before,
#footer-nav .bar-before {
border-left: 1px solid #8fa3df;
}
/* some common listing text styles */
.title a {
color: #03219d;
......@@ -270,6 +274,7 @@ div.pagination a {
#header,
.main-nav ul,
#sub-nav ul,
#tertiary-nav ul,
#mainmiddle,
#footer {
width: 95%;
......@@ -410,6 +415,23 @@ div.pagination a {
.main-nav .dropdown-sub li a:focus {
background: #1F97D5;
}
.main-nav .dropdown-sub li.has-sub a,
.main-nav .dropdown-sub li.selected.has-sub a {
background-image: url(../../../raw/static/images/expand.png);
background-repeat: no-repeat;
background-position: calc(100% - 8px) 50%;
}
.main-nav .dropdown-tertiary {
left: calc(100% - 3px);
}
/******************** Tertiary navigation ********************/
#tertiary-nav {
background: none;
}
#tertiary-nav ul {
background: #eeeeee;
text-align: right;
}
/******************** Tabs ********************/
ul.in-page-tabs li a,
ul.in-page-tabs li a:link,
......
......@@ -77,7 +77,8 @@ div.pagination a {
width: 95%;
}
.main-nav,
#sub-nav {
#sub-nav,
#tertiary-nav {
max-width: 1280px;
min-width: 960px;
margin: 0 auto;
......@@ -213,6 +214,17 @@ div.pagination a {
color: #1A428F;
background: #FFF4EA;
}
.main-nav .dropdown-sub li.has-sub a,
.main-nav .dropdown-sub li.selected.has-sub a {
background-image: url(../../../raw/static/images/expand.png);
background-repeat: no-repeat;
background-position: calc(100% - 8px) 50%;
}
/******************** Tertiary navigation ********************/
#tertiary-nav {
background: #FFFFFF;
border-bottom: 1px solid #EEEEEE;
}
/******************** Tabs ********************/
ul.in-page-tabs li a,
ul.in-page-tabs li a:link,
......
......@@ -296,6 +296,7 @@ div.pagination a {
#header,
.main-nav ul,
#sub-nav ul,
#tertiary-nav ul,
#mainmiddle,
#footer {
min-width: 0;
......@@ -427,8 +428,8 @@ div.pagination a {
border-right: 0;
}
.main-nav .dropdown-sub li a:hover,
.main-nav .dropdown-sub li.selected a:hover,
.main-nav .dropdown-sub li a:focus,
.main-nav .dropdown-sub li.selected a:hover,
.main-nav .dropdown-sub li.selected a:focus {
color: #4C711D;
background: #d5d5d5;
......@@ -441,38 +442,15 @@ div.pagination a {
.main-nav .dropdown-sub li.selected.has-sub a {
background-image: url(../../../raw/static/images/expand.png);
background-repeat: no-repeat;
background-position: 100% 50%;
background-position: calc(100% - 8px) 50%;
}
/******************** Tertiary navigation ********************/
#tertiary-nav {
font-weight: bold;
background: #cbcbcb url(../images/submenu.gif) repeat-x 0 bottom;
}
#tertiary-nav ul {
margin: 0 auto;
padding: 0;
}
#tertiary-nav li {
display: inline-block;
list-style-type: none;
margin: 0;
padding: 0;
vertical-align: middle;
}
#tertiary-nav li a,
#tertiary-nav li a:link,
#tertiary-nav li a:visited,
#tertiary-nav li a:active {
display: inline-block;
padding: 5px 10px;
text-decoration: none;
color: #211C00;
border-right: 1px solid #b1b1b1;
border-left: 1px solid #dddddd;
background: #eeeeee;
}
#tertiary-nav li a:hover,
#tertiary-nav li.selected a:hover,
#tertiary-nav li a:focus,
#tertiary-nav li.selected a:hover,
#tertiary-nav li.selected a:focus {
color: #335804;
}
......@@ -480,47 +458,20 @@ div.pagination a {
#tertiary-nav li.selected a:link,
#tertiary-nav li.selected a:visited,
#tertiary-nav li.selected a:active {
background: #FFFFFF url(../images/submenu-active.gif) repeat-x right top;
color: #4c711d;
border-right: 1px solid #c1c1c1;
border-left: 1px solid #dddddd;
}
#tertiary-nav li:first-child a,
#tertiary-nav li:first-child a:link,
#tertiary-nav li:first-child a:visited,
#tertiary-nav li:first-child a:active {
border-left: 0;
background: #FFFFFF;
color: #211C00;
}
#tertiary-nav li a:hover,
#tertiary-nav li.selected a:hover,
#tertiary-nav li a:focus,
#tertiary-nav li.selected a:hover,
#tertiary-nav li.selected a:focus {
color: #7e7327;
}
/******************** Dropdown tertiary navigation ********************/
.main-nav .dropdown-tertiary {
display: none;
position: absolute;
left: 100%;
top: 0;
z-index: 3;
clear: both;
padding: 0;
margin: 0;
min-width: 0;
}
.main-nav .dropdown-sub li.has-sub
.dropdown-tertiary li a {
background-image: none;
}
.main-nav ul ul li:hover .dropdown-tertiary,
.main-nav ul ul li .dropdown-tertiary.show-menu {
display: block;
}
.main-nav .dropdown-tertiary li {
list-style: none;
display: block;
}
.main-nav .dropdown-sub li.selected ul li a,
.main-nav .dropdown-sub li.selected ul li a:link,
.main-nav .dropdown-sub li.selected ul li a:visited,
......@@ -556,7 +507,6 @@ div.pagination a {
border-left: 0;
border-right: 0;
}
/******************** Responsive navigation ********************/
/* reset responsive navigation */
.rd-nav-title {
......@@ -637,7 +587,7 @@ div.pagination a {
position: inherit;
}
.rd-navmenu .nav-expand ul.dropdown-tertiary li {
font-size: 0.8em;
font-size: 0.833em;
}
.rd-navmenu .main-nav ul li {
display: block;
......@@ -765,6 +715,17 @@ div.pagination a {
border: 0;
text-decoration: underline;
}
/* responsive tertiary nav */
.rd-navmenu .nav-expand .dropdown-tertiary li {
clear: none;
float: left;
width: 100%;
margin-right: 0%;
background: none;
border-top: 1px dotted #FFFFFF;
border-bottom: 0;
left: 0;
}
/* js fallback for 768px or less */
@media screen and (max-width: 768px) {
......@@ -802,6 +763,17 @@ div.pagination a {
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
}
.no-js .main-nav ul.dropdown-tertiary {
left: 0;
border: 0;
display: block;
margin: 0 5px;
padding: 0;
position: inherit;
}
.no-js .main-nav ul.dropdown-tertiary li {
font-size: 0.833em;
}
.no-js .main-nav ul li {
display: block;
clear: left;
......@@ -906,6 +878,16 @@ div.pagination a {
.no-js .main-nav li:hover .dropdown-sub {
display: block !important;
}
.no-js .main-nav .dropdown-tertiary li {
clear: none;
float: left;
width: 100%;
margin-right: 0%;
background: none;
border-top: 1px dotted #FFFFFF;
border-bottom: 0;
left: 0;
}
/* hide sub nav when dropdown is turn off */
.no-js #sub-nav {
display: none;
......@@ -1393,6 +1375,9 @@ a.persona-button:before {
margin: 10px 0 50px 0;
float: none;
width: auto;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
/* Groups > Group's Report */
.groupreport thead {
......@@ -1485,13 +1470,19 @@ a.persona-button:before {
}
input.text,
input.password,
textarea,
div.grippie,
input[type=text],
input[type=password] {
max-width: 94%;
margin-bottom: 3px;
}
textarea,
div.grippie {
width: 100%;
margin-bottom: 3px;
}
.select2-container {
width: 100% !important;
}
input#editblog_tags,
input#editpost_tags,
select {
......@@ -2374,6 +2365,7 @@ a.persona-button:before {
#header,
#main-nav,
#sub-nav,
#tertiary-nav,
#mainmiddle,
#footer {
min-width: 300px;
......
......@@ -73,6 +73,16 @@ tr.highlight-file td {
fieldset {
border: 1px solid #BEE3F1;
}
.pseudofieldset .pseudolegend {
background-color: #080d0f;
}
fieldset.collapsed legend a,
.pseudofieldset.collapsed .pseudolegend a,
fieldset.collapsible legend a,
.pseudofieldset.collapsible .pseudolegend a,
.no-js fieldset.collapsed legend a {
background-color: #080d0f;
}
/******************** Buttons ********************/
/* Buttons to override with colour */
/* input buttons */
......@@ -382,7 +392,6 @@ div.warning,
max-width: 1280px;
min-width: 960px;
text-align: right;
height: 26px;
}
#sub-nav li a,
#sub-nav li a:link,
......@@ -418,6 +427,37 @@ div.warning,
background: #00aef1;
color: #FFFFFF;
}
.main-nav .dropdown-sub li.has-sub a,
.main-nav .dropdown-sub li.selected.has-sub a {
background-image: url(../../../raw/static/images/expand.png);
background-repeat: no-repeat;
background-position: calc(100% - 8px) 50%;
}
.main-nav .dropdown-tertiary {
left: calc(100% - 3px);
}
/******************** Tertiary navigation ********************/
#tertiary-nav {
background: none;
}
#tertiary-nav ul {
background: #0285b7;
text-align: right;
}
#tertiary-nav li a,
#tertiary-nav li a:link,
#tertiary-nav li a:visited,
#tertiary-nav li a:active {
color: #FFFFFF;
}
#tertiary-nav li.selected a,
#tertiary-nav li.selected a:link,
#tertiary-nav li.selected a:visited,
#tertiary-nav li.selected a:active {
color: #FFFFFF;
text-decoration: underline;
font-weight: normal;
}
/******************** Tabs ********************/
ul.in-page-tabs li a,
ul.in-page-tabs li a:link,
......
......@@ -278,11 +278,11 @@ div.pagination a {
}
#top-wrapper {
background: transparent url(../images/header-swirl.png) no-repeat right top;
height: 150px;
min-height: 150px;
}
#micro #top-wrapper {
background: none;
height: auto;
min-height: 0;
}
#main-column-container {
padding-left: 10px;
......@@ -565,6 +565,35 @@ div.pagination a {
background: #0b1960;
color: #ffd64d;
}
.main-nav .dropdown-sub li.has-sub a,
.main-nav .dropdown-sub li.selected.has-sub a {
background-image: url(../../../raw/static/images/expand.png);
background-repeat: no-repeat;
background-position: calc(100% - 8px) 50%;
}
.main-nav .dropdown-tertiary {
left: 100%;
}
.main-nav li span span {
background: none;
}
/******************** Tertiary navigation ********************/
#tertiary-nav {
background: none;
}
#tertiary-nav li a,
#tertiary-nav li a:link,
#tertiary-nav li a:visited,
#tertiary-nav li a:active {
color: #ffb24e;
}
#tertiary-nav li.selected a,
#tertiary-nav li.selected a:link,
#tertiary-nav li.selected a:visited,
#tertiary-nav li.selected a:active {
color: #FFFFFF;
font-weight: bold;
}
/******************** Tabs ********************/
div.tabswrap {
background: url(../images/inpage-right.png) no-repeat right 0;
......
......@@ -14,30 +14,35 @@
margin: .8em 0 .2em;
line-height: 1.5;
}
#sendmessage .select2-choices, #sendmessage .text, #sendmessage textarea {
width: 400px;
padding-left: 0px;
padding-right: 0px;
#messagethread {
margin-bottom: 10px;
}
#messagethread td.profilepicturecolumn {
width: 20px;
#messagethread td label {
margin-right: 5px;
}
#messagethread td div.recipientsdiv {
margin-bottom: 5px;
}
#messagethread td div.subjectdiv {
-ms-word-break: break-all;
word-break: break-all;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
margin-bottom: 10px;
}
#messagethread td div.messagebody {
font-size: 1.25em;
margin-bottom: 5px;
}
#activitylist tr.unread {
font-weight: bold;
}
.userlist img.togglebtn, .userlist span.recipientlist {
.userlist img.togglebtn,
.userlist span.recipientlist {
float: left;
margin-right: 2px;
margin-right: 3px;
margin-top: 1px;
}
\ No newline at end of file
......@@ -5,7 +5,7 @@
<tbody>
{foreach from=$messages item=message}
<tr class="{cycle values='r0,r1'}">
<td class="profilepicturecolumn">
<td class="icon-container">
<img src="{profile_icon_url user=$message->fromid maxwidth=20 maxheight=20}" alt="">
</td>
<td>
......@@ -16,7 +16,7 @@
{if ($message->fromusrlink)}</a>{/if}
<span class="postedon">{$message->ctime|strtotime|format_date}</span>
</h5>
<div>
<div class="recipientsdiv">
<label>{str tag='labelrecipients' section='artefact.multirecipientnotification'}</label>
{foreach from=$message->tousrs item=recipient key="index"}
......
{if $tags}<p class="tags s"><strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}</p>{/if}
<p class="detail">{$description}</p>
{if $tags}<p class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}</p>{/if}
{if $tasks.data}
<p>{$description}</p>
<table id="tasktable_{$blockid}" class="plansblocktable fullwidth">
<thead>
<tr>
......@@ -17,5 +17,5 @@
<div id="plans_page_container_{$blockid}" class="nojs-hidden-block">{$tasks.pagination|safe}</div>
{/if}
{else}
<p>{str tag='notasks' section='artefact.plans'}</p>
<p class="message">{str tag='notasks' section='artefact.plans'}</p>
{/if}
......@@ -37,6 +37,12 @@ img#usersearch {
vertical-align: middle;
}
div.title,
div.title:first-child {
font-weight: bold;
margin-top: 10px;
}
div#verifier {
margin-top: 5px;
......@@ -78,44 +84,37 @@ span.response {
color: #EA33A6;
}
.webserviceconfigcontrols {
width: 70px;
padding: 3px 0 0 5px;
white-space: nowrap;
}
.webserviceconfigcontrols form {
display: inline-block;
margin-left: 5px;
}
#webservices_function_groups_add_service {
margin-right: 3px;
}
.heading {
line-height: 1.25em;
text-align: left;
font-size: 1.167em;
white-space: nowrap;
color: #42637b;
padding: 3px 5px;
font-weight: bold;
border-bottom: 1px solid #CCCCCC;
}
#logsearchformcontainer div {
display: inline-block;
margin-right: 3px;
vertical-align: top;
}
#logsearchformcontainer div label {
margin-right: 5px;
line-height: 28px;
}
#logsearchformcontainer div .select2-display-none {
display: none;
}
#logsearchformcontainer div input,
#logsearchformcontainer div select {
margin-left: 5px;
}
#logsearchform_onlyerrors_container {
display: block !important;
}
#activate_webservices .form-switch,
#activate_webservice_protos_soap .form-switch {
margin: 3px 0;
}
div.function_add,
#user_add {
margin: 10px 0 0 0;
}
\ No newline at end of file
htdocs/theme/raw/static/images/reply.png

1.49 KB | W: | H:

htdocs/theme/raw/static/images/reply.png

54.9 KB | W: | H:

htdocs/theme/raw/static/images/reply.png
htdocs/theme/raw/static/images/reply.png
htdocs/theme/raw/static/images/reply.png
htdocs/theme/raw/static/images/reply.png
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/raw/static/images/replyall.png

1.62 KB | W: | H:

htdocs/theme/raw/static/images/replyall.png

55.1 KB | W: | H:

htdocs/theme/raw/static/images/replyall.png
htdocs/theme/raw/static/images/replyall.png
htdocs/theme/raw/static/images/replyall.png
htdocs/theme/raw/static/images/replyall.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -30,6 +30,14 @@
#msgscol {
width: 50%;
}
#runinstall {
margin-bottom: 15px;
padding: 10px;
background-position: 12px 12px
}
#runinstall h3 {
margin-left: 24px;
}
/* Admin home > Overview */