Merge remote-tracking branch 'upstream/pull/2499'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 607ea4bf6e47ea5ed2f7856c160a3d2e17852b38..d7984436a82eda19a4c58d4ee8be9c08d64833f8 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -58,36 +58,6 @@ strong {
     clear: both;
 }
 
     clear: both;
 }
 

-/* Basic grid */
-
-.col0    { float:left; width:04.1666%; }
-.col1    { float:left; width:08.3333%; }
-.col2    { float:left; width:16.6666%; }
-.col3    { float:left; width:25.0000%; }
-.col4    { float:left; width:33.3333%; }
-.col5    { float:left; width:41.6666%; }
-.col6    { float:left; width:50.0000%; }
-.col7    { float:left; width:58.3333%; }
-.col8    { float:left; width:66.6666%; }
-.col9    { float:left; width:75.0000%; }
-.col10   { float:left; width:83.3333%; }
-.col11   { float:left; width:91.6666%; }
-.col12   { width:100%; }
-
-.margin0  { margin-left:04.1666%; }
-.margin1  { margin-left:08.3333%; }
-.margin2  { margin-left:16.6666%; }
-.margin3  { margin-left:25.0000%; }
-.margin4  { margin-left:33.3333%; }
-.margin5  { margin-left:41.6666%; }
-.margin6  { margin-left:50.0000%; }
-.margin7  { margin-left:58.3333%; }
-.margin8  { margin-left:66.6666%; }
-.margin9  { margin-left:75.0000%; }
-.margin10 { margin-left:83.3333%; }
-.margin11 { margin-left:91.6666%; }
-.margin12 { margin-left:100.0000%; }
-

 .fillL { background-color: white; }
 
 /* Default rules for the body of every page */
 .fillL { background-color: white; }
 
 /* Default rules for the body of every page */


@@ -1108,21 +1078,12 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    padding: 15px 20px;
-    border-bottom: 1px solid $grey;

     cursor: pointer;
 
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
   }
 
     cursor: pointer;
 
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
   }
 

-  h4 {
-    margin: 0;
-    a {
-      color: #000;
-    }
-  }
-

   .comments {
     float: right;
     color: $darkgrey;
   .comments {
     float: right;
     color: $darkgrey;


@@ -1191,7 +1152,6 @@ tr.turn:hover {
     background-color: #F6F6F6;
     border: 1px solid $grey;
     border-radius: 3px;
     background-color: #F6F6F6;
     border: 1px solid $grey;
     border-radius: 3px;

-    font-size: 12px;

     table-layout: fixed;
     border-collapse: separate;
 
     table-layout: fixed;
     border-collapse: separate;
 


@@ -1223,8 +1183,8 @@ tr.turn:hover {
 
     .colour-preview-box {
       float: right;
 
     .colour-preview-box {
       float: right;

-      width: 12px;
-      height: 12px;
+      width: 14px;
+      height: 14px;

       margin: 4px 0px;
       border: 1px solid rgba(0, 0, 0, .1);
       // add color via inline css on element: background-color: <tag value>;
       margin: 4px 0px;
       border: 1px solid rgba(0, 0, 0, .1);
       // add color via inline css on element: background-color: <tag value>;


@@ -1277,17 +1237,14 @@ tr.turn:hover {
 
   .query-results {
     display: none;
 
   .query-results {
     display: none;

+    padding-bottom: $lineheight/2;

 
     h3 {
 
     h3 {

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

     }
 
     ul {
       li {
     }
 
     ul {
       li {

-        padding: 15px 20px;
-        border-bottom: 1px solid $grey;
-

         &.query-result {
           cursor: pointer;
         }
         &.query-result {
           cursor: pointer;
         }


@@ -1404,18 +1361,6 @@ tr.turn:hover {
 
 /* Overrides for pages that use new layout conventions */
 
 
 /* Overrides for pages that use new layout conventions */
 

-.users-new,
-.users-create {
-  .content-body .content-inner {
-    padding: 0;
-
-    .message {
-      margin-top: 80px;
-      padding: 20px;
-    }
-  }
-}
-

 .users-new,
 .users-create,
 .users-terms,
 .users-new,
 .users-create,
 .users-terms,


@@ -2093,13 +2038,6 @@ abbr.geo {
   border-bottom: none;
 }
 
   border-bottom: none;
 }
 

-/* Rules for RSS buttons */
-
-.rsssmall {
-  position: relative;
-  top: 3px;
-}
-

 /* General styles for action lists / subnavs / pager navs */
 
 ul.secondary-actions {
 /* General styles for action lists / subnavs / pager navs */
 
 ul.secondary-actions {


@@ -2639,53 +2577,12 @@ input.richtext_title[type="text"] {
   background-size: cover;
   background-attachment: fixed;
 
   background-size: cover;
   background-attachment: fixed;
 

-  .caption {
-    max-width: 200px;
-    font: 13px/20px Helvetica, Arial, sans-serif;
-    position: fixed;
-    text-align: right;
-    right: 20px;
-    bottom: 60px;
-    text-shadow: #000 0px 1px 5px;
-    color: $lightgrey;
-    opacity: 0.8;
-    display: none;
-  }
-
-  .caption a {
-    color: white;
-    white-space: nowrap;
-    text-decoration: none;
-  }
-
-  a.next {
-    display: block;
-    position: fixed;
-    right: 10px;
-    bottom: 10px;
-    width: 40px;
-    height: 40px;
-    border-radius: 5px;
-    text-indent: -9999px;
-    overflow: hidden;
-    background: image-url('about/sprite.png') -120px 0px no-repeat;
-    background-color: #000;
-    background-color: rgba(0, 0, 0, 0.5);
-  }

 
   .content-inner {
     position: relative;
     color: #333;
     min-width: 320px;
     max-width: 640px;
 
   .content-inner {
     position: relative;
     color: #333;
     min-width: 320px;
     max-width: 640px;

-
-    .section {
-      margin-bottom: 30px;
-    }
-
-    .section:last-child {
-      margin-bottom: 0;
-    }

   }
 
   .text {
   }
 
   .text {


@@ -2745,10 +2642,6 @@ input.richtext_title[type="text"] {
     }
   }
 
     }
   }
 

-  h2 {
-    margin-bottom: 10px;
-  }
-

   .icon {
     width: 30px;
     height: 30px;
   .icon {
     width: 30px;
     height: 30px;