aboutsummaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-06-03 21:11:17 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-06-03 21:12:01 +0200
commit5f5bf67d8491af7221c22e33adb9ee2532a338c3 (patch)
treef970fba065160e8eee5ba32622469cdee914f414 /p
parent1fdd76bc1d00f67899f32d5f7edc98218ce3d0b9 (diff)
Fix sizes in Origine2
Dropdowns and buttons had not homogeneous font-sizes See https://github.com/marienfressinaud/FreshRSS/issues/320
Diffstat (limited to 'p')
-rw-r--r--p/themes/Origine2/origine.css18
-rw-r--r--p/themes/Origine2/template.css2
-rw-r--r--p/themes/template/template.css2
3 files changed, 5 insertions, 17 deletions
diff --git a/p/themes/Origine2/origine.css b/p/themes/Origine2/origine.css
index 814689502..ad97e11cf 100644
--- a/p/themes/Origine2/origine.css
+++ b/p/themes/Origine2/origine.css
@@ -87,22 +87,15 @@ input:focus.extend {
min-height: 25px;
padding: 5px 0;
}
-.form-group .group-controls .control {
- min-height: 30px;
- padding: 5px 0;
- line-height: 25px;
- font-size: 14px;
-}
/*=== Buttons */
.stick {
- font-size: 0px;
vertical-align: middle;
+ font-size: 0;
}
.stick input,
.stick .btn {
border-radius: 0;
- font-size: 0.9rem;
}
.stick .btn:first-child,
.stick input:first-child {
@@ -134,7 +127,6 @@ input:focus.extend {
border-radius: 0 3px 3px 0;
}
.stick .btn + .dropdown a {
- font-size: 0.9rem;
}
.btn {
@@ -154,6 +146,7 @@ input:focus.extend {
border-right: 1px solid #aaa;
color: #666;
text-shadow: 0px -1px 0 #ddd;
+ font-size: 0.9rem;
vertical-align: middle;
cursor: pointer;
overflow: hidden;
@@ -230,6 +223,7 @@ a.btn {
.nav-list .item {
height: 2.5em;
line-height: 2.5em;
+ font-size: 0.9rem;
}
.nav-list .item:hover {
background: #fafafa;
@@ -315,6 +309,7 @@ a.btn {
border: 1px solid #ddd;
border-radius: 5px;
box-shadow: 3px 3px 3px #ddd;
+ font-size: 0.8rem;
text-align: left;
}
.dropdown-menu:after {
@@ -337,11 +332,9 @@ a.btn {
padding: 0 5px 5px;
color: #888;
font-weight: bold;
- font-size: 0.9rem;
text-align: left;
}
.dropdown-menu > .item {
- font-size: 0.9em;
}
.dropdown-menu > .item > a {
padding: 0 25px;
@@ -491,7 +484,6 @@ a.btn {
padding: 1px 5px;
background: #ccc;
color: #fff;
- font-size: 0.9em;
border: 1px solid #bbb;
border-radius: 5px;
box-shadow: 1px 3px 3px #aaa inset;
@@ -521,7 +513,7 @@ a.btn {
margin: 0;
width: 165px;
line-height: 3em;
- font-size: 0.9em;
+ font-size: 0.8em;
text-align: left;
}
.categories .feeds .feed:not([data-unread="0"]) {
diff --git a/p/themes/Origine2/template.css b/p/themes/Origine2/template.css
index 355f1aeda..c546a824d 100644
--- a/p/themes/Origine2/template.css
+++ b/p/themes/Origine2/template.css
@@ -20,7 +20,6 @@ a:hover {
ul, ol, dd {
margin: 0;
padding: 0;
- font-size: 0.9em;
}
/*=== Titles */
@@ -166,7 +165,6 @@ a.btn {
.dropdown-menu {
display: none;
min-width: 200px;
- max-height: 300px;
margin: 0;
position: absolute;
right: 0;
diff --git a/p/themes/template/template.css b/p/themes/template/template.css
index 355f1aeda..c546a824d 100644
--- a/p/themes/template/template.css
+++ b/p/themes/template/template.css
@@ -20,7 +20,6 @@ a:hover {
ul, ol, dd {
margin: 0;
padding: 0;
- font-size: 0.9em;
}
/*=== Titles */
@@ -166,7 +165,6 @@ a.btn {
.dropdown-menu {
display: none;
min-width: 200px;
- max-height: 300px;
margin: 0;
position: absolute;
right: 0;