diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-11 18:02:59 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-11 18:02:59 -0800 |
| commit | 4c526c7d3d98a8ae0521af8af3baea196550e170 (patch) | |
| tree | d98445b6da261d0c4c6bcec35165f1761f7dc218 | |
| parent | bbb83bea38c626aa59f28e3ed29e39488f2e9289 (diff) | |
| parent | 4a24a8de4341d1a3231c4dc22661c89559053424 (diff) | |
| download | volse-hubzilla-4c526c7d3d98a8ae0521af8af3baea196550e170.tar.gz volse-hubzilla-4c526c7d3d98a8ae0521af8af3baea196550e170.tar.bz2 volse-hubzilla-4c526c7d3d98a8ae0521af8af3baea196550e170.zip | |
Merge branch 'dev' into red
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/bluegrid.css | 26 |
3 files changed, 27 insertions, 3 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 8eb3b2181..56a7d0d8e 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -575,7 +575,7 @@ class Channel { '$removeme' => t('Remove Channel'), '$removechannel' => t('Remove this channel.'), '$firefoxshare' => t('Firefox Share $Projectname provider'), - '$cal_first_day' => array('first_day', t('Start calendar week on monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), + '$cal_first_day' => array('first_day', t('Start calendar week on Monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), )); call_hooks('settings_form',$o); 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 { |