aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-05-16 02:33:10 -0700
committerSimon <simon@kisikew.org>2012-05-16 02:33:10 -0700
commit423864dc2300231a0e1351253e4a792236da3810 (patch)
tree32b6eb5efd5a55e9afb861dff7eb1a05f3242c2e
parenta65bd73bf3f4a1e6ccfcdf0a06c70a4f1f4182ce (diff)
parent7eb73bc600a17e7611d3c77ef777bf81becfb0b5 (diff)
downloadvolse-hubzilla-423864dc2300231a0e1351253e4a792236da3810.tar.gz
volse-hubzilla-423864dc2300231a0e1351253e4a792236da3810.tar.bz2
volse-hubzilla-423864dc2300231a0e1351253e4a792236da3810.zip
Merge pull request #299 from simonlnu/master
get rid of the monstrosity for .button. need to find alternate solution
-rw-r--r--view/theme/dispy/dark/style.css4
-rw-r--r--view/theme/dispy/dark/style.less15
-rw-r--r--view/theme/dispy/light/style.css4
-rw-r--r--view/theme/dispy/light/style.less12
4 files changed, 19 insertions, 16 deletions
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 60e7db6e1..229fcbbdf 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -55,8 +55,8 @@ h6{font-size:xx-small;}
.action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeecc;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeecc;font-size:smaller;font-weight:bold;}
+.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
+.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#2e2f2e;border:1px outset #eeeecc;-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;}
.intro-approve-as-friend-desc{margin-top:10px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 7634db1d7..fb8769a87 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -282,20 +282,20 @@ h6 {
}
.button,
#profile-listing-desc {
- .box(25%, auto);
- background: @menu_bg_colour;
+ // .box(25%, auto);
+ // background: @menu_bg_colour;
color: @main_colour;
- .borders(2px, outset, darken(@menu_bg_colour, 20%));
- .rounded_corners;
+ // .borders(2px, outset, darken(@menu_bg_colour, 20%));
+ // .rounded_corners;
padding: 5px;
- font-size: smaller;
+ // font-size: smaller;
cursor: pointer;
&.active {
.box_shadow(4px, 4px, 7px);
}
a {
color: @main_colour;
- font-size: smaller;
+ // font-size: smaller;
font-weight: bold;
}
}
@@ -568,6 +568,9 @@ div.jGrowl div {
padding-left: 58px;
margin-top: 50px;
}
+ // &.jGrowl-message {
+
+ // }
}
#nav-notifications-menu {
margin: 30px 0 0 -20px;
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index e89ee7d24..3b1c6fd71 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -55,8 +55,8 @@ h6{font-size:xx-small;}
.action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeeec;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeeec;font-size:smaller;font-weight:bold;}
+.button,#profile-listing-desc{color:#eeeeec;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
+.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#eeeeec;border:1px outset #eeeeec;-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;}
.intro-approve-as-friend-desc{margin-top:10px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 51ffbd1f2..399578ba7 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -283,20 +283,20 @@ h6 {
}
.button,
#profile-listing-desc {
- .box(25%, auto);
- background: @menu_bg_colour;
+ // .box(25%, auto);
+ // background: @menu_bg_colour;
color: @bg_colour;
- .borders(2px, outset, darken(@menu_bg_colour, 20%));
- .rounded_corners;
+ // .borders(2px, outset, darken(@menu_bg_colour, 20%));
+ // .rounded_corners;
padding: 5px;
- font-size: smaller;
+ // font-size: smaller;
cursor: pointer;
&.active {
.box_shadow(4px, 4px, 7px);
}
a {
color: @bg_colour;
- font-size: smaller;
+ // font-size: smaller;
font-weight: bold;
}
}