summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-10-09 19:04:23 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-10-09 19:04:23 +0200
commit365be0711706b489651b844fd7d05e83b0369658 (patch)
treef3a996cc8a418b466f3d31a48deb431834a7ee01
parent6bab56f5ddd55a258e8a4b182647e5f78faa1946 (diff)
Mise à jour designs
* Les popups de synchro et notification sont mieux réparties à l'écran notamment en vue mobile * Le nom du flux actuellement affiché (à droite de Aujourd'hui par exemple) est mieux tronqué avec des ... (trois petits points) * Refactorisation de quelques bouts de CSS
-rw-r--r--public/themes/default/freshrss.css12
-rw-r--r--public/themes/default/global.css5
-rw-r--r--public/themes/flat-design/freshrss.css14
-rw-r--r--public/themes/flat-design/global.css17
4 files changed, 27 insertions, 21 deletions
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index 6e996cb4d..a9df3ba55 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -205,6 +205,8 @@
opacity: .3;
text-shadow: 0px -1px 0px #333;
font-style: italic;
+ white-space: nowrap;
+ text-overflow: ellipsis;
text-align: right;
}
@@ -587,8 +589,8 @@
.actualizeProgress {
position: fixed;
- top: 5px; left: 25%; right: 25%;
- width: 50%;
+ top: 10px;
+ left: 25%; right: 25%;
padding: 5px;
background: #fff;
text-align: center;
@@ -725,4 +727,10 @@
font-size: 1em;
text-shadow: none;
}
+
+ .notification,
+ .actualizeProgress {
+ left: 10px;
+ right: 10px;
+ }
}
diff --git a/public/themes/default/global.css b/public/themes/default/global.css
index c11032f23..7caeb34e6 100644
--- a/public/themes/default/global.css
+++ b/public/themes/default/global.css
@@ -152,10 +152,7 @@ input, select, textarea {
font-size: 0px;
vertical-align: middle;
}
- .stick input {
- border-radius: 0;
- font-size: 14px;
- }
+ .stick input,
.stick .btn {
border-radius: 0;
font-size: 14px;
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index 8c7be55e5..bea574e37 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -194,6 +194,8 @@ body {
opacity: .3;
font-style: italic;
text-align: right;
+ white-space: nowrap;
+ text-overflow: ellipsis;
z-index: -10;
}
@@ -544,7 +546,8 @@ body {
/*** NOTIFICATION ***/
.notification {
position: fixed;
- top: 10px; left: 10%; right: 10%;
+ top: 10px;
+ left: 25%; right: 25%;
min-height: 30px;
padding: 10px;
line-height: 30px;
@@ -585,7 +588,8 @@ body {
.actualizeProgress {
position: fixed;
- top: 10px; left: 25%; right: 25%;
+ top: 10px;
+ left: 25%; right: 25%;
padding: 5px;
background: #3498db;
color: #fff;
@@ -728,4 +732,10 @@ body {
font-size: 1em;
text-shadow: none;
}
+
+ .notification,
+ .actualizeProgress {
+ left: 10px;
+ right: 10px;
+ }
}
diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css
index 423151d5c..5f645602b 100644
--- a/public/themes/flat-design/global.css
+++ b/public/themes/flat-design/global.css
@@ -166,22 +166,17 @@ input, select, textarea {
font-size: 0px;
vertical-align: middle;
}
+ .stick .btn,
.stick input {
font-size: 14px;
border-radius: 0;
}
- .stick .btn {
- border-radius: 0;
- font-size: 14px;
- }
.stick .btn:first-child,
.stick input:first-child {
border-radius: 5px 0 0 5px;
}
.stick .btn:last-child,
- .stick input:last-child {
- border-radius: 0 5px 5px 0;
- }
+ .stick input:last-child,
.stick .btn + .dropdown > .btn {
border-radius: 0 5px 5px 0;
}
@@ -222,21 +217,17 @@ input, select, textarea {
color: #fff;
border-bottom: 3px solid #d35400;
}
+ .btn.btn-important:active,
.btn.btn-important:hover {
background: #d35400;
}
- .btn.btn-important:active {
- background: #d35400;
- }
.btn.btn-attention {
background: #e74c3c;
color: #fff;
border-bottom: 3px solid #c0392b;
}
- .btn.btn-attention:hover {
- background: #c0392b;
- }
+ .btn.btn-attention:hover,
.btn.btn-attention:active {
background: #c0392b;
}