Skip to content

Commit

Permalink
Merge branch '3.x' into Installer
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ibochkarev
Ibochkarev committed May 15, 2019
2 parents f681686 + f711206 commit 3c831ff
Show file tree
Hide file tree
Showing 38 changed files with 3,440 additions and 2,071 deletions.
41 changes: 18 additions & 23 deletions _build/templates/default/sass/_breadcrumbs.scss
View file
Expand Up @@ -2,6 +2,7 @@
.breadcrumbs .panel-desc {
margin-top: 0;
}

.crumb_wrapper {
background: $lightestGray;
border-bottom: 1px solid $borderColor;
Expand All @@ -24,14 +25,6 @@
position: relative;
z-index: 1;

/*&.first {
padding: 0;
button {
padding: 8px 16px 8px 20px;
}
}*/

&.first {
padding: 0; /* neutralize the normal li padding and give it to the inner element */

Expand All @@ -44,7 +37,9 @@
display: inline-block;
font-size: 20px;
line-height: 34px;
position: absolute; top: 0; left: 6px;
position: absolute;
top: 0;
left: 6px;
text-align: center;
text-indent: 0;
z-index: 2; /* put the icon above the triangle :after element */
Expand Down Expand Up @@ -91,8 +86,9 @@
position: absolute;
top: 50%;
margin-top: -50px;*/
/*margin-left: 1px;*/ /* uncomment to make the line thicker */
/*left: 100%;
/*margin-left: 1px;*/
/* uncomment to make the line thicker */
/*left: 100%;
z-index: 1;
}*/

Expand Down Expand Up @@ -124,13 +120,6 @@
}
}

&:hover:after {
/*border-left-color: $colorSplash;*/
}
&:hover:before {
/*border-left-color: $white;*/
}

button {
background-color: transparent;
border: 0;
Expand Down Expand Up @@ -160,15 +149,18 @@
display: inline-block;
width: 0;
height: 0;
border-top: 50px solid rgba(0,0,0,0); /* no transparent, breaks anti-aliasing in FF */
border-bottom: 50px solid rgba(0,0,0,0);/* no transparent, breaks anti-aliasing in FF */
border-top: 50px solid rgba(0, 0, 0, 0); /* no transparent, breaks anti-aliasing in FF */
border-bottom: 50px solid rgba(0, 0, 0, 0); /* no transparent, breaks anti-aliasing in FF */
border-left: 30px solid $lightestGray;
padding-right: 3px;
position: absolute; top: 50%; left: -33px;
position: absolute;
top: 50%;
left: -33px;
margin-top: -50px;
transform: scale(0.99999); /* fix blurry edges in FF */
z-index: -1;
}

/* the triangle shape and line to the right of each crumb */
&:after {
background-color: $lightestGray;
Expand All @@ -178,8 +170,11 @@
border-radius: $borderRadius;
content: '';
display: inline-block;
width: 34px; height: 34px; /* + 2px border = 36px */
position: absolute; top: 0; right: -22px;
width: 34px;
height: 34px; /* + 2px border = 36px */
position: absolute;
top: 0;
right: -22px;
transform: scaleX(0.6) rotate(45deg);
z-index: -1;
}
Expand Down
145 changes: 84 additions & 61 deletions _build/templates/default/sass/_browser.scss
View file
Expand Up @@ -23,8 +23,8 @@

.x-window &,
.modx-browser-rte & {
border-radius: 0;
box-shadow: none;
border-radius: 0;
box-shadow: none;
}
}

Expand All @@ -38,39 +38,47 @@
cursor: pointer;
user-select: none;
}
.modx-browser-thumb-wrap.x-view-over {

.modx-browser-thumb-wrap .x-view-over {
border: 1px solid $brandSelectedColor;
padding: 4px;
}
.modx-browser-thumb-wrap.x-view-selected {

.modx-browser-thumb-wrap .x-view-selected {
background: $brandSelectedBg;
border: 1px solid $brandSelectedColor;
padding: 4px;
}
.modx-browser-thumb-wrap.x-view-selected .modx-browser-thumb {

.modx-browser-thumb-wrap .x-view-selected .modx-browser-thumb {
background: $white;
}
.modx-browser-thumb-wrap.x-view-selected span {

.modx-browser-thumb-wrap .x-view-selected span {
color: $brandSelectedColor;
}
.modx-browser-thumb {
border: 1px solid $borderColor;
height: 100px;
line-height: 100px;
padding: 5px;
text-align: center;
width: 100px;
}
.modx-browser-thumb img {
vertical-align: middle;
background-color: #ccc;
background-image: url($imgPath + 'modx-theme/transparency-pattern.png');
}
.modx-browser-thumb-wrap span {
display: block;
overflow: hidden;
text-align: center;
}

.modx-browser-thumb {
border: 1px solid $borderColor;
height: 100px;
line-height: 100px;
padding: 5px;
text-align: center;
width: 100px;
}

.modx-browser-thumb img {
vertical-align: middle;
background-color: $silver;
background-image: url($imgPath + 'modx-theme/transparency-pattern.png');
}

.modx-browser-thumb-wrap span {
display: block;
overflow: hidden;
text-align: center;
}

.modx-browser-placeholder {
font-size: 14px;
font-weight: bold;
Expand All @@ -86,40 +94,49 @@
overflow: hidden;
}
}

.modx-browser-list-item {
padding: 0 5px 0 5px;
}
.modx-browser-list-item.x-view-over > span {

.modx-browser-list-item .x-view-over>span {
background: $brandHover;
}
.modx-browser-list-item.x-view-selected > span {

.modx-browser-list-item .x-view-selected>span {
background: $brandSelectedBg;
border-bottom: 1px solid $brandSelectedColor;
color: $brandSelectedColor;
}
.modx-browser-list-item > span {
background-position: center left !important;
border-bottom: 1px solid $borderColor;
clear: both;
display: block;
min-height: 16px;
padding: 5px 0 5px 20px;
position: relative;
}
.modx-browser-list-item > span:before {
font-size: 14px;
position: absolute; left: 2px;
}
.modx-browser-list-item > span span {
display: inline-block;
font: $fontSmall;
padding-top: 2px;
}
.modx-browser-list-item > span span.file-size,
.modx-browser-list-item > span span.image-size {
float: right;
width: 13%;
}

.modx-browser-list-item>span {
background-position: center left !important;
border-bottom: 1px solid $borderColor;
clear: both;
display: block;
min-height: 16px;
padding: 5px 0 5px 20px;
position: relative;
}

.modx-browser-list-item > span:before {
font-size: 14px;
position: absolute;
left: 2px;
}

.modx-browser-list-item > span span {
display: inline-block;
font: $fontSmall;
padding-top: 2px;
}

.modx-browser-list-item > span span.file-size,
.modx-browser-list-item > span span.image-size {
float: right;
width: 13%;
}

.modx-browser-view-ct .loading-indicator {
background-position: left;
background-repeat: no-repeat;
Expand All @@ -141,7 +158,8 @@
.x-toolbar-left {

.x-toolbar-left-row {
/* we need 4 classes to override the !important height of extjs default theme */

/* we need 4 classes to override the !important height of extjs default theme */
td.x-toolbar-cell {
position: relative;

Expand All @@ -151,9 +169,11 @@
content: fa-content($fa-var-clipboard);
font-size: 14px;
margin-top: -7px; /* half of the height to center vertically with top 50% */
opacity: 0.6;
opacity: .6;
filter: alpha(opacity=60); /* for IE <= 8 */
position: absolute; top: 50%; left: 0;
position: absolute;
top: 50%;
left: 0;
text-align: center;
width: 30px;
}
Expand All @@ -164,10 +184,11 @@
box-sizing: border-box;
border-radius: 0;
border: 0;
border-top: 1px solid #e4e4e4;
border-top: 1px solid $lightGray;
margin: 0 !important;
padding-left: 30px; /* for the icon */
width: 100%; height: 32px !important;
width: 100%;
height: 32px !important;
}
}
}
Expand Down Expand Up @@ -203,15 +224,17 @@
margin-top: -28px; /* half of the height to center vertically with top 50% */
opacity: 0;
filter: alpha(opacity=0); /* for IE <= 8 */
position: absolute; top: 50%; left: 0;
position: absolute;
top: 50%;
left: 0;
text-align: center;
width: 100%;
text-shadow: 0 0 10px rgba(0,0,0,0.2);
transition: opacity 0.25s;
text-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
transition: opacity .25s;
}

&:hover:before {
opacity: 0.6;
opacity: .6;
filter: alpha(opacity=60); /* for IE <= 8 */
}
}
Expand All @@ -222,7 +245,7 @@
width: 100%;
max-width: 100%;
height: auto;
background-color: #ccc;
background-color: $silver;
background-image: url($imgPath + 'modx-theme/transparency-pattern.png');
}
}
Expand All @@ -234,7 +257,7 @@
text-align: left;

b {
color: #555;
color: $darkestGray;
display: block;
margin-bottom: 2px;
}
Expand All @@ -254,7 +277,7 @@
width: 100%;
max-width: 100%;
height: auto;
background-color: #ccc;
background-color: $silver;
background-image: url($imgPath + 'modx-theme/transparency-pattern.png');
}
}

0 comments on commit 3c831ff

Please sign in to comment.