diff options
author | Andrew Dolgov <[email protected]> | 2021-02-24 21:56:52 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2021-02-24 21:56:52 +0300 |
commit | 93940d2a9f80d9e1dac49b5eb7db23230d31c5f6 (patch) | |
tree | 71016661f6017918d0934eb462bd9552018d557a /themes/light | |
parent | 8b022c2bfb356d7dddaf334bc931d6dec77086fb (diff) | |
parent | 1adacd057230aea4ede29dab510385bf01cf99a3 (diff) |
Merge branch 'master' of git.fakecake.org:fox/tt-rss into weblate-integration
Diffstat (limited to 'themes/light')
-rw-r--r-- | themes/light/dijit_basic.less | 9 | ||||
-rw-r--r-- | themes/light/prefs.less | 20 | ||||
-rw-r--r-- | themes/light/tt-rss.less | 73 |
3 files changed, 53 insertions, 49 deletions
diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less index 2854c77d0..0582ddc5c 100644 --- a/themes/light/dijit_basic.less +++ b/themes/light/dijit_basic.less @@ -40,6 +40,15 @@ .dijitToolbar { font-size: 13px; padding: 0px; + + .dijitTextBox .dijitInputInner { + line-height : 10px; + } + + label { + position : relative; + top : 2px; + } } .dijitAccordionContainer { diff --git a/themes/light/prefs.less b/themes/light/prefs.less index 95ddefc34..510388391 100644 --- a/themes/light/prefs.less +++ b/themes/light/prefs.less @@ -9,13 +9,13 @@ body.ttrss_prefs { color : @default-text; } - .dijitContentPane { + /*.dijitContentPane { h1:first-of-type, h2:first-of-type, h3:first-of-type { margin-top: 0px; } - } + }*/ #footer, #header { padding : 8px; @@ -57,21 +57,15 @@ body.ttrss_prefs { color : white; } - .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode { - padding : 0px; + #feedsTab { + background : @color-panel-bg; } - div#feedlistLoading, div#filterlistLoading, div#labellistLoading { - text-align : center; - padding : 5px; - color : @default-text; - } - - div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading { - margin-right : 5px; + .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode { + padding : 0px; } - #errorButton { + #pref_feeds_errors_btn { color : red; } diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 65ec33bc3..35eec3e48 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -516,7 +516,6 @@ body.ttrss_main { } .dijitDialog { - header, .dlgSec, .dlgSecHoriz { font-size : 16px; @@ -531,6 +530,7 @@ body.ttrss_main { } header.horizontal + section, + section.horizontal, .dlgSecHoriz + .dlgSecCont { margin : 10px 0; } @@ -584,6 +584,12 @@ body.ttrss_main { footer.text-center { text-align: center; } + + textarea#tags_str { + height : 100px; + font-size : 12px; + width : 98%; + } } i.icon-label { @@ -609,28 +615,14 @@ body.ttrss_main { width : 18px; } - #exceptionDlg { - .dijitDialogTitleBar { - background : red; - color : white; - } - - .dijitDialogPaneContent { - background : #fcc; + .exception-contents { + h3 { + color : red; } - - .error-contents { - .message { - color : red; - } - - textarea { - width : 99%; - height : 200px; - } - .dlgButtons { - text-align : center; - } + textarea { + width : 99%; + height : 200px; + font-size : 11px; } } @@ -834,6 +826,8 @@ body.ttrss_main { } #toolbar-headlines { + font-size : 12px; + background: transparent; padding-right : 4px; flex-grow : 2; display : flex; @@ -843,7 +837,7 @@ body.ttrss_main { display : flex; align-items : center; - #feed_title { + .feed_title, .cancel_search { margin-left : 4px; } } @@ -884,6 +878,19 @@ body.ttrss_main { right : 0px; top : 0px; z-index : 5; + + i.net-alert, .left i.icon-error { + color : red; + } + + i.log-alert { + color : #ddba1c; + cursor : pointer; + } + + i { + margin : 0 4px; + } } #content-insert { @@ -949,16 +956,18 @@ body.ttrss_main { } ul#filterDlg_Matches, ul#filterDlg_Actions { - max-height : 100px; - overflow : auto; list-style-type : none; + margin : 0; + padding: 0; + /*max-height : 100px; + overflow : auto; border-style : solid; border-color : @border-default; border-width : 1px 1px 1px 1px; background-color : @default-bg; margin : 0px 0px 5px 0px; padding : 4px; - min-height : 16px; + min-height : 16px;*/ } ul#filterDlg_Matches li, ul#filterDlg_Actions li { @@ -1004,18 +1013,10 @@ body.ttrss_main { color : #cc90cc; } - div.enclosure_title { - - } - #headlines-frame .dijitCheckBox { margin-right : 4px; } - #editTagsDlg{ - overflow: visible; - } - #feedEditDlg img.feedIcon { border : 1px solid #ccc; padding : 5px; @@ -1048,14 +1049,14 @@ body.ttrss_main { } } -body.ttrss_main .dijitDialog { +/*body.ttrss_main .dijitDialog { h1:first-of-type, h2:first-of-type, h3:first-of-type, h4:first-of-type { margin-top: 0px; } -} +}*/ body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree { .dijitTreeRow.Has_Marked .dijitTreeLabel { |