From f9ffef66f95ab71438d979919e0405abaa42ac15 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 29 Nov 2017 19:10:15 +0300 Subject: [PATCH] move prefs to less, add a shared buildfile --- css/Makefile | 2 +- css/cdm.less | 13 ++--- css/default.less | 11 ++++ css/dijit.less | 4 +- css/prefs.css | 129 ---------------------------------------------- css/prefs.less | 130 +++++++++++++++++++++++++++++++++++++++++++++++ css/tt-rss.less | 7 --- 7 files changed, 148 insertions(+), 148 deletions(-) create mode 100644 css/default.less delete mode 100644 css/prefs.css create mode 100644 css/prefs.less diff --git a/css/Makefile b/css/Makefile index 49bbe195..cb929bb4 100644 --- a/css/Makefile +++ b/css/Makefile @@ -1,4 +1,4 @@ default.css: *.less - cat $^ | lessc -x - > $@ + lessc -x default.less > $@ diff --git a/css/cdm.less b/css/cdm.less index e1cf76ec..5a79addb 100644 --- a/css/cdm.less +++ b/css/cdm.less @@ -1,6 +1,3 @@ -@fonts-ui-bold: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; -@fonts-ui: "Segoe UI Web", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; - .cdm { margin-right : 4px; @@ -166,7 +163,7 @@ div.cdm.expandable.Unread div.cdmHeader a.title { } div.cdm.expandable.active div.cdmHeader a.title { - color: #0088cc; + color: @color-link; font-size: 16px; font-weight: 600; text-rendering: optimizelegibility; @@ -192,7 +189,7 @@ div.cdm.expanded.active { } div.cdm.expanded.active div.cdmHeader a.title { - color : #0088cc; + color : @color-link; } div.cdm.expanded.Unread div.cdmHeader a.title { @@ -225,7 +222,7 @@ div.cdmContent div.postEnclosures { } div.cdmFeedTitle { - border: 0px solid #0088cc; + border: 0px solid @color-link; border-bottom-width: 1px; padding : 5px 3px 5px 5px; } @@ -240,7 +237,7 @@ div.cdmFeedTitle a { } div.cdmFeedTitle a:hover { - color : #0088cc; + color : @color-link; } div.cdmHeader span.hlFeed { @@ -413,7 +410,7 @@ div#floatingTitle.Unread a.title { } a.catchup:hover { - color : #0088cc; + color : @color-link; } } diff --git a/css/default.less b/css/default.less new file mode 100644 index 00000000..73ad2b05 --- /dev/null +++ b/css/default.less @@ -0,0 +1,11 @@ +@fonts-ui-bold: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; +@fonts-ui: "Segoe UI Web", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; + +@color-accent: rgb(82, 168, 236); +@color-accent-light: #ecf4ff; +@color-link: #0088cc; + +@import "tt-rss.less"; +@import "cdm.less"; +@import "prefs.less"; +@import "dijit.less"; \ No newline at end of file diff --git a/css/dijit.less b/css/dijit.less index 73f85643..b350a79d 100644 --- a/css/dijit.less +++ b/css/dijit.less @@ -639,9 +639,7 @@ color: #555; font-size: 16px; text-rendering: optimizelegibility; - font-family: "Segoe WP Semibold", "Segoe UI Semibold", - "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", - Helvetica, Arial, sans-serif; + font-family: @fonts-ui-bold; } .dijitDialog .dijitDialogPaneContent { diff --git a/css/prefs.css b/css/prefs.css deleted file mode 100644 index 0a184ff9..00000000 --- a/css/prefs.css +++ /dev/null @@ -1,129 +0,0 @@ -body#ttrssPrefs { - background-color : #f5f5f5; -} - -body#ttrssPrefs #footer, body#ttrssPrefs #header { - background-color : #f5f5f5; - padding-left : 8px; - padding-right : 8px; -} - - -#header a:hover { - color : black; -} - -#header img { - vertical-align : middle; - cursor : pointer; -} - - -div#pref-tabs .dijitContentPane { - font-size : 13px; -} - -div#pref-tabs { - box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1); - margin : 0px 5px 0px 5px; -} - -div#pref-tabs .dijitContentPane h3 { - font-size : 14px; -} - -#pref-filter-wrap, #pref-filter-header, #pref-filter-content, -#pref-label-wrap, #pref-label-header, #pref-label-content, -#pref-user-wrap, #pref-user-header, #pref-user-content, -#pref-instance-wrap, #pref-instance-header, #pref-instance-content { - margin : 0px; - padding : 0px; - border-width : 0px; -} - -#userConfigTab, #labelConfigTab, #filterConfigTab, #pref-feeds-feeds, #instanceConfigTab { - padding : 0px; -} - -/* preferences */ - -table.prefPrefsList h3 { - margin-top : 0.5em; - margin-bottom : 0px; -} - -tr.title td { - border-width : 0px 0px 1px 0px; - border-color : #ecf4ff; - border-style : solid; - color : #0088cc; -} - -div.prefProfileHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder { - height : 300px; - overflow : auto; - border-width : 0px 1px 1px 1px; - border-color : #ddd; - border-style : solid; - margin : 0px 0px 5px 0px; - background-color : white; -} -div.filterTestHolder, div.prefFeedOPMLHolder { - border-width : 1px; -} - -ul.userFeedList { - height : 200px; - overflow : auto; - list-style-type : none; - border : 1px solid #ddd; - margin : 0px 0px 5px 0px; - padding : 5px; -} - -div#feedlistLoading, div#filterlistLoading, div#labellistLoading { - text-align : center; - padding : 5px; - color : #555; -} - -div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading { - margin-right : 5px; -} - -#errorButton { - color : red; -} - -table.prefPluginsList td label, table.prefUserList td { - cursor : pointer; -} - -table.prefPluginsList label { - white-space : nowrap; -} - -table.prefPluginsList label img { - vertical-align : middle; -} - -table.prefErrorLog tr.errrow td { - font-size : 10px; -} - -table.prefErrorLog tr.errrow td.errno { - font-style : italic; - font-weight : bold; - white-space : nowrap; -} - -table.prefErrorLog td.filename, table.prefErrorLog td.login, table.prefErrorLog td.timestamp { - color : #555; -} - -body#ttrssPrefs hr { - border-color : #ecf4ff; - max-width : 100%; -} - - diff --git a/css/prefs.less b/css/prefs.less new file mode 100644 index 00000000..a7b76bc7 --- /dev/null +++ b/css/prefs.less @@ -0,0 +1,130 @@ +body#ttrssPrefs { + background-color : #f5f5f5; + + #footer, #header { + background-color : #f5f5f5; + padding-left : 8px; + padding-right : 8px; + } + + #header a:hover { + color : black; + } + + #header img { + vertical-align : middle; + cursor : pointer; + } + + + div#pref-tabs .dijitContentPane { + font-size : 13px; + } + + div#pref-tabs { + box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1); + margin : 0px 5px 0px 5px; + } + + div#pref-tabs .dijitContentPane h3 { + font-size : 14px; + } + + #pref-filter-wrap, #pref-filter-header, #pref-filter-content, + #pref-label-wrap, #pref-label-header, #pref-label-content, + #pref-user-wrap, #pref-user-header, #pref-user-content, + #pref-instance-wrap, #pref-instance-header, #pref-instance-content { + margin : 0px; + padding : 0px; + border-width : 0px; + } + + #userConfigTab, #labelConfigTab, #filterConfigTab, #pref-feeds-feeds, #instanceConfigTab { + padding : 0px; + } + + /* preferences */ + + table.prefPrefsList h3 { + margin-top : 0.5em; + margin-bottom : 0px; + } + + tr.title td { + border-width : 0px 0px 1px 0px; + border-color : #ecf4ff; + border-style : solid; + color : @color-link; + } + + div.prefProfileHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder { + height : 300px; + overflow : auto; + border-width : 0px 1px 1px 1px; + border-color : #ddd; + border-style : solid; + margin : 0px 0px 5px 0px; + background-color : white; + } + div.filterTestHolder, div.prefFeedOPMLHolder { + border-width : 1px; + } + + ul.userFeedList { + height : 200px; + overflow : auto; + list-style-type : none; + border : 1px solid #ddd; + margin : 0px 0px 5px 0px; + padding : 5px; + } + + div#feedlistLoading, div#filterlistLoading, div#labellistLoading { + text-align : center; + padding : 5px; + color : #555; + } + + div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading { + margin-right : 5px; + } + + #errorButton { + color : red; + } + + table.prefPluginsList td label, table.prefUserList td { + cursor : pointer; + } + + table.prefPluginsList label { + white-space : nowrap; + } + + table.prefPluginsList label img { + vertical-align : middle; + } + + table.prefErrorLog tr.errrow td { + font-size : 10px; + } + + table.prefErrorLog tr.errrow td.errno { + font-style : italic; + font-weight : bold; + white-space : nowrap; + } + + table.prefErrorLog td.filename, table.prefErrorLog td.login, table.prefErrorLog td.timestamp { + color : #555; + } + + hr { + border-color : #ecf4ff; + max-width : 100%; + } + + + +} + diff --git a/css/tt-rss.less b/css/tt-rss.less index 75c4141d..f762cc66 100644 --- a/css/tt-rss.less +++ b/css/tt-rss.less @@ -1,10 +1,3 @@ -@fonts-ui-bold: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; -@fonts-ui: "Segoe UI Web", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; - -@color-accent: rgb(82, 168, 236); -@color-accent-light: #ecf4ff; -@color-link: #0088cc; - body { background : white; color : black; -- 2.39.5