Merged from sub repository (updated ckeditor, filters - step 3)

Release commit
This commit is contained in:
RainLoop Team 2014-12-06 01:01:33 +04:00
parent ec7324b061
commit 42b8a446c6
464 changed files with 10395 additions and 1303 deletions

View file

@ -30,14 +30,15 @@
color: #333;
margin: 0;
float: none;
width: 303px;
}
.control-label {
/* .control-label {
font-size: 16px;
line-height: 30px;
}
}*/
.control-group {
.controls, .control-group {
margin-bottom: 25px;
}
@ -50,10 +51,20 @@
border-radius: 3px;
}
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px;
height: 30px;
line-height: 29px;
.control-group {
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px;
height: 30px;
line-height: 29px;
}
}
.controls {
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px;
height: 40px;
line-height: 39px;
}
}
.signMeLabel, .languageLabel {
@ -79,7 +90,7 @@
color: #999;
}
.control-group.error .add-on i {
.controls.error .add-on i, .control-group.error .add-on i {
color: #b94a48;
}
}

View file

@ -33,7 +33,7 @@ html.rl-no-preview-pane {
left: -1px;
overflow: hidden;
border: @rlLowBorderSize solid @rlMainDarkColor;
.border-top-right-radius(@rlLowBorderRadius);
.border-bottom-right-radius(@rlLowBorderRadius);
@ -218,7 +218,9 @@ html.rl-no-preview-pane {
.attachmentsPlace {
padding: 10px;
padding: 10px 10px 6px 10px;
background: #eee;
border-bottom: 1px solid #ddd;
.attachmentList {
@ -235,17 +237,20 @@ html.rl-no-preview-pane {
cursor: pointer;
list-style: none;
line-height: 24px;
border: 2px solid grey;
/*border: 2px solid grey;*/
border: 0;
background-color: #fff;
box-shadow: 1px 1px 5px #ccc;
box-shadow: 1px 1px 5px rgba(0,0,0,0.1);
box-shadow: 0 1px 5px #ccc;
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04), 0 1px 5px rgba(0, 0, 0, 0.1);
border-radius: 6px;
border-radius: 2px;
.attachmentIcon {
font-size: 23px;
width: 23px;
height: 23px;
color: #666;
}
.attachmentPreview {

View file

@ -10,7 +10,7 @@
.e-signature-place {
display: inline-block;
width: 680px;
width: 725px;
width: 730px;
height: 250px;
}

View file

@ -3,7 +3,7 @@
.e-signature-place {
display: inline-block;
width: 680px;
width: 725px;
width: 730px;
height: 250px;
}
}

View file

@ -27,7 +27,7 @@
}
.cke_combo_button {
background: #FBFBFB !important;
/*background: #FBFBFB !important;*/
}
.cke_source {

View file

@ -10,4 +10,15 @@
.mfp-container .mfp-figure {
min-height: 300px;
min-width: 300px;
}
.pswp__error-msg {
color: #ccc;
a, a:hover {
color: #fff;
}
}
.pswp__img--placeholder {
opacity: 0;
}