Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jtext #118

Closed
wants to merge 16 commits into from
Closed

Jtext #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c9c2c04
Update to PHPMailer 5.2.21 (#13388)
mbabker Dec 29, 2016
3f400e6
Execute sql uninstall query (if exists) on extension install abort (#…
andrepereiradasilva Dec 29, 2016
00a638d
Some improvements in tests #1:
frankmayer Dec 29, 2016
7aa43fd
Some improvements in tests #2: (#13398)
frankmayer Dec 29, 2016
89b8136
2 to 1 loop optimization in plugins/search/categories/categories.php …
frankmayer Dec 29, 2016
cfc690b
Merge pull request #13391 from frankmayer/improvements-in-tests-1
wilsonge Dec 29, 2016
9164c5e
Codestyle
wilsonge Dec 29, 2016
4c07eb1
Fix cast statements needing a space
wilsonge Dec 29, 2016
5311b5a
Fix concat operator spaces
wilsonge Dec 29, 2016
ba2baab
Merge pull request #13411 from wilsonge/ut-cast-statements
jeckodevelopment Dec 29, 2016
f0e0d36
Spaces instead of tabs issues (#13409)
wilsonge Dec 29, 2016
d93dcc7
Updating languages for calendar
Dec 29, 2016
34ba303
Toolbar min-height correction (#13413)
ciar4n Dec 29, 2016
395f550
Fix double it typo (#13418)
ralain Dec 30, 2016
0e48339
Add thumbsnails-media class (#13406)
ciar4n Dec 30, 2016
6ee15e9
improvements
andrepereiradasilva Dec 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/imageslist/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}
?>
<?php if (count($this->images) > 0 || count($this->folders) > 0) : ?>
<ul class="manager thumbnails">
<ul class="manager thumbnails thumbnails-media">
<?php for ($i = 0, $n = count($this->folders); $i < $n; $i++) :
$this->setFolder($i);
echo $this->loadTemplate('folder');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/medialist/tmpl/thumbs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</label>
</div>

<ul class="manager thumbnails">
<ul class="manager thumbnails thumbnails-media">
<?php
echo $this->loadTemplate('up'),
$this->loadTemplate('folders'),
Expand Down
100 changes: 50 additions & 50 deletions administrator/templates/isis/css/template-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7433,7 +7433,7 @@ body .navbar-fixed-top {
color: #0C192E;
text-shadow: 0 1px 0 #FFF;
margin-bottom: 10px;
min-height: 43px;
min-height: 51px;
}
.subhead-collapse {
margin-bottom: 11px;
Expand Down Expand Up @@ -8484,10 +8484,10 @@ textarea.noResize {
#imageForm .well {
margin-bottom: 5px;
}
.thumbnails {
.thumbnails-media {
margin-left: 0;
}
.thumbnails .thumbnail {
.thumbnails-media .thumbnail {
background-color: #f4f4f4;
border-radius: 3px;
border: 0;
Expand All @@ -8501,7 +8501,7 @@ textarea.noResize {
text-align: center;
overflow: hidden;
}
.thumbnails .thumbnail .close {
.thumbnails-media .thumbnail .close {
background-color: #ccc;
border-left: 1px solid rgba(0,0,0,0.1);
height: 22px;
Expand All @@ -8512,50 +8512,50 @@ textarea.noResize {
top: 0;
right: 0;
}
.thumbnails .thumbnail .close:hover {
.thumbnails-media .thumbnail .close:hover {
background-color: #bbb;
}
.thumbnails .thumbnail *,
.thumbnails .thumbnail *:before {
.thumbnails-media .thumbnail *,
.thumbnails-media .thumbnail *:before {
-webkit-transition: all 0.2s ease;
transition: all 0.2s ease;
-webkit-background-clip: padding-box;
background-clip: padding-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.thumbnails .thumbnail input[type="radio"],
.thumbnails .thumbnail input[type="checkbox"] {
.thumbnails-media .thumbnail input[type="radio"],
.thumbnails-media .thumbnail input[type="checkbox"] {
margin: 0;
opacity: 0.55;
position: absolute;
top: 5px;
left: 5px;
}
.thumbnails .thumbnail .controls,
.thumbnails .thumbnail .imginfoBorder {
.thumbnails-media .thumbnail .controls,
.thumbnails-media .thumbnail .imginfoBorder {
display: none;
}
.thumbnails .imgThumb {
.thumbnails-media .imgThumb {
position: relative;
z-index: 1;
width: 100%;
display: inline-block;
}
.thumbnails .imgThumb input {
.thumbnails-media .imgThumb input {
display: none;
}
.thumbnails .imgThumb label,
.thumbnails .imgThumb .imgThumbInside {
.thumbnails-media .imgThumb label,
.thumbnails-media .imgThumb .imgThumbInside {
display: block;
line-height: 100px;
position: relative;
width: 100%;
border-radius: 3px;
overflow: hidden;
}
.thumbnails .imgThumb label:before,
.thumbnails .imgThumb .imgThumbInside:before {
.thumbnails-media .imgThumb label:before,
.thumbnails-media .imgThumb .imgThumbInside:before {
font-family: "IcoMoon";
font-style: normal;
content: 'G';
Expand All @@ -8573,27 +8573,27 @@ textarea.noResize {
box-shadow: 0 1px 2px rgba(0,0,0,0.05);
border-radius: 0 3px;
}
.thumbnails .imgThumb img {
.thumbnails-media .imgThumb img {
width: auto;
}
.thumbnails .selected :checked + label,
.thumbnails .selected .imgThumbInside,
.thumbnails .imgInput :checked + label,
.thumbnails .imgInput .imgThumbInside {
.thumbnails-media .selected :checked + label,
.thumbnails-media .selected .imgThumbInside,
.thumbnails-media .imgInput :checked + label,
.thumbnails-media .imgInput .imgThumbInside {
background-color: #ddd;
}
.thumbnails .selected :checked + label:before,
.thumbnails .selected .imgThumbInside:before,
.thumbnails .imgInput :checked + label:before,
.thumbnails .imgInput .imgThumbInside:before {
.thumbnails-media .selected :checked + label:before,
.thumbnails-media .selected .imgThumbInside:before,
.thumbnails-media .imgInput :checked + label:before,
.thumbnails-media .imgInput .imgThumbInside:before {
-webkit-transform: scale(1);
transform: scale(1);
opacity: 1;
}
.thumbnails .selected :checked + label:after,
.thumbnails .selected .imgThumbInside:after,
.thumbnails .imgInput :checked + label:after,
.thumbnails .imgInput .imgThumbInside:after {
.thumbnails-media .selected :checked + label:after,
.thumbnails-media .selected .imgThumbInside:after,
.thumbnails-media .imgInput :checked + label:after,
.thumbnails-media .imgInput .imgThumbInside:after {
position: absolute;
top: 0;
left: 0;
Expand All @@ -8603,16 +8603,16 @@ textarea.noResize {
border: 3px solid #46a546;
border-radius: 5px;
}
.thumbnails .imgDelete a.close,
.thumbnails .imgPreview a {
.thumbnails-media .imgDelete a.close,
.thumbnails-media .imgPreview a {
padding: 0;
position: absolute;
left: 0;
z-index: 1;
height: 26px;
width: 26px;
}
.thumbnails .imgDelete a.close {
.thumbnails-media .imgDelete a.close {
background-color: #bd362f;
border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
top: 0;
Expand All @@ -8627,16 +8627,16 @@ textarea.noResize {
-webkit-transform: scale(0.5);
transform: scale(0.5);
}
.thumbnails .imgDelete a.close:hover {
.thumbnails-media .imgDelete a.close:hover {
background-color: #802420;
}
.thumbnails .thumbnail:hover .imgDelete a.close {
.thumbnails-media .thumbnail:hover .imgDelete a.close {
opacity: 1;
-webkit-transform: scale(1);
transform: scale(1);
}
.thumbnails .imgPreview a,
.thumbnails .imgDetails {
.thumbnails-media .imgPreview a,
.thumbnails-media .imgDetails {
position: absolute;
left: 0;
background-color: #fff;
Expand All @@ -8648,22 +8648,22 @@ textarea.noResize {
border-radius: 0 3px 0 0;
z-index: 1;
}
.thumbnails .imgPreview a:hover,
.thumbnails .imgDetails:hover {
.thumbnails-media .imgPreview a:hover,
.thumbnails-media .imgDetails:hover {
background-color: #eee;
}
.thumbnails .imgDetails {
.thumbnails-media .imgDetails {
padding: 0 5px;
line-height: 20px;
color: #555;
}
.thumbnails .imgFolder span {
.thumbnails-media .imgFolder span {
line-height: 90px;
font-size: 38px;
margin: 0;
width: auto;
}
.thumbnails .imgFolder + .imgDetails {
.thumbnails-media .imgFolder + .imgDetails {
color: inherit;
}
#folderframe.thumbnail {
Expand Down Expand Up @@ -9711,26 +9711,26 @@ a.grid_true {
.modal-header {
text-align: right;
}
#mediamanager-form .thumbnails .thumbnail {
#mediamanager-form .thumbnails-media .thumbnail {
margin-left: 18px !important;
margin-right: 0;
}
.thumbnails .imgThumb label::before,
.thumbnails .imgThumb .imgThumbInside::before {
.thumbnails-media .imgThumb label::before,
.thumbnails-media .imgThumb .imgThumbInside::before {
left: 0;
right: auto;
border-radius: 3px 0;
}
.thumbnails .thumbnail input[type="radio"],
.thumbnails .thumbnail input[type="checkbox"] {
.thumbnails-media .thumbnail input[type="radio"],
.thumbnails-media .thumbnail input[type="checkbox"] {
left: auto;
right: 5px;
}
.thumbnails .imgDelete a.close {
.thumbnails-media .imgDelete a.close {
border-radius: 0 3px;
}
.thumbnails .imgPreview a,
.thumbnails .imgDetails {
.thumbnails-media .imgPreview a,
.thumbnails-media .imgDetails {
border-radius: 3px 0;
border-width: 1px 0 0 1px;
left: auto;
Expand Down
Loading