Work on changeset display

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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index f9065266b89b84afe004841cb4b453303b62e03a..fb3c997c0b2108374740372fb58095c7af5abeb4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -304,6 +304,7 @@ header {
   height: $headerHeight;
   position: relative;
   border-bottom: $keyline;
   height: $headerHeight;
   position: relative;
   border-bottom: $keyline;

+  z-index: 1001;

 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;


@@ -580,13 +581,12 @@ nav.secondary {
   border-radius: 4px 0 0 0;
 }
 
   border-radius: 4px 0 0 0;
 }
 

-.site .leaflet-control .zoomout,
+.leaflet-control .zoomout,

 .control-key .control-button {
   margin-bottom: 0;
   border-radius: 0;
 }
 
 .control-key .control-button {
   margin-bottom: 0;
   border-radius: 0;
 }
 

-.leaflet-control .zoomout, // For non-main page maps

 .control-locate .control-button,
 .control-share .control-button {
   border-radius: 0 0 0 4px;
 .control-locate .control-button,
 .control-share .control-button {
   border-radius: 0 0 0 4px;


@@ -594,9 +594,7 @@ nav.secondary {
 
 /* Rules for the home page */
 
 
 /* Rules for the home page */
 

-.site-export #map,
-.site-index #map,
-.site-edit #map {
+#map {

   height: 100%;
   overflow: hidden;
 }
   height: 100%;
   overflow: hidden;
 }


@@ -770,6 +768,8 @@ nav.secondary {
 /* Rules for the sidebar */
 
 #sidebar {
 /* Rules for the sidebar */
 
 #sidebar {

+  border-right: $keyline;
+

   .alert {
     background: #e00;
   }
   .alert {
     background: #e00;
   }


@@ -779,6 +779,10 @@ nav.secondary {
     border-bottom: $keyline;
   }
 
     border-bottom: $keyline;
   }
 

+  h4 {
+    font-weight: normal;
+  }
+

   .icon.close {
     position: absolute;
     right: $lineheight;
   .icon.close {
     position: absolute;
     right: $lineheight;


@@ -852,7 +856,16 @@ nav.secondary {
 }
 
 .search_results_entry {
 }
 
 .search_results_entry {

-  margin-bottom: 0;
+  .search_searching {
+    text-align: center;
+    margin: $lineheight auto;
+    width: $lineheight;
+    display: block;
+  }
+
+  ul li {
+    border-bottom: 1px solid #ccc;
+  }

 
   .search_details {
     display: block;
 
   .search_details {
     display: block;


@@ -863,15 +876,6 @@ nav.secondary {
   }
 }
 
   }
 }
 

-.search_results_entry .search_searching {
-  text-align: center;
-  margin: $lineheight auto;
-  width: $lineheight;
-  display: block;
-}
-
-ul.results-list li { border-bottom: 1px solid #ccc; }
-

 .search_results_error {
   color: #f00;
 }
 .search_results_error {
   color: #f00;
 }


@@ -927,7 +931,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .site-index,
 .site-export,
 
 .site-index,
 .site-export,

-.site-edit {
+.site-edit,
+.changeset-list,
+.browse {

   #content {
     position: absolute;
     top: $headerHeight;
   #content {
     position: absolute;
     top: $headerHeight;


@@ -1073,115 +1079,86 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: right;
 }
 
   float: right;
 }
 

-.content_map #small_map {
-  height: 100%;
-  width: 100%;
-  margin-bottom: $lineheight;
-}
-
-/* Rules for the changeset list shown by the history tab etc */
+/* Rules for the changeset list shown by the history tab */

 
 

-#changeset_list {
-  width: 100%;
-  ul {
-    padding: $lineheight/2 0;
-    margin-bottom: 0px;
-    border-top: 1px solid #ccc;
-    &:last-child {
-      border-bottom: 1px solid #ccc;
-    }
-  }
-  .selected {
-    background: #FFFFC0;
+#sidebar .changesets {
+  li {
+    padding: $lineheight;
+    border-bottom: $keyline;

   }
   }

-  .date,
-  .user {
-    border-left: 1px solid #ccc;
-    padding-left: $lineheight/4;
-    margin-right: $lineheight/4;
+
+  p {
+    padding: 0;

   }
 }
 
   }
 }
 

-#changeset_list_map_wrapper {
-  position: absolute;
-  width: 50%;
-  height: 490px;
-  top: 0;
-  right: 0;
-}
+/* Rules for the data browser */

 
 

-#changeset_list_map_wrapper.scrolled {
-  position: fixed;
-}
+body.browse #sidebar_content {
+  .browse-section {
+    padding: 20px;
+    border-bottom: 1px solid #CCC;

 
 

-#changeset_list_map {
-  position: absolute;
-  bottom: $lineheight;
-  top: $lineheight;
-  right: $lineheight;
-  left: $lineheight;
-  border: 1px solid #ccc;
-}
+    ul {
+      margin: 0;
+    }
+  }

 
 

-#changeset_list_map_wrapper.scrolled #changeset_list_map {
-  margin-left: 93px;
-}
+  .browse-field {
+    margin-bottom: 10px;

 
 

-/* Rules for the data browser */
+    h4 {
+      margin: 0;
+      padding: 5px 0 5px 10px;
+      font-size: 12px;
+      border: 1px solid #CCC;
+      border-radius: 4px 4px 0 0;
+      background-color: #F6F6F6;
+    }

 
 

-.browse-section {
-  border-top: 1px solid #ccc;
-  margin-top: $lineheight/2;
-  padding-top: $lineheight/2;
-  &:first-child {
-    margin-top: 0;
-  }
-  .warning {
-    background-color: #ffe0cc;
-    margin: 0px;
-    padding: 4px 6px;
-    max-width: 100%;
-  }
-  h4, p {
-    margin-bottom: $lineheight/4;
-  }
-  ul, .bbox, .geo {
-    display: inline-block;
-    vertical-align: top;
-    max-width: 65%;
-  }
-  ul p {
-    margin-left: 0;
-    margin-bottom: 0;
-  }
-  h4 {
-    float: left;
-    width: 33.3333%;
-    display: inline-block;
-    vertical-align: top;
+    p {
+      margin: 0;
+      padding: 7px 10px;
+      font-size: 12px;
+      background-color: #FFF;
+      border: 1px solid #CCC;
+      border-top: 0;
+      border-radius: 0 0 4px 4px;
+    }

   }
   }

-}

 
 

-.bbox {
-  div {
-    width: 33.3333%;
-    text-align: center;
-    padding: $lineheight/4 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    float: left;
-  }
-  .max_lat,
-  .min_lat {
-    margin-left: auto;
-    margin-right: auto;
-    width: 100%;
-  }
-}
+  .browse-tag-list {
+    border: 1px solid #CCC;
+    border-radius: 4px;
+    font-size: 12px;

 
 

-#browse_map .secondary-actions {
-  display: none;
-  margin-bottom: $lineheight/2;
+    li {
+      border-bottom: 1px solid #CCC;
+    }
+
+    li:last-child {
+      border-bottom: 0;
+    }
+
+    .browse-tag-k,
+    .browse-tag-v {
+      display: inline-block;
+      width: 50%;
+      height: 30px;
+      float: left;
+      padding: 9px 10px;
+    }
+
+    .browse-tag-k {
+      font-weight: bold;
+      background-color: #F6F6F6;
+      border-radius: 4px 0 0 4px;
+    }
+
+    .browse-tag-v {
+      border-left: 1px solid #CCC;
+    }
+  }

 }
 
 /* Rules for the trace list shown by the traces tab etc */
 }
 
 /* Rules for the trace list shown by the traces tab etc */