diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-11 18:02:38 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-11 18:02:38 -0800 |
| commit | 4a24a8de4341d1a3231c4dc22661c89559053424 (patch) | |
| tree | 6ae62970292a56c84227052ede29b83843526bec | |
| parent | 30503d653352f87a210835a191f99de3deb084bf (diff) | |
| parent | b8ad22f525bf1df458e00eef43be2259a04a51f0 (diff) | |
| download | volse-hubzilla-4a24a8de4341d1a3231c4dc22661c89559053424.tar.gz volse-hubzilla-4a24a8de4341d1a3231c4dc22661c89559053424.tar.bz2 volse-hubzilla-4a24a8de4341d1a3231c4dc22661c89559053424.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/bluegrid.css | 26 |
2 files changed, 26 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php index 144509cd0..a48419c45 100644 --- a/include/nav.php +++ b/include/nav.php @@ -152,7 +152,7 @@ EOT; if(! local_channel()) { $nav['rusermenu'] = array( $homelink, - t('Get me home'), + t('Take me home'), 'logout', t('Log me out of this site') ); 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 { |