Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a11y and usability fixes #1134

Merged
merged 18 commits into from
Sep 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controllers/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function home(Base $f3) {

if (!$f3->ajax()) {
// show as full html page
$this->view->allowPublicUpdate = \F3::get('allow_public_update_access') == 1;
$this->view->publicMode = \F3::get('public') == 1;
$this->view->authEnabled = \F3::get('auth')->enabled() === true;
echo $this->view->render('templates/home.phtml');
Expand Down
180 changes: 73 additions & 107 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ input {
overflow-x:hidden;
}


#nav-filter a, #nav-tags a, #nav-sources a {
display: block;
text-decoration: none;
}

#nav hr {
border:0;
border-bottom:1px solid #272325;
Expand Down Expand Up @@ -124,7 +130,7 @@ input {
margin-bottom:30px;
}

#nav-filter li {
#nav-filter li a {
color:#6a6a6a;
padding:5px;
padding-left:24px;
Expand All @@ -134,7 +140,7 @@ input {
cursor:pointer;
}

#nav-filter li.active {
#nav-filter li a.active {
background:#272325;
color:#d7d7d7;
font-size:1em;
Expand Down Expand Up @@ -200,10 +206,16 @@ input {
display: inline !important;
}

#nav h2 {
#nav h2 button {
display: block;
width: 100%;
text-align: inherit;
line-height: 2.0;
font-family: inherit;
border: 0;
color:#494949;
text-transform:uppercase;
font-size:0.8em;
font-size: 0.8rem;
margin-left:18px;
font-weight:bold;
}
Expand All @@ -224,7 +236,7 @@ input {
background: url(images/nav-expanded.png) center left no-repeat;
}

#nav-tags li {
#nav-tags li a {
position:relative;
color:#b9b9b9;
cursor:pointer;
Expand All @@ -240,7 +252,7 @@ input {
-o-text-overflow: ellipsis;
}

#nav-tags li.active {
#nav-tags li a.active {
background:#272325;
color:#d7d7d7;
}
Expand Down Expand Up @@ -275,7 +287,7 @@ input {
display:none;
}

#nav-sources li {
#nav-sources li a {
position:relative;
color:#b9b9b9;
cursor:pointer;
Expand All @@ -290,12 +302,12 @@ input {
-o-text-overflow: ellipsis;
}

#nav-sources li.active {
#nav-sources li a.active {
background:#272325;
color:#d7d7d7;
}

#nav-sources li.unread{
#nav-sources li a.unread{
font-weight: bold;
font-size: 0.7em;
}
Expand All @@ -316,10 +328,6 @@ input {
#nav-login {
padding: 0;
border: none;
position:absolute;
top:100%;
margin-top:-80px;
left:20px;
width:45px;
height:45px;
border-radius:2px;
Expand All @@ -342,42 +350,32 @@ input {

#nav-settings {
background:url(images/nav-sources.png) no-repeat center center #272325;
left:70px;
}

#nav-logout {
background:url(images/nav-logout.png) no-repeat center center #272325;
left:120px;
}

#nav-login {
background:url(images/nav-login.png) no-repeat center center #272325;
}

.nav-toolbar {
text-align: center;
}

body:not(.publicupdate) #nav-login {
width:140px;
}

#nav-settings.nologin, #nav-refresh.nologin {
width:70px;
}

#nav-settings.nologin {
left:95px;
}

#nav-mobile {
display:none;
}

#nav-copyright {
position:absolute;
top:100%;
margin-top:-25px;
margin-left:20px;
font-size:0.6em;
color:#555;
text-decoration:none;
}


/* search */

#search {
Expand Down Expand Up @@ -548,7 +546,7 @@ input {
margin: 0 10px 5px 0;
}

.entry[aria-expanded="false"] .entry-content, .entry[aria-expanded="false"] .entry-toolbar {
.entry:not(.expanded) .entry-content, .entry:not(.expanded) .entry-toolbar {
display: none;
}

Expand Down Expand Up @@ -776,10 +774,6 @@ input {
display:none;
}

#fullscreen-entry {
display:none;
}

/* sources */

.source input {
Expand Down Expand Up @@ -1029,32 +1023,27 @@ input {
#nav-login,
body.publicmode.authenabled.loggedin #nav-login,
#nav-logout,
body.notloggedin #nav-mark,
body.notloggedin #nav-settings,
body.notloggedin .entry-starr,
body.notloggedin .entry-unread {
body:not(.loggedin) #nav-mark,
body:not(.loggedin) #nav-settings,
body:not(.loggedin) .entry-starr,
body:not(.loggedin):not(.publicupdate) #nav-refresh,
body:not(.loggedin) .entry-unread {
display:none;
}

body.publicmode.authenabled #nav-login,
body.authenabled.loggedin #nav-logout {
display: block;
}

/* mobile version */

/* only desktop */
@media screen and (min-width: 1024px) {

body.publicmode.notloggedin .entry-toolbar {
body.publicmode:not(.loggedin) .entry-toolbar {
display:none;
}

}

/* desktop and tablet */
@media screen and (min-width: 641px) {

#nav {
position:fixed;
width:180px;
Expand All @@ -1068,6 +1057,11 @@ body.authenabled.loggedin #nav-logout {
.mark-these-read {
display: none;
}

body.publicmode.authenabled #nav-login,
body.authenabled.loggedin #nav-logout {
display: inline-block;
}
}

/* ipad and smartphone */
Expand Down Expand Up @@ -1110,23 +1104,11 @@ body.authenabled.loggedin #nav-logout {
#nav-login {
width:40px;
}

#nav-settings {
left:65px;
}

#nav-logout {
left:110px;
}


#nav-settings.nologin, #nav-refresh.nologin {
width:55px;
}

#nav-settings.nologin {
left:80px;
}

#nav-tags .color {
width:25px;
height:25px;
Expand Down Expand Up @@ -1188,7 +1170,6 @@ body.authenabled.loggedin #nav-logout {
}

.entry-content {
display:none;
-moz-column-count: 1;
-webkit-column-count: 1;
column-count: 1;
Expand Down Expand Up @@ -1287,7 +1268,6 @@ body.authenabled.loggedin #nav-logout {

#nav-search {
display:block;
margin-bottom:80px;
}

#nav-search.offline {
Expand All @@ -1307,34 +1287,19 @@ body.authenabled.loggedin #nav-logout {
border-radius:4px;
cursor:pointer;
}

#nav-refresh,
#nav-settings,
#nav-logout,
#nav-login {
position:relative;
top:10px;
left:0;
margin-left:20px;
margin-bottom:20px;
float:left;
}

#nav-settings {
left:50px;
}

#nav-login,
#nav-logout {
left:100px;
body.publicmode.authenabled #nav-login,
body.authenabled.loggedin #nav-logout {
display: block;
}

#nav-copyright {
margin-top:-20px;
margin-left:-60px;
left:100%;

.nav-toolbar button {
margin: 1em auto;
min-width: 85%;
width: 200px;
display: block;
}

#search {
display:none;
}
Expand Down Expand Up @@ -1390,34 +1355,34 @@ body.authenabled.loggedin #nav-logout {
z-index:100;
}

#fullscreen-entry {
position:absolute;
.fullscreen-mode {
overflow: hidden;
}

/* selected expanded entry will be displayed full-screen on mobile */
.entry.selected.expanded {
position: fixed;
left:0;
top:0;
margin:0;
border:0;
width:100%;
overflow-x: hidden;
height: 100%;
background:#ffffff;
z-index:22;
z-index:200;
}

#fullscreen-entry .entry {
.entry.selected.expanded.entry {
padding-top:50px;
}

#fullscreen-entry .entry-title {
.entry.selected.expanded .entry-title {
padding-top:40px;
color:#333333;
font-size:1.3em;
}

#fullscreen-entry .entry-content,
#fullscreen-entry .entry-toolbar {
display:block;
}

#fullscreen-entry .entry-toolbar {

.entry.selected.expanded .entry-toolbar {
position:fixed;
top:0;
left:0;
Expand All @@ -1427,10 +1392,10 @@ body.authenabled.loggedin #nav-logout {
font-size:0.8em;
margin-bottom:0;
}
#fullscreen-entry .entry-close {
display:block;
}

.entry.selected.expanded .entry-close {
display:block;
}

.entry-toolbar .entry-newwindow {
display:none;
Expand Down Expand Up @@ -1460,11 +1425,12 @@ body.authenabled.loggedin #nav-logout {
height:50px;
}

.entry-smartphone-share li {
list-style: none;
display: inline-block;
}
.entry-smartphone-share button {
margin-right:10px;
margin-bottom:5px;
list-style:none;
display:block;
display: block;
}

.source-opml,
Expand Down
Loading