1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 17:56:34 +00:00

Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov
2015-08-13 23:07:58 +03:00
8 changed files with 56 additions and 26 deletions

View File

@@ -184,6 +184,39 @@
/* Various buttons */
.claro .dijitButton.danger .dijitButtonText {
color: #ffffff;
}
.claro .dijitButton.danger {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #da4f49;
*background-color: #bd362f;
background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
background-repeat: repeat-x;
border-color: #bd362f #bd362f #802420;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.claro .dijitButton.dijitButtonDisabled.danger,
.claro .dijitButton.dijitButtonActive.danger,
.claro .dijitButton.dijitButtonHover.danger,
.claro .dijitButton.dijitFocused.danger {
color: #ffffff;
background-color: #bd362f;
*background-color: #a9302a;
}
.claro .dijitButton.dijitButtonActive.danger {
background-color: #942a25 \9;
}
.claro .dijitDropDownButton {
margin : 0px;
}
@@ -192,6 +225,10 @@
padding : 0px;
}
.claro .dijitButton.dijitButtonActive.danger {
color: rgba(255, 255, 255, 0.75);
}
.claro .dijitButton .dijitButtonNode,
.claro .dijitDropDownButton .dijitButtonNode,
.claro .dijitComboButton .dijitButtonNode,
@@ -628,3 +665,5 @@ button[disabled],
.claro .dijitProgressBar .dijitProgressBarLabel {
color : white;
}

View File

@@ -72,12 +72,11 @@ div.filterTestHolder, div.prefFeedOPMLHolder {
border-width : 1px;
}
ul.selfUpdateList, ul.userFeedList {
ul.userFeedList {
height : 200px;
overflow : auto;
list-style-type : none;
border : 1px solid #ddd;
background-color : #f5f5f5;
margin : 0px 0px 5px 0px;
padding : 5px;
}

View File

@@ -252,7 +252,6 @@ div.filterTestHolder {
border-color : #ddd;
border-style : solid;
margin : 0px 0px 5px 0px;
background-color : #f5f5f5;
border-width : 1px;
}
@@ -480,7 +479,6 @@ img[src*='pub_set.png'], img[src*='mark_set.png'] {
div.tagCloudContainer {
border : 1px solid #ddd;
background-color : #f5f5f5;
margin : 5px 0px 5px 0px;
padding : 5px;
text-align : center;
@@ -488,7 +486,6 @@ div.tagCloudContainer {
div.errorExplained {
border : 1px solid #ddd;
background-color : #f5f5f5;
margin : 5px 0px 5px 0px;
padding : 5px;
}
@@ -498,7 +495,6 @@ ul.feedErrorsList {
overflow : auto;
list-style-type : none;
border : 1px solid #ddd;
background-color : #f5f5f5;
margin : 0px 0px 5px 0px;
padding : 5px;
}
@@ -991,7 +987,6 @@ ul.helpKbList {
overflow : auto;
list-style-type : none;
border : 1px solid #ddd;
background-color : #f5f5f5;
margin : 0px 0px 5px 0px;
padding : 5px;
}