Merging in New View

1 files changed, 9 insertions, 23 deletions

diff --git a/play.css b/play.css
index f70fc16..37cfbee 100644
--- a/play.css
+++ b/play.css
@@ -4,12 +4,12 @@ header.your_turn { background-color: orange; }
 #role_Dem { background-color: hsl(210,30%,80%); }

 #role_Com { background-color: hsl(35,40%,80%); }

 #turn_info { background-color: white; }

-.aside_events {

+/*.aside_events {

 	font-family: "Source Sans";

 	font-style: normal;

 	font-size: 16px;

 	line-height: 1.5;

-}

+}*/

 

 #log { background-color: whitesmoke; }

 #log .h1 { font-weight: bold; padding-top:2px; padding-bottom:2px; text-align: center; }

@@ -115,7 +115,7 @@ header.your_turn { background-color: orange; }
 	padding: 3px 1em;

 }

 

-#events_panel, #played_card_panel  {

+#events_panel, #played_card_panel, #table_panel  {

 	min-width: 200px;

 	width: auto;

 	display: inline-block;

@@ -123,6 +123,10 @@ header.your_turn { background-color: orange; }
 	border-radius: 5px;

 }

 

+#events {

+	display: flex;

+}

+

 #discard_panel {

 	min-width: 200px;

 	width: auto;

@@ -420,6 +424,8 @@ left: 660px}
 

 .event-marker.aside {

 	border: solid black 1.5px;

+	margin: 3px;

+	position: relative;

 }

 

 #turn_info {

@@ -439,27 +445,11 @@ left: 660px}
     

 }

 

-#eco_glasnost {

-	position: relative;

-	/*top: 1500px;

-	left: 1050px;*/

-}

-

-#helsinki_final_act {

-	position: relative;

-	display: flex;

-}

 #solidarity_legalised {

 	top: 216px;

 	left: 612px;

 }

 

-#st_nicholas_church {

-	position: relative;

-	/*top: 181px;

-	left: 320px;*/

-}

-

 #systematization {

 	height: 65px;

 	width: 65px;

@@ -475,10 +465,6 @@ left: 660px}
 	left: 170px;

 }

 

-#we_are_the_people {

-	position: relative;

-}

-

 

 /* =========== CARDS ================= */

 /*