Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2017-07-28 20:40:19 +02:00
commit f7bdc42d16
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/stylesheets/bootstrap.css vendored
View file

@ -479,10 +479,10 @@ mark,
background-color: #fcf8e3;
}
.text-left {
text-align: start;
text-align: left;
}
.text-right {
text-align: end;
text-align: right;
}
.text-center {
text-align: center;
@ -611,7 +611,7 @@ dd {
width: 160px;
overflow: hidden;
clear: left;
text-align: end;
text-align: right;
text-overflow: ellipsis;
white-space: nowrap;
}
@ -656,7 +656,7 @@ blockquote .small:before {
blockquote.pull-right {
padding-right: 15px;
padding-left: 0;
text-align: end;
text-align: right;
border-right: 5px solid #eee;
border-left: 0;
}
@ -1368,10 +1368,10 @@ caption {
padding-top: 8px;
padding-bottom: 8px;
color: #777;
text-align: start;
text-align: left;
}
th {
text-align: start;
text-align: left;
}
.table {
width: 100%;
@ -2020,7 +2020,7 @@ select[multiple].form-group-lg .form-control {
.form-horizontal .control-label {
padding-top: 7px;
margin-bottom: 0;
text-align: end;
text-align: right;
}
}
.form-horizontal .has-feedback .form-control-feedback {
@ -2100,7 +2100,7 @@ tbody.collapse.in {
padding: 5px 0;
margin: 2px 0 0;
font-size: 14px;
text-align: start;
text-align: left;
list-style: none;
background-color: #fff;
-webkit-background-clip: padding-box;
@ -4114,7 +4114,7 @@ button.close {
}
.modal-footer {
padding: 15px;
text-align: end;
text-align: right;
border-top: 1px solid #e5e5e5;
}
.modal-footer .btn + .btn {
@ -4268,7 +4268,7 @@ button.close {
font-size: 14px;
font-weight: normal;
line-height: 1.42857143;
text-align: start;
text-align: left;
white-space: normal;
background-color: #fff;
-webkit-background-clip: padding-box;

11
app/assets/stylesheets/zammad.scss
View file

@ -2204,7 +2204,7 @@ kbd {
.page-aside {
@include bidi-style(padding-right, 20px, padding-left, 0);
border-right: 1px solid hsl(0,0%,90%);
@include bidi-style(border-right, 1px solid hsl(0,0%,90%), border-left, none);
@include bidi-style(margin-right, 20px, margin-left, 0);
width: 240px;
flex-shrink: 0;
@ -3942,6 +3942,7 @@ footer {
border: none;
color: hsl(206,7%,28%);
box-shadow: 0 1px 14px rgba(0,8,14,.25);
@include rtl(text-align, right);
}
.popover-body {
@ -6052,6 +6053,7 @@ footer {
padding: 23px 23px 20px;
border: none;
display: flex;
@include rtl(text-align, left);
}
.modal-leftFooter,
@ -6097,6 +6099,7 @@ footer {
border: none;
box-shadow: none;
overflow: hidden;
@include rtl(text-align, right);
}
.dropdown-menu kbd {
@ -7606,7 +7609,7 @@ output {
margin: 0 14px;
background: white;
color: hsl(60,1%,34%);
border-right: 1px solid hsl(198,18%,86%);
@include bidi-style(border-right, 1px solid hsl(198,18%,86%), border-left, none);
border-bottom: 1px solid hsl(198,18%,86%);
border-radius: 3px 3px 0 0;
@ -7632,7 +7635,7 @@ output {
flex-basis: 100%;
white-space: nowrap;
background: hsl(197, 20%, 93%);
border-left: 1px solid hsl(198,18%,86%);
@include bidi-style(border-left, 1px solid hsl(198,18%,86%), border-right, none);
border-top: 1px solid hsl(198,18%,86%);
border-radius: 3px 3px 0 0;
}
@ -8202,7 +8205,7 @@ output {
font-size: 13px;
line-height: 18px;
overflow: auto;
border-right: 1px solid hsl(0,0%,91%);
@include bidi-style(border-right, 1px solid hsl(0,0%,91%), border-left, none);
border-left: 1px solid hsl(0,0%,91%);
position: relative;
}