tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

fix for scss linting issues in new scss (#5448)

Browse Source
This commit is contained in:
Paul 2016-05-04 20:14:56 +12:00 committed by Ingo Schommer
parent 2ecd73d303
commit 4b8e98b351
16 changed files with 361 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/client/dist/styles/bundle.css vendored
View File

File diff suppressed because one or more lines are too long

4
admin/client/dist/styles/editor.css vendored
View File

@ -1,3 +1,3 @@
body.mceContentBody a.ss-broken{background-color:#FF7B71;border:1px red solid;color:#fff;padding:1px;text-decoration:underline} body.mceContentBody a.ss-broken{background-color:#f2dede;border:1px #ebcccc solid;color:#fff;padding:1px;text-decoration:underline}
/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImVkaXRvci5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGdDQUNDLHlCQUNBLHFCQUNBLFdBQ0EsWUFDQSx5QkFBMkIsQ0FDM0IiLCJmaWxlIjoiZWRpdG9yLmNzcyIsInNvdXJjZXNDb250ZW50IjpbImJvZHkubWNlQ29udGVudEJvZHkgYS5zcy1icm9rZW4ge1xuXHRiYWNrZ3JvdW5kLWNvbG9yOiAjRkY3QjcxO1xuXHRib3JkZXI6IDFweCByZWQgc29saWQ7XG5cdGNvbG9yOiAjZmZmO1xuXHRwYWRkaW5nOiAxcHg7XG5cdHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lO1xufVxuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9 */ /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImVkaXRvci5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLGdDQUNFLHlCQUNBLHlCQUNBLFdBQ0EsWUFDQSx5QkFBMkIsQ0FDNUIiLCJmaWxlIjoiZWRpdG9yLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIi8vIEVkaXRvciB2YXJpYWJsZXNcbiRzdGF0ZS1kYW5nZXItYmc6ICNmMmRlZGU7XG4kc3RhdGUtZGFuZ2VyLWJvcmRlcjogZGFya2VuKCRzdGF0ZS1kYW5nZXItYmcsIDUlKTtcbiR0ZXh0LWNvbG9yOiAjZmZmO1xuXG5ib2R5Lm1jZUNvbnRlbnRCb2R5IGEuc3MtYnJva2VuIHtcbiAgYmFja2dyb3VuZC1jb2xvcjogJHN0YXRlLWRhbmdlci1iZztcbiAgYm9yZGVyOiAxcHggJHN0YXRlLWRhbmdlci1ib3JkZXIgc29saWQ7XG4gIGNvbG9yOiAkdGV4dC1jb2xvcjtcbiAgcGFkZGluZzogMXB4O1xuICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTtcbn1cbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ== */

72
admin/client/src/components/Accordion/Accordion.scss
View File

@ -1,48 +1,48 @@
// Accordion based off Bootstrap collapse // Accordion based off Bootstrap collapse
.accordion__block { .accordion__block {
margin-top: $spacer-y * 1.25; margin-top: $spacer-y * 1.25;
} }
.accordion__title { .accordion__title {
margin-bottom: 0; margin-bottom: 0;
margin-left: -$spacer-y; margin-left: -$spacer-y;
margin-right: -$spacer-y; margin-right: -$spacer-y;
padding: $spacer-x*.75 $spacer-y; padding: $spacer-x * .75 $spacer-y;
position: relative; position: relative;
display: block; display: block;
font-size: $font-size-sm; font-size: $font-size-sm;
line-height: $line-height-base; line-height: $line-height-base;
font-weight: 400; font-weight: 400;
color: $body-color; color: $body-color;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
&::before { &::before {
padding: $spacer-x*.75 $spacer-y; padding: $spacer-x * .75 $spacer-y;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
font-size: $font-size-lg; font-size: $font-size-lg;
line-height: $line-height-base; line-height: $line-height-base;
color: lighten($body-color,30); color: lighten($body-color,30);
text-align: center; text-align: center;
content: "7"; content: "7";
font-family: silverstripe; font-family: silverstripe;
} }
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
&::before { &::before {
color: $body-color; color: $body-color;
} }
} }
}
.accordion__title.collapsed::before { .collapsed::before {
content: "6"; content: "6";
}
} }

30
admin/client/src/components/Breadcrumb/Breadcrumb.scss
View File

@ -1,29 +1,27 @@
.breadcrumb { .breadcrumb {
font-size: $font-size-xs; font-size: $font-size-xs;
line-height: 14px; line-height: 14px;
margin-bottom: 0; margin-bottom: 0;
float: left; float: left;
max-width: 70%; max-width: 70%;
max-height: $toolbar-height; max-height: $toolbar-height;
} }
.breadcrumb--current-only { // Todo: move to breadcrumb .breadcrumb--current-only { // Todo: move to breadcrumb
padding: 14px 0; padding: 14px 0;
} }
.breadcrumb__item {}
.breadcrumb>li.breadcrumb__item--last, // TODO Fix Bootstrap clash .breadcrumb>li.breadcrumb__item--last, // TODO Fix Bootstrap clash
.breadcrumb__item--last { .breadcrumb__item--last {
display: block; display: block;
float: none; float: none;
} }
.cms h2.breadcrumb__item-title--last, // TODO Fix CMS clash .cms h2.breadcrumb__item-title--last, // TODO Fix CMS clash
.breadcrumb__item-title--last { .breadcrumb__item-title--last {
margin: 0; margin: 0;
font-size: $font-size-lg; font-size: $font-size-lg;
font-weight: normal; font-weight: normal;
line-height: 24px; line-height: 24px;
@include text-truncate; @include text-truncate;
} }

178
admin/client/src/components/FormAction/FormAction.scss
View File

@ -1,24 +1,25 @@
// TODO Separate out bootstrap btn reset styles to a separate style sheet or divide within this sheet // TODO Separate out bootstrap btn reset styles to a separate style sheet or divide within this sheet
// TODO Rename component to something like Btn or Button? // TODO Rename component to something like Btn or Button?
// General buttons // General buttons
.btn { .btn {
height: 32px; height: 32px;
margin-right: $spacer-x * .75; // 12px margin-right: $spacer-x * .75; // 12px
position: relative; position: relative;
} }
// Button icons // Button icons
.btn[class*="font-icon-"]::before { .btn[class*="font-icon-"]::before {
font-size: 16px; font-size: 16px;
position: relative; position: relative;
top: 3px; top: 3px;
margin-right: 6px; margin-right: 6px;
line-height: 13px; line-height: 13px;
} }
// Gives button a larger icon // Gives button a larger icon
.btn--icon-large { .btn--icon-large {
font-size: 20px; font-size: 20px;
line-height: 20px; line-height: 20px;
} }
@ -27,123 +28,130 @@
// TODO replace all .no-text classes for .btn--no-text // TODO replace all .no-text classes for .btn--no-text
.btn--no-text[class*="font-icon-"]::before, .btn--no-text[class*="font-icon-"]::before,
.no-text[class*="font-icon-"]::before { .no-text[class*="font-icon-"]::before {
margin-right: 0; margin-right: 0;
} }
// SVG loading icon // SVG loading icon
.btn__loading-icon { .btn__loading-icon {
float: left; float: left;
margin: 0 4px 0 0; margin: 0 4px 0 0;
height: 20px; height: 20px;
position: absolute; position: absolute;
left: 50%; left: 50%;
top: $btn-padding-y; top: $btn-padding-y;
transform: translate(-50%); transform: translate(-50%);
svg { svg {
width: 24px; width: 24px;
height: 20px; height: 20px;
} }
circle { circle {
width: 4px; width: 4px;
height: 5px; height: 5px;
animation: loading-icon 1.2s infinite ease-in-out both; animation: loading-icon 1.2s infinite ease-in-out both;
fill: $gray; fill: $gray;
transform-origin: 50% 50%; transform-origin: 50% 50%;
} }
circle:nth-child(1) { circle:nth-child(1) {
animation-delay: -.32s; animation-delay: -.32s;
} }
circle:nth-child(2) { circle:nth-child(2) {
animation-delay: -.16s; animation-delay: -.16s;
} }
} }
.btn--loading > span, .btn--loading > span,
.btn--loading::before { .btn--loading::before {
visibility: hidden; visibility: hidden;
} }
@keyframes loading-icon { @keyframes loading-icon {
0%, 80%, 100% { transform: scale(0); } 0%, 80%, 100% {
40% { transform: scale(1); } transform: scale(0);
}
40% {
transform: scale(1);
}
} }
// Specific button variations // Specific button variations
.btn-primary { .btn-primary {
border-bottom-color: $btn-primary-shadow; border-bottom-color: $btn-primary-shadow;
svg circle { svg circle {
fill: #fff; fill: $white;
} }
} }
.btn-primary-outline { .btn-primary-outline {
border-color: lighten($btn-primary-border,10%); border-color: lighten($btn-primary-border, 10%);
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: darken($btn-primary-bg, 10%); color: darken($btn-primary-bg, 10%);
background-image: none; background-image: none;
background-color: lighten($btn-primary-bg, 50%); background-color: lighten($btn-primary-bg, 50%);
border-color: $btn-primary-border; border-color: $btn-primary-border;
} }
svg circle { svg circle {
fill: $btn-primary-bg; fill: $btn-primary-bg;
} }
} }
.btn-secondary { .btn-secondary {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
&:hover, &:hover,
&:active, &:active,
&:focus, &:focus,
&:active:hover, &:active:hover,
&:active:focus { &:active:focus {
background-color: $gray-lighter; background-color: $gray-lighter;
border-color: transparent; border-color: transparent;
} }
} }
.btn-secondary-outline { .btn-secondary-outline {
color: $btn-secondary-color; color: $btn-secondary-color;
&:hover, &:hover,
&:focus, &:focus,
&:active, &:active,
&:active:focus, &:active:focus,
&:active:hover { &:active:hover {
background-color: $gray-lighter; background-color: $gray-lighter;
color: $btn-secondary-color; color: $btn-secondary-color;
} }
svg circle { svg circle {
fill: $body-color; fill: $body-color;
} }
} }
// Grouped buttons // Grouped buttons
.btn-group { .btn-group {
margin-right: $spacer-x * .75; // 12px margin-right: $spacer-x * .75; // 12px
}
.btn-group .btn { .btn {
margin-right: 0; margin-right: 0;
} }
.btn-group .btn-primary { .btn-primary {
border-left: 1px solid $btn-primary-shadow; border-left: 1px solid $btn-primary-shadow;
&:first-child { &:first-child {
border-left: none; border-left: 0;
} }
}
} }

117
admin/client/src/components/GridField/GridField.scss
View File

@ -6,30 +6,34 @@
// @extend .table; // @extend .table;
// @extend .table-hover; // @extend .table-hover;
} }
.grid-field__row--drillable {
cursor: pointer;
}
.grid-field__cell--actions {
white-space: nowrap;
width: 1px;
}
.grid-field__icon-action {
background: none;
border: 0;
color: lighten($body-color, 10%);
padding: $spacer-y $spacer-x/2;
margin-top: -$spacer-y;
margin-bottom: -$spacer-y;
height: calc(#{$line-height-base} + #{$table-cell-padding*2}); // height of icon + spacing top and bottom
vertical-align: top;
&:hover { .grid-field__row--drillable {
color: $body-color; cursor: pointer;
background: darken($body-bg,3%); }
}
&::before { .grid-field__cell--actions {
font-size: 20px; white-space: nowrap;
} width: 1px;
}
.grid-field__icon-action {
background: none;
border: 0;
color: lighten($body-color, 10%);
padding: $spacer-y $spacer-x / 2;
margin-top: -$spacer-y;
margin-bottom: -$spacer-y;
height: calc(#{$line-height-base} + #{$table-cell-padding * 2}); // height of icon + spacing top and bottom
vertical-align: top;
&:hover {
color: $body-color;
background: darken($body-bg, 3%);
}
&::before {
font-size: 20px;
}
} }
// Responsive grid-field // Responsive grid-field
@ -44,9 +48,10 @@
&:first-child { &:first-child {
display: table-cell; display: table-cell;
} }
&.grid-field__cell[data-reactid$=-actions], &.grid-field__cell[data-reactid$=-actions],
&.grid-field__action-placeholder { &.grid-field__action-placeholder {
display: table-cell; display: table-cell;
} }
} }
} }
@ -58,41 +63,43 @@
.grid-field { .grid-field {
.ss-gridfield-sort { // Todo: rename to grid-filed__sort .ss-gridfield-sort { // Todo: rename to grid-filed__sort
background: transparent url(../images/arrows.png) no-repeat right -1px; background: transparent url(../images/arrows.png) no-repeat right -1px;
border: none; border: 0;
width: 100%; width: 100%;
padding: 0;
text-shadow: none;
border-radius: 0;
text-transform: uppercase;
font-weight: normal;
text-align: left;
.ui-button-text {
padding: 0; padding: 0;
text-shadow: none; line-height: 20px;
border-radius: 0; color: $body-color-light;
text-transform: uppercase; }
font-weight: normal;
text-align: left;
.ui-button-text { &:hover {
padding: 0; box-shadow: none;
line-height: 20px; background: transparent url(../images/arrows.png) no-repeat right -41px;
color: $body-color-light; }
}
&:hover { &.ss-gridfield-sorted-asc,
box-shadow: none; &.ss-gridfield-sorted-asc:hover {
background: transparent url(../images/arrows.png) no-repeat right -41px; background-position-y: -118px;
} }
&.ss-gridfield-sorted-asc,
&.ss-gridfield-sorted-asc:hover { &.ss-gridfield-sorted-desc,
background-position-y: -118px; &.ss-gridfield-sorted-desc:hover {
} background-position-y: -78px;
&.ss-gridfield-sorted-desc, }
&.ss-gridfield-sorted-desc:hover {
background-position-y: -78px;
}
} }
thead tr.title th { .title th {
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
text-transform: none; text-transform: none;
border-bottom: 0; border-bottom: 0;
padding-bottom: 0; padding-bottom: 0;
} }
} }

4
admin/client/src/components/HiddenField/HiddenField.scss
View File

@ -1,3 +1,3 @@
.field.hidden { .field.hidden {
display: none; display: none;
} }

79
admin/client/src/components/ListGroup/ListGroup.scss
View File

@ -4,46 +4,51 @@
margin-left: -$spacer-y; margin-left: -$spacer-y;
margin-right: -$spacer-y; margin-right: -$spacer-y;
border-bottom: 1px solid $border-color-light; border-bottom: 1px solid $border-color-light;
margin-bottom: $spacer-y*.75; margin-bottom: $spacer-y * .75;
} }
.list-group-item { .list-group-item {
padding-left: $spacer-y; padding-left: $spacer-y;
padding-right: $spacer-y; padding-right: $spacer-y;
min-height: 64px; min-height: 64px;
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
transition: opacity .2s ease-in-out; transition: opacity .2s ease-in-out;
&:first-child { &:first-child {
border-top: none; border-top: 0;
}
&:hover {
text-decoration: none;
} }
&.active { &:hover {
background-color: $brand-primary; text-decoration: none;
color: #FFF; }
opacity: 1;
&.active {
background-color: $brand-primary;
color: $white;
opacity: 1;
.list-group-item__status {
color: $white;
opacity: 1;
}
} }
} }
.list-group-item-heading { .list-group-item-heading {
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
margin: 2px 0 5px; margin: 2px 0 5px;
color: $body-color; color: $body-color;
} }
.list-group-item__thumbnail { .list-group-item__thumbnail {
width: 64px; width: 64px;
height: 64px; height: 64px;
display: block; display: block;
background: #ccc; background: $gray-lighter;
float: left; float: left;
margin: -12px 12px 0 -$spacer-y; margin: -12px 12px 0 - $spacer-y;
} }
.list-group-item__info { .list-group-item__info {
@ -56,8 +61,16 @@
opacity: .6; opacity: .6;
&:hover { &:hover {
opacity: 1; opacity: 1;
.list-group-item__status {
opacity: 1;
}
} }
.list-group-item__status {
opacity: 0;
}
} }
.list-group-item__status { .list-group-item__status {
@ -65,18 +78,6 @@
transition: opacity .2s ease-in-out; transition: opacity .2s ease-in-out;
} }
.list-group-item.active .list-group-item__status {
color: #FFF;
opacity: 1;
}
.list-group-item--inactive .list-group-item__status {
opacity: 0;
}
.list-group-item--inactive:hover .list-group-item__status {
opacity: 1;
}
// Temp hide links for Alpha1 (change opacity to 1) // Temp hide links for Alpha1 (change opacity to 1)
.list-group-item:hover .list-group-item__info, .list-group-item:hover .list-group-item__info,

11
admin/client/src/components/Preview/Preview.scss
View File

@ -1,30 +1,35 @@
.preview__iframe { .preview__iframe {
width: 100%; width: 100%;
height: calc(100% - #{$toolbar-total-height}); height: calc(100% - #{$toolbar-total-height});
border: none; border: 0;
} }
.preview__file-container { .preview__file-container {
height: calc(100% - #{$toolbar-total-height}); height: calc(100% - #{$toolbar-total-height});
text-align: center; text-align: center;
position: relative; position: relative;
} }
.preview__file { // TODO files smaller than the given space need to be detected via js to give class --fits-space .preview__file { // TODO files smaller than the given space need to be detected via js to give class --fits-space
} }
.preview__file--fits-space {
.preview__file--fits-space {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.preview__overlay { .preview__overlay {
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
height: calc(100% - #{$toolbar-total-height}); height: calc(100% - #{$toolbar-total-height});
background-color: #FFF; background-color: $white;
} }
.preview__overlay-text { .preview__overlay-text {
font-size: $font-size-lg; font-size: $font-size-lg;
position: relative; position: relative;

16
admin/client/src/components/Toolbar/Toolbar.scss
View File

@ -13,7 +13,7 @@
} }
} }
// Northern bar containing breadcrum, tabs etc. // Northern bar containing breadcrumb, tabs etc.
.toolbar--north { .toolbar--north {
display: block; display: block;
background-image: none; background-image: none;
@ -24,14 +24,14 @@
// Secondary content actions eg. Add page button // Secondary content actions eg. Add page button
.toolbar--content { .toolbar--content {
padding: $spacer-y*.625 $spacer-x*.75; padding: $spacer-y * .625 $spacer-x * .75;
margin-bottom: $spacer-y/2; margin-bottom: $spacer-y / 2;
} }
// Primary content actions // Primary content actions
.toolbar--south { .toolbar--south {
padding-top: $spacer-y*.625; padding-top: $spacer-y * .625;
padding-bottom: $spacer-y*.625; padding-bottom: $spacer-y * .625;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
@ -40,8 +40,8 @@
.toolbar__back-button { .toolbar__back-button {
float: left; float: left;
margin: $spacer-y*.625 $spacer-x/2 $spacer-y*.625 #{-$spacer-x/4}; margin: $spacer-y * .625 $spacer-x / 2 $spacer-y * .625 #{-$spacer-x / 4};
padding-left: $spacer-x/4; padding-left: $spacer-x / 4;
padding-right: $spacer-x/4; padding-right: $spacer-x / 4;
border: 0; border: 0;
} }

24
admin/client/src/containers/CampaignAdmin/CampaignAdmin.scss
View File

@ -1,17 +1,17 @@
// Campaign items which have linked assications // Campaign items which have linked associations
.campaign-admin__item-links--has-links, .campaign-admin__item-links--has-links,
.campaign-admin__item-links--is-linked { .campaign-admin__item-links--is-linked {
color: $brand-primary; color: $brand-primary;
float: right; float: right;
position: absolute; position: absolute;
right: $spacer-y; right: $spacer-y;
top: 27px; top: 27px;
font-size: $font-size-sm; font-size: $font-size-sm;
&::before { &::before {
font-size: 16px; font-size: 16px;
position: relative; position: relative;
top: 3px; top: 3px;
margin-right: 1px; margin-right: 1px;
} }
} }

4
admin/client/src/styles/_chosen.scss
View File

@ -1,4 +1,4 @@
$chosen-sprite: url('../images/chosen-sprite.png'); $chosen-sprite: url("../images/chosen-sprite.png");
$chosen-sprite-retina: url('../images/chosen-sprite@2x.png'); $chosen-sprite-retina: url("../images/chosen-sprite@2x.png");
@import "../../../../node_modules/chosen/sass/chosen"; @import "../../../../node_modules/chosen/sass/chosen";

10
admin/client/src/styles/_layout.scss
View File

@ -15,11 +15,13 @@
.cms-content__split { .cms-content__split {
height: 100%; height: 100%;
} }
.cms-content__split--left-sm { .cms-content__split--left-sm {
.cms-content__right { .cms-content__right {
position: relative; position: relative;
display: none; display: none;
} }
.cms-content__left { .cms-content__left {
width: 100%; width: 100%;
position: absolute; position: absolute;
@ -43,12 +45,13 @@
content: "5"; content: "5";
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
color: #fff; color: $white;
padding: 8px; padding: 8px;
border-radius: 50%; border-radius: 50%;
font-family: silverstripe; font-family: silverstripe;
z-index: 1; z-index: 1;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background-color: $gray-dark; background-color: $gray-dark;
text-decoration: none; text-decoration: none;
@ -61,14 +64,17 @@
.cms-content__left { .cms-content__left {
width: $cms-panel-sm; width: $cms-panel-sm;
} }
.cms-content__right { .cms-content__right {
display: block; display: block;
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
} }
.cms-content__back-btn { .cms-content__back-btn {
display: none; display: none;
} }
} }
@include media-breakpoint-up(xl) { @include media-breakpoint-up(xl) {
padding-left: $cms-panel-md; padding-left: $cms-panel-md;
@ -85,9 +91,11 @@
overflow-y: auto; overflow-y: auto;
height: 100%; height: 100%;
} }
.panel-scrollable--single-toolbar { .panel-scrollable--single-toolbar {
height: calc(100% - #{$toolbar-total-height}); height: calc(100% - #{$toolbar-total-height});
} }
.panel-scrollable--double-toolbar { .panel-scrollable--double-toolbar {
height: calc(100% - #{$toolbar-total-height * 2}); height: calc(100% - #{$toolbar-total-height * 2});
} }

28
admin/client/src/styles/_typography.scss
View File

@ -1,8 +1,7 @@
/** //
* File: typography.scss // File: typography.scss
* //
* Contains the basic typography related styles for the admin interface. // Contains the basic typography related styles for the admin interface.
*/
// Tables // Tables
@ -11,7 +10,7 @@
.table { .table {
margin-left: -$spacer-x; margin-left: -$spacer-x;
margin-right: -$spacer-x; margin-right: -$spacer-x;
min-width: calc(100% + #{$spacer-x*2}); min-width: calc(100% + #{$spacer-x * 2});
margin-bottom: $spacer-y * 2; margin-bottom: $spacer-y * 2;
border-top: 0; border-top: 0;
@ -20,14 +19,7 @@
border-bottom: $table-border-width solid $table-border-color; border-bottom: $table-border-width solid $table-border-color;
text-transform: uppercase; text-transform: uppercase;
font-size: $font-size-sm; font-size: $font-size-sm;
}
thead th {
// font-size: 12px;
// text-transform: uppercase;
font-weight: normal; font-weight: normal;
// border-bottom: 1px solid #bbb;
// border-top: 0;
} }
th, th,
@ -37,12 +29,14 @@
line-height: 20px; line-height: 20px;
&:first-child { &:first-child {
padding-left: #{$spacer-x + $spacer-x*.25}; padding-left: #{$spacer-x + $spacer-x * .25};
} }
&:last-child { &:last-child {
padding-right: #{$spacer-x + $spacer-x*.25}; padding-right: #{$spacer-x + $spacer-x * .25};
} }
} }
tfoot { tfoot {
background-color: transparent; background-color: transparent;
font-size: $font-size-sm; font-size: $font-size-sm;
@ -55,8 +49,8 @@
} }
.cms { .cms {
code { code {
font-family: 'Bitstream Vera Sans Mono','Courier', monospace; font-family: 'Bitstream Vera Sans Mono','Courier', monospace;
} }
} }

99
admin/client/src/styles/_variables.scss
View File

@ -1,7 +1,8 @@
// Variables // Variables
// //
// This file contains the keys for bootstrap variables, the commented code is bootstrap's default values. // This file contains the keys for bootstrap variables, the commented code is bootstrap's default values.
// Uncomment code when you change the values of a variable. // Commented lines indicate that the default Bootstrap values are being used.
// All variables which are uncommented the values will be in use so be cautious when adjusting their values..
// Table of Contents // Table of Contents
@ -18,12 +19,10 @@
// Components // Components
// General variable structure // General variable structure
//
// Variable format should follow the `$component-modifier-state-property` order. // Variable format should follow the `$component-modifier-state-property` order.
// Colors // Colors
//
// Grayscale and brand colors for use across Bootstrap. // Grayscale and brand colors for use across Bootstrap.
$gray-dark: #4f5861; $gray-dark: #4f5861;
@ -31,12 +30,14 @@ $gray: #55595c;
$gray-light: #d3d9dd; $gray-light: #d3d9dd;
$gray-lighter: #e8e9ea; $gray-lighter: #e8e9ea;
// $gray-lightest: #f7f7f9; // $gray-lightest: #f7f7f9;
// $white: #fff; // Never change variable, use new variable if needed
$brand-primary: #29abe2; $brand-primary: #29abe2;
$brand-success: #3fa142; $brand-success: #3fa142;
// $brand-info: #5bc0de; // $brand-info: #5bc0de;
// $brand-warning: #f0ad4e; // $brand-warning: #f0ad4e;
$brand-danger: #D40404; $brand-danger: #d40404;
// Backgrounds // Backgrounds
$background-main: #f6f7f8; $background-main: #f6f7f8;
@ -146,7 +147,7 @@ $container-max-widths: (
// Set the number of columns and specify the width of the gutters. // Set the number of columns and specify the width of the gutters.
// $grid-columns: 12; // $grid-columns: 12;
$grid-gutter-width: $spacer*2; $grid-gutter-width: $spacer * 2;
// Typography // Typography
@ -162,17 +163,17 @@ $font-family-base: $font-family-sans-serif;
$font-size-root: 13px; $font-size-root: 13px;
$font-size-base: 1rem; $font-size-base: 1rem;
$font-size-lg: 1.23rem; /* 16px */ $font-size-lg: 1.23rem; // 16px
$font-size-sm: .923rem; /* 12px */ $font-size-sm: .923rem; // 12px
$font-size-xs: .846rem; /* 11px */ $font-size-xs: .846rem; // 11px
$font-size-xxs: .77rem; /* 10px */ $font-size-xxs: .77rem; // 10px
$font-size-h1: 2.5rem; $font-size-h1: 2.5rem;
$font-size-h2: 18px; /* 2rem; */ $font-size-h2: 18px; // 2rem;
$font-size-h3: 16px; /* 1.75rem; */ $font-size-h3: 16px; // 1.75rem;
$font-size-h4: 14px; /* 1.5rem; */ $font-size-h4: 14px; // 1.5rem;
$font-size-h5: 13px; /* 1.25rem; */ $font-size-h5: 13px; // 1.25rem;
$font-size-h6: 12px; /* 1rem; */ $font-size-h6: 12px; // 1rem;
// $display1-size: 6rem; // $display1-size: 6rem;
// $display2-size: 5.5rem; // $display2-size: 5.5rem;
@ -185,7 +186,7 @@ $font-size-h6: 12px; /* 1rem; */
// $display4-weight: 300; // $display4-weight: 300;
$line-height: 1.539; $line-height: 1.539;
$line-height-base: 20px; /* can be used with varying font-sizes, holds grid sizing */ $line-height-base: 20px; // can be used with varying font-sizes, holds grid sizing
$headings-margin-bottom: $spacer; $headings-margin-bottom: $spacer;
// $headings-font-family: inherit; // $headings-font-family: inherit;
@ -218,18 +219,18 @@ $text-muted: #7f8b97;
// //
// Define common padding and border radius sizes and more. // Define common padding and border radius sizes and more.
// $line-height-lg: (4 / 3); $line-height-lg: (4 / 3);
// $line-height-sm: 1.5; $line-height-sm: 1.5;
//
// $border-radius: .25rem; $border-radius: .25rem;
// $border-radius-lg: .3rem; $border-radius-lg: .3rem;
// $border-radius-sm: .2rem; $border-radius-sm: .2rem;
//
// $component-active-color: #fff; $component-active-color: #fff;
// $component-active-bg: $brand-primary; $component-active-bg: $brand-primary;
//
// $caret-width: .3em; $caret-width: .3em;
// $caret-width-lg: $caret-width; $caret-width-lg: $caret-width;
// Tables // Tables
@ -237,9 +238,9 @@ $text-muted: #7f8b97;
// Customizes the `.table` component with basic values, each used across all table variations. // Customizes the `.table` component with basic values, each used across all table variations.
$table-cell-padding: $spacer; $table-cell-padding: $spacer;
$table-sm-cell-padding: $spacer*.75; $table-sm-cell-padding: $spacer * .75;
$table-bg: #FFF; $table-bg: #fff;
$table-bg-accent: #f9f9f9; $table-bg-accent: #f9f9f9;
$table-bg-hover: #f5f5f5; $table-bg-hover: #f5f5f5;
$table-bg-active: $brand-primary; $table-bg-active: $brand-primary;
@ -295,9 +296,9 @@ $btn-danger-border: $brand-danger;
// $btn-padding-y-lg: .75rem; // $btn-padding-y-lg: .75rem;
// Allows for customizing button radius independently from global border radius // Allows for customizing button radius independently from global border radius
// $btn-border-radius: $border-radius; $btn-border-radius: .23rem;
// $btn-border-radius-lg: $border-radius-lg; $btn-border-radius-lg: .25rem;
// $btn-border-radius-sm: $border-radius-sm; $btn-border-radius-sm: .154rem;
// Forms // Forms
@ -617,23 +618,23 @@ $navbar-padding-vertical: ($spacer / 2);
// List group // List group
// $list-group-bg: #fff; $list-group-bg: #fff;
// $list-group-border-color: #ddd; $list-group-border-color: #ddd;
// $list-group-border-width: $border-width; $list-group-border-width: $border-width;
// $list-group-border-radius: $border-radius; $list-group-border-radius: $border-radius;
//
// $list-group-hover-bg: #f5f5f5; $list-group-hover-bg: #f5f5f5;
// $list-group-active-color: $component-active-color; $list-group-active-color: $component-active-color;
// $list-group-active-bg: $component-active-bg; $list-group-active-bg: $component-active-bg;
// $list-group-active-border: $list-group-active-bg; $list-group-active-border: $list-group-active-bg;
// $list-group-active-text-color: lighten($list-group-active-bg, 40%); $list-group-active-text-color: lighten($list-group-active-bg, 40%);
//
// $list-group-disabled-color: $gray-light; $list-group-disabled-color: $gray-light;
// $list-group-disabled-bg: $gray-lighter; $list-group-disabled-bg: $gray-lighter;
// $list-group-disabled-text-color: $list-group-disabled-color; $list-group-disabled-text-color: $list-group-disabled-color;
//
$list-group-link-color: $body-color; $list-group-link-color: $body-color;
// $list-group-link-hover-color: $list-group-link-color; $list-group-link-hover-color: $list-group-link-color;
$list-group-link-heading-color: $body-color; $list-group-link-heading-color: $body-color;

15
admin/client/src/styles/editor.scss
View File

@ -1,7 +1,12 @@
// Editor variables
$state-danger-bg: #f2dede;
$state-danger-border: darken($state-danger-bg, 5%);
$text-color: #fff;
body.mceContentBody a.ss-broken { body.mceContentBody a.ss-broken {
background-color: #FF7B71; background-color: $state-danger-bg;
border: 1px red solid; border: 1px $state-danger-border solid;
color: #fff; color: $text-color;
padding: 1px; padding: 1px;
text-decoration: underline; text-decoration: underline;
} }