aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
Diffstat (limited to 'view/css')
-rw-r--r--view/css/bootstrap-red.css14
-rw-r--r--view/css/choklet.css53
-rw-r--r--view/css/choklet_edgesthree.css55
-rw-r--r--view/css/choklet_edgestwo.css53
-rw-r--r--view/css/choklet_full.css49
-rw-r--r--view/css/choklet_three.css51
-rw-r--r--view/css/conversation.css3
-rw-r--r--view/css/default.css29
-rw-r--r--view/css/full.css7
-rw-r--r--view/css/mod_connedit.css2
-rw-r--r--view/css/mod_viewconnections.css33
11 files changed, 331 insertions, 18 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 45cf76fb6..00e2f30b7 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -105,8 +105,18 @@ nav .dropdown-menu li a {
padding: 5px 10px;
}
-nav .navbar-collapse {
- max-height: 450px;
+nav .navbar-collapse .navbar-left {
+ float: left;
+}
+
+nav .navbar-collapse .navbar-right {
+ float: right;
}
/* nav overrides end */
+
+.dropdown-menu img {
+ width: 32px;
+ height: 32px;
+ margin-right: 5px;
+}
diff --git a/view/css/choklet.css b/view/css/choklet.css
new file mode 100644
index 000000000..e5e0240f5
--- /dev/null
+++ b/view/css/choklet.css
@@ -0,0 +1,53 @@
+header #banner {
+ position: fixed;
+ top: 0;
+ width: 250px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#blog-banner {
+ position: relative;
+ margin-top: 75px;
+ width: 100%;
+ margin-bottom: 20px;
+}
+
+nav.navbar {
+ width: 100%;
+ margin-left: 0;
+ margin-right: 0;
+}
+
+aside#region_1 {
+ display: block;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+ float: left;
+ margin-left: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+
+section {
+ margin-left: 15px;
+ margin-right: 15px;
+ float: left;
+ min-width: 400px;
+ width: 70%;
+ display: block;
+ padding-bottom: 350px;
+}
+
+#region_3 {
+ display: none;
+}
+
+#blog-margin {
+ margin-right: 0;
+ margin-left: 0;
+}
diff --git a/view/css/choklet_edgesthree.css b/view/css/choklet_edgesthree.css
new file mode 100644
index 000000000..ad4b4e29c
--- /dev/null
+++ b/view/css/choklet_edgesthree.css
@@ -0,0 +1,55 @@
+header #banner {
+ position: fixed;
+ top: 0;
+ width: 250px;
+ margin-left: auto;
+ margin-right: auto;
+}
+#blog-banner {
+ position: relative;
+ margin-top: 75px;
+ width: 100%;
+ margin-bottom: 20px;
+}
+
+nav.navbar {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+
+aside#region_1 {
+ display: block;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+ float: left;
+ margin-left: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+
+section {
+ margin-left: 15px;
+ margin-right: 15px;
+ float: left;
+ min-width: 650px;
+ width: 60%;
+ display: block;
+ padding-bottom: 350px;
+}
+
+#region_3 {
+ float: right;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+}
+
+#blog-margin {
+ margin-right: 5%;
+ margin-left: 5%;
+} \ No newline at end of file
diff --git a/view/css/choklet_edgestwo.css b/view/css/choklet_edgestwo.css
new file mode 100644
index 000000000..57d02679e
--- /dev/null
+++ b/view/css/choklet_edgestwo.css
@@ -0,0 +1,53 @@
+header #banner {
+ position: fixed;
+ top: 0;
+ width: 250px;
+ margin-left: auto;
+ margin-right: auto;
+}
+#blog-banner {
+ position: relative;
+ margin-top: 75px;
+ width: 100%;
+ margin-bottom: 20px;
+}
+
+nav.navbar {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+
+aside#region_1 {
+ display: block;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+ float: left;
+ margin-left: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+
+section {
+ margin-left: 15px;
+ margin-right: 15px;
+ float: left;
+ min-width: 400px;
+ width: 70%;
+ display: block;
+ padding-bottom: 350px;
+}
+
+#region_3 {
+ display: none;
+}
+
+
+#blog-margin {
+ margin-right: 5%;
+ margin-left: 5%;
+} \ No newline at end of file
diff --git a/view/css/choklet_full.css b/view/css/choklet_full.css
new file mode 100644
index 000000000..883bb1ed3
--- /dev/null
+++ b/view/css/choklet_full.css
@@ -0,0 +1,49 @@
+#blog-banner {
+ position: relative;
+ margin-top: 45px;
+ width: 100%;
+ height: 100px;
+ margin-bottom: 20px;
+}
+
+nav.navbar {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+
+aside#region_1 {
+ display: block;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+ float: left;
+ margin-left: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+
+section {
+ margin-left: 15px;
+ margin-right: 15px;
+ float: left;
+ min-width: 650px;
+ width: 60%;
+ display: block;
+ padding-bottom: 350px;
+}
+
+#region_3 {
+ float: right;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+}
+
+#blog-margin {
+ margin-right: 5%;
+ margin-left: 5%;
+} \ No newline at end of file
diff --git a/view/css/choklet_three.css b/view/css/choklet_three.css
new file mode 100644
index 000000000..5bbff0e3b
--- /dev/null
+++ b/view/css/choklet_three.css
@@ -0,0 +1,51 @@
+header #banner {
+ position: fixed;
+ top: 0;
+ width: 250px;
+ margin-left: auto;
+ margin-right: auto;
+}
+#blog-banner {
+ position: relative;
+ margin-top: 75px;
+ width: 100%;
+ margin-bottom: 20px;
+}
+
+nav.navbar {
+ width: 100%;
+ margin-left: 0;
+ margin-right: 0;
+}
+
+aside#region_1 {
+ display: block;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+ float: left;
+ margin-left: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+
+section {
+ margin-left: 15px;
+ margin-right: 15px;
+ float: left;
+ min-width: 650px;
+ width: 60%;
+ display: block;
+ padding-bottom: 350px;
+}
+
+#region_3 {
+ float: right;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+}
+
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 3396863e7..3de9a1ec9 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -113,7 +113,7 @@
/* conversation */
.thread-wrapper.toplevel_item {
- width: 92%;
+ width: 90%;
}
/* conv_item */
@@ -306,7 +306,6 @@
.like-rotator {
float: left;
margin: 8px;
- color: $toolicon_colour;
}
.wall-item-delete-wrapper {
diff --git a/view/css/default.css b/view/css/default.css
index 4afcbf1d5..a98374960 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,22 +1,25 @@
+header #banner {
+ position: fixed;
+ top: 0;
+ width: 250px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
aside#region_1 {
- display: block;
- width: 210px;
- position: absolute;
- top: 65px;
- left: 0;
- margin-left: 10px;
+ min-width: 210px;
+ display: table-cell;
+ vertical-align: top;
+ padding: 65px 10px 10px 10px;
}
aside input[type='text'] {
width: 174px;
}
-
section {
- position: absolute;
- top: 65px;
- left: 250px;
- display: block;
- right: 15px;
- padding-bottom: 350px;
+ width: 100%;
+ display: table-cell;
+ vertical-align: top;
+ padding: 65px 15px 200px 10px;
}
diff --git a/view/css/full.css b/view/css/full.css
index 2e710df1d..38864925f 100644
--- a/view/css/full.css
+++ b/view/css/full.css
@@ -1,3 +1,10 @@
+header #banner {
+ position: fixed;
+ top: 0;
+ width: 250px;
+ margin-left: auto;
+ margin-right: auto;
+}
nav {
height: 24px;
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index f6da96433..83f167915 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -14,7 +14,7 @@
margin-bottom: 5px !important;
}
-.abook-pending-contact {
+.abook-pending-contact, .abook-permschange {
background: orange;
font-weight: bold;
margin: 10px;
diff --git a/view/css/mod_viewconnections.css b/view/css/mod_viewconnections.css
new file mode 100644
index 000000000..56add4cac
--- /dev/null
+++ b/view/css/mod_viewconnections.css
@@ -0,0 +1,33 @@
+
+
+.contact-entry-wrapper {
+ float: left;
+ width: 120px;
+ height: 120px;
+ padding: 10px;
+}
+
+#contacts-search {
+ font-size: 1em;
+ width: 300px;
+}
+
+#contacts-search-end {
+ margin-bottom: 10px;
+}
+
+.contact-entry-photo-end {
+ clear: both;
+}
+
+.contact-entry-name {
+ float: left;
+ margin-left: 0px;
+ margin-right: 10px;
+ width: 120px;
+ overflow: hidden;
+}
+
+.contact-entry-end {
+ clear: both;
+}