aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-30 16:10:59 -0700
committerzotlabs <mike@macgirvin.com>2017-03-30 16:10:59 -0700
commita9cceea8500bfb74aed21af9631b43188dd3ce29 (patch)
tree2165131d83b86f38c4b30b0dc4c7ccb70b70c4b0 /view
parentb51ca4c8d3a36ed49582c4fe894944869b0d42a2 (diff)
parentdea487993828d00e7be9709752129e445a255171 (diff)
downloadvolse-hubzilla-a9cceea8500bfb74aed21af9631b43188dd3ce29.tar.gz
volse-hubzilla-a9cceea8500bfb74aed21af9631b43188dd3ce29.tar.bz2
volse-hubzilla-a9cceea8500bfb74aed21af9631b43188dd3ce29.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css4
-rw-r--r--view/css/widgets.css5
-rw-r--r--view/theme/redbasic/css/style.css61
3 files changed, 22 insertions, 48 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 0df56f621..8e6f4c882 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -67,10 +67,6 @@ code {
white-space: normal;
}
-.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/css/widgets.css b/view/css/widgets.css
index 880745ba2..c6eea1f41 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -7,6 +7,11 @@
margin-top: 0px;
}
+.widget .active .wall-item-ago,
+.widget .active .dropdown-sub-text {
+ color: #fff;
+}
+
.tags {
word-wrap: break-word;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 601124227..29242db27 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -693,39 +693,6 @@ div.jGrowl div.jGrowl-notification {
min-height: 60px;
}
-#recip-ac .autocomplete,
-#poke-recip-ac .autocomplete,
-#id-name-ac .autocomplete,
-#contact-search-ac .autocomplete {
- margin-top: 2px;
- margin-left: $radius;
- margin-right: $radius;
- border: 1px solid #666;
- border-top: none;
-
-}
-
-.autocomplete {
- color: $font_colour;
- cursor: pointer;
- text-align: left;
- max-height: 350px;
- overflow: auto;
- border-bottom-left-radius: $radius;
- border-bottom-right-radius: $radius;
-}
-
-.autocomplete .selected {
- background: #eee;
-}
-
-.autocomplete div {
- padding: 2px 5px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
.jslider .jslider-scale ins {
color: #333;
font-size: 0.9rem;
@@ -1095,20 +1062,10 @@ img.mail-conv-sender-photo {
.wall-item-ago,
-a:hover .wall-item-ago,
-.dropdown-sub-text,
-a:hover .dropdown-sub-text {
+.dropdown-sub-text {
color: #777;
}
-.active .wall-item-ago,
-a.active:hover .wall-item-ago,
-.active .dropdown-sub-text,
-a:active .dropdown-sub-text,
-a.active:hover .dropdown-sub-text {
- color: #fff;
-}
-
.wall-item-content,
.mail-conv-body,
.page-body,
@@ -1393,6 +1350,7 @@ blockquote {
}
.dropdown-menu {
+ color: $font_colour;
font-size: 0.9rem;
border-radius: $radius;
}
@@ -1401,6 +1359,21 @@ blockquote {
border-radius: $radius;
}
+.dropdown-item {
+ color: $font_colour;
+}
+
+.dropdown-item:active,
+.dropdown-item:focus,
+.dropdown-item:hover,
+.textcomplete-item:focus .dropdown-item,
+.textcomplete-item:hover .dropdown-item,
+.textcomplete-item.active .dropdown-item,
+.textcomplete-item:active .dropdown-item {
+ color: $font_colour;
+ background-color: $item_colour;
+}
+
.bg-inverse {
background-color: $nav_bg !important;
}