Consolidate search-related JavaScript

[rails.git] / app / assets / stylesheets / small.css.scss

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index d7600a0d6c24d88b940f170b65768a473b1952f7..e94653d3c6709e730c2e2ae204144123caa3372c 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -3,102 +3,65 @@
 /* Default rules for the body of every page */
 
 body {
 /* Default rules for the body of every page */
 
 body {

-  font-size: 12px;
+  font-size: 10px;

 }
 
 h1 {
 }
 
 h1 {

-  font-size: 14px;
-}
-
-/* Rules for the whole left sidebar, including the logo */
-
-#left {
-  display: none;
-}
-
-/* Rules for tabbed navigation bar */
-
-#top-bar {
-  margin: 0px;
-  height: 39px;
-  padding: 0;
+  font-size: 12px;

 }
 
 }
 

-#tabnav {
-  height: 14px;
-  margin: 0px;
-  padding-top: 5px;
-  margin-top: 20px;
-  font-size: 10px;
-  line-height: 10px;
+h2, h3, h4 {
+  font-size: 12px;

 }
 
 }
 

-#tabnav a, #tabnav a:link, #tabnav a:visited {
-  font-size: 10px;
-  line-height: 10px;
-  padding: 2px 5px;
-  margin-right: 1px;
+.site-edit #content,
+.site-index #content,
+.site-export #content {
+  left: 0;

 }
 
 }
 

-/* Rules for the site name - shown when left sidebar is hidden */
-
-#small-title {
-  font-size: 12px;
-  line-height: 14px;
-  height: 16px;
-  display: block;
-  position: absolute;
-  top: 5px;
-  padding: 2px;
-  width: 110px; /* TODO: find better fix for overlap */
-  background-color: #fff;
-  z-index: 100;
+.site-edit #top-bar,
+.site-index #top-bar,
+.site-export #top-bar {
+  position: relative;

 }
 
 }
 

-#small-title img {
+.site-edit #content, .site-index #content, .site-export #content {

   position: absolute;
 }
 
   position: absolute;
 }
 

-#small-title h1 {
-  position: absolute;
-  left: 18px;
-  font-size: 12px;
-  margin: 0;
+.column-1 {
+  width: 100%;

 }
 
 }
 

-/* Rules for greeting bar in the top right corner */
-
-#greeting {
-  position: absolute;
-  top: 5px;
-  height: 14px;
-  font-size: 12px;
-  line-height: 12px;
-  white-space: nowrap;
-  background: none;
-}
+/* Rules for the whole left sidebar, including the logo */

 
 

-#full-greeting {
+#sidebar {

   display: none;
 }
 
   display: none;
 }
 

-#small-greeting {
-  display: inline;
-}
-
-/* Rules for OpenLayers maps */
+/* Rules for greeting bar in the top right corner */

 
 #map {
   border: 0;
 }
 
 
 #map {
   border: 0;
 }
 

+.content_map {
+  width: 100%;
+  border: none;
+  float: none;
+  height: 200px;
+  max-height: none;
+  min-height: auto;
+}
+

 .leaflet-control-pan, .leaflet-control-zoomslider {
   display: none;
 }
 
 .leaflet-control-pan, .leaflet-control-zoomslider {
   display: none;
 }
 

-.site-index .leaflet-top .leaflet-control,
-.site-export .leaflet-top .leaflet-control {
-  margin-top: 10px !important;
+.site-index .leaflet-top,
+.site-export .leaflet-top {
+  top: 10px !important;

 }
 
 /* Rules for the main content area */
 }
 
 /* Rules for the main content area */


@@ -113,49 +76,41 @@ h1 {
 .site-export #content,
 .site-edit #content,
 .site-index #content {
 .site-export #content,
 .site-edit #content,
 .site-index #content {

-  margin-top: 40px;
+  margin-top: 21px;

 }
 
 /* Rules for search sidebar when shown */
 
 #sidebar {
   border: 0px;
 }
 
 /* Rules for search sidebar when shown */
 
 #sidebar {
   border: 0px;

-  border-right: 1px solid #ccccdd;

   margin: 0px;
   margin: 0px;

-}
-
-.sidebar_title, #sidebar_content {
-  font-size: 10px !important;
+  width: 50% !important;
+  border-right: 1px solid #ccccdd;

 }
 
 p.search_results_entry {
   padding: 2px 0px;
 }
 
 }
 
 p.search_results_entry {
   padding: 2px 0px;
 }
 

-/* Rules for the signup form */
-
-#signupForm input[type="text"], #signupForm input[type="password"] {
-  width: 100%;
-}
-
-#signupForm input#user_email {
-  max-width: 30em;
-}
+/* Rules for the map UI */

 
 

-#signupForm input#user_email_confirmation {
-  max-width: 30em;
-}
+.layers-ui {
+  .leaflet-container {
+    display: none;
+  }

 
 

-#signupForm input#user_display_name {
-  max-width: 20em;
-}
+  li {
+    border-radius: 0;
+    margin-bottom: 0;

 
 

-#signupForm input#user_pass_crypt {
-  max-width: 20em;
-}
+    &:first-child {
+      border-radius: 4px 4px 0 0;
+    }

 
 

-#signupForm input#user_pass_crypt_confirmation {
-  max-width: 20em;
+    &:last-child {
+      border-radius: 0 0 4px 4px;
+    }
+  }

 }
 
 /* Rules for the login form */
 }
 
 /* Rules for the login form */


@@ -176,19 +131,23 @@ p.search_results_entry {
 }
 
 #login_openid_buttons td {
 }
 
 #login_openid_buttons td {

-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
+  padding: 2px;

 }
 
 }
 

-/* Rules for the profile page */
+/* Rules for the user view */

 
 .user_map {
   width: 100% !important;
   height: 300px !important;
 }
 
 
 .user_map {
   width: 100% !important;
   height: 300px !important;
 }
 

+#userinformation .deemphasize {
+  position: relative;
+  right: auto; left: auto;
+  margin-top: 10px;
+  top: auto;
+}
+

 /* Rules for the user settings page */
 
 #user_new_email {
 /* Rules for the user settings page */
 
 #user_new_email {


@@ -205,34 +164,21 @@ p.search_results_entry {
 
 /* Rules for the browse pages */
 
 
 /* Rules for the browse pages */
 

-#browse_navigation {
-  width: 100% !important;
-  margin-top: 0 !important;
+.browse-section.common div{
+  clear: both;

 }
 
 }
 

-#small_map, #browse_map {
-  width: 100% !important;
-}
-
-#changeset_list tr {
-  display: block;
-  clear: left;
+#changeset_list_map {
+  position: relative;

   width: 100%;
   width: 100%;

-}
-
-#changeset_list th {
-  display: none;
-}
-
-#changeset_list td {
-  display: block;
-  float: left;
-  padding-right: 10px;
-}
-
-#changeset_list td.comment, #changeset_list td.area {
-  width: 96%;
-  clear: left;
+  right: 0;
+  left: 0;
+  top: 0px;
+  margin-bottom: 20px;
+  float: none;
+  height: 300px !important;
+  max-height: auto;
+  min-height: auto;

 }
 
 /* Rules for the diary entries pages */
 }
 
 /* Rules for the diary entries pages */


@@ -250,3 +196,16 @@ p.search_results_entry {
 #message_title, #message_body {
   width: 100% !important;
 }
 #message_title, #message_body {
   width: 100% !important;
 }

+
+/* Rules for the sign-up page */
+
+.user-new,
+.user-create {
+  .col6 {
+    width: 100%;
+  }
+
+  .aside {
+    display: none;
+  }
+}