More refactoring of map js

[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 3fb643f3c583897a80fa5cc2091d7532898f6b75..ba25591d304da575d0de4f3fefcc66547d5a0388 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -4,6 +4,7 @@ $typeheight: 14px;
 
 $offwhite: #f4f4ff;
 $blue: #7092FF;
 
 $offwhite: #f4f4ff;
 $blue: #7092FF;

+$lightblue: #B8C5F0;

 $grey: #AAA;
 $keyline: #CCC;
 $hovercolor: 20%;
 $grey: #AAA;
 $keyline: #CCC;
 $hovercolor: 20%;


@@ -12,7 +13,7 @@ $hovercolor: 20%;
 
 /* Minimal CSS reset */
 
 
 /* Minimal CSS reset */
 

-html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p {
+html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input {

   margin: 0;
   padding: 0;
   border: 0;
   margin: 0;
   padding: 0;
   border: 0;


@@ -140,6 +141,36 @@ h6:first-child {
   margin-right: $lineheight/4;
 }
 
   margin-right: $lineheight/4;
 }
 

+/* Rules for icons */
+
+.icon {
+  display:inline-block;
+  vertical-align:top;
+  width:20px;
+  height:20px;
+  background:transparent image-url("sprite.png") no-repeat 0 0;
+  text-indent:-9999px;
+  overflow:hidden;
+  }
+
+.icon-pre-text {
+    margin-right: 5px;
+}
+
+.icon.search      { background-position: 0 0; }
+.icon.donate      { background-position: -20px 0; }
+.icon.zoomin      { background-position: -40px 0; }
+.icon.zoomout     { background-position: -60px 0; }
+.icon.geolocate   { background-position: -80px 0; }
+.icon.layers      { background-position: -100px 0; }
+.icon.key         { background-position: -120px 0; }
+.icon.share       { background-position: -140px 0; }
+.icon.clipboard   { background-position: -160px 0; }
+.icon.link        { background-position: -180px 0; }
+.icon.close       { background-position: -200px 0; }
+.icon.check       { background-position: -220px 0; }
+.icon.note        { background-position: -240px 0; }
+

 /* Rules for links */
 
 a {
 /* Rules for links */
 
 a {


@@ -388,9 +419,9 @@ table {
 
 /* Rules for donation request box */
 
 
 /* Rules for donation request box */
 

-.donate {
+a.donate {

   display: block;
   display: block;

-  width: 164px;
+  width: 163px;

   padding: $lineheight/4;
   border: 1px solid #AED1A0;
   background: #cbeea7;
   padding: $lineheight/4;
   border: 1px solid #AED1A0;
   background: #cbeea7;


@@ -405,11 +436,6 @@ table {
     background: #9ed485;
     text-decoration: none;
   }
     background: #9ed485;
     text-decoration: none;
   }

-  span {
-    margin: 0;
-    padding-left: 18px;
-    background: image-url("sprite.png") 0 -29px no-repeat;
-  }

 }
 
 /* Rules for Creative Commons logo button */
 }
 
 /* Rules for Creative Commons logo button */


@@ -439,7 +465,7 @@ table {
 }
 
 #tabnav {
 }
 
 #tabnav {

-  height: 30px;
+  height: 29px;

   margin-bottom:0;
   overflow: hidden;
   li {
   margin-bottom:0;
   overflow: hidden;
   li {


@@ -488,7 +514,7 @@ table {
 
 .count-number {
   padding: 2px $lineheight/4;
 
 .count-number {
   padding: 2px $lineheight/4;

-  border-radius: 3px;
+  border-radius: 2px;

   background: #d7d7ff;
   margin: 0 2px;
   font-size: 11px;
   background: #d7d7ff;
   margin: 0 2px;
   font-size: 11px;


@@ -518,6 +544,40 @@ table {
 
 /* Rules for Leaflet maps */
 
 
 /* Rules for Leaflet maps */
 

+.leaflet-control a {
+  display: block;
+  height: 40px;
+  width: 40px;
+  background-color: white;
+  background-color: rgba(255,255,255,.8);
+  border-radius: 4px;
+  margin-bottom: 10px;
+}
+
+.leaflet-control a:hover {
+  background-color: white;
+}
+
+.leaflet-control a .icon {
+  margin: 10px;
+}
+
+.leaflet-map-ui-layers {
+  box-shadow: 0 1px 7px rgba(0, 0, 0, 0.4);
+  background: #f8f8f9;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+  display: block;
+  width: 36px;
+  height: 36px;
+}
+
+.leaflet-control-layers-separator {
+  margin: 5px -10px !important;
+}
+

 .leaflet-control-attribution {
   a.disabled {
     color: #99c9dc;
 .leaflet-control-attribution {
   a.disabled {
     color: #99c9dc;


@@ -738,6 +798,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .export_area_inputs {
   margin-bottom: $lineheight/2;
 
 .export_area_inputs {
   margin-bottom: $lineheight/2;

+  input[type="text"] {
+    width: 60px;
+    margin-bottom: 5px;
+  }

 }
 
 .export_bound {
 }
 
 .export_bound {


@@ -1029,6 +1093,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the user profile page */
 
 #userinformation {
 /* Rules for the user profile page */
 
 #userinformation {

+

   min-height: 100px;
   .userinformation-inner {
     float: left;
   min-height: 100px;
   .userinformation-inner {
     float: left;


@@ -1067,13 +1132,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .activity-details p {
 }
 
 .activity-details p {

-  margin-left: 72px;
+  margin-left: 70px;

   margin-bottom: 0;
 }
 
 #friends-container .contact-activity ul {
   margin-bottom: 0;
 }
 
 #friends-container .contact-activity ul {

-  margin-left: 72px;
-  }
+  margin-left: 70px;
+}

 
 .user-view {
   p#no_home_location {
 
 .user-view {
   p#no_home_location {


@@ -1096,16 +1161,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .user_popup {
   min-width: 200px;
 
 .user_popup {
   min-width: 200px;

-

   p {
   p {

-    padding-top: 0;
-    padding-bottom: 5px;
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 60px;
+    padding: 0 0 5px 0;
+    margin-top: 0 0 0 60px;

     font-size: 12px;
   }
     font-size: 12px;
   }

-

   img.user_thumbnail {
     float: left;
     margin: 0 $lineheight/2 0 0;
   img.user_thumbnail {
     float: left;
     margin: 0 $lineheight/2 0 0;


@@ -1285,8 +1345,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 

-.accountImage-options p {
-  margin-bottom: 0px;
+#accountForm .user_image {
+  margin-bottom: 0;
+}
+
+#accountForm #user_image {
+  margin-left: 20px;
+}
+
+#accountForm ul.accountImage-options {
+  margin-left: 120px;

 }
 
 .nohome .location {
 }
 
 .nohome .location {


@@ -1306,12 +1374,18 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: none;
 }
 
   float: none;
 }
 

-/* Rules for message in/out box page */
+/* Rules for the oauth settings page */

 
 

-.message #content {
-  max-width: 740px;
+.oauth_clients .buttons .oauth-edit {
+  border-radius: 2px 0 0 2px;
+}
+
+.oauth_clients .buttons .oauth-delete {
+  border-radius: 0 2px 2px 0;

 }
 
 }
 

+/* Rules for messages pages */
+

 .messages {
   width: 100%;
   border: 1px solid #ddd;
 .messages {
   width: 100%;
   border: 1px solid #ddd;


@@ -1339,7 +1413,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   tr th {
     padding: $lineheight/4;
   }
   tr th {
     padding: $lineheight/4;
   }

+  p:last-child,
+  h2:last-child,
+  h3:last-child,
+  ol:last-child,
+  ul:last-child {
+    margin-bottom:0;
+  }

   tr td {
   tr td {

+    height: 30px;

     border-right: 1px solid $keyline;
   }
 }
     border-right: 1px solid $keyline;
   }
 }


@@ -1362,10 +1444,26 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   vertical-align: middle;
 }
 
   vertical-align: middle;
 }
 

+.inbox-mark-unread,
+.inbox-mark-read,
+.inbox-delete {
+  width: 1%;
+}
+

 .inbox-row-unread .inbox-mark-unread {
   display: none;
 }
 
 .inbox-row-unread .inbox-mark-unread {
   display: none;
 }
 

+.message-read .message-buttons {
+  margin-top: $lineheight;
+  padding-top: $lineheight;
+  border-top: 1px solid $keyline;
+}
+
+.message-read .buttons .mark-unread-button {
+  border-radius: 0;
+}
+

 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {


@@ -1394,11 +1492,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;

-  padding: $lineheight/2;
+  padding: 0 $lineheight/2;

   margin-bottom: $lineheight;
   background-color: #f0f0f0;
   margin-bottom: $lineheight;
   background-color: #f0f0f0;

+

   h2 {
   h2 {

-    margin: -10px;
+    margin: 0 -10px 10px -10px;

     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     font-size: 12px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     font-size: 12px;


@@ -1413,11 +1512,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding: $lineheight/4;
   }
 
     padding: $lineheight/4;
   }
 

-  ul li {
-    font-size: 12px;
-    list-style: disc;
-  }
+  ul {
+    padding-left: $lineheight;

 
 

+    li {
+      font-size: 12px;
+      list-style: disc;
+    }
+  }

 }
 
 /* Rules for forms */
 }
 
 /* Rules for forms */


@@ -1426,15 +1528,25 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   fieldset {
     margin-bottom: $lineheight;
   }
   fieldset {
     margin-bottom: $lineheight;
   }

-  label {
+  label.standard-label {

     display: block;
     display: block;

-    width: 300px;

     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
     line-height: 1.5;
   }
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
     line-height: 1.5;
   }

-  .form-section {
+  label.standard-label.secondary {
+    display: inline-block;
+    font-weight: normal;
+  }
+  .form-help {
+    font-weight: normal;
+  }
+  .form-column {
+    float: left;
+    margin-right: 20px;
+  }
+  .form-divider {

     margin-top: $lineheight;
     padding-top: $lineheight;
     border-top: 1px solid $keyline;
     margin-top: $lineheight;
     padding-top: $lineheight;
     border-top: 1px solid $keyline;


@@ -1442,9 +1554,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   .form-row {
     margin-bottom: $lineheight/2;
   }
   .form-row {
     margin-bottom: $lineheight/2;
   }

-  input[name=remember_me],
-  input[name=remember_me_openid] {
+  .form-list {
+    margin-bottom: 0;
+  }
+  .form-list li {
+    margin-bottom: 5px;
+   }
+  input[type="checkbox"],
+  input[type="radio"] {

     float: left;
     float: left;

+    margin-top: 5px;

   }
 }
 
   }
 }
 


@@ -1452,6 +1571,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   display: block;
 }
 
   display: block;
 }
 

+input[type="checkbox"],
+input[type="radio"] {
+    margin-right: 5px;
+}
+

 input[type="text"],
 input[type="email"],
 input[type="url"],
 input[type="text"],
 input[type="email"],
 input[type="url"],


@@ -1460,10 +1584,13 @@ textarea {
   border: 1px solid #ccc;
   padding: 2px 5px;
   margin: 0;
   border: 1px solid #ccc;
   padding: 2px 5px;
   margin: 0;

+  width: 200px;

 }
 
 textarea {
   padding: 5px;
 }
 
 textarea {
   padding: 5px;

+  width: 100%;
+  height: 100% !important;

 }
 
 /* Rules for user images */
 }
 
 /* Rules for user images */


@@ -1542,6 +1669,8 @@ ul.secondary-actions {
 
 .inner12 { padding: $lineheight/2 $lineheight;}
 
 
 .inner12 { padding: $lineheight/2 $lineheight;}
 

+.inner11 { padding: $lineheight/2;}
+

 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */


@@ -1552,8 +1681,9 @@ input[type="reset"],
 a.button {
   cursor: pointer;
   border: 0;
 a.button {
   cursor: pointer;
   border: 0;

-  display: block;
-  padding: $lineheight/4;
+  display: inline-block;
+  line-height: 20px;
+  padding: $lineheight/4 $lineheight/2;

   min-width: 120px;
   margin: 0 0 $lineheight/2 0;
   color: white;
   min-width: 120px;
   margin: 0 0 $lineheight/2 0;
   color: white;


@@ -1565,42 +1695,61 @@ a.button {
     background: darken($blue, $hovercolor);
     text-decoration: none;
   }
     background: darken($blue, $hovercolor);
     text-decoration: none;
   }

+  &.deemphasize {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
+    }
+  }
+  &:disabled {
+    background: $lightblue;
+  }

   &:last-child {
     margin-bottom: 0;
   }
 }
 
   &:last-child {
     margin-bottom: 0;
   }
 }
 

-a.button.submit {
-  background-color: #cbeea7;
-  &:hover {
-    background-color: #9ed485;
-  }
-}
-

 .buttons {
   min-width: 200px;
 .buttons {
   min-width: 200px;

-

   input[type="submit"],
   input[type="submit"],

+  input[type="button"],
+  input[type="reset"],

   .button {
     box-sizing: border-box;
   .button {
     box-sizing: border-box;

-    display: inline-block;
-    margin-bottom:0;
-    width:50%;
-    min-width: 0;
+    float: left;
+    border-radius: 0;
+    margin:0;
+    min-width: 100px;

     max-width: 150px;
     max-width: 150px;

-    margin-left: 2px;
-    margin-right: 2px;
+    border-right:1px solid white;

   }
   input:first-child,
   .button:first-child {
     border-radius:2px 0 0 2px;
   }
   input:first-child,
   .button:first-child {
     border-radius:2px 0 0 2px;

-    border-right:1px solid white;
-    margin-left: 0px;

   }
   input:last-child,
   .button:last-child {
     border-radius:0 2px 2px 0;
   }
   input:last-child,
   .button:last-child {
     border-radius:0 2px 2px 0;

-    margin-right: 0px;
+    border-right-width: 0;
+  }
+  input:only-child,
+  .button:only-child,
+  *[value="Hide"] + input:last-child,
+  *[value="Hide"] + .button:last-child {
+    border-radius:2px;
+    border-right-width: 0;
+  }
+    /* if a 3-button set has a hidden middle button */
+  *[value="Hide"] + input:nth-child(3),
+  *[value="Hide"] + .button:nth-child(3) {
+    border-radius:0 2px 2px 0;
+    border-right-width: 0;
+  }
+  /* if a 3-button set starts with a hidden button */
+  *[value="Hide"] + input:nth-child(2):not(:last-child),
+  *[value="Hide"] + .button:nth-child(2):not(:last-child) {
+    border-radius:2px 0 0 2px;
+    border-right-width: 1px solid white;

   }
 }
 
   }
 }
 


@@ -1625,7 +1774,8 @@ a.button.submit {
 
 /* Rules for rich text */
 
 
 /* Rules for rich text */
 

-.richtext {
+.richtext,
+.prose {

   h1, h2 {
     padding-bottom: $lineheight/2;
     border-bottom: 1px dashed #cccccc;
   h1, h2 {
     padding-bottom: $lineheight/2;
     border-bottom: 1px dashed #cccccc;


@@ -1703,7 +1853,10 @@ a.button.submit {
 /* Rules for rich text editors */
 
 .richtext_container {
 /* Rules for rich text editors */
 
 .richtext_container {

+  margin-bottom: $lineheight;
+

   .richtext_content {
   .richtext_content {

+    width: 50%;

     display: inline-block;
     vertical-align: top;
 
     display: inline-block;
     vertical-align: top;
 


@@ -1731,8 +1884,7 @@ a.button.submit {
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: $lineheight/2;
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: $lineheight/2;

-    width: 300px;
-    max-width: 450px;
+    width: 220px;

 
     ul {
       margin-bottom: 0;
 
     ul {
       margin-bottom: 0;


@@ -1751,12 +1903,12 @@ a.button.submit {
     }
 
     li h4 {
     }
 
     li h4 {

-      width: 35%;
+      width: 40%;

       margin: 0;
     }
 
     li span, li p {
       margin: 0;
     }
 
     li span, li p {

-      width: 60%;
+      width: 50%;

       margin-left: $lineheight/2;
       margin-bottom: $lineheight/4;
       white-space: nowrap;
       margin-left: $lineheight/2;
       margin-bottom: $lineheight/4;
       white-space: nowrap;


@@ -1782,11 +1934,11 @@ a.button.submit {
 
 /* Rules for the notes interface */
 
 
 /* Rules for the notes interface */
 

-.note {
+.leaflet-popup-content .note {

   padding-top: $lineheight/2;
 }
 
   padding-top: $lineheight/2;
 }
 

-.note {
+.leaflet-popup-content .note {

   h2 {
     margin-bottom: $lineheight/2;
   }
   h2 {
     margin-bottom: $lineheight/2;
   }


@@ -1858,16 +2010,8 @@ a.button.submit {
   border-bottom: 1px solid #ccc;
 }
 
   border-bottom: 1px solid #ccc;
 }
 

-.ads {
-  width: 370px;
-  position: absolute;
-  left: 0%;
-}
-

 .ad {
 .ad {

-  float: left;
-  height: 120px;
-  padding: $lineheight/2;
-  border: 0px;
+  height: 100px;
+  border: 0;

   background: #fff;
 }
   background: #fff;
 }