Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
friendica
commit
4e454656fe
@ -7,7 +7,7 @@ which can be [url=http://gitweb.whogotzot.com/debian-install-script]downloaded h
|
||||
|
||||
Some programs such as Apache & Samba are removed by this script.
|
||||
|
||||
Note, this script will use Nginx as the webserver, and dropbear for ssh. It will also install PHP and MySQL from the DotDeb repository. The DotDeb is not an official Debian repository, though it is maintained by Debian developers.
|
||||
Note, this script will use Nginx as the webserver. It will also install PHP and MySQL from the DotDeb repository. The DotDeb is not an official Debian repository, though it is maintained by Debian developers.
|
||||
|
||||
The file setup-debian.sh has to be on your server.
|
||||
|
||||
@ -17,7 +17,7 @@ For the initial setup git may not be installed on your server, to install git:
|
||||
|
||||
If wget is installed try
|
||||
|
||||
[code]wget "http://gitweb.whogotzot.com/debian-install-script/snapshot/91e76332668509585d52d4fa3f5b81a728c67fa6.tar.gz" -O debian-setup.sh[/code]
|
||||
[code]wget http://git.beardyunixer.com/debian-install-script/blob/HEAD:/debian-setup.sh[/code]
|
||||
|
||||
To install wget:
|
||||
[code]apt-get install wget[/code]
|
||||
|
||||
37
library/bootstrap/css/bootstrap-theme.css
vendored
37
library/bootstrap/css/bootstrap-theme.css
vendored
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* Bootstrap v3.2.0 (http://getbootstrap.com)
|
||||
* Bootstrap v3.3.0 (http://getbootstrap.com)
|
||||
* Copyright 2011-2014 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
*/
|
||||
@ -29,6 +29,14 @@
|
||||
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
|
||||
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
|
||||
}
|
||||
.btn-default .badge,
|
||||
.btn-primary .badge,
|
||||
.btn-success .badge,
|
||||
.btn-info .badge,
|
||||
.btn-warning .badge,
|
||||
.btn-danger .badge {
|
||||
text-shadow: none;
|
||||
}
|
||||
.btn:active,
|
||||
.btn.active {
|
||||
background-image: none;
|
||||
@ -223,12 +231,13 @@
|
||||
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
|
||||
}
|
||||
.navbar-default .navbar-nav > .open > a,
|
||||
.navbar-default .navbar-nav > .active > a {
|
||||
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
|
||||
background-image: -o-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f3f3f3));
|
||||
background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
|
||||
background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
|
||||
background-image: -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
|
||||
background-image: linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
|
||||
background-repeat: repeat-x;
|
||||
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
|
||||
box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
|
||||
@ -246,12 +255,13 @@
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
|
||||
background-repeat: repeat-x;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > .open > a,
|
||||
.navbar-inverse .navbar-nav > .active > a {
|
||||
background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
|
||||
background-image: -o-linear-gradient(top, #222 0%, #282828 100%);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#222), to(#282828));
|
||||
background-image: linear-gradient(to bottom, #222 0%, #282828 100%);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
|
||||
background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
|
||||
background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
|
||||
background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
|
||||
background-repeat: repeat-x;
|
||||
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
|
||||
box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
|
||||
@ -376,6 +386,11 @@
|
||||
background-repeat: repeat-x;
|
||||
border-color: #3278b3;
|
||||
}
|
||||
.list-group-item.active .badge,
|
||||
.list-group-item.active:hover .badge,
|
||||
.list-group-item.active:focus .badge {
|
||||
text-shadow: none;
|
||||
}
|
||||
.panel {
|
||||
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
|
||||
|
||||
File diff suppressed because one or more lines are too long
419
library/bootstrap/css/bootstrap.css
vendored
419
library/bootstrap/css/bootstrap.css
vendored
@ -1,10 +1,10 @@
|
||||
/*!
|
||||
* Bootstrap v3.2.0 (http://getbootstrap.com)
|
||||
* Bootstrap v3.3.0 (http://getbootstrap.com)
|
||||
* Copyright 2011-2014 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
*/
|
||||
|
||||
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
|
||||
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
|
||||
html {
|
||||
font-family: sans-serif;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
@ -22,6 +22,7 @@ footer,
|
||||
header,
|
||||
hgroup,
|
||||
main,
|
||||
menu,
|
||||
nav,
|
||||
section,
|
||||
summary {
|
||||
@ -43,7 +44,7 @@ template {
|
||||
display: none;
|
||||
}
|
||||
a {
|
||||
background: transparent;
|
||||
background-color: transparent;
|
||||
}
|
||||
a:active,
|
||||
a:hover {
|
||||
@ -187,8 +188,11 @@ td,
|
||||
th {
|
||||
padding: 0;
|
||||
}
|
||||
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
|
||||
@media print {
|
||||
* {
|
||||
*,
|
||||
*:before,
|
||||
*:after {
|
||||
color: #000 !important;
|
||||
text-shadow: none !important;
|
||||
background: transparent !important;
|
||||
@ -205,8 +209,8 @@ th {
|
||||
abbr[title]:after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
a[href^="#"]:after,
|
||||
a[href^="javascript:"]:after {
|
||||
content: "";
|
||||
}
|
||||
pre,
|
||||
@ -241,10 +245,6 @@ th {
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.btn > .caret,
|
||||
.dropup > .btn > .caret {
|
||||
border-top-color: #000 !important;
|
||||
@ -255,6 +255,10 @@ th {
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.table-bordered th,
|
||||
.table-bordered td {
|
||||
border: 1px solid #ddd !important;
|
||||
@ -284,7 +288,8 @@ th {
|
||||
.glyphicon-plus:before {
|
||||
content: "\2b";
|
||||
}
|
||||
.glyphicon-euro:before {
|
||||
.glyphicon-euro:before,
|
||||
.glyphicon-eur:before {
|
||||
content: "\20ac";
|
||||
}
|
||||
.glyphicon-minus:before {
|
||||
@ -935,7 +940,6 @@ img {
|
||||
.carousel-inner > .item > img,
|
||||
.carousel-inner > .item > a > img {
|
||||
display: block;
|
||||
width: 100% \9;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
@ -944,7 +948,6 @@ img {
|
||||
}
|
||||
.img-thumbnail {
|
||||
display: inline-block;
|
||||
width: 100% \9;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
padding: 4px;
|
||||
@ -1117,9 +1120,6 @@ small,
|
||||
.small {
|
||||
font-size: 85%;
|
||||
}
|
||||
cite {
|
||||
font-style: normal;
|
||||
}
|
||||
mark,
|
||||
.mark {
|
||||
padding: .2em;
|
||||
@ -1328,10 +1328,6 @@ blockquote.pull-right small:after,
|
||||
blockquote.pull-right .small:after {
|
||||
content: '\00A0 \2014';
|
||||
}
|
||||
blockquote:before,
|
||||
blockquote:after {
|
||||
content: "";
|
||||
}
|
||||
address {
|
||||
margin-bottom: 20px;
|
||||
font-style: normal;
|
||||
@ -1362,6 +1358,7 @@ kbd {
|
||||
kbd kbd {
|
||||
padding: 0;
|
||||
font-size: 100%;
|
||||
font-weight: bold;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
@ -2060,6 +2057,12 @@ pre code {
|
||||
table {
|
||||
background-color: transparent;
|
||||
}
|
||||
caption {
|
||||
padding-top: 8px;
|
||||
padding-bottom: 8px;
|
||||
color: #777;
|
||||
text-align: left;
|
||||
}
|
||||
th {
|
||||
text-align: left;
|
||||
}
|
||||
@ -2120,12 +2123,10 @@ th {
|
||||
.table-bordered > thead > tr > td {
|
||||
border-bottom-width: 2px;
|
||||
}
|
||||
.table-striped > tbody > tr:nth-child(odd) > td,
|
||||
.table-striped > tbody > tr:nth-child(odd) > th {
|
||||
.table-striped > tbody > tr:nth-child(odd) {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
.table-hover > tbody > tr:hover > td,
|
||||
.table-hover > tbody > tr:hover > th {
|
||||
.table-hover > tbody > tr:hover {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
table col[class*="col-"] {
|
||||
@ -2244,13 +2245,15 @@ table th[class*="col-"] {
|
||||
.table-hover > tbody > tr.danger:hover > th {
|
||||
background-color: #ebcccc;
|
||||
}
|
||||
.table-responsive {
|
||||
min-height: .01%;
|
||||
overflow-x: auto;
|
||||
}
|
||||
@media screen and (max-width: 767px) {
|
||||
.table-responsive {
|
||||
width: 100%;
|
||||
margin-bottom: 15px;
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
-ms-overflow-style: -ms-autohiding-scrollbar;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
@ -2375,14 +2378,14 @@ output {
|
||||
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
|
||||
}
|
||||
.form-control::-moz-placeholder {
|
||||
color: #777;
|
||||
color: #999;
|
||||
opacity: 1;
|
||||
}
|
||||
.form-control:-ms-input-placeholder {
|
||||
color: #777;
|
||||
color: #999;
|
||||
}
|
||||
.form-control::-webkit-input-placeholder {
|
||||
color: #777;
|
||||
color: #999;
|
||||
}
|
||||
.form-control[disabled],
|
||||
.form-control[readonly],
|
||||
@ -2409,12 +2412,44 @@ input[type="time"].input-sm,
|
||||
input[type="datetime-local"].input-sm,
|
||||
input[type="month"].input-sm {
|
||||
line-height: 30px;
|
||||
line-height: 1.5 \0;
|
||||
}
|
||||
input[type="date"].input-lg,
|
||||
input[type="time"].input-lg,
|
||||
input[type="datetime-local"].input-lg,
|
||||
input[type="month"].input-lg {
|
||||
line-height: 46px;
|
||||
line-height: 1.33 \0;
|
||||
}
|
||||
_:-ms-fullscreen,
|
||||
:root input[type="date"],
|
||||
_:-ms-fullscreen,
|
||||
:root input[type="time"],
|
||||
_:-ms-fullscreen,
|
||||
:root input[type="datetime-local"],
|
||||
_:-ms-fullscreen,
|
||||
:root input[type="month"] {
|
||||
line-height: 1.42857143;
|
||||
}
|
||||
_:-ms-fullscreen.input-sm,
|
||||
:root input[type="date"].input-sm,
|
||||
_:-ms-fullscreen.input-sm,
|
||||
:root input[type="time"].input-sm,
|
||||
_:-ms-fullscreen.input-sm,
|
||||
:root input[type="datetime-local"].input-sm,
|
||||
_:-ms-fullscreen.input-sm,
|
||||
:root input[type="month"].input-sm {
|
||||
line-height: 1.5;
|
||||
}
|
||||
_:-ms-fullscreen.input-lg,
|
||||
:root input[type="date"].input-lg,
|
||||
_:-ms-fullscreen.input-lg,
|
||||
:root input[type="time"].input-lg,
|
||||
_:-ms-fullscreen.input-lg,
|
||||
:root input[type="datetime-local"].input-lg,
|
||||
_:-ms-fullscreen.input-lg,
|
||||
:root input[type="month"].input-lg {
|
||||
line-height: 1.33;
|
||||
}
|
||||
.form-group {
|
||||
margin-bottom: 15px;
|
||||
@ -2423,12 +2458,12 @@ input[type="month"].input-lg {
|
||||
.checkbox {
|
||||
position: relative;
|
||||
display: block;
|
||||
min-height: 20px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.radio label,
|
||||
.checkbox label {
|
||||
min-height: 20px;
|
||||
padding-left: 20px;
|
||||
margin-bottom: 0;
|
||||
font-weight: normal;
|
||||
@ -2491,35 +2526,41 @@ fieldset[disabled] .checkbox label {
|
||||
padding-left: 0;
|
||||
}
|
||||
.input-sm,
|
||||
.form-horizontal .form-group-sm .form-control {
|
||||
.form-group-sm .form-control {
|
||||
height: 30px;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
select.input-sm {
|
||||
select.input-sm,
|
||||
select.form-group-sm .form-control {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
textarea.input-sm,
|
||||
select[multiple].input-sm {
|
||||
textarea.form-group-sm .form-control,
|
||||
select[multiple].input-sm,
|
||||
select[multiple].form-group-sm .form-control {
|
||||
height: auto;
|
||||
}
|
||||
.input-lg,
|
||||
.form-horizontal .form-group-lg .form-control {
|
||||
.form-group-lg .form-control {
|
||||
height: 46px;
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
border-radius: 6px;
|
||||
}
|
||||
select.input-lg {
|
||||
select.input-lg,
|
||||
select.form-group-lg .form-control {
|
||||
height: 46px;
|
||||
line-height: 46px;
|
||||
}
|
||||
textarea.input-lg,
|
||||
select[multiple].input-lg {
|
||||
textarea.form-group-lg .form-control,
|
||||
select[multiple].input-lg,
|
||||
select[multiple].form-group-lg .form-control {
|
||||
height: auto;
|
||||
}
|
||||
.has-feedback {
|
||||
@ -2530,7 +2571,7 @@ select[multiple].input-lg {
|
||||
}
|
||||
.form-control-feedback {
|
||||
position: absolute;
|
||||
top: 25px;
|
||||
top: 0;
|
||||
right: 0;
|
||||
z-index: 2;
|
||||
display: block;
|
||||
@ -2538,6 +2579,7 @@ select[multiple].input-lg {
|
||||
height: 34px;
|
||||
line-height: 34px;
|
||||
text-align: center;
|
||||
pointer-events: none;
|
||||
}
|
||||
.input-lg + .form-control-feedback {
|
||||
width: 46px;
|
||||
@ -2554,7 +2596,11 @@ select[multiple].input-lg {
|
||||
.has-success .radio,
|
||||
.has-success .checkbox,
|
||||
.has-success .radio-inline,
|
||||
.has-success .checkbox-inline {
|
||||
.has-success .checkbox-inline,
|
||||
.has-success.radio label,
|
||||
.has-success.checkbox label,
|
||||
.has-success.radio-inline label,
|
||||
.has-success.checkbox-inline label {
|
||||
color: #3c763d;
|
||||
}
|
||||
.has-success .form-control {
|
||||
@ -2580,7 +2626,11 @@ select[multiple].input-lg {
|
||||
.has-warning .radio,
|
||||
.has-warning .checkbox,
|
||||
.has-warning .radio-inline,
|
||||
.has-warning .checkbox-inline {
|
||||
.has-warning .checkbox-inline,
|
||||
.has-warning.radio label,
|
||||
.has-warning.checkbox label,
|
||||
.has-warning.radio-inline label,
|
||||
.has-warning.checkbox-inline label {
|
||||
color: #8a6d3b;
|
||||
}
|
||||
.has-warning .form-control {
|
||||
@ -2606,7 +2656,11 @@ select[multiple].input-lg {
|
||||
.has-error .radio,
|
||||
.has-error .checkbox,
|
||||
.has-error .radio-inline,
|
||||
.has-error .checkbox-inline {
|
||||
.has-error .checkbox-inline,
|
||||
.has-error.radio label,
|
||||
.has-error.checkbox label,
|
||||
.has-error.radio-inline label,
|
||||
.has-error.checkbox-inline label {
|
||||
color: #a94442;
|
||||
}
|
||||
.has-error .form-control {
|
||||
@ -2627,6 +2681,9 @@ select[multiple].input-lg {
|
||||
.has-error .form-control-feedback {
|
||||
color: #a94442;
|
||||
}
|
||||
.has-feedback label ~ .form-control-feedback {
|
||||
top: 25px;
|
||||
}
|
||||
.has-feedback label.sr-only ~ .form-control-feedback {
|
||||
top: 0;
|
||||
}
|
||||
@ -2647,6 +2704,9 @@ select[multiple].input-lg {
|
||||
width: auto;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.form-inline .form-control-static {
|
||||
display: inline-block;
|
||||
}
|
||||
.form-inline .input-group {
|
||||
display: inline-table;
|
||||
vertical-align: middle;
|
||||
@ -2707,7 +2767,6 @@ select[multiple].input-lg {
|
||||
}
|
||||
}
|
||||
.form-horizontal .has-feedback .form-control-feedback {
|
||||
top: 0;
|
||||
right: 15px;
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
@ -2730,6 +2789,8 @@ select[multiple].input-lg {
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
vertical-align: middle;
|
||||
-ms-touch-action: manipulation;
|
||||
touch-action: manipulation;
|
||||
cursor: pointer;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
@ -2741,13 +2802,17 @@ select[multiple].input-lg {
|
||||
}
|
||||
.btn:focus,
|
||||
.btn:active:focus,
|
||||
.btn.active:focus {
|
||||
.btn.active:focus,
|
||||
.btn.focus,
|
||||
.btn:active.focus,
|
||||
.btn.active.focus {
|
||||
outline: thin dotted;
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px;
|
||||
}
|
||||
.btn:hover,
|
||||
.btn:focus {
|
||||
.btn:focus,
|
||||
.btn.focus {
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
}
|
||||
@ -2775,6 +2840,7 @@ fieldset[disabled] .btn {
|
||||
}
|
||||
.btn-default:hover,
|
||||
.btn-default:focus,
|
||||
.btn-default.focus,
|
||||
.btn-default:active,
|
||||
.btn-default.active,
|
||||
.open > .dropdown-toggle.btn-default {
|
||||
@ -2796,6 +2862,9 @@ fieldset[disabled] .btn-default:hover,
|
||||
.btn-default.disabled:focus,
|
||||
.btn-default[disabled]:focus,
|
||||
fieldset[disabled] .btn-default:focus,
|
||||
.btn-default.disabled.focus,
|
||||
.btn-default[disabled].focus,
|
||||
fieldset[disabled] .btn-default.focus,
|
||||
.btn-default.disabled:active,
|
||||
.btn-default[disabled]:active,
|
||||
fieldset[disabled] .btn-default:active,
|
||||
@ -2816,6 +2885,7 @@ fieldset[disabled] .btn-default.active {
|
||||
}
|
||||
.btn-primary:hover,
|
||||
.btn-primary:focus,
|
||||
.btn-primary.focus,
|
||||
.btn-primary:active,
|
||||
.btn-primary.active,
|
||||
.open > .dropdown-toggle.btn-primary {
|
||||
@ -2837,6 +2907,9 @@ fieldset[disabled] .btn-primary:hover,
|
||||
.btn-primary.disabled:focus,
|
||||
.btn-primary[disabled]:focus,
|
||||
fieldset[disabled] .btn-primary:focus,
|
||||
.btn-primary.disabled.focus,
|
||||
.btn-primary[disabled].focus,
|
||||
fieldset[disabled] .btn-primary.focus,
|
||||
.btn-primary.disabled:active,
|
||||
.btn-primary[disabled]:active,
|
||||
fieldset[disabled] .btn-primary:active,
|
||||
@ -2857,6 +2930,7 @@ fieldset[disabled] .btn-primary.active {
|
||||
}
|
||||
.btn-success:hover,
|
||||
.btn-success:focus,
|
||||
.btn-success.focus,
|
||||
.btn-success:active,
|
||||
.btn-success.active,
|
||||
.open > .dropdown-toggle.btn-success {
|
||||
@ -2878,6 +2952,9 @@ fieldset[disabled] .btn-success:hover,
|
||||
.btn-success.disabled:focus,
|
||||
.btn-success[disabled]:focus,
|
||||
fieldset[disabled] .btn-success:focus,
|
||||
.btn-success.disabled.focus,
|
||||
.btn-success[disabled].focus,
|
||||
fieldset[disabled] .btn-success.focus,
|
||||
.btn-success.disabled:active,
|
||||
.btn-success[disabled]:active,
|
||||
fieldset[disabled] .btn-success:active,
|
||||
@ -2898,6 +2975,7 @@ fieldset[disabled] .btn-success.active {
|
||||
}
|
||||
.btn-info:hover,
|
||||
.btn-info:focus,
|
||||
.btn-info.focus,
|
||||
.btn-info:active,
|
||||
.btn-info.active,
|
||||
.open > .dropdown-toggle.btn-info {
|
||||
@ -2919,6 +2997,9 @@ fieldset[disabled] .btn-info:hover,
|
||||
.btn-info.disabled:focus,
|
||||
.btn-info[disabled]:focus,
|
||||
fieldset[disabled] .btn-info:focus,
|
||||
.btn-info.disabled.focus,
|
||||
.btn-info[disabled].focus,
|
||||
fieldset[disabled] .btn-info.focus,
|
||||
.btn-info.disabled:active,
|
||||
.btn-info[disabled]:active,
|
||||
fieldset[disabled] .btn-info:active,
|
||||
@ -2939,6 +3020,7 @@ fieldset[disabled] .btn-info.active {
|
||||
}
|
||||
.btn-warning:hover,
|
||||
.btn-warning:focus,
|
||||
.btn-warning.focus,
|
||||
.btn-warning:active,
|
||||
.btn-warning.active,
|
||||
.open > .dropdown-toggle.btn-warning {
|
||||
@ -2960,6 +3042,9 @@ fieldset[disabled] .btn-warning:hover,
|
||||
.btn-warning.disabled:focus,
|
||||
.btn-warning[disabled]:focus,
|
||||
fieldset[disabled] .btn-warning:focus,
|
||||
.btn-warning.disabled.focus,
|
||||
.btn-warning[disabled].focus,
|
||||
fieldset[disabled] .btn-warning.focus,
|
||||
.btn-warning.disabled:active,
|
||||
.btn-warning[disabled]:active,
|
||||
fieldset[disabled] .btn-warning:active,
|
||||
@ -2980,6 +3065,7 @@ fieldset[disabled] .btn-warning.active {
|
||||
}
|
||||
.btn-danger:hover,
|
||||
.btn-danger:focus,
|
||||
.btn-danger.focus,
|
||||
.btn-danger:active,
|
||||
.btn-danger.active,
|
||||
.open > .dropdown-toggle.btn-danger {
|
||||
@ -3001,6 +3087,9 @@ fieldset[disabled] .btn-danger:hover,
|
||||
.btn-danger.disabled:focus,
|
||||
.btn-danger[disabled]:focus,
|
||||
fieldset[disabled] .btn-danger:focus,
|
||||
.btn-danger.disabled.focus,
|
||||
.btn-danger[disabled].focus,
|
||||
fieldset[disabled] .btn-danger.focus,
|
||||
.btn-danger.disabled:active,
|
||||
.btn-danger[disabled]:active,
|
||||
fieldset[disabled] .btn-danger:active,
|
||||
@ -3017,11 +3106,11 @@ fieldset[disabled] .btn-danger.active {
|
||||
.btn-link {
|
||||
font-weight: normal;
|
||||
color: #428bca;
|
||||
cursor: pointer;
|
||||
border-radius: 0;
|
||||
}
|
||||
.btn-link,
|
||||
.btn-link:active,
|
||||
.btn-link.active,
|
||||
.btn-link[disabled],
|
||||
fieldset[disabled] .btn-link {
|
||||
background-color: transparent;
|
||||
@ -3091,9 +3180,11 @@ input[type="button"].btn-block {
|
||||
}
|
||||
.collapse {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
.collapse.in {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
}
|
||||
tr.collapse.in {
|
||||
display: table-row;
|
||||
@ -3105,9 +3196,15 @@ tbody.collapse.in {
|
||||
position: relative;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
-webkit-transition: height .35s ease;
|
||||
-o-transition: height .35s ease;
|
||||
transition: height .35s ease;
|
||||
-webkit-transition-timing-function: ease;
|
||||
-o-transition-timing-function: ease;
|
||||
transition-timing-function: ease;
|
||||
-webkit-transition-duration: .35s;
|
||||
-o-transition-duration: .35s;
|
||||
transition-duration: .35s;
|
||||
-webkit-transition-property: height, visibility;
|
||||
-o-transition-property: height, visibility;
|
||||
transition-property: height, visibility;
|
||||
}
|
||||
.caret {
|
||||
display: inline-block;
|
||||
@ -3413,12 +3510,13 @@ tbody.collapse.in {
|
||||
.btn-group-justified > .btn-group .dropdown-menu {
|
||||
left: auto;
|
||||
}
|
||||
[data-toggle="buttons"] > .btn > input[type="radio"],
|
||||
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
|
||||
[data-toggle="buttons"] > .btn input[type="radio"],
|
||||
[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
|
||||
[data-toggle="buttons"] > .btn input[type="checkbox"],
|
||||
[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
|
||||
position: absolute;
|
||||
z-index: -1;
|
||||
filter: alpha(opacity=0);
|
||||
opacity: 0;
|
||||
clip: rect(0, 0, 0, 0);
|
||||
pointer-events: none;
|
||||
}
|
||||
.input-group {
|
||||
position: relative;
|
||||
@ -3757,9 +3855,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
}
|
||||
.tab-content > .tab-pane {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
.tab-content > .active {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
}
|
||||
.nav-tabs .dropdown-menu {
|
||||
margin-top: -1px;
|
||||
@ -3806,6 +3906,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
height: auto !important;
|
||||
padding-bottom: 0;
|
||||
overflow: visible !important;
|
||||
visibility: visible !important;
|
||||
}
|
||||
.navbar-collapse.in {
|
||||
overflow-y: visible;
|
||||
@ -3821,7 +3922,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
.navbar-fixed-bottom .navbar-collapse {
|
||||
max-height: 340px;
|
||||
}
|
||||
@media (max-width: 480px) and (orientation: landscape) {
|
||||
@media (max-device-width: 480px) and (orientation: landscape) {
|
||||
.navbar-fixed-top .navbar-collapse,
|
||||
.navbar-fixed-bottom .navbar-collapse {
|
||||
max-height: 200px;
|
||||
@ -3858,9 +3959,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
right: 0;
|
||||
left: 0;
|
||||
z-index: 1030;
|
||||
-webkit-transform: translate3d(0, 0, 0);
|
||||
-o-transform: translate3d(0, 0, 0);
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.navbar-fixed-top,
|
||||
@ -3888,6 +3986,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
.navbar-brand:focus {
|
||||
text-decoration: none;
|
||||
}
|
||||
.navbar-brand > img {
|
||||
display: block;
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.navbar > .container .navbar-brand,
|
||||
.navbar > .container-fluid .navbar-brand {
|
||||
@ -3966,17 +4067,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
.navbar-nav.navbar-right:last-child {
|
||||
margin-right: -15px;
|
||||
}
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.navbar-left {
|
||||
float: left !important;
|
||||
}
|
||||
.navbar-right {
|
||||
float: right !important;
|
||||
}
|
||||
}
|
||||
.navbar-form {
|
||||
padding: 10px 15px;
|
||||
@ -4000,6 +4090,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
width: auto;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.navbar-form .form-control-static {
|
||||
display: inline-block;
|
||||
}
|
||||
.navbar-form .input-group {
|
||||
display: inline-table;
|
||||
vertical-align: middle;
|
||||
@ -4040,6 +4133,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
.navbar-form .form-group {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.navbar-form .form-group:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.navbar-form {
|
||||
@ -4052,9 +4148,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.navbar-form.navbar-right:last-child {
|
||||
margin-right: -15px;
|
||||
}
|
||||
}
|
||||
.navbar-nav > li > .dropdown-menu {
|
||||
margin-top: 0;
|
||||
@ -4087,7 +4180,16 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
margin-right: 15px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
.navbar-text.navbar-right:last-child {
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.navbar-left {
|
||||
float: left !important;
|
||||
}
|
||||
.navbar-right {
|
||||
float: right !important;
|
||||
margin-right: -15px;
|
||||
}
|
||||
.navbar-right ~ .navbar-right {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
@ -4192,7 +4294,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
border-color: #080808;
|
||||
}
|
||||
.navbar-inverse .navbar-brand {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-brand:hover,
|
||||
.navbar-inverse .navbar-brand:focus {
|
||||
@ -4200,10 +4302,10 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
background-color: transparent;
|
||||
}
|
||||
.navbar-inverse .navbar-text {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > li > a {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > li > a:hover,
|
||||
.navbar-inverse .navbar-nav > li > a:focus {
|
||||
@ -4250,7 +4352,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
background-color: #080808;
|
||||
}
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
|
||||
@ -4271,13 +4373,13 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
}
|
||||
}
|
||||
.navbar-inverse .navbar-link {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-link:hover {
|
||||
color: #fff;
|
||||
}
|
||||
.navbar-inverse .btn-link {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .btn-link:hover,
|
||||
.navbar-inverse .btn-link:focus {
|
||||
@ -4545,7 +4647,7 @@ a.list-group-item.active > .badge,
|
||||
margin-left: 3px;
|
||||
}
|
||||
.jumbotron {
|
||||
padding: 30px;
|
||||
padding: 30px 15px;
|
||||
margin-bottom: 30px;
|
||||
color: inherit;
|
||||
background-color: #eee;
|
||||
@ -4562,7 +4664,8 @@ a.list-group-item.active > .badge,
|
||||
.jumbotron > hr {
|
||||
border-top-color: #d5d5d5;
|
||||
}
|
||||
.container .jumbotron {
|
||||
.container .jumbotron,
|
||||
.container-fluid .jumbotron {
|
||||
border-radius: 6px;
|
||||
}
|
||||
.jumbotron .container {
|
||||
@ -4570,8 +4673,7 @@ a.list-group-item.active > .badge,
|
||||
}
|
||||
@media screen and (min-width: 768px) {
|
||||
.jumbotron {
|
||||
padding-top: 48px;
|
||||
padding-bottom: 48px;
|
||||
padding: 48px 0;
|
||||
}
|
||||
.container .jumbotron {
|
||||
padding-right: 60px;
|
||||
@ -4590,9 +4692,9 @@ a.list-group-item.active > .badge,
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
-webkit-transition: all .2s ease-in-out;
|
||||
-o-transition: all .2s ease-in-out;
|
||||
transition: all .2s ease-in-out;
|
||||
-webkit-transition: border .2s ease-in-out;
|
||||
-o-transition: border .2s ease-in-out;
|
||||
transition: border .2s ease-in-out;
|
||||
}
|
||||
.thumbnail > img,
|
||||
.thumbnail a > img {
|
||||
@ -4745,18 +4847,6 @@ a.thumbnail.active {
|
||||
-o-animation: progress-bar-stripes 2s linear infinite;
|
||||
animation: progress-bar-stripes 2s linear infinite;
|
||||
}
|
||||
.progress-bar[aria-valuenow="1"],
|
||||
.progress-bar[aria-valuenow="2"] {
|
||||
min-width: 30px;
|
||||
}
|
||||
.progress-bar[aria-valuenow="0"] {
|
||||
min-width: 30px;
|
||||
color: #777;
|
||||
background-color: transparent;
|
||||
background-image: none;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.progress-bar-success {
|
||||
background-color: #5cb85c;
|
||||
}
|
||||
@ -4789,29 +4879,35 @@ a.thumbnail.active {
|
||||
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
|
||||
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
|
||||
}
|
||||
.media,
|
||||
.media-body {
|
||||
overflow: hidden;
|
||||
zoom: 1;
|
||||
}
|
||||
.media,
|
||||
.media .media {
|
||||
.media {
|
||||
margin-top: 15px;
|
||||
}
|
||||
.media:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.media-object {
|
||||
display: block;
|
||||
.media-right,
|
||||
.media > .pull-right {
|
||||
padding-left: 10px;
|
||||
}
|
||||
.media-left,
|
||||
.media > .pull-left {
|
||||
padding-right: 10px;
|
||||
}
|
||||
.media-left,
|
||||
.media-right,
|
||||
.media-body {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
}
|
||||
.media-middle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
.media-bottom {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
.media-heading {
|
||||
margin: 0 0 5px;
|
||||
}
|
||||
.media > .pull-left {
|
||||
margin-right: 10px;
|
||||
}
|
||||
.media > .pull-right {
|
||||
margin-left: 10px;
|
||||
margin-top: 0;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.media-list {
|
||||
padding-left: 0;
|
||||
@ -4860,6 +4956,7 @@ a.list-group-item:focus {
|
||||
.list-group-item.disabled:hover,
|
||||
.list-group-item.disabled:focus {
|
||||
color: #777;
|
||||
cursor: not-allowed;
|
||||
background-color: #eee;
|
||||
}
|
||||
.list-group-item.disabled .list-group-item-heading,
|
||||
@ -5028,19 +5125,23 @@ a.list-group-item-danger.active:focus {
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
.panel > .list-group {
|
||||
.panel > .list-group,
|
||||
.panel > .panel-collapse > .list-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.panel > .list-group .list-group-item {
|
||||
.panel > .list-group .list-group-item,
|
||||
.panel > .panel-collapse > .list-group .list-group-item {
|
||||
border-width: 1px 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.panel > .list-group:first-child .list-group-item:first-child {
|
||||
.panel > .list-group:first-child .list-group-item:first-child,
|
||||
.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
|
||||
border-top: 0;
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.panel > .list-group:last-child .list-group-item:last-child {
|
||||
.panel > .list-group:last-child .list-group-item:last-child,
|
||||
.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
|
||||
border-bottom: 0;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
@ -5056,11 +5157,24 @@ a.list-group-item-danger.active:focus {
|
||||
.panel > .panel-collapse > .table {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.panel > .table caption,
|
||||
.panel > .table-responsive > .table caption,
|
||||
.panel > .panel-collapse > .table caption {
|
||||
padding-right: 15px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.panel > .table:first-child,
|
||||
.panel > .table-responsive:first-child > .table:first-child {
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.panel > .table:first-child > thead:first-child > tr:first-child,
|
||||
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,
|
||||
.panel > .table:first-child > tbody:first-child > tr:first-child,
|
||||
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
|
||||
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
|
||||
.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
|
||||
@ -5086,6 +5200,13 @@ a.list-group-item-danger.active:focus {
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
.panel > .table:last-child > tbody:last-child > tr:last-child,
|
||||
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,
|
||||
.panel > .table:last-child > tfoot:last-child > tr:last-child,
|
||||
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
|
||||
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
|
||||
.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
|
||||
@ -5107,7 +5228,9 @@ a.list-group-item-danger.active:focus {
|
||||
border-bottom-right-radius: 3px;
|
||||
}
|
||||
.panel > .panel-body + .table,
|
||||
.panel > .panel-body + .table-responsive {
|
||||
.panel > .panel-body + .table-responsive,
|
||||
.panel > .table + .panel-body,
|
||||
.panel > .table-responsive + .panel-body {
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
.panel > .table > tbody:first-child > tr:first-child th,
|
||||
@ -5183,7 +5306,8 @@ a.list-group-item-danger.active:focus {
|
||||
.panel-group .panel-heading {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.panel-group .panel-heading + .panel-collapse > .panel-body {
|
||||
.panel-group .panel-heading + .panel-collapse > .panel-body,
|
||||
.panel-group .panel-heading + .panel-collapse > .list-group {
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
.panel-group .panel-footer {
|
||||
@ -5310,7 +5434,8 @@ a.list-group-item-danger.active:focus {
|
||||
.embed-responsive .embed-responsive-item,
|
||||
.embed-responsive iframe,
|
||||
.embed-responsive embed,
|
||||
.embed-responsive object {
|
||||
.embed-responsive object,
|
||||
.embed-responsive video {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
@ -5381,7 +5506,7 @@ button.close {
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 1050;
|
||||
z-index: 1040;
|
||||
display: none;
|
||||
overflow: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
@ -5391,14 +5516,16 @@ button.close {
|
||||
-webkit-transition: -webkit-transform .3s ease-out;
|
||||
-o-transition: -o-transform .3s ease-out;
|
||||
transition: transform .3s ease-out;
|
||||
-webkit-transform: translate3d(0, -25%, 0);
|
||||
-o-transform: translate3d(0, -25%, 0);
|
||||
transform: translate3d(0, -25%, 0);
|
||||
-webkit-transform: translate(0, -25%);
|
||||
-ms-transform: translate(0, -25%);
|
||||
-o-transform: translate(0, -25%);
|
||||
transform: translate(0, -25%);
|
||||
}
|
||||
.modal.in .modal-dialog {
|
||||
-webkit-transform: translate3d(0, 0, 0);
|
||||
-o-transform: translate3d(0, 0, 0);
|
||||
transform: translate3d(0, 0, 0);
|
||||
-webkit-transform: translate(0, 0);
|
||||
-ms-transform: translate(0, 0);
|
||||
-o-transform: translate(0, 0);
|
||||
transform: translate(0, 0);
|
||||
}
|
||||
.modal-open .modal {
|
||||
overflow-x: hidden;
|
||||
@ -5427,7 +5554,6 @@ button.close {
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 1040;
|
||||
background-color: #000;
|
||||
}
|
||||
.modal-backdrop.fade {
|
||||
@ -5600,6 +5726,9 @@ button.close {
|
||||
display: none;
|
||||
max-width: 276px;
|
||||
padding: 1px;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
line-height: 1.42857143;
|
||||
text-align: left;
|
||||
white-space: normal;
|
||||
background-color: #fff;
|
||||
@ -5627,8 +5756,6 @@ button.close {
|
||||
padding: 8px 14px;
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
background-color: #f7f7f7;
|
||||
border-bottom: 1px solid #ebebeb;
|
||||
border-radius: 5px 5px 0 0;
|
||||
@ -5731,6 +5858,37 @@ button.close {
|
||||
.carousel-inner > .item > a > img {
|
||||
line-height: 1;
|
||||
}
|
||||
@media all and (transform-3d), (-webkit-transform-3d) {
|
||||
.carousel-inner > .item {
|
||||
-webkit-transition: -webkit-transform .6s ease-in-out;
|
||||
-o-transition: -o-transform .6s ease-in-out;
|
||||
transition: transform .6s ease-in-out;
|
||||
|
||||
-webkit-backface-visibility: hidden;
|
||||
backface-visibility: hidden;
|
||||
-webkit-perspective: 1000;
|
||||
perspective: 1000;
|
||||
}
|
||||
.carousel-inner > .item.next,
|
||||
.carousel-inner > .item.active.right {
|
||||
left: 0;
|
||||
-webkit-transform: translate3d(100%, 0, 0);
|
||||
transform: translate3d(100%, 0, 0);
|
||||
}
|
||||
.carousel-inner > .item.prev,
|
||||
.carousel-inner > .item.active.left {
|
||||
left: 0;
|
||||
-webkit-transform: translate3d(-100%, 0, 0);
|
||||
transform: translate3d(-100%, 0, 0);
|
||||
}
|
||||
.carousel-inner > .item.next.left,
|
||||
.carousel-inner > .item.prev.right,
|
||||
.carousel-inner > .item.active {
|
||||
left: 0;
|
||||
-webkit-transform: translate3d(0, 0, 0);
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
}
|
||||
.carousel-inner > .active,
|
||||
.carousel-inner > .next,
|
||||
.carousel-inner > .prev {
|
||||
@ -5986,9 +6144,6 @@ button.close {
|
||||
}
|
||||
.affix {
|
||||
position: fixed;
|
||||
-webkit-transform: translate3d(0, 0, 0);
|
||||
-o-transform: translate3d(0, 0, 0);
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
@-ms-viewport {
|
||||
width: device-width;
|
||||
|
||||
4
library/bootstrap/css/bootstrap.min.css
vendored
4
library/bootstrap/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -226,4 +226,4 @@
|
||||
<glyph unicode="" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
|
||||
<glyph unicode="" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
|
||||
</font>
|
||||
</defs></svg>
|
||||
</defs></svg>
|
||||
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
6
library/bootstrap/js/bootbox.min.js
vendored
6
library/bootstrap/js/bootbox.min.js
vendored
File diff suppressed because one or more lines are too long
518
library/bootstrap/js/bootstrap.js
vendored
518
library/bootstrap/js/bootstrap.js
vendored
File diff suppressed because it is too large
Load Diff
5
library/bootstrap/js/bootstrap.min.js
vendored
5
library/bootstrap/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -503,7 +503,6 @@ function photos_content(&$a) {
|
||||
$can_post = perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_photos');
|
||||
$can_view = perm_is_allowed($owner_uid,$observer['xchan_hash'],'view_photos');
|
||||
|
||||
|
||||
if(! $can_view) {
|
||||
notice( t('Access to this item is restricted.') . EOL);
|
||||
return;
|
||||
@ -535,29 +534,6 @@ function photos_content(&$a) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(array_key_exists('albums', $a->data))
|
||||
$albums = get_app()->data['albums'];
|
||||
else
|
||||
$albums = photos_albums_list($a->data['channel'],$a->data['observer']);
|
||||
|
||||
|
||||
$selname = (($datum) ? hex2bin($datum) : '');
|
||||
$albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
|
||||
|
||||
$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '> </option>';
|
||||
if(count($albums['albums'])) {
|
||||
foreach($albums['albums'] as $album) {
|
||||
if(! $album['text'])
|
||||
continue;
|
||||
$selected = (($selname === $album['text']) ? ' selected="selected" ' : '');
|
||||
$albumselect .= '<option value="' . $album['text'] . '"' . $selected . '>' . $album['text'] . '</option>';
|
||||
}
|
||||
}
|
||||
|
||||
$albumselect .= '</select>';
|
||||
|
||||
$uploader = '';
|
||||
|
||||
$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'],
|
||||
@ -579,10 +555,10 @@ function photos_content(&$a) {
|
||||
|
||||
$limit = service_class_fetch($a->data['channel']['channel_id'],'photo_upload_limit');
|
||||
if($limit !== false) {
|
||||
$usage_message = sprintf( t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 );
|
||||
$usage_message = sprintf( t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000 );
|
||||
}
|
||||
else {
|
||||
$usage_message = sprintf( t('You have used %1$.2f Mbytes of photo storage.'), $r[0]['total'] / 1024000 );
|
||||
$usage_message = sprintf( t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000 );
|
||||
}
|
||||
|
||||
if($_is_owner) {
|
||||
@ -596,19 +572,22 @@ function photos_content(&$a) {
|
||||
);
|
||||
}
|
||||
|
||||
$albumselect_e = $albumselect;
|
||||
$aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : '');
|
||||
|
||||
$selname = (($datum) ? hex2bin($datum) : '');
|
||||
|
||||
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
|
||||
|
||||
$tpl = get_markup_template('photos_upload.tpl');
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$pagename' => t('Upload Photos'),
|
||||
'$sessid' => session_id(),
|
||||
'$usage' => $usage_message,
|
||||
'$nickname' => $a->data['channel']['channel_address'],
|
||||
'$newalbum' => t('New album name: '),
|
||||
'$existalbumtext' => t('or existing album name: '),
|
||||
'$newalbum' => t('Enter a new album name or select an existing one:'),
|
||||
'$nosharetext' => t('Do not show a status post for this upload'),
|
||||
'$albumselect' => $albumselect_e,
|
||||
'$albums' => $albums['albums'],
|
||||
'$selname' => $selname,
|
||||
'$permissions' => t('Permissions'),
|
||||
'$aclselect' => $aclselect_e,
|
||||
'$uploader' => $ret['addon_text'],
|
||||
@ -671,11 +650,13 @@ function photos_content(&$a) {
|
||||
else {
|
||||
$album_e = $album;
|
||||
}
|
||||
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
|
||||
$edit_tpl = get_markup_template('album_edit.tpl');
|
||||
$album_edit = replace_macros($edit_tpl,array(
|
||||
'$nametext' => t('New album name: '),
|
||||
'$nickname' => $a->data['channel']['channel_address'],
|
||||
'$album' => $album_e,
|
||||
'$albums' => $albums['albums'],
|
||||
'$hexalbum' => bin2hex($album),
|
||||
'$submit' => t('Submit'),
|
||||
'$dropsubmit' => t('Delete Album')
|
||||
@ -943,18 +924,14 @@ function photos_content(&$a) {
|
||||
|
||||
$edit = null;
|
||||
if($can_post) {
|
||||
if(array_key_exists('albums', $a->data))
|
||||
$albums = get_app()->data['albums'];
|
||||
else
|
||||
$albums = photos_albums_list($a->data['channel'],$a->data['observer']);
|
||||
|
||||
$album_e = $ph[0]['album'];
|
||||
$caption_e = $ph[0]['description'];
|
||||
$aclselect_e = populate_acl($ph[0]);
|
||||
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
|
||||
|
||||
$edit = array(
|
||||
'edit' => t('Edit photo'),
|
||||
'id' => $link_item['id'], //$ph[0]['id'],
|
||||
'id' => $link_item['id'],
|
||||
'rotatecw' => t('Rotate CW (right)'),
|
||||
'rotateccw' => t('Rotate CCW (left)'),
|
||||
'albums' => $albums['albums'],
|
||||
|
||||
@ -128,7 +128,7 @@ a.wall-item-name-link {
|
||||
}
|
||||
|
||||
.wall-item-content img {
|
||||
max-width: 95%;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.wall-item-title h3 {
|
||||
@ -262,4 +262,4 @@ a.wall-item-name-link {
|
||||
.item-forged {
|
||||
color: #FF0000;
|
||||
font-size: 1.5em !important;
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
}
|
||||
|
||||
#photo-photo {
|
||||
display: table;
|
||||
margin: 0 auto;
|
||||
display: table;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
#photo-photo-end {
|
||||
@ -22,27 +22,12 @@
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
#photos-upload-newalbum-div {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
|
||||
#photos-upload-noshare {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#photos-upload-existing-album-text {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
#photos-upload-newalbum {
|
||||
float: left;
|
||||
}
|
||||
#photos-upload-album-select {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#photos-upload-spacer {
|
||||
#photos-upload-spacer,
|
||||
#photos-upload-new-end {
|
||||
margin-top: 25px;
|
||||
}
|
||||
#photos-upload-new-end, #photos-upload-exist-end {
|
||||
|
||||
@ -2341,6 +2341,12 @@ aside .nav-pills > li > a {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.section-content-wrapper {
|
||||
padding: 7px 10px;
|
||||
background-color: $comment_item_colour;
|
||||
border-bottom-left-radius: $radiuspx;
|
||||
border-bottom-right-radius: $radiuspx;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 767px) {
|
||||
aside#region_1 {
|
||||
|
||||
@ -226,7 +226,7 @@ if(! $a->install) {
|
||||
if (! $input_linksubmit)
|
||||
$input_linksubmit = "#0080FF";
|
||||
if (! $input_border)
|
||||
$input_border = "#666";
|
||||
$input_border = "#ccc";
|
||||
if (! $input_colourhover)
|
||||
$input_colourhover = "#333";
|
||||
if (! $input_decohover)
|
||||
|
||||
@ -3,7 +3,14 @@
|
||||
|
||||
|
||||
<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
|
||||
<input type="text" name="albumname" value="{{$album}}" >
|
||||
<input type="text" name="albumname" value="{{$album}}" list="dl-album-edit" />
|
||||
<datalist id="dl-album-edit">
|
||||
{{foreach $albums as $al}}
|
||||
{{if $al.text}}
|
||||
<option value="{{$al.text}}">
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</datalist>
|
||||
|
||||
<div id="photo-album-edit-name-end"></div>
|
||||
|
||||
|
||||
@ -1,44 +1,50 @@
|
||||
<div class="section-title-wrapper">
|
||||
<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
|
||||
<h2>{{$pagename}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
|
||||
<input type="hidden" id="photos-upload-source" name="source" value="photos" />
|
||||
<div id="photos-upload-new-wrapper" >
|
||||
<div id="photos-upload-newalbum-div">
|
||||
<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
|
||||
</div>
|
||||
<input id="photos-upload-newalbum" type="text" name="newalbum" />
|
||||
</div>
|
||||
<div id="photos-upload-new-end"></div>
|
||||
<div id="photos-upload-exist-wrapper">
|
||||
<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
|
||||
{{$albumselect}}
|
||||
</div>
|
||||
<div id="photos-upload-exist-end"></div>
|
||||
|
||||
<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
|
||||
<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
|
||||
<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="photos-upload-perms" class="photos-upload-perms" >
|
||||
<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
|
||||
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
|
||||
</div>
|
||||
{{$aclselect}}
|
||||
<div id="photos-upload-perms-end"></div>
|
||||
|
||||
<div id="photos-upload-spacer"></div>
|
||||
|
||||
{{$uploader}}
|
||||
|
||||
{{$default}}
|
||||
|
||||
<div class="photos-upload-end" ></div>
|
||||
</form>
|
||||
<div class="generic-content-wrapper">
|
||||
<div class="section-title-wrapper">
|
||||
<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
|
||||
<h2>{{$pagename}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
<div class="section-content-wrapper">
|
||||
<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
|
||||
<input type="hidden" id="photos-upload-source" name="source" value="photos" />
|
||||
<div id="photos-album-name-label" >
|
||||
<label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
|
||||
</div>
|
||||
<div id="photos-album-name-input">
|
||||
<input id="photos-upload-newalbum" type="text" value="{{$selname}}" name="newalbum" list="dl-photo-upload" />
|
||||
<datalist id="dl-photo-upload">
|
||||
{{foreach $albums as $al}}
|
||||
{{if $al.text}}
|
||||
<option value="{{$al.text}}">
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</datalist>
|
||||
</div>
|
||||
|
||||
<div id="photos-upload-new-end"></div>
|
||||
|
||||
<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
|
||||
<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
|
||||
<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
|
||||
</div>
|
||||
|
||||
<div id="photos-upload-perms" class="photos-upload-perms" >
|
||||
<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
|
||||
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
|
||||
</div>
|
||||
|
||||
{{$aclselect}}
|
||||
|
||||
<div id="photos-upload-perms-end"></div>
|
||||
|
||||
<div id="photos-upload-spacer"></div>
|
||||
|
||||
{{$uploader}}
|
||||
|
||||
{{$default}}
|
||||
|
||||
<div class="photos-upload-end" ></div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user