--- a/src/pyams_skin/resources/css/myams.css Thu Jun 02 16:33:03 2016 +0200
+++ b/src/pyams_skin/resources/css/myams.css Thu Jun 02 16:34:29 2016 +0200
@@ -3073,29 +3073,29 @@
*/
@font-face {
font-family: 'Ubuntu';
- src: url('fonts/Ubuntu-C.eot');
- src: url('fonts/Ubuntu-C.eot?#iefix') format('embedded-opentype'), url('fonts/Ubuntu-C.woff') format('woff'), url('fonts/Ubuntu-C.ttf') format('truetype'), url('fonts/Ubuntu-C.svg') format('svg');
+ src: url('./fonts/Ubuntu-C.eot');
+ src: url('./fonts/Ubuntu-C.eot?#iefix') format('embedded-opentype'), url('./fonts/Ubuntu-C.woff') format('woff'), url('./fonts/Ubuntu-C.ttf') format('truetype'), url('./fonts/Ubuntu-C.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Ubuntu-Light';
- src: url('fonts/Ubuntu-L.eot');
- src: url('fonts/Ubuntu-L.eot?#iefix') format('embedded-opentype'), url('fonts/Ubuntu-L.woff') format('woff'), url('fonts/Ubuntu-L.ttf') format('truetype'), url('fonts/Ubuntu-L.svg') format('svg');
+ src: url('./fonts/Ubuntu-L.eot');
+ src: url('./fonts/Ubuntu-L.eot?#iefix') format('embedded-opentype'), url('./fonts/Ubuntu-L.woff') format('woff'), url('./fonts/Ubuntu-L.ttf') format('truetype'), url('./fonts/Ubuntu-L.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Ubuntu-Bold';
- src: url('fonts/Ubuntu-B.eot');
- src: url('fonts/Ubuntu-B.eot?#iefix') format('embedded-opentype'), url('fonts/Ubuntu-B.woff') format('woff'), url('fonts/Ubuntu-B.ttf') format('truetype'), url('fonts/Ubuntu-B.svg') format('svg');
+ src: url('./fonts/Ubuntu-B.eot');
+ src: url('./fonts/Ubuntu-B.eot?#iefix') format('embedded-opentype'), url('./fonts/Ubuntu-B.woff') format('woff'), url('./fonts/Ubuntu-B.ttf') format('truetype'), url('./fonts/Ubuntu-B.svg') format('svg');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
- src: url('fonts/OpenSans-Regular.eot');
- src: url('fonts/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('fonts/OpenSans-Regular.woff2') format('woff2'), url('fonts/OpenSans-Regular.woff') format('woff'), url('fonts/OpenSans-Regular.ttf') format('truetype'), url('fonts/OpenSans-Regular.svg') format('svg');
+ src: url('./fonts/OpenSans-Regular.eot');
+ src: url('./fonts/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('./fonts/OpenSans-Regular.woff2') format('woff2'), url('./fonts/OpenSans-Regular.woff') format('woff'), url('./fonts/OpenSans-Regular.ttf') format('truetype'), url('./fonts/OpenSans-Regular.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -3641,7 +3641,7 @@
}
.badge {
font-size: 11px;
- padding: 4px 6px 1px;
+ padding: 3px 6px 2px;
}
.label {
padding: 0.3em .6em .1em;
@@ -3772,6 +3772,7 @@
background: -webkit-gradient(linear, top left, top right, from(#829db0), to(#6f8696));
background: -webkit-linear-gradient(left, #829db0 93%, #6f8696 100%);
background: linear-gradient(to right, #829db0 93%, #6f8696 100%);*/
+
}
#header {
display: block;
@@ -4496,9 +4497,11 @@
}
.login-info span {
/*height: 38px;*/
+
display: inline-block;
padding: 0 0 0 10px;
/*border-bottom: 1px solid #1A1817;*/
+
}
.login-info span a.btn-success {
margin-top: -10px;
@@ -4566,6 +4569,7 @@
overflow: visible;
/*border-bottom: 1px solid #1A1817;
border-top: 1px solid #525151;*/
+
}
.minified #left-panel > ul > li > ul::before,
.minified nav > ul > li > ul::before {
@@ -4672,6 +4676,7 @@
.minified nav > ul > li > ul > li {
background-color: rgba(91, 103, 113, 0.8);
/*background-color: rgba(69, 69, 69, .9);*/
+
}
.minified #left-panel > ul > li > ul > li > ul > li,
.minified nav > ul > li > ul > li > ul > li {
@@ -5504,6 +5509,12 @@
nav > ul > li > a > .badge.pull-right {
margin-right: 15px;
}
+.minified nav > ul > li > a > .badge.pull-right {
+ position: absolute;
+ margin-right: 0;
+ top: 0.4em;
+ right: 5px;
+}
nav > ul > li > a b {
position: absolute!important;
visibility: hidden;
@@ -5739,14 +5750,14 @@
left: -100%;
margin-left: 10px;
}
-.ajax-dropdown {
+#user-activity .ajax-dropdown {
position: absolute;
display: none;
z-index: 1003;
top: 48px;
left: 16px;
width: 344px;
- height: 435px;
+ height: 452px;
border-radius: 0;
-webkit-box-shadow: 0 2px 4px rgba(30, 30, 100, 0.25);
box-shadow: 0 2px 4px rgba(30, 30, 100, 0.25);
@@ -5755,15 +5766,15 @@
border: 1px solid #b3b3b3;
}
@media only screen and (min-width: 320px) and (max-width: 479px) {
- .ajax-dropdown {
+ #user-activity .ajax-dropdown {
width: 299px;
- height: 320px;
+ height: 337px;
left: 0;
top: 49px;
}
}
-.ajax-dropdown:after,
-.ajax-dropdown:before {
+#user-activity .ajax-dropdown:after,
+#user-activity .ajax-dropdown:before {
bottom: 100%;
border: solid transparent;
content: " ";
@@ -5772,64 +5783,66 @@
position: absolute;
pointer-events: none;
}
-.ajax-dropdown:before {
+#user-activity .ajax-dropdown:before {
border-color: rgba(131, 131, 131, 0);
border-bottom-color: #838383;
border-width: 8px;
- left: 50%;
+ right: 8px;
margin-left: -8px;
}
@media only screen and (min-width: 320px) and (max-width: 479px) {
- .ajax-dropdown:before {
+ #user-activity .ajax-dropdown:before {
margin-left: -14px;
- }
-}
-.ajax-dropdown:after {
+ right: 13px;
+ }
+}
+#user-activity .ajax-dropdown:after {
border-color: rgba(255, 255, 255, 0);
border-bottom-color: #fff;
border-width: 7px;
- left: 50%;
+ right: 9px;
margin-left: -7px;
}
@media only screen and (min-width: 320px) and (max-width: 479px) {
- .ajax-dropdown:after {
+ #user-activity .ajax-dropdown:after {
margin-left: -13px;
- }
-}
-.ajax-dropdown > :last-child {
+ right: 14px;
+ }
+}
+#user-activity .ajax-dropdown > :last-child {
font-size: 13px;
display: block;
padding: 5px 0;
- line-height: 22px;
- font-weight: 400;
-}
-.ajax-dropdown > :first-child {
+ line-height: 20px;
+ font-weight: 400;
+}
+#user-activity .ajax-dropdown > :first-child {
margin: 0 0 3px;
padding: 0 0 9px;
}
-.ajax-dropdown .fa-4x.fa-border {
+#user-activity .ajax-dropdown .fa-4x.fa-border {
border-width: 3px;
border-radius: 50%;
display: block;
margin: 0 auto;
- width: 46px;
+ width: 80px;
text-align: center;
color: #D1D1D1;
border-color: #D1D1D1;
}
-.ajax-dropdown .btn-group .btn {
+#user-activity .ajax-dropdown .btn-group .btn {
font-weight: 700;
text-transform: capitalize;
}
-.ajax-dropdown .btn-group > :nth-child(2) {
+#user-activity .ajax-dropdown .btn-group > :nth-child(2) {
border-right-width: 0;
border-left-width: 0;
}
-.ajax-dropdown .btn-group .btn:active {
+#user-activity .ajax-dropdown .btn-group .btn:active {
top: 0;
left: 0;
}
-.active + .ajax-dropdown {
+.active + #user-activity .ajax-dropdown {
-webkit-animation-name: flipInY;
animation-name: flipInY;
-webkit-animation-duration: .7s;
@@ -7090,15 +7103,20 @@
display: block;
min-height: 25px;
overflow: hidden;
- padding: 8px 10px 13px;
+ padding: 8px 8px 10px;
white-space: normal;
}
.notification-body > li > span:hover {
background: #F0F4F7;
color: #667F8F;
}
+.notification-body > li > span > a > span.msg-body,
+.notification-body > li > span > a > span.subject {
+ height: auto;
+ line-height: normal;
+}
.notification-body > li a.msg {
- padding-left: 50px!important;
+ padding-left: 40px!important;
}
.notification-body > li a,
.notification-body > li a span {
@@ -7124,7 +7142,7 @@
color: #333;
font-weight: 400;
margin-right: 60px;
- margin-bottom: 6px;
+ margin-bottom: 3px;
height: 20px;
text-overflow: ellipsis;
white-space: nowrap;
@@ -7150,8 +7168,6 @@
color: #A0A0A0;
max-height: 35px;
width: 100%;
- text-overflow: ellipsis;
- white-space: nowrap;
overflow: hidden;
}
.notification-body .subject {
@@ -10890,13 +10906,16 @@
.btn-header a {
margin-top: 9px!important;
/*width: 40px!important;*/
+
}
}
@media (min-width: 768px) and (max-width: 880px) {
.btn-header a {
margin-top: 9px!important;
/*width: 40px!important;*/
+
/*height: 39px!important;*/
+
line-height: 26px!important;
}
}
@@ -15765,30 +15784,42 @@
.modal-overflow .scrollmarker.top {
background: -moz-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* FF3.6+ */
+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #3276b1), color-stop(17%, rgba(50, 118, 177, 0.83)), color-stop(100%, rgba(50, 118, 177, 0)));
/* Chrome,Safari4+ */
+
background: -webkit-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* Chrome10+,Safari5.1+ */
+
background: -o-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* Opera 11.10+ */
+
background: -ms-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* IE10+ */
+
background: linear-gradient(to bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* W3C */
+
}
.modal-overflow .scrollmarker.bottom {
background: -moz-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* FF3.6+ */
+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0%, #3276b1), color-stop(17%, rgba(50, 118, 177, 0.83)), color-stop(100%, rgba(50, 118, 177, 0)));
/* Chrome,Safari4+ */
+
background: -webkit-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* Chrome10+,Safari5.1+ */
+
background: -o-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* Opera 11.10+ */
+
background: -ms-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* IE10+ */
+
background: linear-gradient(to top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%);
/* W3C */
+
}
/*
* Pricing-style component
@@ -16794,7 +16825,7 @@
-webkit-box-shadow: inset 2px 2px 5px rgba(0, 0, 0, 0.04);
box-shadow: inset 2px 2px 5px rgba(0, 0, 0, 0.04);
display: block;
- height: 270px;
+ min-height: 270px;
overflow-y: scroll;
overflow-x: hidden;
padding: 10px;
@@ -16808,17 +16839,22 @@
margin: 0;
padding: 0;
}
-.chat-body li:first-child {
- margin-top: 10px;
-}
.chat-body li.message {
display: block;
position: relative;
- margin: 20px 20px 0;
+ padding: 10px;
+ margin: 2px;
+}
+.chat-body li.message:hover {
+ background-color: #eee;
+}
+.chat-body li.message.request,
+.chat-body li.message.request:hover {
+ background-color: #e4e4e4;
}
.chat-body li.message img {
display: inline-block;
- border-left: 4px solid #fff;
+ border-left: 4px solid transparent;
position: absolute;
}
.chat-body li.message img.online {
@@ -16840,16 +16876,16 @@
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
padding: 0;
- margin-left: 65px;
+ margin-left: 50px;
line-height: normal;
}
.chat-body li.message .message-text time {
position: absolute;
- top: 1px;
- right: 0;
+ top: 3px;
+ right: 5px;
font-size: 10px;
line-height: 10px;
- color: #AFAFAF;
+ color: #a1a1a1;
}
.chat-body li.message .message-text .chat-file {
display: block;
@@ -16892,7 +16928,7 @@
width: 150px;
}
}
-.chat-body li.message .message-text a.username {
+.chat-body li.message .message-text .username {
display: block;
font-weight: 700;
margin-bottom: 4px;