Merge branch 'master' into redesign

[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 7ce0484b73604dda2083d9b082ac206ab2dc6e65..39b946af06d93c96eacf54d691bb6fbb02c54c27 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -1,115 +1,133 @@
-/* Styles specific to a small screen, such as iPhone, Android, etc... */
-
-/* Default rules for the body of every page */
-
-body {
-  font-size: 12px;
-}
+@import "parameters";

 
 

-h1 {
-  font-size: 16px;
-}
+/* Styles specific to a small screen, such as iPhone, Android, etc... */

 
 

-h2, h3, h4 {
-  font-size: 14px;
+input[type="submit"],
+input[type="text"] {
+  -webkit-appearance: none;

 }
 
 }
 

-.wrapper {
-  margin: 0;
+.column-1 {
+  width: 100%;

 }
 
 }
 

-.site-edit #content,
-.site-index #content,
-.site-export #content {
-  left: 0;
+#menu-icon {
+  display: inline-block !important;

 }
 
 }
 

-.site-edit #top-bar,
-.site-index #top-bar,
-.site-export #top-bar {
+nav.primary,
+nav.secondary {
+  float: none !important;

   position: relative;
   position: relative;

+  display: block;
+  clear: both;

 }
 
 }
 

-.column-1 {
-  width: 100%;
-}
-
-/* Rules for the whole left sidebar, including the logo */
+header {
+  height: auto;
+  min-height: $headerHeight;
+  background: #fff;

 
 

-#left {
-  display: none;
-}
+  h1 {
+    padding-bottom: 15px;
+  }

 
 

-/* Rules for tabbed navigation bar */
+  &.closed nav {
+    display: none;
+  }

 
 

-#top-bar {
-  left: 0;
-  margin: 0px;
-  height: 24px;
-  position: static;
+  .search_form {
+    display: block;
+  }

 }
 
 }
 

-#tabnav {
-  height: 19px;
-  margin: 0px;
-  padding-top: 5px;
-  margin-top: 26px;
-  font-size: 10px;
-  line-height: 10px;
+#sidebar .search_form,
+#edit_tab,
+#export_tab {
+  display: none;

 }
 
 }
 

-#tabnav a, #tabnav a:link, #tabnav a:visited {
-  font-size: 10px;
-  line-height: 10px;
-  padding: 5px;
-  margin-right: 1px;
+nav.primary {
+  padding: 0;
+
+  ul, li {
+    border: none;
+    border-radius: 0;
+    width: 100%;
+  }
+
+  ul {
+    border-top: 1px solid #eee;
+    li {
+      border-bottom: 1px solid #eee;
+      border-right: none;
+      > a {
+        border-radius: 0;
+        width: 100%;
+        text-align: center;
+        font-size: 15px;
+      }
+    }
+  }
+}
+
+nav.secondary {
+  border-bottom: 1px solid #eee;
+
+  .user-menu {
+    display: block;
+    width: 100%;
+    margin-left: 0;
+    > li {
+      width: 49%;
+      > a { 
+        width: 100%; 
+        text-align: center;
+      }
+    }
+  }
+}
+
+#compact-secondary-nav {
+  display: none;

 }
 
 }
 

-.menuicon { line-height: 10px;}
-
-/* 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;
-  left: 5px;
-  top: 5px;
-  padding: 2px;
-  width: 110px;
-  background-color: #fff;
-  z-index: 100;
+.compact-hide {
+  display: inline-block;

 }
 
 }
 

-#small-title img {
-  position: absolute;
-}
+.map-layout {
+  #sidebar, #map {
+    position: relative;
+    overflow-x: hidden;
+    width: 100%;
+    height: 50%;
+  }

 
 

-#small-title h1 {
-  position: absolute;
-  font-size: 12px;
-  line-height: 18px;
-  margin: 0;
-  left: 22px;
-}
+  .overlay-sidebar {
+    #sidebar {
+      width: 300px;
+    }

 
 

-/* Rules for greeting bar in the top right corner */
+    #map {
+      height: 100%;
+    }
+  }

 
 

-#greeting {
-  position: absolute;
-  right: 0;
-  top: 0;
-  background: none;
+  #map-ui {
+    z-index: 9999;
+    width: 100%;
+    overflow-y: scroll;
+  }

 }
 
 }
 

-#browse_map ul.secondary-actions {
-  float: right;
+#sidebar .welcome {
+  display: none;

 }
 
 }
 

-#map {
-  border: 0;
+.leaflet-top.leaflet-right {
+  top: 10px !important;
+  z-index: 0;

 }
 
 .content_map {
 }
 
 .content_map {


@@ -121,78 +139,6 @@ h2, h3, h4 {
   min-height: auto;
 }
 
   min-height: auto;
 }
 

-.content_map #small_map {
-  height: 300px;
-  border: 1px solid #ccc;
-}
-
-.leaflet-control-pan, .leaflet-control-zoomslider {
-  display: none;
-}
-
-.site-index .leaflet-top,
-.site-export .leaflet-top {
-  top: 47px !important;
-}
-
-/* Rules for the main content area */
-
-#content {
-  margin-left: 0px;
-  margin-right: 0px;
-  border-left: 0px;
-  border-right: 0px;
-}
-
-.site-export #content,
-.site-edit #content,
-.site-index #content {
-  margin-top: 21px;
-}
-
-/* Rules for search sidebar when shown */
-
-#sidebar {
-  border: 0px;
-  margin: 0px;
-  width: 50%;
-  border-right: 1px solid #ccccdd;
-}
-
-.sidebar_title, #sidebar_content {
-  font-size: 10px !important;
-}
-
-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;
-}
-
-#signupForm input#user_email_confirmation {
-  max-width: 30em;
-}
-
-#signupForm input#user_display_name {
-  max-width: 20em;
-}
-
-#signupForm input#user_pass_crypt {
-  max-width: 20em;
-}
-
-#signupForm input#user_pass_crypt_confirmation {
-  max-width: 20em;
-}
-

 /* Rules for the login form */
 
 #login_login input#user_email {
 /* Rules for the login form */
 
 #login_login input#user_email {


@@ -228,51 +174,19 @@ p.search_results_entry {
   top: auto;
 }
 
   top: auto;
 }
 

-/* Rules for the user settings page */
+/* Rules for the sign-up page */

 
 

-#user_new_email {
-  width: 60% !important;
-}
+.user-new,
+.user-create {
+  .col6 {
+    width: 100%;
+  }

 
 

-#user_description, #user_preferred_editor {
-  width: 90% !important;
-}
-
-.minorNote {
-  display: block;
+  .aside {
+    display: none;
+  }

 }
 
 }
 

-/* Rules for the browse pages */
-
-.browse-section.common div{
-  clear: both;
-}
-
-#changeset_list_map {
-  position: relative;
-  width: 100%;
-  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 */
-
-#diary_entry_title, #diary_entry_body, #diary_entry_language_code, #diary_comment_body {
-  width: 100% !important;
-}
-
-#usemap {
-  display: block;
-}
-
-/* Rules for the messaging pages */
-
-#message_title, #message_body {
-  width: 100% !important;
+.site-about #content .attr h1 {
+  font-size: 28px;

 }
 }