aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-30 19:37:43 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-30 19:37:43 +0200
commit77f57e1b135674f48a37e7cf0b1d7bb9172665ca (patch)
tree12aeed45d7941646bfd79b7c3892e016190cab09
parent24e7a3413c92c516e662f0c418fde992a9f6c9da (diff)
parentf50fb7d6ca47729c7cb464f84b768d56e35b62d6 (diff)
downloadvolse-hubzilla-77f57e1b135674f48a37e7cf0b1d7bb9172665ca.tar.gz
volse-hubzilla-77f57e1b135674f48a37e7cf0b1d7bb9172665ca.tar.bz2
volse-hubzilla-77f57e1b135674f48a37e7cf0b1d7bb9172665ca.zip
Merge remote-tracking branch 'friendica/master'
-rw-r--r--view/theme/diabook-aerith/style-network.css3
-rw-r--r--view/theme/diabook-aerith/style-profile.css3
-rw-r--r--view/theme/diabook-aerith/style.css2
-rw-r--r--view/theme/diabook-red/style-network.css25
-rw-r--r--view/theme/diabook-red/style-profile.css10
-rw-r--r--view/theme/diabook-red/style.css7
6 files changed, 36 insertions, 14 deletions
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index ea1831a57..b35a70c65 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1039,6 +1039,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1261,6 +1263,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 5ff380e68..9c9f8b4e6 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1038,6 +1038,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1260,6 +1262,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 82cfcd651..fbcca699f 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -1036,6 +1036,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 0bfc059cc..d3e080bf5 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -557,6 +557,7 @@ header #banner a:hover {
outline: none;
vertical-align: middle;
font-weight: bolder;
+
}
header #banner #logo-img {
height: 25px;
@@ -566,6 +567,7 @@ header #banner #logo-text {
font-size: 20px;
position: absolute;
top: 10%;
+ margin-left: 3px;
}
/* nav */
nav {
@@ -657,7 +659,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
- margin: 3px 17px;
+ margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@@ -1037,6 +1039,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1244,7 +1248,7 @@ right_aside {
/* background: #F1F1F1; */
}
-right_aside a{color: #ff500f;}
+right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
@@ -1256,6 +1260,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
@@ -1793,7 +1798,7 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
@@ -1822,12 +1827,14 @@ transition: all 0.2s ease-in-out;
font-weight: bolder;
}
/*input[type="submit"] {
- border: 0px;
- background-color: @ButtonBackgroundColor;
- color: @ButtonColor;
- padding: 0px 10px;
- .rounded(5px);
- height: 18px;
+ background-color: #FF500F;
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+ cursor: pointer;
+ font-weight: bolder;
}*/
/** acl **/
#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index f31f72ab2..5af75f2b5 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -559,6 +559,7 @@ header #banner #logo-text {
font-size: 20px;
position: absolute;
top: 10%;
+ margin-left: 3px;
}
/* nav */
nav {
@@ -642,7 +643,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
- margin: 3px 17px;
+ margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@@ -1020,6 +1021,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 150px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1227,7 +1230,7 @@ right_aside {
/* background: #F1F1F1; */
}
-right_aside a{color: #ff500f;}
+right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
@@ -1239,6 +1242,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
right_aside .icon {width: 10px; height: 10px;}
.close_box {
background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
@@ -1772,7 +1776,7 @@ transition: all 0.2s ease-in-out;
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 0f622897b..40b5b2ec3 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -564,6 +564,7 @@ header #banner #logo-text {
font-size: 20px;
position: absolute;
top: 10%;
+ margin-left: 3px;
}
/* nav */
nav {
@@ -655,7 +656,7 @@ nav #logo-text {
nav .nav-menu-search {
position: relative;
- margin: 3px 17px;
+ margin: 4px 17px;
margin-right: 0px;
height: 17px;
width: 180px;
@@ -1034,6 +1035,8 @@ aside #profiles-menu {
}
aside #search-text {
width: 173px;
+ height: 17px;
+ padding-left: 10px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
@@ -1717,7 +1720,7 @@ body .pageheader{
float: right;
margin-left: 10px;
margin-top: 2px;
- font-size: 10px;
+ font-size: 9px;
font-weight: bolder;
cursor: pointer;
}