aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2015-12-04 10:32:14 +0100
committermrjive <mrjive@mrjive.it>2015-12-04 10:32:14 +0100
commit051346325609f5f2e78ef0deaf182c65d7823bbc (patch)
treef3660377b3daf6599623d2e4fb95b4d33c30d8cc /view/theme
parent53a796afcc0cff6f9e3f51457df4506a43db1945 (diff)
parent8a9d743f6f518d3af35014130dcef8f148148113 (diff)
downloadvolse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.gz
volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.bz2
volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.zip
Merge pull request #9 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/narrow_navbar.css3
-rw-r--r--view/theme/redbasic/css/style.css184
-rw-r--r--view/theme/redbasic/schema/bluegrid.css12
-rw-r--r--view/theme/redbasic/schema/dark.css4
4 files changed, 46 insertions, 157 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index f403fabbf..9d14beb33 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -8,7 +8,7 @@
min-height:25px !important;
}
- nav img {
+ nav .navbar-header img {
height: 30px;
width: 30px;
margin-top: 1px;
@@ -49,7 +49,6 @@
top: -31px;
float: right;
font-size: 10px;
- padding: 2px 6px;
cursor: pointer;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d981a38b9..d76992b2f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -241,7 +241,8 @@ footer {
padding-right: 3em;
}
-.birthday-today, .event-today {
+.birthday-today,
+.event-today {
font-weight: bold;
}
@@ -785,6 +786,7 @@ a.rateme, div.rateme {
#nav-search-text {
font-size: 12px;
+ width: 200px;
height: 20px;
margin: 15px;
padding: 0px 5px 0px 5px;
@@ -847,121 +849,6 @@ nav .acpopup {
cursor: pointer;
}
-.eventcal {
- float: left;
- font-size: 20px;
-}
-
-#event-summary-text {
- margin-top: 15px;
-}
-
-#event-share-checkbox {
- float: left;
- margin-top: 10px;
-}
-
-#event-share-text {
- float: left;
- margin-top: 10px;
- margin-left: 5px;
-}
-
-#event-share-break {
- clear: both;
- margin-bottom: 10px;
-}
-
-.event-wrapper {
- width: 400px;
- height: auto;
- padding: 10px;
-}
-
-.vevent {
- max-width: 100%;
- margin: 10px;
- padding: 10px;
- border: 1px solid #CCCCCC;
-}
-
-.vevent .event-summary {
- margin: 10px;
- font-weight: bold;
-}
-
-.vevent .event-description, .vevent .event-location {
- margin-left: 10px;
- margin-right: 10px;
-}
-.vevent .event-start {
- margin-left: 10px;
- margin-right: 10px;
-}
-
-#new-event-link {
- margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link, .drop-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
-}
-
-.event-description:before {
- content: url('../../../../images/calendar.png');
- margin-right: 15px;
-}
-
-.event-start, .event-end {
- margin-left: 10px;
- width: 300px;
- clear: both;
-}
-
-.event-owner img {
- padding: 10px;
-}
-
-.event-buttons {
- margin-top: 10px;
- margin-left: 10px;
-}
-
-.event-start .dtstart, .event-end .dtend {
- float: right;
- margin-right: 10px;
-}
-
-.event-list-date {
- margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
- float: left;
- margin-left: 32px;
- margin-right: 32px;
- margin-top: 64px;
-}
-.event-calendar-end {
- clear: both;
-}
-
-
-.calendar {
- font-family: Courier, monospace;
-}
-.today {
- font-weight: bold;
- color: #FF0000;
-}
-
-.fc-state-highlight {
- background: none repeat scroll 0% 0% #FCF8E3 !important;
-}
-
#cboxOverlay {
z-index: 1050;
}
@@ -1117,31 +1004,6 @@ nav .acpopup {
color: #ff0000;
}
-
-#event-start-text, #event-finish-text {
- margin-top: 10px;
- margin-bottom: 5px;
-}
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
- float: left;
-}
-#event-datetime-break {
- margin-bottom: 10px;
-}
-
-#event-nofinish-break, #event-adjust-break {
- clear: both;
-}
-
-#event-desc-text, #event-location-text {
- margin-top: 15px;
- margin-bottom: 5px;
-}
-#event-submit {
- margin-top: 10px;
-}
-
#item-delete-selected {
margin-top: 30px;
}
@@ -1328,6 +1190,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
.contactname {
padding-top: 2px;
font-weight: bold;
+ line-height: 1em;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -1335,7 +1198,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
}
.dropdown-sub-text {
- font-size: 0.833em;
+ line-height: 1em;
overflow: hidden;
text-overflow: ellipsis;
display: block;
@@ -1639,8 +1502,12 @@ img.mail-conv-sender-photo {
padding: 0.5em 10px;
}
-.wall-photo-item {
- /*padding: 0.5em 10px;*/
+.wall-event-item {
+ padding: 10px;
+ color: #fff;
+ background-color: #3A87AD; /* should reflect calendar color */
+ border-top-left-radius: $radiuspx;
+ border-top-right-radius: $radiuspx;
}
.wall-photo-item img {
@@ -1720,7 +1587,8 @@ img.mail-conv-sender-photo {
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
}
-.wall-item-ago {
+.wall-item-ago,
+.dropdown-sub-text {
color: #777;
font-size: 0.833em;
}
@@ -1854,6 +1722,26 @@ nav .dropdown-menu {
border-bottom-left-radius: $radiuspx;
}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:focus,
+.dropdown-menu > .active > a:hover {
+ color: #333;
+ background-color: #f5f5f5;
+}
+
+.dropdown-menu-img-sm {
+ float: left;
+ width: 36px;
+ height: 36px;
+ margin-right: 5px;
+}
+
+.dropdown-menu-img-xs {
+ height: 18px;
+ width: 18px;
+ margin-right: 5px;
+}
+
#usermenu-caret {
color: $nav_icon_colour;
}
@@ -2111,8 +1999,6 @@ nav .badge.mail-update:hover {
#tabs-collapse-1 {
padding: 0px;
margin-bottom: 25px;
- border-top: none;
- box-shadow: none;
}
.btn {
@@ -2315,7 +2201,3 @@ nav .badge.mail-update:hover {
.help-searchlist a {
font-size: 130%;
}
-
-.response-list ul {
- list-style-type: none;
-}
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 2c6f34558..0eb3dab1f 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -110,7 +110,7 @@ input#jot-title:hover, input#jot-title:focus {
border-color: transparent;
}
-nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu {
+nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
background-color: rgba(67,72,138,.97);
color: #fff;
border-radius: 0;
@@ -188,6 +188,10 @@ nav .badge:hover, nav .badge:focus {
box-shadow: 0px 6px 12px rgba(45,48,92,.176);
}
+.tags a {
+ color: inherit;
+}
+
#profile-photo-wrapper {
border: none;
}
@@ -299,7 +303,7 @@ input {
border: 1px solid rgba(255,255,255,.5);
}
-.contact-entry-edit a:hover, .contact-entry-edit a:focus, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus {
+.contact-entry-edit:hover a, .contact-entry-edit:focus a, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus {
color: #43488A;
}
@@ -337,7 +341,7 @@ input {
background-color: #FFF;
}
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit {
background-color: #FFF;
color: #43488A;
border-radius: 0px;
@@ -346,7 +350,7 @@ input {
transition: all .3s ease-in-out;
}
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus {
border-color: #FFF;
background-color: #43488A;
color: #FFF;
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 20f9e0833..936f74761 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -88,6 +88,10 @@
background-color: #111;
}
+.jotnets-wrapper > a.btn {
+ font-weight: 400 !important;
+}
+
.btn {
background-color: #1e1e1e;
border-color: #222;