1
0
Fork 0

Merge remote-tracking branch 'upstream/develop' into 1606-shared-template

This commit is contained in:
Michael Vogel 2016-06-07 22:40:29 +02:00
commit f59b21d4a8
15 changed files with 416 additions and 247 deletions

View file

@ -282,6 +282,9 @@
display: block;
text-overflow: ellipsis;
}
.hovercard-content .hover-card-details .hover-card-content .profile-details > .profile-network a {
color: #777;
}
.hover-card-actions {
display: flex;
}

View file

@ -109,7 +109,7 @@ a#item-delete-selected {
* Overwriting and Extend Bootstrap
*/
.label, .label a {
color: #fff !important;
color: #fff;
}
/* Buttons */
@ -138,6 +138,12 @@ a#item-delete-selected {
padding: 4px 8px;
font-size: 12px;
}
.btn-small {
padding: 6px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
.btn-primary {
background: $nav_bg;
color: $btn_primary_color !important;
@ -186,6 +192,13 @@ a#item-delete-selected {
background: $link_hover_color;
}
.form-control-sm, .input-group-sm>.form-control, .input-group-sm>.input-group-addon, .input-group-sm>.input-group-btn>.btn {
padding: .275rem .75rem;
/*font-size: .875rem;*/
line-height: 1.5;
height: 30px;
border-radius: .2rem;
}
/* Bootstrap media class fix/hack
* This is a test. I thought it does have some
* issues in some corner cases. Maybe we remove
@ -939,15 +952,18 @@ aside #follow-sidebar .form-group-search .form-button-search {
padding: 2px 8px;
}
aside #group-sidebar .group-edit-tool {
aside #group-sidebar .group-edit-tool,
aside #saved-search-list .savedsearchdrop {
opacity: 0.1;
transition: all 0.25s ease-in-out;
}
aside #group-sidebar .sidebar-group-li:hover .group-edit-tool {
aside #group-sidebar .sidebar-group-li:hover .group-edit-tool,
aside #saved-search-list .saved-search-li:hover .savedsearchdrop {
opacity: 0.8;
transition: all 0.25s ease-in-out;
}
aside #group-sidebar .sidebar-group-li .group-edit-tool:hover {
aside #group-sidebar .sidebar-group-li .group-edit-tool:hover,
aside #saved-search-list .saved-search-li .savedsearchdrop:hover {
opacity: 1;
}
@ -1324,6 +1340,10 @@ blockquote.shared_content {
.wall-item-tags a:hover {
text-decoration: none;
}
.wall-item-bottom .label,
.wall-item-bottom .label a {
color: #fff;
}
/* item social action buttons */
.wall-item-actions, .wall-item-actions a {
@ -1641,7 +1661,22 @@ ul.dropdown-menu li:hover {
color: $link_color;
font-size: 20px;
}
/* Section-Content-Wrapper */
#search-header-wrapper {
padding: 15px;
padding-bottom: 20px;
margin-bottom: 20px;
border: none;
/*background-color: #fff;*/
background-color: rgba(255,255,255,$contentbg_transp);
border-radius: 4px;
position: relative;
/*overflow: hidden;*/
color: #555;
box-shadow: 0 0 3px #dadada;
-webkit-box-shadow: 0 0 3px #dadada;
-moz-box-shadow: 0 0 3px #dadada;
}
/* PAGES */
@ -1948,3 +1983,11 @@ There are for some reasons empty <a> tags. I don't know why */
padding: 0;
}
/* hovercard fix */
body .tread-wrapper .hovercard a,
body .tread-wrapper .hovercard a:hover {
color: $link_color;
}
body .tread-wrapper .hovercard:hover .hover-card-content a {
color: $link_color !important;
}