aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
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 /view/css
parentc968a18db3ae9ddb0cc9e9be18d1ddb1335e423f (diff)
downloadvolse-hubzilla-13916566f016a6b754401ca6cd6423f2a7ecaccf.tar.gz
volse-hubzilla-13916566f016a6b754401ca6cd6423f2a7ecaccf.tar.bz2
volse-hubzilla-13916566f016a6b754401ca6cd6423f2a7ecaccf.zip
use border-box for everything
Diffstat (limited to 'view/css')
-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
4 files changed, 12 insertions, 30 deletions
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;
}