aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2015-10-26 15:28:11 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2015-10-26 15:28:11 +0100
commit32a0f5b04ad5969f00313ceecc0195107707603d (patch)
treed97c34cf92d663a10399e2d33437f40da3dfe822
parent3bc6190bddc2eeec808ced7958796c9ad41bbc12 (diff)
parent4fb9571136eaa659cfe5cdfd9185acd92be527eb (diff)
downloadvolse-hubzilla-32a0f5b04ad5969f00313ceecc0195107707603d.tar.gz
volse-hubzilla-32a0f5b04ad5969f00313ceecc0195107707603d.tar.bz2
volse-hubzilla-32a0f5b04ad5969f00313ceecc0195107707603d.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
-rw-r--r--view/css/bootstrap-red.css4
-rw-r--r--view/theme/redbasic/css/style.css19
-rwxr-xr-xview/tpl/photo_album.tpl12
-rwxr-xr-xview/tpl/photos_recent.tpl12
4 files changed, 28 insertions, 19 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index c6d99e7ae..abffe2f78 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -87,6 +87,10 @@ code {
font-size: unset;
}
+.panel-group {
+ margin-bottom: 0px;
+}
+
/* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */
.field.checkbox input[type="checkbox"] { margin-left: 0px; }
.field.checkbox label { padding-left: 0px; font-weight: 700}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e6ca7cbc3..9403b078e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1661,6 +1661,8 @@ img.mail-conv-sender-photo {
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
+ border-top-right-radius: 0px;
+ border-top-left-radius: 0px;
}
.hide-comments-outer {
@@ -1683,11 +1685,11 @@ img.mail-conv-sender-photo {
border-radius: 0px;
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
- margin-top: 3px;
+ border-top: 3px solid $comment_item_colour;
}
.wall-item-comment-wrapper-wc {
- margin-top: 0px;
+ border-top: 0px solid $comment_item_colour;
}
.wall-item-like,
@@ -1869,7 +1871,6 @@ nav .dropdown-menu {
border: 1px solid #ccc;
box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
border-radius: $radiuspx;
- background-color: #fff;
}
.section-title-wrapper {
@@ -1877,7 +1878,7 @@ nav .dropdown-menu {
background-color: $item_colour;
border-top-left-radius: $radiuspx;
border-top-right-radius: $radiuspx;
- margin-bottom: 3px;
+ border-bottom: 3px solid $comment_item_colour;
}
.section-title-wrapper h2,
@@ -1892,20 +1893,20 @@ nav .dropdown-menu {
.section-subtitle-wrapper {
padding: 7px 10px;
background-color: $item_colour;
- margin-bottom: 3px;
+ border-bottom: 3px solid $comment_item_colour;
}
.section-content-tools-wrapper {
padding: 7px 10px;
background-color: $comment_item_colour;
- margin-bottom: 3px
+ border-bottom: 3px solid $comment_item_colour;
}
.section-content-info-wrapper {
padding: 21px 10px;
color: #31708f;
background-color: #d9edf7;
- margin-bottom: 3px;
+ border-bottom: 3px solid $comment_item_colour;
text-align: center;
}
@@ -1913,7 +1914,7 @@ nav .dropdown-menu {
padding: 21px 10px;
color: #8a6d3b;
background-color: #fcf8e3;
- margin-bottom: 3px;
+ border-bottom: 3px solid $comment_item_colour;
text-align: center;
}
@@ -1921,7 +1922,7 @@ nav .dropdown-menu {
padding: 21px 10px;
color: #a94442;
background-color: #f2dede;
- margin-bottom: 3px;
+ border-bottom: 3px solid $comment_item_colour;
text-align: center;
}
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0ce9c36a8..d22f82f8e 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -18,11 +18,13 @@
</div>
{{$upload_form}}
{{$album_edit.1}}
- <div id="photo-album-contents">
- {{foreach $photos as $photo}}
- {{include file="photo_top.tpl"}}
- {{/foreach}}
- <div id="page-end"></div>
+ <div class="section-content-wrapper-np">
+ <div id="photo-album-contents">
+ {{foreach $photos as $photo}}
+ {{include file="photo_top.tpl"}}
+ {{/foreach}}
+ <div id="page-end"></div>
+ </div>
</div>
</div>
<div class="photos-end"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 15faa4a34..46ac65e87 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -7,11 +7,13 @@
<div class="clear"></div>
</div>
{{$upload_form}}
- <div id="photo-album-contents">
- {{foreach $photos as $photo}}
- {{include file="photo_top.tpl"}}
- {{/foreach}}
- <div id="page-end"></div>
+ <div class="section-content-wrapper-np">
+ <div id="photo-album-contents">
+ {{foreach $photos as $photo}}
+ {{include file="photo_top.tpl"}}
+ {{/foreach}}
+ <div id="page-end"></div>
+ </div>
</div>
</div>
<div class="photos-end"></div>