[Scummvm-git-logs] scummvm-web master -> cccf6a993149553b3d033afd2704cdc39d4e77a6

[Mataniko]

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

Summary:
72b99b81a8 CSS: Move styles into proper places and outside of the shame file
cccf6a9931 TEMPLATES: Add a CSS cachebuster param


Commit: 72b99b81a80ce43cae7fe3ebb725019118ba7ada
    https://github.com/scummvm/scummvm-web/commit/72b99b81a80ce43cae7fe3ebb725019118ba7ada
Author: Matan Bareket (mataniko at gmail.com)
Date: 2018-08-27T00:53:26-04:00

Commit Message:
CSS: Move styles into proper places and outside of the shame file

Changed paths:
    scss/base/_base.scss
    scss/layout/_footer.scss
    scss/layout/_grid.scss
    scss/layout/_menu.scss
    scss/layout/_shame.scss


diff --git a/scss/base/_base.scss b/scss/base/_base.scss
index 9dbc015..7290b68 100644
--- a/scss/base/_base.scss
+++ b/scss/base/_base.scss
@@ -9,6 +9,10 @@ body {
 	font-size: 14px;
 	line-height: 1.357em;
 	margin: 8px 8px 24px 8px;
+
+	@include respond-to('small') {
+		margin: 0;	
+	}
 }
 
 .no-scroll {
@@ -60,6 +64,10 @@ a:hover {
 .container {
 	border-radius: 0 0 8px 8px;
 	background: $theme-wrapper-background;
+
+	@include respond-to('small') {
+		border-radius: 0;
+	}
 }
 
 span.sprite {
@@ -81,3 +89,11 @@ span.sprite {
 	margin: 0;
 	padding: 10px 20px;
 }
+
+.float_right {
+	float: right;
+}
+
+.float_left {
+	float: left;
+}
diff --git a/scss/layout/_footer.scss b/scss/layout/_footer.scss
index cb26c8b..49fc777 100644
--- a/scss/layout/_footer.scss
+++ b/scss/layout/_footer.scss
@@ -10,7 +10,12 @@ footer {
         color: $black-semi-transparent;
         text-decoration: none;
       }
-    }
+		}
+		
+		@include respond-to('small') {
+			padding: 0 8px;
+			background: rgb(251, 241, 206);
+		}
   }
   
   .tentacle {
diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss
index 644ab93..8cd7e95 100644
--- a/scss/layout/_grid.scss
+++ b/scss/layout/_grid.scss
@@ -5,6 +5,11 @@
 	position: relative;
 	margin: 0 auto;
 	padding: 0 50px;
+
+	@include respond-to('small') {
+		padding: 0;
+		margin: 0;
+	}
 }
 
 .col-4-5 {
@@ -49,3 +54,44 @@
 		box-sizing: border-box;
 	}
 }
+
+ at include respond-to('small') {
+	.col-1-2 {
+		clear: left;
+		width: 100%;
+	}
+	[class*='col-'] {
+		padding-right: 0;
+	}
+	.col-1-5 {
+		width: 100%;
+	}
+	.col-4-5 {
+		width: 100%;
+	}
+	.hide-small {
+		display: none;
+	}
+	.col-sm-1 {
+		width: 100%;
+	}
+	.col-md-2 {
+		width: 50%;
+	}
+	.col-md-1 {
+		width: 100%;
+	}	
+}
+
+ at include respond-to('medium') {
+	/* CSS Rules targeting most tablets in vertical orientation */
+	.hide-medium {
+		display: none;
+	}
+	.col-md-2 {
+		width: 50%;
+	}
+	.col-md-1 {
+		width: 100%;
+	}
+}
diff --git a/scss/layout/_menu.scss b/scss/layout/_menu.scss
index 73942c5..9fd66dd 100644
--- a/scss/layout/_menu.scss
+++ b/scss/layout/_menu.scss
@@ -153,6 +153,14 @@ nav {
   display: none;
 }
 
+nav label {
+	@include respond-to('small') {
+		display: block;
+		width: 100%;
+		cursor: pointer;
+	}
+}
+
 label[for="nav-trigger"] {
   display: none;
   position: absolute;
@@ -163,7 +171,13 @@ label[for="nav-trigger"] {
   width: 30px;
   cursor: pointer;
   background-image: url('/images/nav-trigger.svg');
-  background-size: contain;
+	background-size: contain;
+	
+	@include respond-to('small') {
+		display: block;
+		z-index: 91;
+		overflow-y: unset;
+	}
 }
 
 .nav-trigger {
diff --git a/scss/layout/_shame.scss b/scss/layout/_shame.scss
index ae6f07e..64a03a1 100644
--- a/scss/layout/_shame.scss
+++ b/scss/layout/_shame.scss
@@ -1,81 +1,2 @@
 // Hacks and workarounds to fix for example:
 // float overrides, grid elements in responsive layout
-
-.float_right {
-	float: right;
-}
-
-.float_left {
-	float: left;
-}
-
-/* Responsive Behavior */
-
- at include respond-to('medium') {
-	/* CSS Rules targeting most tablets in vertical orientation */
-	.hide-medium {
-		display: none;
-	}
-	.col-1-2 {
-		width: 100%;
-	}
-	.col-md-2 {
-		width: 50%;
-	}
-	.col-md-1 {
-		width: 100%;
-	}
-}
-
- at include respond-to('small') {
-	body {
-		margin: 0;
-	}
-	footer {
-		padding: 0 8px;
-		background: rgb(251, 241, 206);
-	}
-	.site-wrap {
-		padding: 0;
-		margin: 0;
-	}
-	.col-1-2 {
-		clear: left;
-		width: 100%;
-	}
-	[class*='col-'] {
-		padding-right: 0;
-	}
-	.topper {
-		border-radius: 0;
-		background: 0;
-	}
-	.container {
-		border-radius: 0;
-	}
-	.col-1-5 {
-		width: 100%;
-	}
-	.col-4-5 {
-		width: 100%;
-	}
-	.header-left {
-		width: 100%;
-	}
-	label[for="nav-trigger"] {
-		display: block;
-		z-index: 91;
-		overflow-y: unset;
-	}
-	.hide-small {
-		display: none;
-	}
-	.col-sm-1 {
-		width: 100%;
-	}
-	nav label {
-		display: block;
-		width: 100%;
-		cursor: pointer;
-	}
-}


Commit: cccf6a993149553b3d033afd2704cdc39d4e77a6
    https://github.com/scummvm/scummvm-web/commit/cccf6a993149553b3d033afd2704cdc39d4e77a6
Author: Matan Bareket (mataniko at gmail.com)
Date: 2018-08-27T00:54:03-04:00

Commit Message:
TEMPLATES: Add a CSS cachebuster param

Changed paths:
    templates/pages/index.tpl


diff --git a/templates/pages/index.tpl b/templates/pages/index.tpl
index 29fc8f3..26196bd 100644
--- a/templates/pages/index.tpl
+++ b/templates/pages/index.tpl
@@ -4,7 +4,9 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<base href="{$baseurl}">
-	<link rel="stylesheet" href="{$baseurl}css/main.css">	
+	{* Cache bust CSS if making major changes *}
+	{$css = "2.0.0"}
+	<link rel="stylesheet" href="{$baseurl}css/main.css?v={$css}">	
 	{* Page specific, or other extra CSS rules. *}
 	{foreach from=$css_files item=filename}
 	<link rel="stylesheet" href="{$baseurl}css/{$filename}">