aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2016-02-01 11:25:07 +0100
committermrjive <mrjive@mrjive.it>2016-02-01 11:25:07 +0100
commit337735094b944fd31ed96e36c869227a0d63e5d1 (patch)
tree763577a8373b26426dc131c58f6a7f8c9c9213bf /view/theme
parent28943af494eae225b256b9771a5699a1b05d7a2f (diff)
parent01b5b1347521951ca78b1718b03c45897800bf5e (diff)
downloadvolse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.tar.gz
volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.tar.bz2
volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.zip
Merge pull request #20 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css20
-rw-r--r--view/theme/redbasic/schema/bluegrid.css7
-rw-r--r--view/theme/redbasic/schema/dark.css12
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.css9
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.css9
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.css9
6 files changed, 61 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4ae08dec8..7b4a3ddd7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -297,7 +297,7 @@ footer {
margin-bottom: 10px;
padding: 10px;
background-color: rgba(254,254,254,0.5);
- border-bottom: 1px solid rgba(238,238,238,0.8);
+ border: 1px solid rgba(254,254,254,0.5);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -1160,6 +1160,13 @@ img.mail-conv-sender-photo {
background-color: #fff;
}
+#profile-jot-wrapper {
+ background-color: rgba(254,254,254,.5);
+ border: 1px solid rgba(254,254,254,.5);
+ border-radius: $radiuspx;
+
+}
+
#profile-jot-text {
color:#000;
border: 1px solid #cccccc;
@@ -1361,8 +1368,8 @@ img.mail-conv-sender-photo {
/* widgets */
.widget {
- background-color: rgba(254,254,254,0.5);
- border-bottom: 1px solid rgba(238,238,238,0.8);
+ background-color: rgba(254,254,254,.5);
+ border: 1px solid rgba(254,254,254,.5);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -1691,6 +1698,13 @@ nav .badge.mail-update:hover {
padding: 7px 10px;
}
+.nav-tabs.nav-justified {
+ background-color: rgba(254,254,254,.5);
+ border: 1px solid rgba(254,254,254,.5);
+ border-top-left-radius: $radiuspx;
+ border-top-right-radius: $radiuspx;
+}
+
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 38701024f..36e26302a 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -11,6 +11,11 @@ body {
border: 1px solid #FFF;
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+
.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus {
color: rgba(255,255,255,.8);
}
@@ -458,3 +463,5 @@ a:hover > .icon-trash {
background-color: #43488A !important;
}
}
+
+
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index b667dca5c..16044b224 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #333;
border-radius: 0px
}
@@ -336,11 +337,18 @@ pre {
text-decoration: underline;
}
-
-
@media (min-width: 768px) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #333;
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 5a6b2655b..ba9771a40 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #fff;
}
@@ -265,4 +266,12 @@ pre {
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index d25585f98..0928c64f3 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #fff;
}
@@ -282,4 +283,12 @@ pre {
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 277ac7a12..45bdba1cd 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #fff;
}
@@ -261,4 +262,12 @@ pre {
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}