Commit e30d2907 authored by Carsten Schoenert's avatar Carsten Schoenert

New upstream version 3.4.7+dfsg1

parent 5c1cc855
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -39,6 +39,24 @@ body.zarafa-welcome {
}
/* line 28, ../../scss/external/login.scss */
body.login:after,
#loading-mask:after,
#bg:after,
body.zarafa-welcome:after {
content: '';
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: 0;
padding: 0;
background: url(../../images/background.svg);
background-size: cover;
z-index: -1;
}
/* line 45, ../../scss/external/login.scss */
#loading-mask {
position: absolute;
top: 0;
......@@ -49,7 +67,7 @@ body.zarafa-welcome {
z-index: 20002;
}
/* line 40, ../../scss/external/login.scss */
/* line 57, ../../scss/external/login.scss */
body.login #form-container,
#loading-mask #form-container {
display: inline-block;
......@@ -61,7 +79,7 @@ body.login #form-container,
color: #222222;
/* clearfix */
}
/* line 49, ../../scss/external/login.scss */
/* line 66, ../../scss/external/login.scss */
body.login #form-container #bg,
#loading-mask #form-container #bg {
position: absolute;
......@@ -70,7 +88,7 @@ body.login #form-container #bg,
-webkit-filter: blur(10px);
filter: blur(10px);
}
/* line 57, ../../scss/external/login.scss */
/* line 74, ../../scss/external/login.scss */
body.login #form-container #content,
#loading-mask #form-container #content {
width: 560px;
......@@ -78,14 +96,14 @@ body.login #form-container #content,
background: rgba(255, 255, 255, 0.5);
position: relative;
}
/* line 64, ../../scss/external/login.scss */
/* line 81, ../../scss/external/login.scss */
body.login #form-container #content:after,
#loading-mask #form-container #content:after {
content: " ";
display: block;
clear: both;
}
/* line 70, ../../scss/external/login.scss */
/* line 87, ../../scss/external/login.scss */
body.login #form-container .left,
#loading-mask #form-container .left {
float: left;
......@@ -93,7 +111,7 @@ body.login #form-container .left,
height: 220px;
padding-right: 60px;
}
/* line 76, ../../scss/external/login.scss */
/* line 93, ../../scss/external/login.scss */
body.login #form-container .right,
#loading-mask #form-container .right {
float: left;
......@@ -102,7 +120,7 @@ body.login #form-container .right,
min-height: 220px;
position: relative;
}
/* line 84, ../../scss/external/login.scss */
/* line 101, ../../scss/external/login.scss */
body.login #form-container h1,
#loading-mask #form-container h1 {
font-size: 36px !important;
......@@ -110,19 +128,14 @@ body.login #form-container h1,
font-weight: normal;
margin: 0 0 30px;
}
/* line 90, ../../scss/external/login.scss */
/* line 107, ../../scss/external/login.scss */
body.login #form-container h2,
#loading-mask #form-container h2 {
font-size: 13px;
font-weight: normal;
text-align: right;
}
/* line 95, ../../scss/external/login.scss */
body.login #form-container h2.zcp-version,
#loading-mask #form-container h2.zcp-version {
color: transparent;
}
/* line 99, ../../scss/external/login.scss */
/* line 113, ../../scss/external/login.scss */
body.login #form-container #logo,
#loading-mask #form-container #logo {
background: url(../../images/kopano-logo_220x52.png) no-repeat right center;
......@@ -130,17 +143,32 @@ body.login #form-container #logo,
height: 61px;
margin: 71px 0 15px;
}
/* line 106, ../../scss/external/login.scss */
body.login #form-container label,
#loading-mask #form-container label {
/* line 121, ../../scss/external/login.scss */
body.login #form-container.loading,
#loading-mask #form-container.loading {
visibility: visible;
}
/* line 123, ../../scss/external/login.scss */
body.login #form-container.loading .right,
#loading-mask #form-container.loading .right {
background: url(../../images/loading_m.png) no-repeat center center;
animation: rotate 1.3s 0s infinite ease;
}
/* line 124, ../../scss/external/login.scss */
body.login #form-container.loading .right h1, body.login #form-container.loading .right form,
#loading-mask #form-container.loading .right h1,
#loading-mask #form-container.loading .right form {
display: none;
}
/* line 136, ../../scss/external/login.scss */
body.login > #form-container label {
display: block;
margin-bottom: 0.5em;
}
/* line 110, ../../scss/external/login.scss */
body.login #form-container input[type="text"],
body.login #form-container input[type="password"],
#loading-mask #form-container input[type="text"],
#loading-mask #form-container input[type="password"] {
/* line 140, ../../scss/external/login.scss */
body.login > #form-container input[type="text"],
body.login > #form-container input[type="password"] {
display: block;
width: 231px;
background: white !important;
......@@ -149,71 +177,51 @@ body.login #form-container input[type="password"],
margin-bottom: 15px;
height: 24px;
}
/* line 120, ../../scss/external/login.scss */
body.login #form-container input:-webkit-autofill,
#loading-mask #form-container input:-webkit-autofill {
/* line 151, ../../scss/external/login.scss */
body.login > #form-container input:-webkit-autofill {
-webkit-box-shadow: 0 0 0px 1000px white inset;
}
/* line 124, ../../scss/external/login.scss */
body.login #form-container #password,
#loading-mask #form-container #password {
/* line 155, ../../scss/external/login.scss */
body.login > #form-container input:focus {
outline: 0;
border-color: #3094e3;
}
/* line 160, ../../scss/external/login.scss */
body.login > #form-container #password {
margin-bottom: 8px;
}
/* line 128, ../../scss/external/login.scss */
body.login #form-container #error,
#loading-mask #form-container #error {
/* line 164, ../../scss/external/login.scss */
body.login > #form-container #error {
color: #e40023;
}
/* line 132, ../../scss/external/login.scss */
body.login #form-container #submitbutton,
#loading-mask #form-container #submitbutton {
/* line 168, ../../scss/external/login.scss */
body.login > #form-container #submitbutton {
background: #0f70bd;
color: white;
height: 24px;
line-height: 24px;
border: none;
border: 1px solid transparent;
padding: 0 9px;
min-width: 84px;
margin: 12px 0 0;
box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.35);
}
/* line 143, ../../scss/external/login.scss */
body.login #form-container #submitbutton:hover,
#loading-mask #form-container #submitbutton:hover {
/* line 179, ../../scss/external/login.scss */
body.login > #form-container #submitbutton:hover {
background-color: #065fa5;
}
/* line 146, ../../scss/external/login.scss */
body.login #form-container #submitbutton:click,
#loading-mask #form-container #submitbutton:click {
/* line 182, ../../scss/external/login.scss */
body.login > #form-container #submitbutton:click {
background-color: #065fa5;
}
/* line 152, ../../scss/external/login.scss */
body.login #form-container.loading,
#loading-mask #form-container.loading {
visibility: visible;
}
/* line 154, ../../scss/external/login.scss */
body.login #form-container.loading .right,
#loading-mask #form-container.loading .right {
background: url(../../images/loading_m.png) no-repeat center center;
animation: rotate 1.3s 0s infinite ease;
}
/* line 155, ../../scss/external/login.scss */
body.login #form-container.loading .right h1, body.login #form-container.loading .right form,
#loading-mask #form-container.loading .right h1,
#loading-mask #form-container.loading .right form {
display: none;
}
/* IE9 supports blur filter in a different way */
/* line 168, ../../scss/external/login.scss */
body.login.MSIE9 #bg {
filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='100');
/* line 185, ../../scss/external/login.scss */
body.login > #form-container #submitbutton:focus {
box-shadow: 0 0 0 1px #ffffff inset;
}
/* IE10 and IE11 don't support filters, so we load a blurred copy of the background image
* and use that */
/* line 173, ../../scss/external/login.scss */
/* line 192, ../../scss/external/login.scss */
body.login.MSIE10 #bg,
body.login.MSIE11 #bg {
background-image: url(../../images/loginbg_daybreak_blurred.jpg);
......
This diff is collapsed.
......@@ -28,6 +28,7 @@ $white : #ffffff;
$red : #FF0000;
$red1 : #e30022;
$red2 : #fbdde1;
$sky-blue : #3094e3;
$light-blue : #d5e8f7;
$seperator-color : #aca889;
......
......@@ -97,7 +97,7 @@ $normal-button-bgcolor-hover : $grey2;
.x-btn-small, .x-btn-medium, .x-btn-large {
display: inline-block;
border: none;
border: 1px solid transparent;
height: auto;
border-radius: 0;
box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.35);
......@@ -119,7 +119,6 @@ $normal-button-bgcolor-hover : $grey2;
/* hovered button */
.x-btn.x-btn-over {
.x-btn-small, .x-btn-medium, .x-btn-large {
border: none;
border-radius: 0;
background: $normal-button-bgcolor-hover;
box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.35);
......@@ -129,7 +128,6 @@ $normal-button-bgcolor-hover : $grey2;
/* active button */
.x-btn.x-btn-over.x-btn-click, .x-btn.x-btn-click {
.x-btn-small, .x-btn-medium, .x-btn-large {
border: none;
border-radius: 0;
background: $normal-button-bgcolor !important;
box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.35);
......@@ -140,6 +138,13 @@ $normal-button-bgcolor-hover : $grey2;
}
}
/* focused normal button */
.x-btn.x-btn-focus:not(.zarafa-action):not(.x-btn-click) {
.x-btn-small, .x-btn-medium, .x-btn-large {
border: 1px solid $sky-blue !important;
}
}
/* small button */
.x-btn {
.x-btn-small {
......@@ -248,6 +253,14 @@ $normal-button-bgcolor-hover : $grey2;
}
}
/* focused action button */
.x-btn.zarafa-action.x-btn-focus {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $action-bgcolor-hover !important;
box-shadow: 0 0 0 1px $white inset;
}
}
/* active button */
.x-btn.zarafa-action.x-btn-over.x-btn-click, .x-btn.zarafa-action.x-btn-click {
.x-btn-small, .x-btn-medium, .x-btn-large {
......@@ -275,8 +288,13 @@ $normal-button-bgcolor-hover : $grey2;
.x-toolbar-left-row,
.x-toolbar-right-row {
.x-toolbar-cell:not(.x-hide-offsets) {
.x-btn {
.x-btn-small, .x-btn-medium, .x-btn-large {
border: 1px solid transparent !important;
}
}
/* Normal button */
/* action button */
.x-btn:not(.zarafa-normal) {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $action-bgcolor !important;
......@@ -287,20 +305,28 @@ $normal-button-bgcolor-hover : $grey2;
}
}
/* hovered button */
/* hovered action button */
.x-btn.x-btn-over:not(.zarafa-normal) {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $action-bgcolor-hover !important;
}
}
/* active button */
/* active action button */
.x-btn.x-btn-over.x-btn-click:not(.zarafa-normal),
.x-btn.x-btn-click:not(.zarafa-normal) {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $action-bgcolor !important;
}
}
/* focused action button */
.x-btn.x-btn-focus:not(.zarafa-normal) {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $action-bgcolor-hover;
box-shadow: 0 0 0 1px $white inset;
}
}
}
.x-toolbar-cell:not(.x-hide-offsets) ~ .x-toolbar-cell:not(.x-hide-offsets) {
......@@ -315,20 +341,28 @@ $normal-button-bgcolor-hover : $grey2;
}
}
/* hovered button */
/* hovered normal button */
.x-btn.x-btn-over:not(.zarafa-action) {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $normal-button-bgcolor-hover !important;
}
}
/* active button */
/* active normal button */
.x-btn.x-btn-over.x-btn-click:not(.zarafa-action),
.x-btn.x-btn-click:not(.zarafa-action) {
.x-btn-small, .x-btn-medium, .x-btn-large {
background: $normal-button-bgcolor !important;
}
}
/* focused normal button */
.x-btn.x-btn-focus:not(.zarafa-action):not(.x-btn-over):not(.x-btn-click) {
.x-btn-small, .x-btn-medium, .x-btn-large {
border: 1px solid $sky-blue !important;
box-shadow: none !important;
}
}
}
}
}
......
......@@ -164,7 +164,7 @@
.k-reminder-panel,
.k-taskrequestsettings {
padding: $padding-medium;
padding-left: 2 * $padding-medium;
padding-left: $trigger-width - $padding-small;
.x-form-check-wrap {
line-height: $font-default-line-height;
......
......@@ -29,6 +29,17 @@ body.Safari input[type="radio"] {
.x-form-text {
padding: 0 $padding-medium;
}
.x-form-text.x-form-focus:not(.x-trigger-noedit) {
border-color: $sky-blue !important;
}
.x-form-field-wrap.x-trigger-wrap-focus:not(.x-freebusy-userlist-container) {
border-color: $sky-blue;
input.x-form-text.x-form-field.x-form-focus {
border-color: $sky-blue !important;
}
}
.x-form-text:not(.x-zarafa-boxfield):not(.x-zarafa-boxfield-input),
.ext-strict .x-form-text:not(.x-zarafa-boxfield):not(.x-zarafa-boxfield-input),
......
......@@ -338,7 +338,7 @@ td.x-grid3-hd-menu-open .x-grid3-hd-inner {
/*********************************
* Icons in the grid colums
********************************/
.x-panel:not(.zarafa-searchgrid) > .x-panel-bwrap > .x-panel-body > .x-grid3{
.x-panel > .x-panel-bwrap > .x-panel-body > .x-grid3{
.x-grid3-row {
/* Icon column */
......
......@@ -26,16 +26,16 @@ body #zarafa-mainmenu.zarafa-maintabbar > .x-toolbar-ct {
background: $mainmenubar-background-color;
color: $font-color-light;
padding: 0;
* {
font-size: 15px !important;
}
.x-btn {
padding: 0;
margin: 0;
display: block;
.x-btn-small{
height: auto;
background-color: transparent !important;
......@@ -43,7 +43,7 @@ body #zarafa-mainmenu.zarafa-maintabbar > .x-toolbar-ct {
border: none;
margin: 0;
}
button.x-btn-text {
font-size: 15px !important;
line-height: 100% !important;
......@@ -58,14 +58,21 @@ body #zarafa-mainmenu.zarafa-maintabbar > .x-toolbar-ct {
border: none;
}
}
/* focused button */
.x-btn.x-btn-focus {
.x-btn-small {
border: none !important;
}
}
.x-btn.x-btn-over, .x-btn.x-btn-over.x-btn-click {
background-color: $mainmenubar-background-color-hover !important;
.x-btn-small{
border: none;
}
button.x-btn-text {
border: none;
color: $mainmenubar-font-color-hover;
......@@ -73,16 +80,16 @@ body #zarafa-mainmenu.zarafa-maintabbar > .x-toolbar-ct {
background-color: transparent;
}
}
.zarafa-maintabbar-maintab-active,
.zarafa-maintabbar-maintab-active.x-btn-over,
.zarafa-maintabbar-maintab-active.x-btn-over.x-btn-click {
background-color: $mainmenubar-background-color-active !important;
.x-btn-small{
border: none;
}
button.x-btn-text {
border: none;
color: $mainmenubar-font-color-active;
......@@ -94,34 +101,34 @@ body #zarafa-mainmenu.zarafa-maintabbar > .x-toolbar-ct {
background-position: sprite-position($icons, arrow_menubar, $offset_y: 30px, $offset_x: 50%);
}
}
.x-toolbar-right {
button.x-btn-text {
text-transform: none;
}
}
#mainmenu-button-settings em{
background-image: sprite-url($icons) !important;
background-repeat: no-repeat;
background-position: sprite-position($icons, icon_settings, $offset_y: 10px, $offset_x: $mainmenubar-button-padding-left);
button.x-btn-text {
padding-left: $mainmenubar-button-padding-left + 16px + 9px;
}
}
#mainmenu-button-logout em {
background-image: sprite-url($icons) !important;
background-repeat: no-repeat;
background-position: sprite-position($icons, icon_logout, $offset_y: 10px, $offset_x: $mainmenubar-button-padding-left);
button.x-btn-text {
padding-left: $mainmenubar-button-padding-left + 16px + 9px;
text-transform: none;
}
}
#mainmenu-logintext {
opacity: $mainmenubar-button-opacity / 100;
padding-right: $mainmenubar-button-padding-right;
......
......@@ -75,7 +75,6 @@
max-height: $button-small-height;
display: block;
position: relative;
overflow: hidden;
.x-zarafa-boxfield-item-text {
line-height: $font-default-line-height;
......
......@@ -48,190 +48,82 @@
color: $kopano-blue;
cursor: pointer;
}
}
.x-grid3-row {
border-left: none;
border-right: none;
.x-grid3-cell-inner {
padding: ($header-height - $font-default-line-height)/2 $padding-medium;
.x-grid3-td-name {
width: 0 !important;
}
td {
line-height: $font-default-line-height;
.x-grid3-hd.x-grid3-cell.x-grid3-td-column_icon.x-grid3-cell-first {
width: 100% !important;
}
}
/* let css take care of fields that are too long */
table.messageclass-data {
td,
td div.padding{
overflow: hidden;
}
span.body{
opacity: 0.5;
}
td.icon{
width: 28px;
}
td.name{
width: 120px;
/* some padding to have some space between the fields */
padding-right: $padding-extra-large;
}
.subject{
/* some padding to have some space between the fields */
padding-right: $padding-extra-large;
}
span.subject {
/* some padding to have some space between the fields */
padding-right: $padding-extra-large;
}
td.subject-body {
padding-right: $padding-small;
.x-grid3-row-body-tr {
.zarafa-grid-body-container {
overflow: hidden;
word-wrap: break-word;
span.body{
opacity: 0.5;
}
.grid_compact {
line-height: $font-line-height-mail-grid-compact;
min-height: $font-line-height-mail-grid-compact; /* we need this for when there is no title set */
max-height: $font-line-height-mail-grid-compact; /* added 1px because letters get cut off at the bottom otherwise */
padding-bottom: 1px;
padding-top: $padding-small + 1px;
}
/* the icons */
.icon_message,
.icon_mail.icon_message_read {
@extend .icon_mail_read;
background-position: sprite-position($iconsmap, icon_mail_read, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_mail.icon_message_unread {
@extend .icon_mail_unread;
background-position: sprite-position($iconsmap, icon_mail_unread, $offset-y: 5, $offset-x: $padding-medium - 1);
}
.icon_mail_replied {
background-position: sprite-position($iconsmap, icon_mail_replied, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_appt_meeting_single {
@extend .icon_calendar_mr;
background-position: sprite-position($iconsmap, icon_calendar_mr, $offset-y: 1, $offset-x: $padding-medium - 2);
}
.icon_mail_stubbed {
background-position: sprite-position($iconsmap, icon_mail_stubbed, $offset-y: 2, $offset-x: $padding-medium - 1);
}
.icon_mail_forwarded {
background-position: sprite-position($iconsmap, icon_mail_forwarded, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_mail_oof {
background-position: sprite-position($iconsmap, icon_mail_oof, $offset-y: 2, $offset-x: $padding-medium - 3);
}
.icon_contact_user {
@extend .icon_contact_card;
background-position: sprite-position($iconsmap, icon_contact_card, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_contact_distlist {
@extend .icon_distlist;
background-position: sprite-position($iconsmap, icon_distlist, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_contact_equipment {
background-position: sprite-position($iconsmap, icon_contact_equipment, $offset-y: 4, $offset-x: $padding-medium - 2);
}
.icon_contact_gab_user {
@extend .icon_contact_smtp;
background-position: sprite-position($iconsmap, icon_contact_smtp, $offset-y: 4, $offset-x: $padding-medium - 2);
}
.icon_contact_room {
background-position: sprite-position($iconsmap, icon_contact_room, $offset-y: 2, $offset-x: $padding-medium + 1);
}
.icon_contact_company {
background-position: sprite-position($iconsmap, icon_contact_company, $offset-y: 2, $offset-x: $padding-medium - 3);
}
.icon_appt_appointment {
@extend .icon_calendar_blue;
background-position: sprite-position($iconsmap, icon_calendar_blue, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_appt_meeting_recurring,
.icon_appt_recurring {
@extend .icon_calendar_appt_recurring;
background-position: sprite-position($iconsmap, icon_calendar_appt_recurring, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_appt_meeting_single {
@extend .icon_calendar_mr;
background-position: sprite-position($iconsmap, icon_calendar_mr, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_appt_meeting_accept {
@extend .icon_calendar_appt_accept;
background-position: sprite-position($iconsmap, icon_calendar_appt_accept, $offset-y: 2, $offset-x: $padding-medium - 2);
}
.icon_appt_meeting_decline {