Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / theme / shiny / css / display.css

diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index a2ed37e104ee6639e7dd030612f2b35ac0693125..eb206e1c25a3860642dd1f643a09ee7fd20b3a11 100644 (file)
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -289,28 +289,28 @@ h6 {font-size: 1em;}
     margin-left: 1px;
 }
 
-#site_nav_local_views {\r
-       position: relative;\r
-       z-index: 9;\r
-       float: right;\r
-    margin: 0px 0px 20px 0px;
+#site_nav_local_views {
+       position: relative;
+       z-index: 9;
+       float: right;
+    margin: 0px;
     width: 290px;
-}\r
-\r
-#site_nav_local_views li {\r
-       width: 100%;\r
-       margin-right: 0;\r
+}
+
+#site_nav_local_views li {
+       width: 100%;
+       margin-right: 0;
        margin-bottom: 0px;
        text-align: right;
 }
 
 #site_nav_local_views a {
     background: url(../images/overlay10.png) repeat-x top left;
-       display:block;\r
-       padding-right: 10px;\r
-       border: 1px solid #fff;\r
-       border-color: transparent;\r
-       padding-top: 4px;\r
+       display:block;
+       padding-right: 10px;
+       border: 1px solid #fff;
+       border-color: transparent;
+       padding-top: 4px;
        padding-bottom: 4px;
        font-size: 1.1em;
        font-weight: normal;
@@ -321,17 +321,17 @@ h6 {font-size: 1em;}
        border-bottom: 1px solid #999;
        border-left: none;
        text-shadow: 0px 1px 0px rgba(0,0,0,0.8); 
-       border-radius:0;\r
-       -moz-border-radius:0;\r
+       border-radius:0;
+       -moz-border-radius:0;
        -webkit-border-radius:0;
     text-decoration: none;
 }
 
 #site_nav_local_views li:first-child a {
-       border-radius-topright:4px;\r
+       border-top-right-radius:4px;
        -moz-border-radius-topright:4px;
        -webkit-border-top-right-radius:4px;
-}\r
+}
 
 #site_nav_local_views a:hover {
     background: url(../images/overlay20.png) repeat-x top left;
@@ -346,7 +346,7 @@ h6 {font-size: 1em;}
     color: #4d4d4d !important;
     box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
     -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
-       -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.5);\r
+       -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
        border-bottom: 1px solid #fff;
        text-shadow: 1px 1px 0px rgba(0,0,0,0.2);
     background-color: #e2e2e2;
@@ -365,7 +365,7 @@ h6 {font-size: 1em;}
        border-radius: 4px;
        -moz-border-radius: 4px;
        -webkit-border-radius: 4px;
-       border-radius-topright: 0px;\r
+       border-top-right-radius: 0px;
        -moz-border-radius-topright: 0px;
        -webkit-border-top-right-radius: 0px;
     padding: 14px 10px 20px 10px;
@@ -379,9 +379,8 @@ h6 {font-size: 1em;}
        padding: 0px;
     padding-top: 16px;
     padding-left: 10px;
-    margin-top: -20px;
     background-color: #262626;
-       border-radius-bottomright: 6px;\r
+       border-bottom-right-radius: 6px;
        -moz-border-radius-bottomright: 6px;
        -webkit-border-bottom-right-radius: 6px;
 }
@@ -401,10 +400,10 @@ h6 {font-size: 1em;}
     width: 248px;
 }
 
-#aside_primary .section H2 {\r
-       font-size: 1.1em;\r
-       font-weight: normal;\r
-       letter-spacing: 0.2em;\r
+#aside_primary .section H2 {
+       font-size: 1.1em;
+       font-weight: normal;
+       letter-spacing: 0.2em;
        margin-bottom: 10px;
     margin-left: -4px;
        padding: 6px;