valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge login form css into default.css 

update more hardcoded colors to use @color-accent
update @color-accent
This commit is contained in:
Andrew Dolgov 2017-12-10 22:51:39 +03:00
parent 1c1fc17120
commit 4d10b4abca
8 changed files with 134 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
css/cdm.less
View File

@ -28,7 +28,7 @@
} }
span.updated { span.updated {
color : #555; color : @default-text;
font-weight : normal; font-weight : normal;
font-size : 11px; font-size : 11px;
white-space : nowrap; white-space : nowrap;
@ -59,7 +59,7 @@
height : 30px; height : 30px;
padding-left : 5px; padding-left : 5px;
font-weight : normal; font-weight : normal;
color : #555; color : @default-text;
clear : both; clear : both;
> * { > * {
@ -150,7 +150,7 @@ div.cdm.expandable.active div.cdmHeader span.titleWrap {
div.cdm.expandable div.cdmHeader a.title { div.cdm.expandable div.cdmHeader a.title {
font-weight : 600; font-weight : 600;
color : #555; color : @default-text;
font-size : 14px; font-size : 14px;
-webkit-transition : color 0.2s; -webkit-transition : color 0.2s;
transition : color 0.2s; transition : color 0.2s;
@ -197,7 +197,7 @@ div.cdm.expanded.Unread div.cdmHeader a.title {
} }
div.cdm.expanded div.cdmContent { div.cdm.expanded div.cdmContent {
color : #555; color : @default-text;
} }
div.cdm.expanded.Unread div.cdmContent { div.cdm.expanded.Unread div.cdmContent {
@ -218,7 +218,7 @@ span.cdmExcerpt {
div.cdmContent div.postEnclosures { div.cdmContent div.postEnclosures {
margin-top : 1em; margin-top : 1em;
color : #555; color : @default-text;
} }
div.cdmFeedTitle { div.cdmFeedTitle {
@ -228,12 +228,12 @@ div.cdmFeedTitle {
} }
div.cdmFeedTitle a.title { div.cdmFeedTitle a.title {
color : #555; color : @default-text;
font-weight : bold; font-weight : bold;
} }
div.cdmFeedTitle a { div.cdmFeedTitle a {
color : #555; color : @default-text;
} }
div.cdmFeedTitle a:hover { div.cdmFeedTitle a:hover {
@ -248,7 +248,7 @@ div.cdmHeader span.hlFeed {
div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a { div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
vertical-align : middle; vertical-align : middle;
color : #555; color : @default-text;
font-weight : normal; font-weight : normal;
font-style : italic; font-style : italic;
font-size : 11px; font-size : 11px;
@ -274,7 +274,7 @@ div.cdmContentInner iframe {
div.cdmHeader span.author { div.cdmHeader span.author {
white-space : nowrap; white-space : nowrap;
color : #555; color : @default-text;
font-size : 11px; font-size : 11px;
font-weight : normal; font-weight : normal;
} }
@ -288,7 +288,7 @@ div#floatingTitle {
border: 0px solid #ddd; border: 0px solid #ddd;
border-bottom-width: 1px; border-bottom-width: 1px;
background : white; background : white;
color : #555; color : @default-text;
box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1); box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1);
> * { > * {
@ -304,7 +304,7 @@ div#floatingTitle {
} }
span.author { span.author {
color : #555; color : @default-text;
font-size : 11px; font-size : 11px;
font-weight : normal; font-weight : normal;
} }
@ -325,7 +325,7 @@ div#floatingTitle {
div.hlFeed { div.hlFeed {
padding-right : 10px; padding-right : 10px;
color : #555; color : @default-text;
font-weight : normal; font-weight : normal;
font-style : italic; font-style : italic;
font-size : 11px; font-size : 11px;
@ -341,12 +341,12 @@ div#floatingTitle {
span.updated { span.updated {
padding-right : 10px; padding-right : 10px;
white-space : nowrap; white-space : nowrap;
color : #555; color : @default-text;
font-size : 11px; font-size : 11px;
} }
div.hlFeed a { div.hlFeed a {
color : #555; color : @default-text;
} }
span.titleWrap { span.titleWrap {
@ -403,7 +403,7 @@ div#floatingTitle.Unread a.title {
a.catchup { a.catchup {
text-align : right; text-align : right;
color : #555; color : @default-text;
padding-right : 10px; padding-right : 10px;
font-size : 11px; font-size : 11px;
white-space : nowrap; white-space : nowrap;

2
css/default.css
View File

File diff suppressed because one or more lines are too long

7
css/default.less
View File

@ -1,9 +1,10 @@
@fonts-ui-bold: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif; @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; @fonts-ui: "Segoe UI Web", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
@color-accent: rgb(82, 168, 236); @color-accent: #257aa7;
@color-accent-light: #ecf4ff; @color-accent-light: lighten(@color-accent, 50%);
@color-link: #0088cc; @color-link: @color-accent;
@default-text: #555;
body.ttrss_main, body.ttrss_main,
body.ttrss_prefs, body.ttrss_prefs,

30
css/dijit.less
View File

@ -12,7 +12,7 @@
} }
.dijitTree .feedParam { .dijitTree .feedParam {
color: #555; color: @default-text;
float: right; float: right;
margin-right: 1em; margin-right: 1em;
} }
@ -45,7 +45,7 @@
.dijitTree .dijitTreeLabel.filterDisabled, .dijitTree .dijitTreeLabel.filterDisabled,
.dijitTree .labelParam.filterDisabled { .dijitTree .labelParam.filterDisabled {
color: #555; color: @default-text;
text-decoration: line-through; text-decoration: line-through;
} }
@ -413,14 +413,14 @@
} }
.dijitMenu { .dijitMenu {
border-color: rgba(82, 168, 236, 0.8); border-color: @color-accent;
} }
.dijitMenu .dijitMenuItemSelected, .dijitMenu .dijitMenuItemSelected,
.dijitMenu .dijitMenuItemSelected td { .dijitMenu .dijitMenuItemSelected td {
background: rgb(82, 168, 236); background: @color-accent;
color: white; color: white;
border-color: rgba(82, 168, 236, 0.8); border-color: @color-accent;
} }
.dijitButton .dijitButtonNode, .dijitButton .dijitButtonNode,
@ -453,7 +453,7 @@
.dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected, .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected,
.dijitAccordionTitle.dijitAccordionTitleSelected { .dijitAccordionTitle.dijitAccordionTitleSelected {
background: #0088cc; background: @color-accent;
transition: background 0.25s; transition: background 0.25s;
} }
@ -462,7 +462,7 @@
} }
.dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected { .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected {
border-color: #0088cc; border-color: @color-accent;
} }
.dijitAccordionContainer .dijitAccordionChildWrapper { .dijitAccordionContainer .dijitAccordionChildWrapper {
@ -520,7 +520,7 @@
padding: 4px 6px; padding: 4px 6px;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
color: #555555; color: @default-text;
vertical-align: middle; vertical-align: middle;
border-width: 0px; border-width: 0px;
} }
@ -534,7 +534,7 @@
padding: 4px 6px; padding: 4px 6px;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
color: #555555; color: @default-text;
vertical-align: middle; vertical-align: middle;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
@ -575,9 +575,9 @@
outline: thin dotted \9; outline: thin dotted \9;
/* IE6-9 */ /* IE6-9 */
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(red(@color-accent), green(@color-accent), blue(@color-accent), 0.6);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(red(@color-accent), green(@color-accent), blue(@color-accent), 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(red(@color-accent), green(@color-accent), blue(@color-accent), 0.6);
} }
.dijitError .dijitValidationContainer { .dijitError .dijitValidationContainer {
@ -636,7 +636,7 @@
background: white; background: white;
padding: 8px; padding: 8px;
font-weight: 600; font-weight: 600;
color: #555; color: @default-text;
font-size: 16px; font-size: 16px;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
font-family: @fonts-ui-bold; font-family: @fonts-ui-bold;
@ -649,11 +649,11 @@
.dijitProgressBar.dijitProgressBarEmpty { .dijitProgressBar.dijitProgressBarEmpty {
background: #ddd; background: #ddd;
border-color: #0088cc; border-color: @color-accent;
} }
.dijitProgressBar.dijitProgressBarEmpty .dijitProgressBarFull .dijitProgressBarTile { .dijitProgressBar.dijitProgressBarEmpty .dijitProgressBarFull .dijitProgressBarTile {
background: rgb(82, 168, 236); background: @color-accent;
} }

14
css/prefs.less
View File

@ -51,18 +51,16 @@ body.ttrss_prefs {
} }
tr.title td { tr.title td {
border-width : 0px 0px 1px 0px; border: 0px solid #ecf4ff;
border-color : #ecf4ff; border-bottom-width: 1px;
border-style : solid;
color : @color-link; color : @color-link;
} }
div.prefProfileHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder { div.prefProfileHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder {
height : 300px; height : 300px;
overflow : auto; overflow : auto;
border-width : 0px 1px 1px 1px; border: 1px solid #ddd;
border-color : #ddd; border-top-width: 0px;
border-style : solid;
margin : 0px 0px 5px 0px; margin : 0px 0px 5px 0px;
background-color : white; background-color : white;
} }
@ -82,7 +80,7 @@ body.ttrss_prefs {
div#feedlistLoading, div#filterlistLoading, div#labellistLoading { div#feedlistLoading, div#filterlistLoading, div#labellistLoading {
text-align : center; text-align : center;
padding : 5px; padding : 5px;
color : #555; color : @default-text;
} }
div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading { div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading {
@ -116,7 +114,7 @@ body.ttrss_prefs {
} }
table.prefErrorLog td.filename, table.prefErrorLog td.login, table.prefErrorLog td.timestamp { table.prefErrorLog td.filename, table.prefErrorLog td.login, table.prefErrorLog td.timestamp {
color : #555; color : @default-text;
} }
hr { hr {

110
css/tt-rss.less
View File

@ -30,7 +30,7 @@ body.ttrss_main {
} }
span.author { span.author {
color : #555; color : @default-text;
font-size : 11px; font-size : 11px;
font-weight : normal; font-weight : normal;
} }
@ -81,7 +81,7 @@ body.ttrss_main {
} }
div.postEnclosures { div.postEnclosures {
color : #555; color : @default-text;
} }
img.tagsPic { img.tagsPic {
@ -263,7 +263,7 @@ body.ttrss_main {
font-size : 11px; font-size : 11px;
font-style : italic; font-style : italic;
font-weight : normal; font-weight : normal;
color : #555; color : @default-text;
white-space : nowrap; white-space : nowrap;
} }
@ -272,7 +272,7 @@ body.ttrss_main {
} }
span.hlUpdated { span.hlUpdated {
color : #555; color : @default-text;
display : table-cell; display : table-cell;
vertical-align : middle; vertical-align : middle;
text-align : right; text-align : right;
@ -359,7 +359,7 @@ body.ttrss_main {
#headlines-frame blockquote, #headlines-frame blockquote,
.dijitContentPane blockquote { .dijitContentPane blockquote {
margin : 5px 0px 5px 0px; margin : 5px 0px 5px 0px;
color : #555; color : @default-text;
padding-left : 10px; padding-left : 10px;
border: 0px solid #ccc; border: 0px solid #ccc;
border-left-width: 4px; border-left-width: 4px;
@ -378,7 +378,7 @@ body.ttrss_main {
.dijitContentPane pre { .dijitContentPane pre {
margin: 5px 0px 5px 0px; margin: 5px 0px 5px 0px;
padding: 10px; padding: 10px;
color: #555; color: @default-text;
font-family: monospace; font-family: monospace;
font-size: 12px; font-size: 12px;
border: 0px solid #ccc; border: 0px solid #ccc;
@ -453,12 +453,12 @@ body.ttrss_main {
} }
div.prefHelp { div.prefHelp {
color : #555; color : @default-text;
padding : 5px; padding : 5px;
} }
.insensitive { .insensitive {
color : #555; color : @default-text;
} }
.small { .small {
@ -588,7 +588,7 @@ body.ttrss_main {
padding : 5px; padding : 5px;
em { em {
color : #555; color : @default-text;
} }
} }
@ -712,7 +712,7 @@ body.ttrss_main {
div.dlgSec { div.dlgSec {
font-size : 12px; font-size : 12px;
color : #555; color : @default-text;
font-weight : bold; font-weight : bold;
clear : both; clear : both;
height : 20px; height : 20px;
@ -763,7 +763,7 @@ body.ttrss_main {
left : 5px; left : 5px;
bottom : 5px; bottom : 5px;
font-size : 11px; font-size : 11px;
color : #555; color : @default-text;
font-weight : bold; font-weight : bold;
background-color : white; background-color : white;
border : 1px solid @color-accent; border : 1px solid @color-accent;
@ -860,9 +860,9 @@ body.ttrss_main {
display : inline-block; display : inline-block;
font-size : 9px; font-size : 9px;
text-align : center; text-align : center;
border : 1px solid @color-accent; border : 1px solid lighten(@color-accent, 5%);;
color : white; color : white;
background : @color-accent; background : lighten(@color-accent, 5%);
border-radius : 4px; border-radius : 4px;
vertical-align : middle; vertical-align : middle;
float : right; float : right;
@ -923,7 +923,7 @@ body.ttrss_main {
#header { #header {
border-width : 0px; border-width : 0px;
text-align : right; text-align : right;
color : #555; color : @default-text;
padding : 5px 5px 0px 0px; padding : 5px 5px 0px 0px;
margin : 0px; margin : 0px;
position : absolute; position : absolute;
@ -934,7 +934,7 @@ body.ttrss_main {
#footer { #footer {
text-align : center; text-align : center;
color : #555; color : @default-text;
padding : 4px 4px 8px 4px; padding : 4px 4px 8px 4px;
border-width : 0px; border-width : 0px;
} }
@ -959,10 +959,10 @@ body.ttrss_main {
.player { .player {
display : inline-block; display : inline-block;
color : #555; color : @default-text;
font-size : 11px; font-size : 11px;
font-family : sans-serif; font-family : sans-serif;
border : 1px solid #555; border : 1px solid @default-text;
padding : 0px 4px 0px 4px; padding : 0px 4px 0px 4px;
margin : 0px 2px 0px 2px; margin : 0px 2px 0px 2px;
width : 50px; width : 50px;
@ -984,12 +984,12 @@ body.ttrss_main {
height : 100%; height : 100%;
margin-left : 1px; margin-left : 1px;
text-align : center; text-align : center;
color : #555; color : @default-text;
font-size : 11px; font-size : 11px;
font-style : italic; font-style : italic;
a, span { a, span {
color : #555; color : @default-text;
padding : 10px; padding : 10px;
display : block; display : block;
} }
@ -1114,4 +1114,76 @@ body.ttrss_main {
} }
} }
body.ttrss_login {
padding : 2em;
font-size : 14px;
fieldset {
margin-left : auto;
margin-right : auto;
display : block;
width : 400px;
border-width : 0px;
}
label {
width : 120px;
margin-right : 20px;
display : inline-block;
text-align : right;
color : gray;
}
div.header {
border: 0px solid @color-accent;
border-bottom-width: 1px;
margin-bottom : 1em;
padding-bottom : 5px;
}
div.footer {
margin-top : 1em;
padding-top : 5px;
border: 0px solid @color-accent;
border-top-width: 1px;
text-align : center;
color : gray;
font-size : 12px;
}
a.forgotpass {
text-align : right;
font-size : 11px;
display : inline-block;
}
a {
color: @color-accent;
text-decoration: none;
}
a:hover,
a:focus {
color: @color-accent;
text-decoration: underline;
}
div.footer a {
color : gray;
}
div.footer a:hover {
color : @color-accent;
}
div.row {
padding : 0px 0px 5px 0px;
}
div.row-error {
color : red;
text-align : center;
padding : 0px 0px 5px 0px;
}
}

4
css/zoom.less
View File

@ -76,7 +76,7 @@ body.ttrss_zoom {
blockquote { blockquote {
margin : 5px 0px 5px 0px; margin : 5px 0px 5px 0px;
color : #555; color : @default-text;
padding-left : 10px; padding-left : 10px;
border: 0px solid #ccc; border: 0px solid #ccc;
border-left-width: 4px; border-left-width: 4px;
@ -91,7 +91,7 @@ body.ttrss_zoom {
pre { pre {
margin : 5px 0px 5px 0px; margin : 5px 0px 5px 0px;
padding : 10px; padding : 10px;
color : #555; color : @default-text;
font-family : monospace; font-family : monospace;
font-size : 12px; font-size : 12px;
border: 0px solid #ccc; border: 0px solid #ccc;

75
include/login_form.php
View File

@ -23,81 +23,6 @@
init(); init();
}); });
</script> </script>
<style type="text/css">
body.ttrss_login {
padding : 2em;
font-size : 14px;
}
fieldset {
margin-left : auto;
margin-right : auto;
display : block;
width : 400px;
border-width : 0px;
}
label {
width : 120px;
margin-right : 20px;
display : inline-block;
text-align : right;
color : gray;
}
div.header {
border: 0px solid #0088cc;
border-bottom-width: 1px;
margin-bottom : 1em;
padding-bottom : 5px;
}
div.footer {
margin-top : 1em;
padding-top : 5px;
border: 0px solid #0088cc;
border-top-width: 1px;
text-align : center;
color : gray;
font-size : 12px;
}
a.forgotpass {
text-align : right;
font-size : 11px;
display : inline-block;
}
a {
color: #0088cc;
text-decoration: none;
}
a:hover,
a:focus {
color: #005580;
text-decoration: underline;
}
div.footer a {
color : gray;
}
div.footer a:hover {
color : #0088cc;
}
div.row {
padding : 0px 0px 5px 0px;
}
div.row-error {
color : red;
text-align : center;
padding : 0px 0px 5px 0px;
}
</style>
</head> </head>
<body class="claro ttrss_main ttrss_login"> <body class="claro ttrss_main ttrss_login">