Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
redmatrix 2016-05-16 13:47:04 -07:00
commit c8322e89c6
9 changed files with 6127 additions and 5946 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -333,6 +333,15 @@ input {
text-decoration: none;
}
.section-content-info-wrapper {
color: #fff;
background-color: #43488A;
}
.section-content-info-wrapper a {
color: #fff;
}
.btn, #event-edit-form .btn, input.directory-rating-submit {
border: 1px solid #FFF;
color: #FFF;
@ -450,7 +459,7 @@ a:hover > .fa-trash-o {
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF;
}
.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left {
.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle {
color: #FFF;
}
.navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {

View File

@ -63,7 +63,7 @@
background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
}
.alert-info {
.alert-info, .section-content-info-wrapper {
color: #CCC;
background-color:#333;
border-color: #444;
@ -79,16 +79,35 @@
color: #fff;
}
#acl-showall {
color: #fff;
#acl-select {
background-color:#333;
border: 1px solid #444;
color: #FFF;
}
#acl-showall {
color: #FFF;
}
#acl-list {
border: 1px solid #333;
border: 1px solid #444;
}
#acl-search-wrapper {
border-bottom: 1px solid #444;
}
.acl-list-item {
border: 1px solid #333;
border: 1px solid #222;
color: #CCC;
background-color:#333;
}
.abook-self {
border: 1px solid #222;
color: #555;
background-color:#111;
}
.modal-content {
@ -312,7 +331,7 @@ pre {
background-image: none;
}
.open .dropdown-toggle.btn-default {
.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
color: #ccc;
background-color: #222;
border-color: #222;

View File

@ -51,8 +51,21 @@
background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
}
#acl-select {
border: 1px solid #000;
color: #000;
}
.acl-list-item {
border: 1px solid #000;
background-color: #FFF;
}
.abook-self {
background-color: #fff;
border: 1px solid #EEE;
color: #ccc;
background-color: #EEE;
}
.acl-button-show,
@ -60,18 +73,10 @@
color: #000;
}
#acl-showall {
color: #000;
}
#acl-list {
border: 1px solid #fff;
}
.acl-list-item {
border: 1px solid #fff;
}
.modal-content {
background-color: #fff;
}

View File

@ -51,8 +51,30 @@
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.section-content-info-wrapper {
color: #50f148;
background-color:#000;
border: 1px solid #143D12 !important;
}
.modal-header {
border-bottom: 1px solid #143D12;
}
.modal-footer {
border-top: 1px solid #143D12;
}
#acl-select {
background-color: #000;
border: 1px solid #143D12;
color: #50f148;
}
.abook-self {
background-color: #000;
color: #333;
background-color: #000 !important;
border: 1px solid #111;
}
.acl-button-show,
@ -60,16 +82,18 @@
color: #fff;
}
#acl-showall {
color: #fff;
#acl-list {
border: 1px solid #143D12;
}
#acl-list {
border: 1px solid #000;
#acl-search-wrapper {
border-bottom: 1px solid #143D12;
}
.acl-list-item {
border: 1px solid #000;
border: 1px solid #111;
background-color:#111;
}
.modal-content {
@ -267,7 +291,7 @@ pre {
background-image: none;
}
.open .dropdown-toggle.btn-default {
.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
color: #50f148;
background-color: #000;
border-color: #143D12;

View File

@ -47,8 +47,30 @@
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.section-content-info-wrapper {
color: #fff;
background-color:#000;
border: 1px solid #fff !important;
}
.modal-header {
border-bottom: 1px solid #000;
}
.modal-footer {
border-top: 1px solid #000;
}
#acl-select {
background-color: #000;
border: 1px solid #fff;
color: #fff;
}
.abook-self {
background-color: #000;
color: #333;
background-color: #111 !important;
border: 1px solid #111;
}
.acl-button-show,
@ -56,16 +78,17 @@
color: #fff;
}
#acl-showall {
color: #fff;
#acl-list {
border: 1px solid #000;
}
#acl-list {
border: 1px solid #000;
#acl-search-wrapper {
border-bottom: 1px solid #000;
}
.acl-list-item {
border: 1px solid #000;
border: 1px solid #fff;
background-color:#000;
}
.modal-content {
@ -246,10 +269,10 @@ pre {
background-image: none;
}
.open .dropdown-toggle.btn-default {
.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
color: #fff;
background-color: #000;
border-color: #000;
border-color: #fff;
}
.preview {