Skip to content

Commit

Permalink
link colors; filemanager; cms blockholder; (#1449)
Browse files Browse the repository at this point in the history
  • Loading branch information
dev7ch authored and nadar committed Sep 5, 2017
1 parent ae9b96b commit bf7d09c
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 18 deletions.
3 changes: 2 additions & 1 deletion modules/admin/src/resources/dist/css/admin.css

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions modules/admin/src/resources/scss/base/_a.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
a:not([disabled]):not([type="submit"]):not(.mainnav-link):not([type="button"]):not(.btn) {
&:not([href]):not([tabindex]):not([class*=" mainnav-"][class^=" mainnav-"]) {
a {
color: $gray-900;
&:hover, &:focus {
color: $gray-700;
}
}

a:not([disabled]):not([type="submit"]):not(.mainnav-link):not([type="button"]):not(.btn):not([href]):not([tabindex]):not([class*=" mainnav-"][class^=" mainnav-"]) {
color: inherit;
&:hover {
color: inherit;
&:hover {
color: inherit;
}
}
}
}

2 changes: 1 addition & 1 deletion modules/admin/src/resources/scss/components/_btn.scss
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ $btns: (
border-radius: 0;
}

&:not([class*=" outline-"][class^=" outline-"]) {
&:not([class*="outline-"]):not([class^="outline-"]):not([class*="btn-"]):not([class^="btn-"]) {
background-color: map-get($colors, gray-light);
color: $btn-color-dark;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/admin/src/resources/scss/components/_folders.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ $icon-line-height: $icon-font-size + 5px;
margin-right: 4px;
overflow: hidden;

position: relative;
position: relative;

&:not(:first-of-type) {
Expand Down Expand Up @@ -187,6 +186,7 @@ $icon-line-height: $icon-font-size + 5px;
cursor: pointer;
margin: 0;
padding: 0;
outline: 0 !important;
}

.folder-label-input {
Expand Down
2 changes: 1 addition & 1 deletion modules/admin/src/views/layouts/_angulardirectives.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<span class="folders-actions-left">
<button class="folders-actions-toggler" ng-click="toggleFolderItem(folder)" ng-if="folder.subfolder == true">
<i class="material-icons" ng-if="folder.toggle_open">keyboard_arrow_down</i>
<i class="material-icons" ng-if="!folder.toggle_open">keyboard_arrow_up</i>
<i class="material-icons" ng-if="!folder.toggle_open">keyboard_arrow_right</i>
</button>
</span>
<span class="folders-text folders-label" ng-click="changeCurrentFolderId(folder.id)">
Expand Down
2 changes: 1 addition & 1 deletion modules/cms/src/admin/resources/dist/css/cmsadmin.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions modules/cms/src/admin/resources/scss/cmsadmin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
@import "../../../../../admin/src/resources/scss/helpers/overflow-no-scrollbars";
@import "../../../../../admin/src/resources/scss/helpers/zindex";


// ==================================================
// Variables
// ==================================================

@import "variables/variables";

// ==================================================
// Components
// ==================================================
Expand Down
4 changes: 0 additions & 4 deletions modules/cms/src/admin/resources/scss/components/_block.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
$block-border-width: 1px !default;
$block-border-color: map-get($grays, 500) !default;
$block-padding: 10px !default;

.block {
background-color: $white;
border: $block-border-width dashed $block-border-color;
Expand Down
15 changes: 12 additions & 3 deletions modules/cms/src/admin/resources/scss/components/_blockholder.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@


.blockholder-column {
max-width: 255px;
min-width: 255px;
max-width: $blockholder-width;
min-width: $blockholder-width;
padding-left: 0;
padding-right: 0;
transform: translateZ(0);
display: none;
height: 100vh;
right: 0;
position: fixed;

@media (min-width: $mobile-nav-breakpoint) {
display: block;
}
}

.blockholder {
overflow-y: scroll;
background-color: color(gray);
color: map-get($grays, 500);
display: block;
height: 100%;
padding: 15px;
position: fixed;
width: 100%;
user-select: none;
@include overflow-no-scrollbars;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
margin: 0 0 0 15px;
min-height: 100%;

@media (min-width: $mobile-nav-breakpoint) {
margin: 0 $blockholder-width 0 15px;
}

> .row {
flex: 1 1 100%;
margin-right: 0;
Expand All @@ -12,6 +16,7 @@
flex-wrap: nowrap;
}


> .col,
> .col > .row > .col {
align-items: stretch;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$block-border-width: 1px !default;
$block-border-color: map-get($grays, 500) !default;
$block-padding: 10px !default;

$blockholder-width: 255px;

0 comments on commit bf7d09c

Please sign in to comment.