aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-06-25 14:25:33 -0700
committerSimon <simon@kisikew.org>2012-06-25 14:25:33 -0700
commitd944ff7833355f3bae7befd9c97becf01c4083b1 (patch)
treed42b6cd22730286fc4b8d47669901d9106a8c1c2
parentcb450d336559c8d2049861f518420c100719a8d6 (diff)
parent2ed3af55a821f99732950e3ba2c43f7ba816d5bc (diff)
downloadvolse-hubzilla-d944ff7833355f3bae7befd9c97becf01c4083b1.tar.gz
volse-hubzilla-d944ff7833355f3bae7befd9c97becf01c4083b1.tar.bz2
volse-hubzilla-d944ff7833355f3bae7befd9c97becf01c4083b1.zip
Merge pull request #361 from simonlnu/master
cleaned up the css a bit
-rw-r--r--view/theme/dispy/dark/style.css9
-rw-r--r--view/theme/dispy/dark/style.less17
-rw-r--r--view/theme/dispy/light/style.css9
-rw-r--r--view/theme/dispy/light/style.less17
4 files changed, 14 insertions, 38 deletions
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index bf23cf625..6551d9a93 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -59,7 +59,7 @@ h6{font-size:xx-small;}
.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
-#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+#item-delete-selected-desc{float:left;font-size:smaller;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
#group-edit-desc{margin:10px 0px;}
@@ -226,7 +226,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wallwall .wall-item-photo-end{clear:both;}
.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
-#item-delete-selected{overflow:auto;width:100%;}
#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
@@ -390,10 +389,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
.checkeditem{opacity:1;}
-#item-delete-selected{margin-top:30px;}
-#item-delete-selected{position:absolute;left:35px;margin-top:20px;}
-#item-delete-selected-icon{float:left;margin-right:5px;}
-#item-delete-selected-desc{font-size:smaller;}
+#item-delete-selected{margin-top:30px;position:absolute;left:35px;width:15em;overflow:auto;}
+#item-delete-selected-icon{float:left;margin:11px 5px;}
.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 1c2dc0665..5e6883964 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -325,6 +325,7 @@ h6 {
}
#item-delete-selected-desc {
float: left;
+ font-size: smaller;
margin-right: 5px;
&:hover {
text-decoration: underline;
@@ -1533,10 +1534,6 @@ nav #nav-notifications-linkmenu {
}
}
}
-#item-delete-selected {
- overflow: auto;
- width: 100%;
-}
#connect-services-header,
#extra-help-header {
margin: 1.5em 0 0 0;
@@ -2370,20 +2367,14 @@ div {
}
#item-delete-selected {
margin-top: 30px;
-}
-/* was tired of having no way of moving it around, so
-* here's a little 'hook' to do so */
-#item-delete-selected {
position: absolute;
left: 35px;
- margin-top: 20px;
+ width: 15em;
+ overflow: auto;
}
#item-delete-selected-icon {
float: left;
- margin-right: 5px;
-}
-#item-delete-selected-desc {
- font-size: smaller;
+ margin: 11px 5px;
}
.fc-state-highlight {
background: @main_colour;
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index cbf0168f1..793feb6fc 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -59,7 +59,7 @@ h6{font-size:xx-small;}
.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:2px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
-#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+#item-delete-selected-desc{float:left;font-size:smaller;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
#group-edit-desc{margin:10px 0px;}
@@ -226,7 +226,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wallwall .wall-item-photo-end{clear:both;}
.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
-#item-delete-selected{overflow:auto;width:100%;}
#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
@@ -390,10 +389,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
.checkeditem{opacity:1;}
-#item-delete-selected{margin-top:30px;}
-#item-delete-selected{position:absolute;left:35px;margin-top:20px;}
-#item-delete-selected-icon{float:left;margin-right:5px;}
-#item-delete-selected-desc{font-size:smaller;}
+#item-delete-selected{margin-top:30px;position:absolute;left:35px;width:15em;overflow:auto;}
+#item-delete-selected-icon{float:left;margin:11px 5px;}
.fc-state-highlight{background:#eeeeec;color:#111111;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index c5624841e..13f296d22 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -326,6 +326,7 @@ h6 {
}
#item-delete-selected-desc {
float: left;
+ font-size: smaller;
margin-right: 5px;
&:hover {
text-decoration: underline;
@@ -1534,10 +1535,6 @@ nav #nav-notifications-linkmenu {
}
}
}
-#item-delete-selected {
- overflow: auto;
- width: 100%;
-}
#connect-services-header,
#extra-help-header {
margin: 1.5em 0 0 0;
@@ -2371,20 +2368,14 @@ div {
}
#item-delete-selected {
margin-top: 30px;
-}
-/* was tired of having no way of moving it around, so
-* here's a little 'hook' to do so */
-#item-delete-selected {
position: absolute;
left: 35px;
- margin-top: 20px;
+ width: 15em;
+ overflow: auto;
}
#item-delete-selected-icon {
float: left;
- margin-right: 5px;
-}
-#item-delete-selected-desc {
- font-size: smaller;
+ margin: 11px 5px;
}
.fc-state-highlight {
background: @bg_colour;