Skip to content

Commit

Permalink
Incorporated chameleon last changes (up to 21.01.2016).
Browse files Browse the repository at this point in the history
  • Loading branch information
Anisotropic committed Jan 21, 2016
1 parent 8039d31 commit d970519
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 5 deletions.
Binary file modified modified_source/buttons.psd
Binary file not shown.
Binary file modified modified_source/listicons.psd
Binary file not shown.
Binary file modified skins/chameleon-blue/images/buttons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified skins/chameleon-blue/images/listicons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion skins/chameleon-blue/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"author": "Kolab Systems AG, Zurich, Switzerland",
"license": "GNU Affero General Public License",
"license-url": "http://www.gnu.org/licenses/agpl.html",
"version": "0.3.6"
"version": "0.3.7"
}
2 changes: 1 addition & 1 deletion skins/chameleon-blue/styles.css

Large diffs are not rendered by default.

68 changes: 65 additions & 3 deletions skins/chameleon-blue/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -2746,6 +2746,10 @@ div.tasklist-invitebox .rsvp-status.needs-action {
padding-left: 22px;
}

.attendees-list .attendee.loading {
background: url(images/ajaxloader.gif) 3px 4px no-repeat;
}

.attendees-list div.attendee {
line-height: 15px;
}
Expand Down Expand Up @@ -3196,7 +3200,7 @@ div.messagetasklinks::before {
}

#filestoolbar a.button.edit {
background-position: center -2384px;
background-position: center -2385px;
}

#filestoolbar a.button.save,
Expand All @@ -3214,6 +3218,31 @@ div.messagetasklinks::before {
background-position: center -690px;
}

.manticore #filestoolbar a.button.delete {
background-image: url(images/buttons.png);
background-position: center -3039px;
}

#filestoolbar a.button.export {
background-position: -5px -2264px;
}

#filestoolbar a.button.create {
background-position: center -3078px;
}

#filestoolbar a.button.rename {
background-position: center -3118px;
}

#filestoolbar > label {
text-shadow: none;
}

#collaborators.toolbar {
top: 0;
}

#files-folder-list ul li .name,
#files-folder-list ul li.mailbox.collection .name {
background-image: url(images/listicons.png);
Expand Down Expand Up @@ -3248,6 +3277,11 @@ div.messagetasklinks::before {
background-position: 7px -2435px;
}

#files-folder-list ul li.mailbox.collection.sessions .name,
#files-folder-list ul li.mailbox.collection.sessions.selected .name {
background-position: 10px -3589px;
}

#files-folder-list li.readonly {
background-position: 88% -2121px;
}
Expand All @@ -3268,8 +3302,8 @@ ul.toolbarmenu li:hover a.active span.saveas {
}

.filelist tbody tr td {
height: 28px;
line-height: 28px;
height: 26px;
line-height: 26px;
}

table.propform td.source.selected {
Expand All @@ -3289,6 +3323,34 @@ table.propform td.source.selected {
border-left: none;
}

.filelist tbody td.options span {
background-image: url(images/listicons.png);
background-position: -25px 0;
height: 24px;
width: 24px;
}

.filelist tbody tr.session > td.options span {
background-position: -25px -2268px;
}

.filelist tbody tr.session.invited > td.options span {
background-position: -25px -2244px;
}

.filelist tbody tr.session.owner > td.options span {
background-position: 0 -2244px;
}

.filelist tbody tr.selected.session > td.options span {
background-position: 0 -3161px;
}

#collaborators a.button.add {
background-image: url(images/listicons.png);
background-position: 0 -2810px;
}

/*** kolab delegation plugin ***/

#settings-sections #settingstabplugindelegation a {
Expand Down

0 comments on commit d970519

Please sign in to comment.