diff --git a/mod/photos.php b/mod/photos.php index de691de4ff..74457d6ac1 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1041,7 +1041,7 @@ function photos_content(App $a) $albumselect = ''; - $albumselect .= ''; + $albumselect .= ''; if (count($a->data['albums'])) { foreach ($a->data['albums'] as $album) { if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) { @@ -1077,7 +1077,7 @@ function photos_content(App $a) '$usage' => $usage_message, '$nickname' => $a->data['user']['nickname'], '$newalbum' => L10n::t('New album name: '), - '$existalbumtext' => L10n::t('or existing album name: '), + '$existalbumtext' => L10n::t('or select existing album:'), '$nosharetext' => L10n::t('Do not show a status post for this upload'), '$albumselect' => $albumselect, '$permissions' => L10n::t('Permissions'), diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 055a661117..dd464be094 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -217,7 +217,7 @@ a.btn:hover { font-size: 12px; } .btn-primary { - background: $nav_bg; + background: $nav_bg !important; color: $btn_primary_color !important; } .btn-primary:hover, .btn-primary:focus { @@ -3258,6 +3258,50 @@ section .profile-match-wrapper { background-color: rgba(255,255,255,.85); } +.qq-upload-button { + background: $nav_bg !important; + color: $btn_primary_color !important; + float: none; + border: none; + -webkit-box-shadow: none; + box-shadow: none; + -moz-box-shadow: none; + background-image: none; + text-shadow: none; + border-radius: 3px; + outline: 0!important; + margin-bottom: 0; + font-size: 14px; + font-weight: 600; + padding: 8px 16px; + color: inherit; + width: 100% !important; +} + +.qq-upload-drop-area { + background: white !important; + float: none; + border: none; + -webkit-box-shadow: none; + box-shadow: none; + -moz-box-shadow: none; + background-image: none; + text-shadow: none; + border-radius: 3px; + outline: 0!important; + margin-bottom: 0; + font-size: 14px; + font-weight: 600; + padding: 8px 16px; + color: inherit; + width: 100% !important; + display: block !important; + position: relative !important; + border: black 1px dashed !important; + margin-bottom: 5px !important; + margin-top: 15px !important; +} + /* Medium devices (desktops, 992px and up) */ @media (min-width: 992px) { .mod-home.is-not-singleuser #content, diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl new file mode 100644 index 0000000000..4372b10264 --- /dev/null +++ b/view/theme/frio/templates/photos_upload.tpl @@ -0,0 +1,52 @@ + +

{{$pagename}}

+ +
{{$usage}}
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+ +
+ + +
+ + +
+ + {{$permissions}} + +
+
+ +
+
+ {{$aclselect}} +
+
+ +
+ + {{$alt_uploader}} + + {{$default_upload_box}} + {{$default_upload_submit}} + +
+
+