merge staging

code-dot-org · Dec 3, 2015 · 5b6f40a · 5b6f40a
2 parents b9c6ec3 + 4f5ffc9
commit 5b6f40a
Show file tree

Hide file tree

Showing 23 changed files with 102 additions and 58 deletions.
diff --git a/apps/style/craft/style.scss b/apps/style/craft/style.scss
@@ -38,6 +38,25 @@ $original-background-color: #F2F2F2;
   -ms-interpolation-mode:nearest-neighbor;   /* IE8+           */
 }
 
+@mixin mc-x-close-button() {
+  $button-centering-offset: 35px;
+
+  position: absolute;
+  cursor: pointer;
+  z-index: 1;
+  background: url("#{$root}Sliced_Parts/X_Button.png") no-repeat center center;
+  background-size: 100% auto;
+  top: -$button-centering-offset;
+  right: -$button-centering-offset;
+  width: 50px;
+  height: 50px;
+
+  html[dir=rtl] & {
+    right: auto;
+    left: -$button-centering-offset;
+  }
+}
+
 body {
   background-color: $below-header-background;
 }
@@ -148,7 +167,14 @@ body {
   $frame-width: 434;
   $native-game-width: 400;
   $game-offset-x: (($frame-width - $native-game-width) / 2);
-  margin-left: $game-offset-x * 1px;
+  $game-margin-side: $game-offset-x * 1px;
+
+  margin-left: $game-margin-side;
+  html[dir=rtl] & {
+    margin-left: 0;
+    margin-right: $game-margin-side;
+  }
+
   margin-top: 61px; // asset pixel distance from frame top to game top
   display: inline-block;
 }
@@ -262,6 +288,9 @@ $height-to-width: 434 / 477;
 
   .modal-content.no-modal-icon {
     margin-left: 0;
+    html[dir=rtl] & {
+      margin-right: 0;
+    }
   }
 
   .minecraft-big-yellow-header {
@@ -339,15 +368,7 @@ $height-to-width: 434 / 477;
   }
 
   #close-character-select {
-    position: absolute;
-    cursor: pointer;
-    z-index: 1;
-    background: url("#{$root}Sliced_Parts/X_Button.png") no-repeat center center;
-    background-size: 100% auto;
-    top: -35px;
-    right: -35px;
-    width: 50px;
-    height: 50px;
+    @include mc-x-close-button();
   }
 
   .choose-character-button {
@@ -396,6 +417,9 @@ $height-to-width: 434 / 477;
 
   .modal-content {
     margin-left: 0;
+    html[dir=rtl] & {
+      margin-right: 0;
+    }
   }
 
   .minecraft-big-yellow-header {
@@ -411,9 +435,13 @@ $height-to-width: 434 / 477;
     color: #e7e8ea;
   }
 
+
+  $house-outline-height: 168px;
+  $house-outline-width: 167px;
+
   .minecraft-house {
     float: left;
-    width: 150px;
+    width: $house-outline-width;
     text-align: center;
     padding-left: 15px;
     padding-right: 15px;
@@ -424,21 +452,23 @@ $height-to-width: 434 / 477;
     margin-top: 8px;
   }
 
-  $house-outline-height: 182px;
-
   .house-outline-container {
-    border: 3px solid white;
+    @include pixelated();
+    background: url("#{$root}Sliced_Parts/House_Selection_Box.png") no-repeat;
     display: table;
     $margin-above: 23px;
     $margin-below: 16px;
     margin: $margin-above auto $margin-below;
-    $house-outline-width: 160px;
-    width: 160px;
+    width: $house-outline-width;
     height: $house-outline-height;
+
     @media screen and (max-height: 630px) {
-      width: $house-outline-width / 2;
       $fudge-factor-to-match-bottoms: 7px;
-      height: ($house-outline-height / 2) + $fudge-factor-to-match-bottoms;
+      $smaller-height: ($house-outline-height / 2) + $fudge-factor-to-match-bottoms;
+      $smaller-width: $house-outline-width / 2;
+      width: $smaller-width;
+      height: $smaller-height;
+      background-size: $smaller-width $smaller-height;
     }
   }
 
@@ -459,11 +489,13 @@ $height-to-width: 434 / 477;
     height: $height;
     $margin-above-photo: ($house-outline-height - $height) / 2 + $extra-offset-for-shadow;
     margin-top: $margin-above-photo;
+    margin-bottom: -$margin-above-photo;
 
     @media screen and (max-height: 630px) {
       width: $width / 2;
       height: $height / 2;
       margin-top: $margin-above-photo / 2;
+      margin-bottom: -($margin-above-photo / 2);
     }
   }
   #house-c-picture {
@@ -474,11 +506,13 @@ $height-to-width: 434 / 477;
     height: $height;
     $margin-above-photo: ($house-outline-height - $height) / 2 + $extra-offset-for-shadow;
     margin-top: $margin-above-photo;
+    margin-bottom: -$margin-above-photo;
 
     @media screen and (max-height: 630px) {
       width: $width / 2;
       height: $height / 2;
       margin-top: $margin-above-photo / 2;
+      margin-bottom: -($margin-above-photo / 2);
     }
   }
   #house-b-picture {
@@ -489,11 +523,13 @@ $height-to-width: 434 / 477;
     height: $height;
     $margin-above-photo: ($house-outline-height - $height) / 2 + $extra-offset-for-shadow;
     margin-top: $margin-above-photo;
+    margin-bottom: -$margin-above-photo;
 
     @media screen and (max-height: 630px) {
       width: $width / 2;
       height: $height / 2;
       margin-top: $margin-above-photo / 2;
+      margin-bottom: -($margin-above-photo / 2);
     }
   }
 
@@ -510,15 +546,7 @@ $height-to-width: 434 / 477;
   }
 
   #close-house-select {
-    position: absolute;
-    cursor: pointer;
-    z-index: 1;
-    background: url("#{$root}Sliced_Parts/X_Button.png") no-repeat center center;
-    background-size: 100% auto;
-    top: -35px;
-    right: -35px;
-    width: 50px;
-    height: 50px;
+    @include mc-x-close-button();
   }
 
   .choose-house-button {
@@ -688,21 +716,17 @@ $height-to-width: 434 / 477;
 
   .modal-image {
     margin-left: -21px;
+    html[dir=rtl] & {
+      margin-left: 0;
+      margin-right: -32px;
+    }
+
     margin-top: -100px;
     width: auto;
   }
 
   .x-close {
-    @include pixelated();
-    position: absolute;
-    cursor: pointer;
-    z-index: 1;
-    background: url("#{$root}Sliced_Parts/X_Button.png") no-repeat center center;
-    background-size: 100% auto;
-    top: -35px;
-    right: -35px;
-    width: 50px;
-    height: 50px;
+    @include mc-x-close-button();
   }
 
   .modal-content .lines-of-code-message {
@@ -711,6 +735,10 @@ $height-to-width: 434 / 477;
 
   #show-code, #feedbackButtons, #puzzleRatingButtons, #sharing {
     margin-left: -100px;
+    html[dir=rtl] & {
+      margin-right: -100px;
+      margin-left: 0;
+    }
   }
 
   .modal-content {

diff --git a/bin/generate-mailing-list b/bin/generate-mailing-list
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def csv_contacts(path, params={})
   fields = params[:fields] if params[:fields]

diff --git a/bin/generate-mailing-list-cities b/bin/generate-mailing-list-cities
@@ -102,7 +102,7 @@ def location_filter_query
   end
 end
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def csv_contacts(path, params={})
   fields = params[:fields] if params[:fields]

diff --git a/bin/generate-mailing-list-everybody b/bin/generate-mailing-list-everybody
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/generate-mailing-list-from-query b/bin/generate-mailing-list-from-query
@@ -6,7 +6,7 @@ require src_dir 'database'
 raise "Usage: $0 'solr query'" unless ARGV.length == 1
 solr_query = ARGV[0]
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/generate-mailing-list-hoc-brazil b/bin/generate-mailing-list-hoc-brazil
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/generate-mailing-list-hoc-latam-excluding-brazil b/bin/generate-mailing-list-hoc-latam-excluding-brazil
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/generate-mailing-list-houston b/bin/generate-mailing-list-houston
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def csv_contacts(path, params={})
   fields = params[:fields] if params[:fields]

diff --git a/bin/generate-mailing-list-new-jersey.rb b/bin/generate-mailing-list-new-jersey.rb
@@ -100,7 +100,7 @@ def location_filter_query
   end
 end
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def csv_contacts(path, params={})
   fields = params[:fields] if params[:fields]

diff --git a/bin/generate-mailing-list-nyc b/bin/generate-mailing-list-nyc
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def csv_contacts(path, params={})
   fields = params[:fields] if params[:fields]

diff --git a/bin/generate-mailing-list-seattle-code-studio b/bin/generate-mailing-list-seattle-code-studio
@@ -121,7 +121,7 @@ def location_filter_query
   end
 end
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def csv_contacts(path, params={})
   fields = params[:fields] if params[:fields]

diff --git a/bin/generate-mailing-list-us-only.rb b/bin/generate-mailing-list-us-only.rb
@@ -9,7 +9,7 @@
 # HocSignup2014- US ONLY
 # CSEdWeekEvent2013- US ONLY
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/hoc-2015-latam-mailing/generate-mailing-list-hoc-2015-brazil b/bin/hoc-2015-latam-mailing/generate-mailing-list-hoc-2015-brazil
@@ -3,7 +3,7 @@ require_relative '../../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/hoc-2015-latam-mailing/generate-mailing-list-hoc-2015-latam b/bin/hoc-2015-latam-mailing/generate-mailing-list-hoc-2015-latam
@@ -3,7 +3,7 @@ require_relative '../../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-brazil b/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-brazil
@@ -3,7 +3,7 @@ require_relative '../../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-general b/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-general
@@ -3,7 +3,7 @@ require_relative '../../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-latam b/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-latam
@@ -3,7 +3,7 @@ require_relative '../../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-mexico b/bin/hoc-2015-mailing/generate-mailing-list-hoc-2015-mexico
@@ -3,7 +3,7 @@ require_relative '../../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def export_contacts_to_csv(contacts, path)
   columns = nil

diff --git a/bin/mailing-common/mailing-list-utils.rb b/bin/mailing-common/mailing-list-utils.rb
@@ -2,7 +2,7 @@
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 def common_script_path(name)
   File.join(File.dirname(__FILE__), name)

diff --git a/bin/map-hoc-afterschool b/bin/map-hoc-afterschool
@@ -3,7 +3,7 @@ require_relative '../pegasus/src/env'
 require 'cdo/solr'
 require src_dir 'database'
 
-SOLR = Solr::Server.new(host: 'ec2-54-83-22-254.compute-1.amazonaws.com')
+SOLR = Solr::Server.new(host: CDO.solr_server)
 
 class Array
   # when called on an array of hashes, output a CSV to path