Skip to content

GitLab

Commit 2f420432 authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files

Update themes

parent 8490fc7f
Hide whitespace changes
Inline Side-by-side
htdocs/artefact/blog/theme/raw/posts.tpl
View file @ 2f420432
......@@ -15,7 +15,7 @@
{else}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php">
<input type="hidden" name="id" value="{$post->id}">
<input type="submit" class="icon btn-edit" value="{str tag=edit section=artefact.blog}">
<input type="submit" class="icon btn-edit s" value="{str tag=edit section=artefact.blog}">
</form>
{$post->delete|safe}
{/if}
......
htdocs/artefact/blog/theme/raw/static/style/style.css
View file @ 2f420432
......@@ -28,12 +28,28 @@
font-size: 1.8em;
}
#postlist th.controls {
font-size: .9167em;
text-align: right;
}
#postlist th.controls input {
margin-left: .5em;
}
#postlist th.controls .btn-edit {
background: transparent url(../images/edit.gif) no-repeat left;
width: 16px;
height: 16px;
border: 0;
cursor: pointer;
font-size: 1%;
}
#postlist th.controls .btn-del {
background: transparent url(../images/delete.gif) no-repeat left;
width: 16px;
height: 16px;
border: 0;
cursor: pointer;
font-size: 1%;
margin-left: .5em;
}
#postlist th form,
#postlist th form div {
display: inline;
......
htdocs/artefact/resume/theme/raw/static/style/style.css
View file @ 2f420432
......@@ -20,6 +20,10 @@
#resumewrap table.resumecomposite {
margin-bottom: .5em;
}
#resumewrap table.resumecomposite .btn-edit,
#resumewrap table.resumecomposite .btn-del {
font-size: .9167em;
}
#resumewrap table.resumecomposite td {
padding: .25em .5em;
}
......
htdocs/theme/default/static/images/btn-search.gif 100755 → 100644
View replaced file @ 8490fc7f View file @ 2f420432
htdocs/theme/default/static/images/btn-search.gif

1.34 KB | W: | H:

htdocs/theme/default/static/images/btn-search.gif

1.33 KB | W: | H:

htdocs/theme/default/static/images/btn-search.gif
htdocs/theme/default/static/images/btn-search.gif
htdocs/theme/default/static/images/btn-search.gif
htdocs/theme/default/static/images/btn-search.gif
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/default/static/style/style.css
View file @ 2f420432
......@@ -51,6 +51,7 @@ h6 {
.description,
.unvalidated,
.postdetails {
color: #888;
}
......@@ -113,6 +114,7 @@ div.pagination .disabled {
/**************************** Forms ****************************/
/* Label */
label {
color: #333;
}
/* required */
.required th, .required label, .requiredmarker, #register_tandc_container th {
......@@ -124,6 +126,7 @@ label {
}
/* description */
.pieform td.description {
color: #7d7d7d;
}
/* Legend */
......@@ -163,24 +166,22 @@ input.error, select.error {
/****************************** Buttons ****************************/
/** input buttons **/
.btn,
input.submit,
input.cancel,
button,
input.button,
input.buttondk,
input.select,
input#files_filebrowser_edit_artefact,
#delete_all_notifications_submit,
input.cancel {
input#files_filebrowser_edit_artefact {
border-color: #d5ed8a #496000 #496000 #d5ed8a;
background: #6e8e00;
color: #FFF;
color: #FFF !important;
}
#btn-logout,
#buttons_delete,
#settings_delete {
border-color: #eda58c #611700 #611700 #eda58c !important;
background: #8f2100 !important;
coloR: #FFF !important;
color: #FFF !important;
}
input.quiet {
background: none !important;
......@@ -191,61 +192,37 @@ input.quiet.btn-del {
color: #ca0000 !important;
}
/** link buttons **/
.rbuttons a.btn,
.upgradeicon a,
#loginas .btn-loginas {
border-color: #d5ed8a #496000 #496000 #d5ed8a;
background: #6e8e00;
color: #FFF !important;
}
/** hover for buttons **/
.btn:hover,
input.submit:hover,
input.cancel:hover,
button:hover,
input.button:hover,
input.buttondk:hover,
input.select:hover,
input#files_filebrowser_edit_artefact:hover,
.rbuttons a.btn:hover,
#delete_all_notifications_submit:hover {
input#files_filebrowser_edit_artefact:hover {
background: #84aa00;
text-decoration: none;
}
#btn-logout:hover,
#buttons_delete:hover,
#settings_delete:hover {
background: #A82700 !important;
}
input.cancel:hover {
background: #e3e3e3 !important;
}
/** Depress for buttons **/
.btn:active,
input.submit:active,
input.cancel:active,
button:active,
input.button:active,
input.buttondk:active,
input.select:active,
input#files_filebrowser_edit_artefact:active,
.rbuttons a.btn:active,
#delete_all_notifications_submit:active {
input#files_filebrowser_edit_artefact:active {
border-color: #496000 #d5ed8a #d5ed8a #496000;
background: #84aa00;
color: #FFF;
}
#btn-logout:active,
#buttons_delete:active,
#settings_delete:active {
border-color: #611700 #eda58c #eda58c #611700 !important;
background: #A82700 !important;
}
input.cancel:active {
border-color: #a3a3a3 #f0f0f0 #f0f0f0 #a3a3a3 !important;
background: #e3e3e3 !important;
}
#delete_all_notifications_submit {
background: #6e8e00 !important;
color: #FFF !important;
/* buttons that look like links with icons */
.icon {
color: #6e8e00;
}
/* buttons that look like links */
.linkbtn {
color: #6e8e00;
}
/** Buttons with icons **/
......@@ -262,6 +239,10 @@ input.cancel:active {
background: url(../images/icon-manage.gif) no-repeat left;
padding-left: 15px;
}
#btn-request {
background: url(../images/icon-friendrequest.gif) no-repeat left;
padding-left: 13px;
}
a.btn-req {
background: url(../images/icon-join.gif) no-repeat left center;
padding-left: 15px;
......@@ -302,10 +283,6 @@ ul.actionlist li #btn-sendmessage {
background: url(../images/icon-mail.gif) no-repeat left;
padding-left: 13px;
}
ul.actionlist li #btn-request {
background: url(../images/icon-friendrequest.gif) no-repeat left;
padding-left: 13px;
}
/* Search buttons */
#usf_submit {
......@@ -323,16 +300,14 @@ ul.actionlist li #btn-request {
* html #usf_submit {
height: 22px;
}
#dosearch,
#selfsearch button ,
#selfsearch button,
.query-button,
#query-button,
#moderator_search_btn,
#search_submit,
#search_search,
#selfsearch button,
#users_search_btn,
#admins_search_btn {
#search_submit,
.btn-search {
background: transparent url(../images/btn-search.gif) no-repeat !important;
border: 0;
color: #6e8e00;
......@@ -344,33 +319,6 @@ ul.actionlist li #btn-request {
width: 24px;
margin-left: 2px;
}
#usf_submit:hover,
#dosearch:hover,
#selfsearch button:hover,
.query-button:hover,
#query-button:hover,
#moderator_search_btn:hover,
#search_submit:hover,
#search_search:hover,
#selfsearch button:hover,
#users_search_btn:hover,
#admins_search_btn:hover {
background: #84aa00 url(../images/icon-search-white.gif) no-repeat 6px 6px !important;
}
#usf_submit:active,
#dosearch:active,
#selfsearch button:active,
.query-button:active,
#query-button:active,
#moderator_search_btn:active,
#search_submit:active,
#search_search:active,
#selfsearch button:active,
#users_search_btn:active,
#admins_search_btn:active {
border-color: #496000 #d5ed8a #d5ed8a #496000;
background: #84aa00 url(../images/icon-search-white.gif) no-repeat 6px 6px !important;
}
/**************************** Top of page elements ****************************/
#container, #containerX {
......
htdocs/theme/raw/static/style/admin.css
View file @ 2f420432
......@@ -47,7 +47,7 @@
background: #fbeceb;
text-align: left;
padding: 1em 1.5em;
width: 25%;
width: 24%;
float: left;
margin: 0 0 0 1em;
min-height: 160px;
......@@ -350,16 +350,23 @@ table.tablerenderer th.desc {
padding: 1em;
margin-left: 1em;
}
#suspenddelete h4 {
#suspenddelete #delete h4 {
margin-top: 0;
color: #ca0000;
}
#suspenddelete #delete #edituser_delete_submit {
border-color: #f69595 #750000 #750000 #f69595 !important;
background: #ca0000 !important;
color: #FFF;
}
#edituser_institution_addinstitution_container,
#edituser_institution_add_container {
display: inline;
}
#edituser_site_passwordchange_container th label {
white-space: nowrap;
}
/* USERS > SUSPENDED USERS */
#suspendedlist {
......@@ -484,9 +491,6 @@ form#uploadcsv {
}
/* MANAGE INSTITUTIONS > INSTITUTIONS */
.admininstitutionbtns {
font-size: .9167em;
}
/* MANAGE INSTITUTIONS > INSTITUTION MEMBERS */
#usertypeselect table td,
......
htdocs/theme/raw/static/style/style.css
View file @ 2f420432
......@@ -219,10 +219,12 @@ td.narrow {
.r0,
.r0 td {
background-color: #f9f9f9;
border-bottom: 1px solid #FFF;
}
.r1,
.r1 td {
background-color: #f3f3f3;
border-bottom: 1px solid #FFF;
}
tr.highlight td {
background-color: #fffcd8 !important;
......@@ -241,6 +243,23 @@ div.listing {
.listing div div {
font-size: .9167em;
}
.listing .vi .videsc {
font-size: .9167em;
}
.listing .vi .tags {
font-size: 1em;
margin-top: .25em;
color: #888;
}
.listing .vi .viartefacts {
color: #888;
font-size: 1em;
}
.listing .vi .viviews {
color: #888;
font-size: 1em;
}
/**************************** Pagination ****************************/
div.pagination {
......@@ -267,12 +286,16 @@ div.pagination .selected {
font-weight: bold;
border: none;
padding: .25em .5em;
border: 1px solid #d1d1d1;
}
div.pagination .results {
color: #838383;
display: inline;
padding: .25em .5em;
}
div.pagination .results a {
border: 0;
}
/**************************** Forms ****************************/
form {
......@@ -326,6 +349,7 @@ legend {
/* Select */
select {
margin-right: .25em;
padding: .16em;
}
/* Fieldset */
......@@ -476,6 +500,8 @@ input#files_filebrowser_edit_artefact:active {
background: none;
padding: 0;
font-family: Arial, Helvetica, sans-serif;
margin-left: .5em;
text-decoration: underline;
}
/* buttons that look like links */
.linkbtn {
......@@ -1093,6 +1119,9 @@ li#pendingfriends a {
/* Friends control sideblock */
div.sideblock #friendscontrol td {
padding: 0;
}
div.sideblock #friendscontrol label {
line-height: 1.833em;
vertical-align: top;
......@@ -1100,6 +1129,9 @@ div.sideblock #friendscontrol label {
}
/* Tags */
#results_heading {
margin-top: 1.5em;
}
.mytags {
padding: .5em 0;
}
......@@ -1107,7 +1139,6 @@ div.sideblock #friendscontrol label {
margin-bottom: 2em;
}
a.tag {
text-decoration: none;
line-height: 1.1667em;
}
.mytags a.tag {
......@@ -1809,7 +1840,7 @@ form#search input.text {
}
.home-info-inner {
padding: 6px;
min-height: 260px;
min-height: 265px;
text-align: center;
vertical-align: top;
}
......
htdocs/theme/raw/static/style/views.css
View file @ 2f420432
......@@ -142,13 +142,15 @@ ul.artefactchooser-subtabs li.current a:active {
margin: 5px 0;
}
.add-button .newblockhere {
background: url(../images/btn_addblock.gif) repeat-x;
background: url(../images/btn-addblock.gif) repeat-x;
font-weight: normal;
height: 18px;
height: 16px;
padding: 1px 5px 2px 5px;
color: #FFF;
width: 100%;
margin: 0;
border-left: 1px solid #5d5d5d;
border-right: 1px solid #5d5d5d;
}
/* this rule compresses and centers the buttons better in konqueror and safari */
body:last-child:not(:root:root) .newblockhere {
......
htdocs/theme/raw/templates/account/activity/activitylist.tpl
View file @ 2f420432
......@@ -7,7 +7,7 @@
{if $item->message}
<a href="" onclick="showHideMessage({$item->id}); return false;">{$item->subject}</a>
<div id="message-{$item->id}" class="hidden">{$item->message|safe}
{if $item->url}<br><a href="{$item->url}" class="s">{if $item->urltext}{$item->urltext} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
{if $item->url}<br><a href="{$item->url}">{if $item->urltext}{$item->urltext} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
</div>
{elseif $item->url}
<a href="{$item->url}">{$item->subject}</a>
......
htdocs/theme/raw/templates/admin/users/institutions.tpl
View file @ 2f420432
......@@ -83,11 +83,11 @@
<td class="center">{$institution->maxuseraccounts}</td>
<td class="center"><a href="{$WWWROOT}admin/users/institutionstaff.php?institution={$institution->name}">{$institution->staff}</a></td>
<td class="center"><a href="{$WWWROOT}admin/users/institutionadmins.php?institution={$institution->name}">{$institution->admins}</a></td>
<td class="admininstitutionbtns right">
<td class="right">
<form action="" method="post">
<input type="hidden" name="i" value="{$institution->name}">
<input type="submit" class="btn-edit icon" name="edit" value="{str tag="edit"}">
{if $siteadmin && !$institution->members && $institution->name != 'mahara'}<input type="submit" class="btn-del icon" name="delete" value="{str tag="delete"}">{/if}
<input type="submit" class="btn-edit icon s" name="edit" value="{str tag="edit"}">
{if $siteadmin && !$institution->members && $institution->name != 'mahara'}<input type="submit" class="btn-del icon s" name="delete" value="{str tag="delete"}">{/if}
</form>
</td>
<td class="center">{if $institution->suspended}<span class="suspended">{str tag="suspendedinstitution" section=admin}</span>{/if}</td>
......
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