aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-03-22 21:10:26 +0100
committermarijus <mario@mariovavti.com>2014-03-22 21:10:26 +0100
commit13916566f016a6b754401ca6cd6423f2a7ecaccf (patch)
tree862a9d117091671809bdaafa7e7f0af336695461
parentc968a18db3ae9ddb0cc9e9be18d1ddb1335e423f (diff)
downloadvolse-hubzilla-13916566f016a6b754401ca6cd6423f2a7ecaccf.tar.gz
volse-hubzilla-13916566f016a6b754401ca6cd6423f2a7ecaccf.tar.bz2
volse-hubzilla-13916566f016a6b754401ca6cd6423f2a7ecaccf.zip
use border-box for everything
-rw-r--r--include/photos.php2
-rw-r--r--view/css/bootstrap-red.css19
-rw-r--r--view/css/conversation.css12
-rw-r--r--view/css/default.css7
-rw-r--r--view/css/widgets.css4
-rw-r--r--view/theme/redbasic/css/style.css22
6 files changed, 28 insertions, 38 deletions
diff --git a/include/photos.php b/include/photos.php
index 82af4aaeb..be386f1c9 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -426,4 +426,4 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
$item_id = $result['item_id'];
return $item_id;
-} \ No newline at end of file
+}
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 016c66c97..10d341691 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,28 +1,9 @@
/* override some bootstrap settings */
-*,
-*:before,
-*:after {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
html {
font-size: 100%;
}
-.panel-body .form-control{
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-.profile-jot-text{
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
-
-
h1,
.h1 {
font-size: 24px;
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 33786600d..8d7404b5d 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -6,7 +6,7 @@
border: 0px;
margin: 0px;
padding: 8px;
- height: 1.8em;
+ height: 3.4em;
width: 70%;
margin-bottom: 5px;
}
@@ -16,10 +16,10 @@
}
#profile-jot-text {
- height: 1.8em;
+ height: 3.4em;
padding: 8px;
margin-right: 0px;
- width: 90%;
+ width: 100%;
}
#profile-jot-text-loading {
@@ -29,11 +29,11 @@
#profile-jot-submit-wrapper {
margin-top: 10px;
- width: 90%;
+ width: 100%;
}
#profile-jot-submit {
- height: 22px;
+ height: 30px;
width: 70px;
float: right;
}
@@ -369,7 +369,7 @@
}
.comment-edit-text-empty {
- height: 1.2em;
+ height: 2.8em;
width: 30%;
overflow: auto;
margin-bottom: 10px;
diff --git a/view/css/default.css b/view/css/default.css
index 9ece626b4..c6a8fe58e 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -14,11 +14,12 @@ main {
}
aside#region_1 {
- width: 210px;
- min-width: 210px;
+ width: 231px;
+ min-width: 231px;
+ max-width: 231px;
display: table-cell;
vertical-align: top;
- padding: 65px 7px 13px 7px;
+ padding: 65px 7px 0px 7px;
}
aside input[type='text'] {
diff --git a/view/css/widgets.css b/view/css/widgets.css
index dcda66b81..7c2a03c3b 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -22,8 +22,8 @@
/* notes */
#note-text {
- width: 190px;
- max-width: 190px;
+ width: 100%;
+ resize: vertical;
height: 150px;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index eee31342f..ecb9352ec 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -357,6 +357,10 @@ footer {
color: #444444;
}
+.vcard {
+ padding: 8px;
+}
+
.vcard .title {
margin-bottom: 5px;
}
@@ -429,9 +433,9 @@ footer {
#profile-photo-wrapper img {
- width:175px;
- height:175px;
padding: 12px;
+ width: 201px;
+ height: 201px;
}
#profile-in-dir-yes-label,
@@ -727,6 +731,7 @@ footer {
#contact-block {
margin-top: 25px;
+ padding: 8px;
}
#contact-block-numcontacts {
@@ -736,8 +741,8 @@ footer {
.contact-block-div {
float: left;
- width: 52px;
- height: 52px;
+ width: 50px;
+ height: 50px;
}
.contact-block-textdiv {
float: left;
@@ -1240,7 +1245,7 @@ brain is weird like that */
background-image:url("../../../../images/onoff.jpg");
background-repeat: no-repeat;
padding: 4px 2px 2px 2px;
- height: 16px;
+ height: 24px;
text-decoration: none;
}
.field .onoff .off {
@@ -1430,6 +1435,9 @@ div.jGrowl div.info {
right: 15px;
}
+div.jGrowl div.jGrowl-notification {
+ min-height: 60px;
+}
#id_term_label {
width:75px;
@@ -2264,8 +2272,8 @@ blockquote {
}
main {
- left: -225px;
- width: calc( 100% + 225px );
+ left: -231px;
+ width: calc( 100% + 231px );
}
main.region_1-on {