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

Moved to many new BS3 dialogs.

Browse source
This commit is contained in:
Martin Edenhofer 2013-08-05 00:03:13 +02:00
parent 232774d0bf
commit e6ee6e1d9f
2 changed files with 98 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/custom/chat.css
View file

@ -1,8 +1,18 @@
#chat { #chat {
position: fixed; bottom: 0; right: 0; position: fixed;
bottom: 0;
right: 0;
} }
#chat .well-chat { #chat .well-chat {
padding: 8px 15px 0px 15px; padding: 8px 15px 0px 15px;
margin: 0px; margin: 0px;
} }
.chat {
padding: 0px 14px;
width: 200px;
margin-bottom: 0;
z-index: 1040;
}

116
app/assets/stylesheets/zzz.css
View file

@ -85,11 +85,12 @@ table th, table td {
.content-two .sidebar { .content-two .sidebar {
padding: 8px 10px; padding: 8px 10px;
width: 180px; width: 200px;
height: 100%; height: 100%;
float: left; float: left;
position: absolute; position: absolute;
overflow-y: scroll; overflow-y: auto;
overflow-x: hidden;
} }
.content-two .sidebar.nav-manage { .content-two .sidebar.nav-manage {
padding-left: 16px; padding-left: 16px;
@ -117,12 +118,13 @@ table th, table td {
width: 600px; width: 600px;
height: 100%; height: 100%;
float: left; float: left;
margin-left: 184px; margin-left: 204px;
padding-bottom: 10px; padding-bottom: 10px;
padding-left: 14px; padding-left: 14px;
border-left: 1px solid #eeeeee; border-left: 1px solid #eeeeee;
position: absolute; position: absolute;
overflow-y: scroll; overflow-y: auto;
overflow-x: hidden;
} }
.content-two .main > .nav { .content-two .main > .nav {
margin-top: 12px; margin-top: 12px;
@ -132,11 +134,11 @@ table th, table td {
} }
@media (min-width: 800px) { @media (min-width: 800px) {
.content-two .sidebar { .content-two .sidebar {
width: 220px; width: 240px;
} }
.content-two .main { .content-two .main {
width: 680px; width: 660px;
margin-left: 224px; margin-left: 244px;
} }
.content-two .meta { .content-two .meta {
display: none; display: none;
@ -144,11 +146,11 @@ table th, table td {
} }
@media (min-width: 1024px) { @media (min-width: 1024px) {
.content-two .sidebar { .content-two .sidebar {
width: 240px; width: 260px;
} }
.content-two .main { .content-two .main {
width: 780px; width: 760px;
margin-left: 244px; margin-left: 264px;
} }
.content-two .meta { .content-two .meta {
display: none; display: none;
@ -156,11 +158,11 @@ table th, table td {
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.content-two .sidebar { .content-two .sidebar {
width: 260px; width: 280px;
} }
.content-two .main { .content-two .main {
width: 820px; width: 800px;
margin-left: 264px; margin-left: 284px;
} }
.content-two .meta { .content-two .meta {
width: 140px; width: 140px;
@ -341,12 +343,18 @@ h3 {
h4 { h4 {
font-size: 20px; font-size: 20px;
} }
h4 { h5 {
font-size: 14px; font-size: 16px;
} }
.form-group .help-message {
float: right;
margin-right: -23px;
margin-top: -23px;
}
.form-control { .form-control {
height: 35px; height: 33px;
font-size: 13px;
} }
.form-large { .form-large {
@ -502,6 +510,17 @@ form.form-inline input[type="password"] {
.edit { .edit {
min-height:30px; min-height:30px;
bottom: 0px;
/* position: fixed; */
padding: 2px 14px;
width: 720px;
margin-bottom: 0px;
}
.edit .form-group {
margin-bottom: 2px;
}
.edit .form-control {
height: 30px;
} }
.edit:focus { .edit:focus {
@ -542,13 +561,37 @@ footer {
margin-bottom: 5px; margin-bottom: 5px;
} }
.customer_info {
padding-bottom: 10px;
border-bottom: 1px solid #eeeeee;
}
.customer_info ul.nav > li {
width: 50%;
}
.customer_info ul.nav > li > a {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
.customer_info .thumbnail {
position: absolute;
right: 14px;
top: 50px;
}
.customer_info textarea {
padding-left: 10px;
width: 100%;
border-color: #eee;
}
.ticket-action { .ticket-action {
padding-left: 12px; padding-left: 2px;
} }
.ticket-answer .avatar { .ticket-answer .avatar {
padding-left: 6px; padding-left: 6px;
padding-top: 10px; padding-top: 4px;
width: 70px; width: 70px;
float: left; float: left;
} }
@ -556,6 +599,9 @@ footer {
padding-left: 20px; padding-left: 20px;
} }
.ticket-update {
width: 100%;
}
.ticket-update .span2 { .ticket-update .span2 {
width: 160px; width: 160px;
margin-right: 4px; margin-right: 4px;
@ -578,8 +624,13 @@ footer {
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
} }
.article-message { .article-content {
margin-left: 70px;
}
.article-message {
padding: 4px 2px;
/*
margin-top: 0px; margin-top: 0px;
margin-bottom: 6px; margin-bottom: 6px;
margin-left: 10px; margin-left: 10px;
@ -591,6 +642,7 @@ footer {
margin-left: 70px; margin-left: 70px;
min-height: 85px; min-height: 85px;
*/
} }
.show_toogle { .show_toogle {
@ -615,6 +667,7 @@ footer {
background-color: #f2dede; background-color: #f2dede;
border-color: #eed3d7; border-color: #eed3d7;
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
border-radius: 2px;
} }
.merged, .merge:hover { .merged, .merge:hover {
@ -635,6 +688,7 @@ footer {
.nav .form-control { .nav .form-control {
height: 34px; height: 34px;
margin-top: 1px; margin-top: 1px;
border-radius: 8px;
} }
.nav .form-control { .nav .form-control {
@ -653,6 +707,16 @@ footer {
line-height: 18px; line-height: 18px;
} }
.navbar .bell {
display: none;
}
.navbar .bell.show {
display: block;
}
.navbar .bell.show a {
color: #fff;
}
.nav.nav-tabs.nav-stacked > li > a > span { .nav.nav-tabs.nav-stacked > li > a > span {
visibility: hidden; visibility: hidden;
} }
@ -677,9 +741,9 @@ footer {
} }
.customer-info { .customer-info {
width:86%; width: 100%;
padding-top: 5px; padding-top: 7px;
padding-left: 20px; padding-left: 7px;
padding-right: 10px; padding-right: 10px;
} }
@ -761,14 +825,6 @@ footer {
background-color: transparent; background-color: transparent;
} }
.chat {
padding: 0px 14px;
width: 200px;
margin-bottom: 0;
z-index: 1040;
}
.sub_attribute .control-label { .sub_attribute .control-label {
width: 60px; width: 60px;
} }