aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-10 16:26:36 -0800
committerfriendica <info@friendica.com>2014-12-10 16:26:36 -0800
commit7f1a42340a3f0967e23cf836b2c417a1b9b9b20b (patch)
tree27627ee92feb7ac5c16fcb1214f0819d2f68c653 /view/css
parent58067c24fc5200993539af6d7f7254877662c3c9 (diff)
parentc91aa863d85e6d3b3a260fefe5e281d66730c4c9 (diff)
downloadvolse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.tar.gz
volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.tar.bz2
volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/css')
-rw-r--r--view/css/bootstrap-red.css6
-rw-r--r--view/css/default.css4
-rw-r--r--view/css/widgets.css1
3 files changed, 1 insertions, 10 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 9f93395c9..587ea7b8f 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,11 +1,5 @@
/* override some bootstrap settings */
-/* this might be a bug in bootstrap */
-.input-group-addon,
-.input-group-btn {
- width: unset;
-}
-
/* nav overrides */
nav .badge {
diff --git a/view/css/default.css b/view/css/default.css
index 40d5cfc59..56173f932 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -23,10 +23,6 @@ aside#region_1 {
padding: 65px 7px 0px 7px;
}
-aside input[type='text'] {
- width: 100%;
-}
-
section {
width: 100%;
display: table-cell;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index a24f5fb29..4db87e633 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -13,6 +13,7 @@
}
.widget-input {
+ width: 100%;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}