remove more hacks from toolbar layout

This commit is contained in:
Andrew Dolgov 2018-12-05 10:10:39 +03:00
parent 05200a3840
commit 5b3d5a28f2
5 changed files with 35 additions and 24 deletions

View File

@ -722,7 +722,6 @@ body.ttrss_main #toolbar-frame #toolbar {
border: 0px solid #ddd; border: 0px solid #ddd;
border-bottom-width: 1px; border-bottom-width: 1px;
height: 32px; height: 32px;
line-height: 32px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -744,12 +743,20 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
} }
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left { body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
flex-grow: 2; flex-grow: 2;
display: flex;
} }
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left img { body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left img {
vertical-align: middle; vertical-align: middle;
margin-right: 8px; margin-right: 8px;
position: relative; }
top: -2px; body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left > * {
align-self: center;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
display: flex;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right > * {
align-self: center;
} }
body.ttrss_main #toolbar-frame #toolbar #selected_prompt { body.ttrss_main #toolbar-frame #toolbar #selected_prompt {
font-style: italic; font-style: italic;
@ -875,10 +882,6 @@ body.ttrss_main select.attachments {
margin-top: 10px; margin-top: 10px;
max-width: 120px; max-width: 120px;
} }
body.ttrss_main #selected_prompt {
margin-right: 25px;
vertical-align: middle;
}
body.ttrss_main #filterDlg_feeds select { body.ttrss_main #filterDlg_feeds select {
height: 150px; height: 150px;
width: 410px; width: 410px;

File diff suppressed because one or more lines are too long

View File

@ -847,7 +847,6 @@ body.ttrss_main {
border: 0px solid #ddd; border: 0px solid #ddd;
border-bottom-width: 1px; border-bottom-width: 1px;
height : 32px; height : 32px;
line-height : 32px;
display : flex; display : flex;
flex-direction : row; flex-direction : row;
flex-wrap : nowrap; flex-wrap : nowrap;
@ -871,12 +870,23 @@ body.ttrss_main {
.left { .left {
flex-grow: 2; flex-grow: 2;
display : flex;
img { img {
vertical-align : middle; vertical-align : middle;
margin-right : 8px; margin-right : 8px;
position : relative; }
top : -2px;
> * {
align-self: center;
}
}
.right {
display : flex;
> * {
align-self : center;
} }
} }
} }
@ -1021,11 +1031,6 @@ body.ttrss_main {
max-width : 120px; max-width : 120px;
} }
#selected_prompt {
margin-right : 25px;
vertical-align : middle;
}
#filterDlg_feeds select { #filterDlg_feeds select {
height : 150px; height : 150px;
width : 410px; width : 410px;

View File

@ -722,7 +722,6 @@ body.ttrss_main #toolbar-frame #toolbar {
border: 0px solid #ddd; border: 0px solid #ddd;
border-bottom-width: 1px; border-bottom-width: 1px;
height: 32px; height: 32px;
line-height: 32px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -744,12 +743,20 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
} }
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left { body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
flex-grow: 2; flex-grow: 2;
display: flex;
} }
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left img { body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left img {
vertical-align: middle; vertical-align: middle;
margin-right: 8px; margin-right: 8px;
position: relative; }
top: -2px; body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left > * {
align-self: center;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
display: flex;
}
body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right > * {
align-self: center;
} }
body.ttrss_main #toolbar-frame #toolbar #selected_prompt { body.ttrss_main #toolbar-frame #toolbar #selected_prompt {
font-style: italic; font-style: italic;
@ -875,10 +882,6 @@ body.ttrss_main select.attachments {
margin-top: 10px; margin-top: 10px;
max-width: 120px; max-width: 120px;
} }
body.ttrss_main #selected_prompt {
margin-right: 25px;
vertical-align: middle;
}
body.ttrss_main #filterDlg_feeds select { body.ttrss_main #filterDlg_feeds select {
height: 150px; height: 150px;
width: 410px; width: 410px;

File diff suppressed because one or more lines are too long