aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-23 16:57:32 -0700
committerredmatrix <git@macgirvin.com>2016-04-23 16:57:32 -0700
commitce45a1cf945617f3895fb3e40b13e6f705fbc000 (patch)
tree8d407ab11e8c4fdc4560cf67e0fd242f7f1544a0 /view/theme
parent79c63e3cf44438a7f993b2ea1813b9234ea4d3f3 (diff)
parent9d698c08876169228b09e144f80c5311fcb0fa49 (diff)
downloadvolse-hubzilla-ce45a1cf945617f3895fb3e40b13e6f705fbc000.tar.gz
volse-hubzilla-ce45a1cf945617f3895fb3e40b13e6f705fbc000.tar.bz2
volse-hubzilla-ce45a1cf945617f3895fb3e40b13e6f705fbc000.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/narrow_navbar.css4
-rw-r--r--view/theme/redbasic/css/style.css29
2 files changed, 17 insertions, 16 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 9d14beb33..2c0c7e133 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -56,4 +56,8 @@
top: 30px;
right: 15px;
}
+
+ .contextual-help-content-open {
+ top: 32px;
+ }
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5b8729111..31455cbdd 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -201,29 +201,26 @@ header #banner #logo-text {
}
/* contextual help */
-.help-content {
- background: $comment_item_colour;
- color: $font_colour;
+.contextual-help-content {
+ display: none;
+
+}
+
+.contextual-help-content-open {
+ display: block;
position: fixed;
- top: -50%;
- left: 0px;
- width: 100%;
+ top: 51px;
max-height: 50%;
+ background: $comment_item_colour;
padding: 20px;
- /*transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);*/
- border-bottom: #CCC 1px solid;
+ border-bottom: #ccc 1px solid;
overflow: auto;
-}
-
-.help-content-open {
- top: 51px;
-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
- /*transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);*/
}
-.help-content dd {
+.contextual-help-content dd {
margin-bottom: 1em;
}
/* contextual help end */
@@ -1608,6 +1605,7 @@ nav ul li .notify-unseen
}
blockquote {
+ display: inline-block;
font-size: $font_size;
font-style: italic;
border-left: 3px solid #ccc;
@@ -1703,10 +1701,9 @@ nav .badge.mail-update:hover {
#expand-aside,
#expand-tabs,
-#help_nav_btn_collapsed {
+#context-help-btn {
color: $nav_active_icon_colour;
padding: 7px 10px;
- text-decoration: none;
}
.nav-tabs.nav-justified {