aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-04-29 21:49:43 -0700
committerfriendica <info@friendica.com>2015-04-29 21:49:43 -0700
commitc4221f32738dac51f691d5be1bebd2b50318521e (patch)
treee353242b42ca2942d7fe6d29888568c8bfe821ee /view/css
parent6679734135fb04f4a7beccb81663bf1e9574f062 (diff)
parent2376d2140ab6eeb8a44d7582a52978520844e229 (diff)
downloadvolse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz
volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2
volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip
Merge branch 'master' into tres
Conflicts: include/notifier.php
Diffstat (limited to 'view/css')
-rw-r--r--view/css/mod_blocks.css10
-rw-r--r--view/css/mod_layouts.css33
-rw-r--r--view/css/mod_webpages.css4
3 files changed, 44 insertions, 3 deletions
diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
index c930f5dc8..36a12e1d1 100644
--- a/view/css/mod_blocks.css
+++ b/view/css/mod_blocks.css
@@ -15,14 +15,18 @@
padding: 7px 3px 7px 10px;
}
-#block-list-table th:nth-child(5),
-#block-list-table td:nth-child(5){
- padding: 7px 3px;
+#block-list-table th:nth-child(2){
white-space: nowrap;
}
#block-list-table th:nth-child(6),
#block-list-table td:nth-child(6){
+ padding: 7px 3px;
+ white-space: nowrap;
+}
+
+#block-list-table th:nth-child(7),
+#block-list-table td:nth-child(7){
padding: 7px 10px 7px 7px;
white-space: nowrap;
}
diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css
index 7f65713e7..8e0a945bf 100644
--- a/view/css/mod_layouts.css
+++ b/view/css/mod_layouts.css
@@ -1,3 +1,36 @@
#layout-editor {
display: none;
}
+
+#layout-list-table {
+ width: 100%;
+}
+
+#layout-list-table th:nth-child(1){
+ padding: 7px 3px 7px 10px;
+ white-space: nowrap;
+}
+
+#layout-list-table td:nth-child(1){
+ padding: 7px 3px 7px 10px;
+}
+
+#layout-list-table th:nth-child(2){
+ white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(6),
+#layout-list-table td:nth-child(6){
+ padding: 7px 3px;
+ white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(7),
+#layout-list-table td:nth-child(7){
+ padding: 7px 10px 7px 7px;
+ white-space: nowrap;
+}
+
+.webpage-list-tool {
+ padding: 7px 10px;
+}
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index d88657c69..1c6ec4aea 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -15,6 +15,10 @@
padding: 7px 3px 7px 10px;
}
+#webpage-list-table th:nth-child(2){
+ white-space: nowrap;
+}
+
#webpage-list-table th:nth-child(7),
#webpage-list-table td:nth-child(7){
padding: 7px 3px;