Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / theme / diabook-aerith / style.css

diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index d1611d326166479ffa26ed4f9a646bc4c67fff25..a9269f21ddff3703c30fba015e728fbfef0b5848 100644 (file)
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -527,8 +527,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-       background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+       background: aliceBlue;
 }
 .tool .label {
   float: left;
@@ -1061,44 +1062,57 @@ ul.menu-popup .empty {
        }
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
        }
 .menu-profile-list:hover{
-       background: #EEE;
+       background: aliceBlue; 
        }
 .menu-profile-list-item{
        padding-left: 5px;
+       vertical-align: middle;
        }       
 .menu-profile-list-item:hover{ 
        text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
        background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
+       float: left;
+       height: 22px;
+       width: 22px;
        }
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
        background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
-       }
-.menu-profile-list.events{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
        background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
-       }
-.menu-profile-list.notes{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
        background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
-       }
-.menu-profile-list.foren{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
        background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
-       }
-.menu-profile-list.com_side{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
        background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
-       }
-.menu-profile-list.pscontacts{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
        background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
-       }
+       float: left;
+       height: 22px;
+   width: 22px;}
 /* aside */
 aside {
   display: table-cell;
@@ -1216,6 +1230,50 @@ aside #likes a:hover{
   float: left;
   margin-right: 20px;          
        }
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add         { 
+               background-image: url("../../../images/icons/16/add.png");
+               float: right;
+               opacity: 0.1;
+               margin-right: 14px;
+               }
+.icon.text_add:hover   { 
+               background-image: url("../../../images/icons/16/add.png");
+               float: right;
+               cursor: pointer;
+               margin-right: 14px;
+               opacity: 1;
+-webkit-transition: all 0.2s ease-in-out;
+-moz-transition: all 0.2s ease-in-out;
+-o-transition: all 0.2s ease-in-out;
+-ms-transition: all 0.2s ease-in-out;
+transition: all 0.2s ease-in-out;
+               }
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1396,10 +1454,10 @@ body .pageheader{
   color: #999;
 }
 .wall-item-photo-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
   margin-bottom: 14px;
 }
 .wall-item-photo-container .wall-item-content img {
@@ -1541,10 +1599,10 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
   margin-bottom: 14px;
 }
 
@@ -2147,6 +2205,41 @@ ul.tabs li .active {
     box-shadow: 2px 2px 2px #CFCFCF;
     margin-left: 5px;
 }
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {       
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+       }
 /**
  * Form fields
  */