aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-16 19:54:38 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-16 19:54:38 -0700
commitbe3a272a80182074e7417e33cc280b523779254b (patch)
tree2fd1ad8b9d5fb14b84828ffcb96efa14a34eb087 /view
parent6a1d1867f0dccccaf567c689a701e62c7f3a9a6d (diff)
parent631eb4b2c213cf612e97f6a90ff1dbf1352eadad (diff)
downloadvolse-hubzilla-be3a272a80182074e7417e33cc280b523779254b.tar.gz
volse-hubzilla-be3a272a80182074e7417e33cc280b523779254b.tar.bz2
volse-hubzilla-be3a272a80182074e7417e33cc280b523779254b.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_admin.css7
-rw-r--r--view/theme/redbasic/css/style.css4
2 files changed, 8 insertions, 3 deletions
diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css
index f052175bb..9a7cb4bb3 100644
--- a/view/css/mod_admin.css
+++ b/view/css/mod_admin.css
@@ -61,7 +61,12 @@
#adminpage table tr:hover { background-color: #bbc7d7; }
#adminpage .selectall { text-align: right; }
+.checkbox {
+ width: 1.2em;
+ height: 1.2em;
+}
.channels_ckbx, .pending_ckbx, .users_ckbx {
- margin-top: -5px !important;
+ margin-top: 0px !important;
+ margin-left: 0px !important;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 046d8471b..702c7238e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2293,6 +2293,6 @@ nav .badge.mail-update:hover {
background-color: #337AB7;
}
-.channels_ckbx, .pending_ckbx, .users_ckbx {
+/*.channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important;
-}
+}*/