Merge branch 'dev' into module_blog

This commit is contained in:
Michal Kváček
2016-09-13 03:53:29 +02:00
8 changed files with 129 additions and 101 deletions
+21 -6
View File
@@ -9520,11 +9520,11 @@ pre code {
border-bottom-width: 2px;
}
.table-striped tbody tr:nth-of-type(odd) {
.table-striped tbody tr:nth-of-type(odd), .rows-striped .row:nth-of-type(odd) {
background-color: #F9F9F9;
}
.table-hover tbody tr:hover {
.table-hover tbody tr:hover, .rows-striped .row:hover {
background-color: #F5F5F5;
}
@@ -14168,7 +14168,7 @@ img {
}
.users-list img {
border-radius: 500px;
border-radius: 50%;
padding: 3px;
}
@@ -14191,7 +14191,6 @@ img {
.timeline > li {
position: relative;
}
.timeline > li:before,
@@ -14204,7 +14203,6 @@ img {
clear: both;
}
.timeline > li > .timeline-panel {
width: 46%;
float: left;
@@ -14250,7 +14248,7 @@ img {
top: 26px;
left: 50%;
margin-left: -14px;
background-color: #ddd;
background-color: #DDD;
z-index: 100;
border-radius: 50%;
}
@@ -14349,6 +14347,7 @@ img {
.ace-editor-container {
position: relative;
}
.ace-editor {
position: absolute !important;
width: 100%;
@@ -14367,4 +14366,20 @@ img {
.header-block img {
margin-right: 10px;
}
.truncate {
width: 90%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.bold {
font-weight: bold;
}
.p-tb-15 {
padding-top: 15px;
padding-bottom: 15px;
}