[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] src: webpopup: shrink to 400x400 and simplify styling
From: Thibaut Gridel <tgridel () free ! fr>
Date: 2014-01-08 20:32:41
Message-ID: E1W0znt-0005Su-IG () scm ! kde ! org
[Download RAW message or body]
Git commit 638fb2f9909b0de6020eee655a84d1aa20089f8d by Thibaut Gridel.
Committed on 08/01/2014 at 20:03.
Pushed by tgridel into branch 'master'.
webpopup: shrink to 400x400 and simplify styling
M +1 -1 src/lib/marble/layers/PopupLayer.cpp
M +0 -5 src/lib/marble/webpopup/city.html
M +0 -6 src/lib/marble/webpopup/geoplace.html
M +0 -5 src/lib/marble/webpopup/nation.html
M +20 -18 src/lib/marble/webpopup/placesscreen.css
M +0 -6 src/lib/marble/webpopup/skyplace.html
M +- -- src/plugins/render/satellites/data/orbital_elements.png
M +1 -0 src/plugins/render/satellites/data/satellite.html
M +33 -28 src/plugins/render/satellites/data/satellitescreen.css
http://commits.kde.org/marble/638fb2f9909b0de6020eee655a84d1aa20089f8d
diff --git a/src/lib/marble/layers/PopupLayer.cpp \
b/src/lib/marble/layers/PopupLayer.cpp index 297f10b..bb5eb21 100644
--- a/src/lib/marble/layers/PopupLayer.cpp
+++ b/src/lib/marble/layers/PopupLayer.cpp
@@ -138,7 +138,7 @@ void PopupLayer::setPlacemark( const GeoDataPlacemark *placemark \
) if ( m_widget->model()->mapTheme() ) {
isSky = m_widget->model()->mapTheme()->head()->target() == "sky";
}
- setSize(QSizeF(580, 620));
+ setSize(QSizeF(400, 400));
if (isSatellite) {
setupDialogSatellite( placemark );
} else if (isCity) {
diff --git a/src/lib/marble/webpopup/city.html b/src/lib/marble/webpopup/city.html
index ffae934..478b8a7 100644
--- a/src/lib/marble/webpopup/city.html
+++ b/src/lib/marble/webpopup/city.html
@@ -6,12 +6,7 @@
<link rel="stylesheet" media="print, embossed" \
href="qrc:/marble/webpopup/placesprint.css"></head> <style>
.flag {
- width: 400px;
- height: 50px;
background-image:url('file://%flag%');
- background-repeat:no-repeat;
- background-size: contain;
- background-position:right center;
}
</style>
<body>
diff --git a/src/lib/marble/webpopup/geoplace.html \
b/src/lib/marble/webpopup/geoplace.html index 9700d9b..11abb56 100644
--- a/src/lib/marble/webpopup/geoplace.html
+++ b/src/lib/marble/webpopup/geoplace.html
@@ -4,12 +4,6 @@
<title>Place information</title>
<link rel="stylesheet" media="screen" href="qrc:/marble/webpopup/placesscreen.css">
<link rel="stylesheet" media="print, embossed" \
href="qrc:/marble/webpopup/placesprint.css"></head>
-<style>
-.name {
- width: 400px;
- height: 50px;
-}
-</style>
<body>
<div class="name"><h1>%name%</h1></div>
<br>
diff --git a/src/lib/marble/webpopup/nation.html \
b/src/lib/marble/webpopup/nation.html index 4ff41d2..e2a81be 100644
--- a/src/lib/marble/webpopup/nation.html
+++ b/src/lib/marble/webpopup/nation.html
@@ -6,12 +6,7 @@
<link rel="stylesheet" media="print, embossed" \
href="qrc:/marble/webpopup/placesprint.css"></head> <style>
.flag {
- width: 400px;
- height: 50px;
background-image:url('file://%flag%');
- background-repeat:no-repeat;
- background-size: contain;
- background-position:right center;
}
</style>
<body>
diff --git a/src/lib/marble/webpopup/placesscreen.css \
b/src/lib/marble/webpopup/placesscreen.css index 6264073..550794d 100644
--- a/src/lib/marble/webpopup/placesscreen.css
+++ b/src/lib/marble/webpopup/placesscreen.css
@@ -1,35 +1,28 @@
/* * Style sheet for weather plugin
================================================== */
-body {
- margin-top: 50px;
- background-image: url('qrc:/marble/webpopup/deco_places.png');
- background-repeat: no-repeat;
- background-position: 0px 0px;
-}
-
h1 {
color: #b3925d;
- font-size: 24px;
- margin-top: 80px;
+ font-size: 20px;
+ margin-top: 20px;
}
h2 {
color: #888a85;
font-size: 18px;
- margin-top: 20px;
+ margin-top: 15px;
}
h3 {
color: #b3925d;
font-size: 16px;
- margin-top: 25px;
+ margin-top: 15px;
}
- table {
+table {
font: 11px/24px Verdana, Arial, Helvetica, sans-serif;
border-collapse: collapse;
- width: 400px;
+ width: 220px;
}
tr.blue td {
@@ -61,22 +54,31 @@ td+td {
p.gray {
color: #888a85;
font-size: 12px;
- margin-top: 20px;
}
p {
color: black;
font-size: 11px;
- margin-top: 20px;
- width: 400px;
+ width: 220px;
}
hr {
margin-left: 0px;
- width: 400px;
- margin-top: 25px;
+ width: 220px;
+ margin-top: 15px;
}
a {
color: #382509;
}
+
+.name, .flag {
+ width: 220px;
+ height: 50px;
+}
+
+.flag {
+ background-repeat:no-repeat;
+ background-size: contain;
+ background-position:right center;
+}
diff --git a/src/lib/marble/webpopup/skyplace.html \
b/src/lib/marble/webpopup/skyplace.html index 59eb292..d75e838 100644
--- a/src/lib/marble/webpopup/skyplace.html
+++ b/src/lib/marble/webpopup/skyplace.html
@@ -4,12 +4,6 @@
<title>Place information</title>
<link rel="stylesheet" media="screen" href="qrc:/marble/webpopup/placesscreen.css">
<link rel="stylesheet" media="print, embossed" \
href="qrc:/marble/webpopup/placesprint.css"></head>
-<style>
-.name {
- width: 400px;
- height: 50px;
-}
-</style>
<body>
<div class="name"><h1>%name%</h1></div>
<br>
diff --git a/src/plugins/render/satellites/data/orbital_elements.png \
b/src/plugins/render/satellites/data/orbital_elements.png index 495ea66..cbd27e8 \
100644 Binary files a/src/plugins/render/satellites/data/orbital_elements.png and \
b/src/plugins/render/satellites/data/orbital_elements.png differ
diff --git a/src/plugins/render/satellites/data/satellite.html \
b/src/plugins/render/satellites/data/satellite.html index abe681d..62caef3 100644
--- a/src/plugins/render/satellites/data/satellite.html
+++ b/src/plugins/render/satellites/data/satellite.html
@@ -1,6 +1,7 @@
<html>
<head>
<title>Satellite information</title>
+<link rel="stylesheet" media="screen" href="qrc:/marble/webpopup/placesscreen.css">
<link rel="stylesheet" media="screen" \
href="qrc:/marble/satellites/satellitescreen.css"> <link rel="stylesheet" \
media="print, embossed" href="qrc:/marble/satellites/satelliteprint.css"></head> \
<body>
diff --git a/src/plugins/render/satellites/data/satellitescreen.css \
b/src/plugins/render/satellites/data/satellitescreen.css index 9526872..6e84774 \
100644
--- a/src/plugins/render/satellites/data/satellitescreen.css
+++ b/src/plugins/render/satellites/data/satellitescreen.css
@@ -3,46 +3,51 @@
*/
body {
- margin-top: 50px;
- background-image:url('qrc:/marble/satellites/marble_deco.png'); \
background-repeat:no-repeat; + height: 50px;
+ background-image:url('qrc:/marble/satellites/marble_deco.png');
+ background-repeat:no-repeat;
background-position:0px 0px;
}
-h1 { color:#2c72c7; font:bold 36px "Linux Biolinum O", Verdana, Arial, Helvetica, \
sans-serif; margin-top:80px; } +h1 {
+ color:#2c72c7;
+ font:bold 20px "Linux Biolinum O", Verdana, Arial, Helvetica, sans-serif;
+ margin-top: 70px;
+}
-h2 { color:#888a85; font-size:24px; margin-top:20px; }
+h2 {
+ color:#888a85;
+}
-h3 { color:#6193cf; font-size:18px; margin-top:25px; }
+h3 {
+ color:#6193cf;
+}
-table {
- font: 11px/24px Verdana, Arial, Helvetica, sans-serif;
- border-collapse: collapse;
- width: 400px;
- }
tr.blue td {
- border-top: 1px solid #00316e;
- border-bottom: 1px solid #00316e;
- background: #00438a;
- color:white;
- font:bold 12px/26px Verdana, Arial, Helvetica, sans-serif;
- }
+ border-top: 1px solid #00316e;
+ border-bottom: 1px solid #00316e;
+ background: #00438a;
+ color:white;
+}
td {
- border-bottom: 1px solid #CCC;
- padding: 0 0.5em;
- }
+ border-bottom: 1px solid #CCC;
+ padding: 0 0.5em;
+}
td+td {
- border-left: 1px solid #CCC;
- text-align: center;
- }
-
-
-p.gray { color:#888a85; font-size:12px; margin-top:20px; }
+ border-left: 1px solid #CCC;
+ text-align: center;
+}
-p { color:black; font-size:12px; margin-top:20px; }
-hr { margin-left:0px; width: 400px; margin-top:25px}
+hr {
+ margin-left:0px;
+ width: 220px;
+ margin-top:25px
+}
-a { color: #2c72c7 }
+a {
+ color: #2c72c7
+}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic