Merge pull request #592 from doublespeakgames/master

merge pull

css/dark.css

@@ -27,7 +27,7 @@ div#saveNotify {
 }
 
 div.tooltip {
-	background-color: #111;
+	background-color: #171813;
 	border: 1px solid black;
 	box-shadow: -1px 3px 2px #111;
 }

css/main.css

@@ -69,6 +69,7 @@ div#header {
 	right: 10px;
 	bottom: 10px;
 	color: #666;
+	z-index: 10;
 }
 
 .menu span {
@@ -83,12 +84,12 @@ div#header {
 
 span.customSelectOptions {
 	margin: 0;
-	width: 80px;
+	width: 120px;
 }
 
 .customSelectOptions > ul {
 	max-height: 20px;
-	width: 80px;
+	width: 120px;
 	overflow: hidden;
 	-webkit-transition: max-height 1s;
 	transition: max-height 1s;
@@ -100,7 +101,7 @@ span.customSelectOptions {
 }
 
 .customSelectOptions > ul:hover {
-	max-height: 400px;
+	max-height: 600px;
 }
 
 .customSelectOptions > ul > li {
@@ -126,6 +127,10 @@ span.customSelectOptions {
 	text-decoration: underline;
 }
 
+.menu .appStore {
+	font-weight: bold;
+}
+
 div.headerButton {
 	font-size: 18px;
 	cursor: pointer;
@@ -181,6 +186,10 @@ div.row_val {
 	float: right;
 }
 
+div.total {
+	font-weight: bold;
+}
+
 /* Notifications */
 
 div#notifications {
@@ -257,7 +266,7 @@ div.button div.cooldown {
 .upBtn, .dnBtn, .upManyBtn, .dnManyBtn {
 	position: absolute;
 	width: 14px;
-	height: 15px;
+	height: 12px;
 	cursor: pointer;
 }
 
@@ -266,7 +275,7 @@ div.button div.cooldown {
 }
 
 .upManyBtn, .dnManyBtn {
-	right: -11px;
+	right: -15px;
 }
 
 .upBtn.disabled, .dnBtn.disabled, .upManyBtn.disabled, .dnManyBtn.disabled {
@@ -274,11 +283,11 @@ div.button div.cooldown {
 }
 
 .upBtn {
-	top: -2px;
+	top: -3px;
 }
 
 .upManyBtn {
-	top: -2px;
+	top: -3px;
 }
 
 .upBtn:after, .upBtn:before, .upManyBtn:after, .upManyBtn:before {
@@ -287,7 +296,7 @@ div.button div.cooldown {
 	content: " ";
 	height: 0;
 	width: 0;
-	bottom: 4px;
+	bottom: 2px;
 }
 
 .upBtn:after, .upManyBtn:after {
@@ -317,27 +326,33 @@ div.button div.cooldown {
 	content: " ";
 	height: 0;
 	width: 0;
-	top: 4px;
+	top: 2px;
 }
 
+/* Overall size of buttons controlled by this style
+   border-width and margin-left should be the same. */
+.upBtn:before, .dnBtn:before, .upManyBtn:before, .dnManyBtn:before {
+	border-width: 6px;
+	left: 50%;
+	margin-left: -6px;
+}
+
+/* Thickness of up/down button lines controlled by this style.
+   border-width and margin-left should be the same.
+   Thickness = :before.border-width minus :after.border-width */
 .upBtn:after, .dnBtn:after {
+	border-width: 4px;
+	left: 50%;
+	margin-left: -4px;
+}
+
+/* See comment on .upBtn:after, .dnBtn:after */
+.upManyBtn:after, .dnManyBtn:after {
 	border-width: 3px;
 	left: 50%;
 	margin-left: -3px;
 }
 
-.upBtn:before, .dnBtn:before, .upManyBtn:before, .dnManyBtn:before {
-	border-width: 5px;
-	left: 50%;
-	margin-left: -5px;
-}
-
-.upManyBtn:after, .dnManyBtn:after {
-	border-width: 2px;
-	left: 50%;
-	margin-left: -2px;
-}
-
 .dnBtn:after, .dnManyBtn:after {
 	border-color: white transparent transparent;
 }
@@ -501,6 +516,10 @@ body.noMask #description {
 	padding-bottom: 20px;
 }
 
+.take-all-button {
+	float: none;
+}
+
 #buttons > .button {
 	margin: 0 5px 5px;
 	margin-right: 15px;
@@ -544,12 +563,12 @@ body.noMask #description {
 
 #lootButtons {
 	padding-bottom: 0px !important;
-	margin: 20px 0 0 5px;
+	margin: 20px 0 5px 0;
 	position: relative;
 }
 
 #lootButtons:before {
-	content: "take:";
+	content: attr(data-legend);
 	position: absolute;
 	top: -25px;
 	left: 0px;
@@ -567,7 +586,7 @@ body.noMask #description {
 }
 
 #dropMenu:before {
-	content: "drop:";
+	content: attr(data-legend);
 	border-bottom: 1px solid black;
 	display: block;
 	margin-bottom: 5px;

css/outside.css

@@ -22,15 +22,11 @@ div#population {
 div#village:before {
 	position: absolute;
 	background: white;
-	content: "village";
+	content: attr(data-legend);
 	left: 8px;
 	top: -13px;
 }
 
-div#village.noHuts:before {
-	content: "forest";
-}
-
 div#workers {
 	position:absolute;
 	top: -4px;
@@ -61,4 +57,4 @@ div#workers {
 
 div.storeRow div.tooltip {
 	width: 160px;
-}
+}

css/path.css

@@ -6,9 +6,9 @@
 	padding: 5px 10px;
 }
 
-div#outfitting:before {
+div#outfitting:before ,div#perks:before {
+	content: attr(data-legend);
 	position: absolute;
-	content: "supplies";
 	top: -13px;
 	background-color: white;
 }
@@ -50,17 +50,10 @@ div#perks {
 	width: 200px;
 }
 
-div#perks:before {
-	position: absolute;
-	content: "perks";
-	top: -13px;
-	background-color: white;
-}
-
 div.perkRow {
 	position: relative;
 }
 
 div.perkRow .row_key {
 	float: none;
-}
+}

css/room.css

@@ -4,8 +4,8 @@ div#buildBtns {
 	left: 0px;
 }
 
-div#buildBtns:before {
-	content: "build:";
+div#buildBtns:before, div#craftBtns:before, div#buyBtns:before {
+	content: attr(data-legend);
 	position: relative;
 	top: -5px;
 }
@@ -16,32 +16,29 @@ div#craftBtns {
 	left: 150px;
 }
 
-div#craftBtns:before {
-	content: "craft:";
-	position: relative;
-	top: -5px;
-}
-
 div#buyBtns {
 	position: absolute;
 	top: 50px;
 	left: 300px;
 }
 
-div#buyBtns:before {
-	content: "buy:";
-	position: relative;
-	top: -5px;
-}
-
 div#storesContainer {
 	position: absolute;
 	top: 0px;
 	right: 0px;
 }
 
+div#stores:before, div#weapons:before {
+	position: absolute;
+	background: white;
+	content: attr(data-legend);
+	left: 8px;
+	top: -13px;
+}
+
 div#stores {
 	position: relative;
+	z-index:10;
 	border: 1px solid black;
 	cursor: default;
 	padding: 5px 10px;
@@ -52,14 +49,6 @@ div.storeRow {
 	position: relative;
 }
 
-div#stores:before {
-	position: absolute;
-	background: white;
-	content: "stores";
-	left: 8px;
-	top: -13px;	
-}
-
 div#weapons {
 	margin-top: 15px;
 	position: relative;
@@ -69,11 +58,3 @@ div#weapons {
 	padding: 5px 10px;
 	width: 200px;
 }
-
-div#weapons:before {
-	position: absolute;
-	background: white;
-	content: "weapons";
-	left: 8px;
-	top: -13px;	
-}

css/space.css

@@ -144,11 +144,11 @@
 	position:relative;
 }
 
-.endGameRestart {
+.endGameOption {
 	font-size: 32px;
 	cursor: pointer;
 }
 
-.endGameRestart:hover {
+.endGameOption:hover {
 	text-decoration: underline;
 }