summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/share/mageiawelcome/css/style.css27
-rw-r--r--usr/share/mageiawelcome/helpers.py1
-rw-r--r--usr/share/mageiawelcome/img/mageia-2013-alpha.pngbin0 -> 5600 bytes
-rw-r--r--usr/share/mageiawelcome/img/mga_logo.pngbin6561 -> 0 bytes
-rw-r--r--usr/share/mageiawelcome/index.html12
5 files changed, 25 insertions, 15 deletions
diff --git a/usr/share/mageiawelcome/css/style.css b/usr/share/mageiawelcome/css/style.css
index 7755f16..d65877e 100644
--- a/usr/share/mageiawelcome/css/style.css
+++ b/usr/share/mageiawelcome/css/style.css
@@ -4,10 +4,9 @@ html {
a:focus, button:focus{outline:none;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}
p a.weblink{color:#FFF;font-weight:bold; text-decoration:none;}
p a.weblink:hover{text-decoration:underline;}
-body {background: #262F45; color:#FFF;margin:0;padding:0;font-size:12px;cursor:default;text-shadow: 1px 0 2px #000;}
-header{/*border-bottom: 1px solid gray;*/padding:0 6px;height:90px;position:relative;color:#FFF; background-image:url('../img/mga_bg.png');
- background-repeat:no-repeat;
- background-position:98% -20%;}
+body {background: #0C3A6D;#262F45; color:#FFF;margin:0;padding:0;font-size:12px;cursor:default;text-shadow: 1px 0 2px #000;}
+header{/*border-bottom: 1px solid #072341;*/padding:0 6px;height:90px;position:relative;color:#FFF;
+ }
h1,h2,ul,div{margin:0;padding:0;}
h1{ font-size:48px;}
@@ -21,10 +20,13 @@ button.cmd {margin-bottom:4px;}
header nav {width:100%;text-align:center;margin-top:54px;z-index:100;cursor: pointer;float:left;}
#logo {margin-top: -90px;margin-left: -10px; height:90px;float:left;}
+#logoright {width:200px;height:240px; position:absolute;right:16px; bottom:50px; background-image:url('../img/mga_bg.png');background-repeat:no-repeat;
+ background-position:bottom left;
+}
.taby {margin: 0 auto;z-index:100;}
-section{padding: 0;background-image:url('../img/mga_bg.png');
-background-repeat:no-repeat;
-background-position:98% -65px;height:405px;background-color: #2397D4;}
+section{background-image: -webkit-linear-gradient(bottom, #2B8BCa 0%, #0C3A6D 100%);
+
+ padding:0;}
div.tab {margin:0;padding:6px;}
div.tab nav {width:100%;text-align:center;}
div#tab-1,div#tab-2{padding:0;}
@@ -50,7 +52,7 @@ div.mgalinks h5{text-align:center;font-weight:normal;text-transform:uppercase;}
.slides li {height:405px; }
.icons {margin-left:30px; margin-bottom:12px;}
.icons li {height: 20px;}
-div#slide-pager{position:absolute; right:0;z-index:20;background:rgba(0, 0, 0, 0.4);padding:6px 3px;margin: 0 -6px 0 0;width:45%;border-radius: 0 0 0 8px;}
+div#slide-pager{position:absolute; right:0;z-index:20;background:rgba(255, 255, 255, 0.2);padding:6px 3px;margin: 0 -6px 0 0;width:45%;border-radius: 0 0 0 8px;}
div#slide-pager ol{margin-bottom:0;}
div#slide-pager li {line-height:14px;margin-left:0;padding:0;}
div#slide-pager li a{text-shadow:none;color:#DDD;font-size:11px;text-decoration:none;font-weight:normal;}
@@ -75,6 +77,10 @@ div#slide-pager li a:hover{text-decoration:underline;color:#EEE;}
background: url("img/controls.png") no-repeat scroll 0 -32px transparent;
left: 10px;
}
+div#prevnext {position:absolute;top:2px;right:10px;}
+div#prevnext div{position:relative;margin-right:4px;float:left;color:#DDD;}
+div#prevnext div a{position:absolute;top:0; left:0;display:block; min-width:22px; min-height:24px;text-decoration:none;font-size:16px;font-weight:bold;color:#222;text-shadow:none;line-height:24px;border-radius:12px; }
+div#prevnext div:hover {color: #FFF;}
#mcc {width:300px; height:206px;background-image:url('../img/mcc.jpg');text-align:center;border: 4px solid white;
box-shadow: 0 0 4px 2px rgba(0,0,0,.5);margin-bottom:8px;}
@@ -92,7 +98,7 @@ ul.filter li {display:block;
}
ul.filter li.current,ul.filter li.current:hover {background-color: #0A5C93; color: #FFF;}
ul.filter li:hover {background-color: #e5e5e5; color: #333;}
-ul.list {width: 630px;height:375px; overflow-x:hidden;overflow-y:auto;padding:0;list-style-type:none;border-left:1px solid #262F45;}
+ul.list {width: 630px;height:375px; overflow-x:hidden;overflow-y:auto;padding:0;list-style-type:none;border-left:1px solid #262F45;background-image: -webkit-linear-gradient(bottom, #2B8BCa 0%, #0C3A6D 100%);}
ul.list img.icon {height:32px;width:32px; float:left;margin:6px;}
ul.list li {width: 660px;height:54px;margin: 0;position:relative;border-bottom:1px solid #262F45;padding:2px;}
@@ -102,7 +108,6 @@ ul.list li p.description {margin-top:0;}
ul.list li button.cmd,ul.list li button.inst {position:absolute; left:540px; top:28px;width:72px;float:right;}
ul.list li button.uninst {display:none;}
-/*ul.list li:hover button.uninst {display:block;position:absolute; left:64px; bottom:1px;}*/
ul.list li.urpme {background:rgba(0, 0, 0, 0.4);
background-image:url('../img/ok.png');
background-repeat:no-repeat;
@@ -112,5 +117,5 @@ ul.list li.urpme:hover {background-color:rgba(0, 0, 0, 0.3);}
ul.list li span.label{position:absolute; top:2px; right:56px;}
.chkbox {float:left;width:30px;height:54px;}
.chkbox input[type='checkbox']{margin-top: 14px;}
-#selectedRPMS{position:absolute;bottom:44px;left:2px;background:rgba(0, 0, 0, 0.6); padding:3px;border-radius:3px;font-size:11px; z-index:200;width:165px;}
+#selectedRPMS{position:absolute;bottom:46px;left:2px;background:rgba(0, 0, 0, 0.6); padding:3px;border-radius:3px;font-size:11px; z-index:200;width:165px;}
#install_all {position:absolute;bottom:14px;left:22px;}
diff --git a/usr/share/mageiawelcome/helpers.py b/usr/share/mageiawelcome/helpers.py
index 3695c39..4f5c1dc 100644
--- a/usr/share/mageiawelcome/helpers.py
+++ b/usr/share/mageiawelcome/helpers.py
@@ -8,6 +8,7 @@ def get_desktop_name(x):
return {
'01KDE4':'KDE',
'02GNOME':'Gnome',
+ 'gnome': 'Gnome',
'LXDE':'LXDE',
'06xfce4':'XFCE',
'10MATE':'Mate',
diff --git a/usr/share/mageiawelcome/img/mageia-2013-alpha.png b/usr/share/mageiawelcome/img/mageia-2013-alpha.png
new file mode 100644
index 0000000..a75bf06
--- /dev/null
+++ b/usr/share/mageiawelcome/img/mageia-2013-alpha.png
Binary files differ
diff --git a/usr/share/mageiawelcome/img/mga_logo.png b/usr/share/mageiawelcome/img/mga_logo.png
deleted file mode 100644
index 3c8f0e2..0000000
--- a/usr/share/mageiawelcome/img/mga_logo.png
+++ /dev/null
Binary files differ
diff --git a/usr/share/mageiawelcome/index.html b/usr/share/mageiawelcome/index.html
index 4ade183..6741944 100644
--- a/usr/share/mageiawelcome/index.html
+++ b/usr/share/mageiawelcome/index.html
@@ -19,7 +19,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
$(document).ready(function() {
$('.slides').bxSlider({
- pagerCustom: '#slide-pager'
+ pagerCustom: '#slide-pager',
+ nextSelector: '#slider-next',
+ prevSelector: '#slider-prev',
+ nextText: '',
+ prevText: ''
});
//NAVIGATION
@@ -122,7 +126,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
// ]]>
</script>
</head>
-<body class="$bodyclass">
+<body class="$bodyclass"><div id="logoright"></div>
<header>
<nav>
<ul class="taby button-bar">
@@ -130,7 +134,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<li href="#tab-2"><a class=""><i class="icon-list-alt"> </i> $rpm_install</a></li>
</ul>
</nav>
- <img src="img/mga_logo.png" id="logo" />
+ <img src="img/mageia-2013-alpha.png" id="logo" />
<div id="hdrinfo">
$release<br />
$kernel_l $kernel<br />
@@ -150,6 +154,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<li><a data-slide-index="2" href="">$conf_update</a></li>
<li><a data-slide-index="3" href="">$inst_remove</a></li>
</ol>
+ <div id="prevnext"><div id="slider-prev"><i class="icon-circle-arrow-left icon-2x"></i></div><div id="slider-next"><i class="icon-circle-arrow-right icon-2x"></i></div></div>
</div>
<!-- Slideshow -->
<ul class="slides">
@@ -188,7 +193,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<p>$mccdesc</p>
<ul class="icons">
<li><i class="icon-ok"> </i>$SM</li>
- <li><i class="icon-ok"> </i>$Oa</li>
<li><i class="icon-ok"> </i>$H</li>
<li><i class="icon-ok"> </i>$NI</li>
<li><i class="icon-ok"> </i>$S</li>
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-23 05:41:56 +0000