aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-13 11:11:20 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-13 11:11:20 +0100
commit188782c46195fcc530f8641f41da012aab9dbd76 (patch)
tree38e4b5544af3996000853f94b9f916078944da7f /view
parent61257094b7befe12dadbd3593fcfa70d09da2fbb (diff)
parentbdfdd23b36cac0881ef4096180e1c9242753dd49 (diff)
downloadvolse-hubzilla-188782c46195fcc530f8641f41da012aab9dbd76.tar.gz
volse-hubzilla-188782c46195fcc530f8641f41da012aab9dbd76.tar.bz2
volse-hubzilla-188782c46195fcc530f8641f41da012aab9dbd76.zip
merge dev into bs4
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/schema/bluegrid.css26
-rwxr-xr-xview/tpl/jot.tpl2
-rwxr-xr-xview/tpl/nav.tpl2
3 files changed, 27 insertions, 3 deletions
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 64e5a2c95..46e28197e 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -116,7 +116,7 @@ input#jot-title:hover, input#jot-title:focus {
}
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
- background-color: rgba(67,72,138,.97);
+ background-color: #43488A;
color: #fff;
border-radius: 0;
border: none;
@@ -304,6 +304,30 @@ input {
#login-main {
margin-top: 0;
+ color: #EEE;
+}
+
+#remember_me_container label:hover, #remember_container label:hover {
+ color: #FFF;
+}
+
+#login-main #lost-password-link, #login-main #register-link {
+ color: #FFF;
+}
+
+#nav-login .modal-content {
+ background-color: #43488A;
+ background-image: url('/images/bggrid.png');
+ box-shadow: 0 5px 15px rgba(0,0,0,.3);
+ -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.3);
+}
+
+#nav-login h3, #nav-login button.close {
+ color: #EEE;
+}
+
+#nav-login .modal-header {
+ border-bottom: none;
}
.directory-item {
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 5b64867aa..8885da7c1 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -217,7 +217,7 @@
<div id="jot-preview-content" style="display:none;"></div>
-{{if $showacl}}{{$acl}}{{/if}}
+{{$acl}}
{{if $feature_expire}}
<!-- Modal for item expiry-->
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 42f331fee..d3ead3cfe 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -184,7 +184,7 @@
<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
</li>
{{/if}}
- <li class="nav-item dropdown">
+ <li class="nav-item dropdown" id="app-menu">
<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
<div class="dropdown-menu dropdown-menu-right">
{{foreach $navapps as $navapp}}