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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index e660a0930a7e512d5df42b5e4716de861823a1b9..9d262d8f39f364d5ae438bd3ac8a77c42b748bf8 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 */


@@ -1165,7 +1135,7 @@ tr.turn:hover {
       font-size: 12px;
       border: 1px solid $grey;
       border-radius: 4px 4px 0 0;
       font-size: 12px;
       border: 1px solid $grey;
       border-radius: 4px 4px 0 0;

-      background-color: #F6F6F6;
+      background-color: $offwhite;

     }
 
     p {
     }
 
     p {


@@ -1179,7 +1149,7 @@ tr.turn:hover {
   }
 
   .browse-tag-list {
   }
 
   .browse-tag-list {

-    background-color: #F6F6F6;
+    background-color: $offwhite;

     border: 1px solid $grey;
     border-radius: 3px;
     table-layout: fixed;
     border: 1px solid $grey;
     border-radius: 3px;
     table-layout: fixed;


@@ -1203,7 +1173,7 @@ tr.turn:hover {
 
     .browse-tag-k {
       font-weight: 500;
 
     .browse-tag-k {
       font-weight: 500;

-      background-color: #F6F6F6;
+      background-color: $offwhite;

     }
 
     .browse-tag-v {
     }
 
     .browse-tag-v {


@@ -1267,7 +1237,11 @@ tr.turn:hover {
 
   .query-results {
     display: none;
 
   .query-results {
     display: none;

-    padding: 0 $lineheight $lineheight/2;
+    padding-bottom: $lineheight/2;
+
+    h3 {
+      padding: 0 $lineheight;
+    }

 
     ul {
       li {
 
     ul {
       li {


@@ -1387,19 +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,
-.users-terms {
-  .content-body .content-inner {
-    padding: 0;
-
-    .message {
-      margin-top: 80px;
-      padding: 20px;
-    }
-  }
-}
-

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


@@ -2603,11 +2564,6 @@ input.richtext_title[type="text"] {
     text-decoration: none;
   }
 
     text-decoration: none;
   }
 

-  .note-box {
-    margin-top: 20px;
-    background-color: $offwhite;
-  }
-

   .icon.note {
     background-color: #333;
     border-radius: 4px;
   .icon.note {
     background-color: #333;
     border-radius: 4px;


@@ -2621,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 {


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

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

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