[Scummvm-cvs-logs] scummvm-web master -> 0a370191ed3538d56ec76c9b46563d8c9e736514

sev- sev at scummvm.org
Mon May 2 23:26:20 CEST 2016


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
be2e90d92d WEB: Don't reload the page when clicking the language button
659018ae64 WEB: Move language button to the top of the screen
0a370191ed Merge pull request #53 from salty-horse/language_button


Commit: be2e90d92ddc7657c4cb6acb47e8357c588a2733
    https://github.com/scummvm/scummvm-web/commit/be2e90d92ddc7657c4cb6acb47e8357c588a2733
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-04-26T15:29:09+03:00

Commit Message:
WEB: Don't reload the page when clicking the language button

This made the button unusable on mobile, which has no hover.
Fixed by changing the <a> to a <span>.

Changed paths:
    css/lang-menu.css
    templates/lang_menu.tpl



diff --git a/css/lang-menu.css b/css/lang-menu.css
index 4e9f19c..dcea1a2 100644
--- a/css/lang-menu.css
+++ b/css/lang-menu.css
@@ -19,14 +19,6 @@ code.text-badge {
 	padding: 0 0px;
 }
 
-#langmenu a {
-	position: relative;
-	top: 4px;
-	color: #000000;
-	text-decoration: none;
-	font-size: 9pt;
-}
-
 #langmenu > li {
 	float: left;
 	height: 29px;
@@ -36,6 +28,7 @@ code.text-badge {
 	margin-bottom: 0pt;
 	position: relative;
 	background: url(../images/header-background.gif) repeat-x;
+	cursor: pointer;
 
 	border-left: 1px solid #cecece;
 	border-right: 1px solid #cecece;
@@ -45,17 +38,25 @@ code.text-badge {
 	-webkit-border-radius: 4px 4px 0 0;
 }
 
-#langmenu > li > a {
+#langmenu > li > span {
+	display: inline;
+	width: auto;
+	position: relative;
+	top: 4px;
+	color: #000000;
+	text-decoration: none;
+	font-size: 9pt;
 	text-shadow: 0 1px 2px #fff;
 	font-weight: 700;
-	/* padding: 0px 7px 0px 7px; */
-	/* display: block; */
-	color: #000000;
-
 	padding: 0px 20px 0px 10px;
 	background: url(../images/dropdown.png) no-repeat right center;
 }
 
+#langmenu > li > span > img {
+	display: inline;
+	vertical-align: middle;
+}
+
 #langmenu > li > ul {
 	position: absolute;
 	top: 27px;
@@ -70,9 +71,10 @@ code.text-badge {
 	display: none;
 	background: #f6f6f6;
 	z-index: 1000;
+	cursor: default;
 }
 
-#langmenu > li:hover > a {
+#langmenu > li:hover > span {
 	background: url(../images/dropdown-over.png) no-repeat right center;
 	color: rgb(168, 39, 9);
 }
@@ -94,6 +96,9 @@ code.text-badge {
 }
 
 #langmenu li ul li a {
+	position: relative;
+	color: #000000;
+	text-decoration: none;
 	font-size: 9pt;
 	font-weight: bold;
 	display: block;
diff --git a/templates/lang_menu.tpl b/templates/lang_menu.tpl
index 5466e34..92a0dc5 100644
--- a/templates/lang_menu.tpl
+++ b/templates/lang_menu.tpl
@@ -1,7 +1,7 @@
 <div id="lang-wrapper">
-    <div id="drop-down">
+    <div>
         <ul id="langmenu">
-            <li><a href=""><img src="/images/lang-icon.png" width="16" height="16" alt="Language">  Language</a>
+            <li><span><img src="/images/lang-icon.png" width="16" height="16" alt="Language">  Language</span>
                 <ul>
                     {foreach from=$available_languages key=key item=item}
                     <li><a href="{$pageurl}?lang={$key}"><code class="text-badge">{$key|strtoupper}</code>{$item|escape}</a></li>


Commit: 659018ae6462df31dce62face18ae957c37599d6
    https://github.com/scummvm/scummvm-web/commit/659018ae6462df31dce62face18ae957c37599d6
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-04-26T15:29:09+03:00

Commit Message:
WEB: Move language button to the top of the screen

Also changed page width to fit the language button on mobile devices

Changed paths:
    css/lang-menu.css
    css/layout.css



diff --git a/css/lang-menu.css b/css/lang-menu.css
index dcea1a2..3a18d66 100644
--- a/css/lang-menu.css
+++ b/css/lang-menu.css
@@ -1,9 +1,8 @@
 #lang-wrapper {
-	margin: 0 auto;
+	margin-right: 10px;
 	float: right;
 	position: relative;
-	top: 79px;
-	margin-right: 10px;
+	top: 0px;
 }
 
 code.text-badge {
@@ -14,6 +13,7 @@ code.text-badge {
 }
 
 #langmenu {
+	margin: 0 auto;
 	font-size: 8pt;
 	list-style: none;
 	padding: 0 0px;
@@ -23,19 +23,17 @@ code.text-badge {
 	float: left;
 	height: 29px;
 	padding-right: 2px;
-	margin-right: 10px;
-	margin-top: 0pt;
-	margin-bottom: 0pt;
+	margin-top: 0px;
+	margin-bottom: 0px;
 	position: relative;
 	background: url(../images/header-background.gif) repeat-x;
 	cursor: pointer;
-
 	border-left: 1px solid #cecece;
 	border-right: 1px solid #cecece;
-	border-top: 1px solid #cecece;
-	border-radius: 4px 4px 0 0;
-	-moz-border-radius: 4px 4px 0 0;
-	-webkit-border-radius: 4px 4px 0 0;
+	border-bottom: 1px solid #cecece;
+	border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	-webkit-border-radius: 0 0 4px 4px;
 }
 
 #langmenu > li > span {
@@ -91,8 +89,6 @@ code.text-badge {
 	width: 100%;
 	float: left;
 	list-style: none;
-	margin-bottom: 7px;
-	padding: 0 0 3px 0;
 }
 
 #langmenu li ul li a {
@@ -102,11 +98,11 @@ code.text-badge {
 	font-size: 9pt;
 	font-weight: bold;
 	display: block;
-	padding: 2px 0px 2px 0px;
+	padding: 5px 0px 5px 0px;
 }
 
 #langmenu li ul li a:hover {
 	color: #ffffff;
-	padding: 2px 0px 2px 0px;
+	padding: 5px 0px 5px 0px;
 	background: url(../images/par-head.png) repeat-x;
 }
diff --git a/css/layout.css b/css/layout.css
index a15f57c..c2de9b8 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -2,13 +2,13 @@ body {
 	font: normal 8pt/normal verdana, tahoma, arial, helvetica, sans-serif;
 	background: rgb(239, 196, 24) url('../images/body-bg.png') repeat-x scroll 0 0;
 	margin-top: 0px;
+	min-width: 1031px;
 }
 
 #header {
 	background: transparent url('../images/bg-upper.gif') repeat scroll 0 0;
 	height: 118px;
 	margin: 0 auto;
-	min-width: 780px;
 	width: 90%;
 }
 
@@ -26,7 +26,6 @@ body {
 	margin: 0;
 	margin: 0px auto;
 	min-height: 1080px;
-	min-width: 780px;
 	position: relative;
 	width: 90%;
 }


Commit: 0a370191ed3538d56ec76c9b46563d8c9e736514
    https://github.com/scummvm/scummvm-web/commit/0a370191ed3538d56ec76c9b46563d8c9e736514
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-02T23:26:17+02:00

Commit Message:
Merge pull request #53 from salty-horse/language_button

Move language button to top of screen, mobile fixes

Changed paths:
    css/lang-menu.css
    css/layout.css
    templates/lang_menu.tpl









More information about the Scummvm-git-logs mailing list