From 640c9a49d8dfddae5780970882b3c72941d633ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 20 Feb 2016 16:51:54 +0100
Subject: [PATCH] ux(): merge fixes

---
 public/sass/_variables.scss          |  2 +-
 public/sass/components/_gf-form.scss | 53 +++++++++++++++-------------
 public/sass/layout/_page.scss        |  5 ---
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss
index 3031507e05b..b259c3cd57a 100644
--- a/public/sass/_variables.scss
+++ b/public/sass/_variables.scss
@@ -61,7 +61,7 @@ $grid-breakpoints: (
 //
 // Define the maximum width of `.container` for different screen sizes.
 
-$container-max-widths: (tork  
+$container-max-widths: (
   sm: 576px,
   md: 720px,
   lg: 940px,
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index dbe45a2b766..c860d474f34 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -104,31 +104,34 @@ $gf-form-label-margin: 0.2rem;
   &.gf-size-auto { width: auto; }
 }
 
-select.gf-form-input {
-  text-overflow: '';
-  -webkit-appearance: none;
-  -moz-appearance: menulist-text; // was set to "window" and caused odd display on windos and linux.
-  appearance: none;
-
-  &:after {
-    position: absolute;
-    top: 50%;
-    right: 10px;
-    height: 12px;
-    margin-top: -6px;
-    padding: 0;
-    background-color: transparent;
-    color: $input-color;
-    font: normal normal normal 14px/1 FontAwesome;
-    text-align: center;
-    content: '\f0d7';
-    pointer-events: none;
-  }
-
-  &:-moz-focusring {
-    color: transparent;
-  }
-}
+// select.gf-form-input {
+//   -webkit-appearance: none;
+//   -moz-appearance: menulist-text; // was set to "window" and caused odd display on windos and linux.
+//   appearance: none;
+//
+//
+//   &:-moz-focusring {
+//     color: transparent;
+//   }
+// }
+//
+// .gf-form-select-wrapper {
+//   position: relative;
+//   &:after {
+//     position: absolute;
+//     top: 50%;
+//     right: 10px;
+//     height: 12px;
+//     margin-top: -6px;
+//     padding: 0;
+//     background-color: transparent;
+//     color: $input-color;
+//     font: normal normal normal 14px/1 FontAwesome;
+//     text-align: center;
+//     content: '\f0d7';
+//     pointer-events: none;
+//   }
+// }
 
 .gf-form-btn {
   padding: $input-padding-y $input-padding-x;
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
index 5c2ae08c37f..4438bb79b4d 100644
--- a/public/sass/layout/_page.scss
+++ b/public/sass/layout/_page.scss
@@ -20,13 +20,8 @@
 
 .page-container {
   background-color: $page-bg;
-  background-position: left;
-  background-size: 60%;
-  background-repeat: no-repeat;
-  position: relative;
   padding: ($spacer * 2) ($spacer * 4);
   max-width: 1060px;
-  margin-left: 0;
   min-height: calc(100% - 54px);
   padding-bottom: $spacer * 5;
   background-image: linear-gradient(60deg, rgba(0, 0, 0, 0) 0%, lighten($page-bg, 4%) 98%);