FIX: sass-lint styleguide fixes

This commit is contained in:
Sam Minnee 2016-09-17 15:30:49 +12:00
parent c2ebff5c19
commit b61c5a56de
16 changed files with 2202 additions and 2070 deletions

View File

@ -1,5 +1,3 @@
// scss-lint:disable all
//Color Variables //Color Variables
$message: #BDBD00; // blue $message: #BDBD00; // blue
$good: #359318; // green $good: #359318; // green
@ -8,7 +6,7 @@ $warning: #E07127; // orange
$warningBg: #fcf8f2; $warningBg: #fcf8f2;
$warningBorder: #ffc28b; $warningBorder: #ffc28b;
$error: #C61414 /* #E21607 */; // red $error: #C61414; // red - was #E21607
$errorBg: #FDF1F3; $errorBg: #FDF1F3;
$errorBorder: #F8C3CD; $errorBorder: #F8C3CD;
@ -18,18 +16,19 @@ $gradientBottom: #7F9198;
//Mixin to create a gradient from top to bottom //Mixin to create a gradient from top to bottom
@mixin topGradient($topColor, $bottomColor) { @mixin topGradient($topColor, $bottomColor) {
background: $topColor; /* Old browszzzzzers */ background: $topColor; // Old browszzzzzers
background: -moz-linear-gradient(top, $topColor 0%, $bottomColor 100%); /* FF3.6+ */ background: -moz-linear-gradient(top, $topColor 0%, $bottomColor 100%); // FF3.6+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$topColor), color-stop(100%,$bottomColor)); /* Chrome,Safari4+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, $topColor), color-stop(100%, $bottomColor)); // Chrome,Safari4+
background: -webkit-linear-gradient(top, $topColor 0%,$bottomColor 100%); /* Chrome10+,Safari5.1+ */ background: -webkit-linear-gradient(top, $topColor 0%, $bottomColor 100%); // Chrome10+,Safari5.1+
background: -o-linear-gradient(top, $topColor 0%,$bottomColor 100%); /* Opera11.10+ */ background: -o-linear-gradient(top, $topColor 0%, $bottomColor 100%); // Opera11.10+
background: -ms-linear-gradient(top, $topColor 0%,$bottomColor 100%); /* IE10+ */ background: -ms-linear-gradient(top, $topColor 0%, $bottomColor 100%); // IE10+
background: linear-gradient(to bottom, $topColor 0%,$bottomColor 100%); /* W3C */ background: linear-gradient(to bottom, $topColor 0%, $bottomColor 100%); // W3C
.lt-ie9 & { .lt-ie9 & {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$topColor}', endColorstr='#{$bottomColor}',GradientType=0 ); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$topColor}', endColorstr='#{$bottomColor}',GradientType=0 ); // IE6-9
} }
$experimental-support-for-svg: true; // $experimental-support-for-svg: true;
/* @include background-image(linear-gradient(top, $topColor,$bottomColor)); */ // @include background-image(linear-gradient(top, $topColor,$bottomColor));
} }
//Mixin to create rounded corners. Takes a value for each of the 4 corners //Mixin to create rounded corners. Takes a value for each of the 4 corners
@ -54,7 +53,6 @@ $gradientBottom: #7F9198;
-webkit-box-shadow: $shadow; -webkit-box-shadow: $shadow;
-moz-box-shadow: $shadow; -moz-box-shadow: $shadow;
box-shadow: $shadow; box-shadow: $shadow;
} }
//Mixin to create an inset box shadow //Mixin to create an inset box shadow
@ -72,20 +70,27 @@ body {
color: #333; color: #333;
width: 940px; width: 940px;
margin: 0 auto 18px; margin: 0 auto 18px;
/* background: url(../../../admin/images/textures/bg_cms_main_content.png) repeat scroll left top #F0F3F4; */ // background: url(../../../admin/images/textures/bg_cms_main_content.png) repeat scroll left top #F0F3F4;
background-color: #f4f4f4; background-color: #f4f4f4;
/* Typography */ // Typography
p { p {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
margin-bottom: 18px; margin-bottom: 18px;
color: #333; color: #333;
} }
a { a {
color: $link; color: $link;
} }
h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
color: #222; color: #222;
font-family: inherit; font-family: inherit;
font-weight: bold; font-weight: bold;
@ -94,19 +99,19 @@ body {
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
clear: both; clear: both;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
small { small {
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
color: #666; color: #666;
} }
} }
h1 { h1 {
font-size: 36px; font-size: 36px;
line-height: 36px; line-height: 36px;
letter-spacing: -0.5px; letter-spacing: -0.5px;
} background: transparent url("../images/logo.gif") no-repeat left top;
h1 {
background: transparent url(../images/logo.gif) no-repeat left top;
text-indent: -9999px; text-indent: -9999px;
height: 164px; height: 164px;
width: 161px; width: 161px;
@ -115,65 +120,85 @@ body {
border-right: 1px solid $gradientTop; border-right: 1px solid $gradientTop;
margin-right: 40px; margin-right: 40px;
} }
h2 { h2 {
font-size: 34px; font-size: 34px;
line-height: 36px; line-height: 36px;
letter-spacing: -0.5px; letter-spacing: -0.5px;
} }
h3 { h3 {
font-size: 18px; font-size: 18px;
line-height: 27px; line-height: 27px;
} }
h4 { h4 {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
margin: 18px 0 9px; margin: 18px 0 9px;
} }
h5 { h5 {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
margin: 18px 0 0; margin: 18px 0 0;
} }
/* Helpers */ //PHP5 required screen
#Header {
h1 {
margin-top: 45px;
margin-bottom: 27px;
}
h3 {
margin-top: -10px;
}
}
// Helpers
.clear { .clear {
clear: both; clear: both;
} }
.left { .left {
float: left; float: left;
} }
/* Messages */ // Messages
.message { .message {
padding: 2px 18px; padding: 2px 18px;
margin-bottom: 18px; margin-bottom: 18px;
@include roundedCorners(3px, 3px, 3px, 3px); @include roundedCorners(3px, 3px, 3px, 3px);
p { p {
margin: 11px 0 13px; margin: 11px 0 13px;
} }
&.warning { &.warning {
background-color: $warningBg; background-color: $warningBg;
border: 1px $warningBorder solid; border: 1px $warningBorder solid;
} }
&.error { &.error {
background-color: #FDF1F3 /* #fdf5f5 */; background-color: #FDF1F3; // was #fdf5f5
border: 1px solid $errorBorder; border: 1px solid $errorBorder;
} }
ul { ul {
margin-left: 18px; margin-left: 18px;
margin-top: -9px; margin-top: -9px;
li { }
}
}
}
}
.helpText { .helpText {
float: right; float: right;
width: 425px; width: 425px;
padding-left: 20px; padding-left: 20px;
color: #666; color: #666;
margin-top: 0; margin-top: 0;
background: transparent url(../images/question.png) no-repeat left 1px; background: transparent url("../images/question.png") no-repeat left 1px;
&.requirementsHelpText { &.requirementsHelpText {
margin-top: 17px; margin-top: 17px;
} }
@ -185,39 +210,45 @@ body {
margin: 9px 0 27px; margin: 9px 0 27px;
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
thead { thead {
tr { td,
td, th { th {
font-weight: bold; font-weight: bold;
vertical-align: bottom; vertical-align: bottom;
padding: 12px; padding: 12px;
} }
} }
}
th, td { th,
td {
padding: 8px 12px; padding: 8px 12px;
text-align: left; text-align: left;
} }
td { td {
vertical-align: top; vertical-align: top;
border-top: none; border-top: 0;
background-color: #fff; background-color: #fff;
} }
th + th, // th + th,
td + td, // td + td,
th + td { // th + td {
/* border-left: 1px solid #ddd; */ // border-left: 1px solid #ddd;
} // }
tbody { tbody {
tr:nth-child(odd) td, tr:nth-child(odd) td,
tr:nth-child(odd) th { tr:nth-child(odd) th {
background-color: #fcfcfc; background-color: #fcfcfc;
} }
tr:hover td, tr:hover td,
tr:hover th { tr:hover th {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
} }
tfoot { tfoot {
font-style: italic; font-style: italic;
color: #888; color: #888;
@ -225,7 +256,9 @@ body {
} }
// Forms // Forms
input, textarea, select { input,
textarea,
select {
width: 420px; width: 420px;
margin-bottom: 9px; margin-bottom: 9px;
color: #707070; color: #707070;
@ -244,6 +277,7 @@ body {
transition: border linear .2s, box-shadow linear .2s; transition: border linear .2s, box-shadow linear .2s;
@include box-shadow(inset 0 1px 3px rgba(0, 0, 0, .1)); @include box-shadow(inset 0 1px 3px rgba(0, 0, 0, .1));
} }
input:focus, input:focus,
textarea:focus { textarea:focus {
outline: 0; outline: 0;
@ -251,6 +285,7 @@ body {
$shadow: inset 0 1px 3px rgba(0, 0, 0, .1), 0 0 4px rgba(82, 168, 236, .6); $shadow: inset 0 1px 3px rgba(0, 0, 0, .1), 0 0 4px rgba(82, 168, 236, .6);
@include box-shadow($shadow); @include box-shadow($shadow);
} }
input[type=file]:focus, input[type=file]:focus,
input[type=checkbox]:focus, input[type=checkbox]:focus,
select:focus { select:focus {
@ -262,12 +297,14 @@ body {
select { select {
height: 26px; height: 26px;
} }
option { option {
line-height: 27px; line-height: 27px;
font-size: 12px; font-size: 12px;
padding: 2px 6px; padding: 2px 6px;
color: #666; color: #666;
} }
label { label {
width: auto; width: auto;
float: none; float: none;
@ -276,9 +313,11 @@ body {
text-align: left; text-align: left;
display: block; display: block;
} }
.fields { .fields {
float: left; float: left;
} }
input.action { input.action {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
@ -296,20 +335,26 @@ body {
@include roundedCorners(3px, 3px, 3px, 3px); @include roundedCorners(3px, 3px, 3px, 3px);
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
background-color: #ddd; background-color: #ddd;
&:hover { &:hover {
@include boxShadow(0, 1px, 2px, 0, #ccc); @include boxShadow(0, 1px, 2px, 0, #ccc);
@include topGradient (#fbfbfb, #ccc); @include topGradient (#fbfbfb, #ccc);
} }
&:focus, &:active {
&:focus,
&:active {
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
@include topGradient (#fbfbfb, #bbb); @include topGradient (#fbfbfb, #bbb);
} }
} }
input.action:hover, input.action:hover,
input.action:focus { input.action:focus {
cursor: pointer; cursor: pointer;
} }
input[type="checkbox"], input[type="radio"] {
input[type="checkbox"],
input[type="radio"] {
border: medium none; border: medium none;
height: auto; height: auto;
line-height: normal; line-height: normal;
@ -319,28 +364,34 @@ body {
float: left; float: left;
margin-top: 3px; margin-top: 3px;
} }
#install_button { #install_button {
font-size: 20px; font-size: 20px;
color: #fff; color: #fff;
border-color: #78A127 #78A127 #59781D; border-color: #78A127 #78A127 #59781D;
text-shadow: 0 1px 1px #4D7326; text-shadow: 0 1px 1px #4D7326;
padding: 8px 14px; padding: 8px 14px;
background-color: green; background-color: #008000;
@include topGradient(#80BF40, #59862D); @include topGradient(#80BF40, #59862D);
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
&:hover { &:hover {
@include boxShadow(0, 1px, 3px, 0, #bbb); @include boxShadow(0, 1px, 3px, 0, #bbb);
} }
&:focus, &:active {
&:focus,
&:active {
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
@include topGradient(#80BF40, #59862D); @include topGradient(#80BF40, #59862D);
} }
&[disabled=disabled] { &[disabled=disabled] {
border: 1px solid #aaa; border: 1px solid #aaa;
border-color: #bbb #bbb #aaa; border-color: #bbb #bbb #aaa;
color: #999; color: #999;
text-shadow: 0 1px 0 #eee; text-shadow: 0 1px 0 #eee;
@include topGradient (#fbfbfb, #bbb); @include topGradient (#fbfbfb, #bbb);
&:hover { &:hover {
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
} }
@ -348,26 +399,31 @@ body {
} }
} }
/* Custom styles */ // Custom styles
#Container { #Container {
margin-bottom: 40px; margin-bottom: 40px;
h3.sectionHeading { h3.sectionHeading {
padding-top: 27px; padding-top: 27px;
border-top: 1px solid $gradientTop; border-top: 1px solid $gradientTop;
clear: both; clear: both;
} }
#Header { #Header {
margin-bottom: 30px; margin-bottom: 30px;
height: 200px; height: 200px;
div.left { div.left {
width: 698px; width: 698px;
margin-top: 47px; margin-top: 47px;
} }
} }
#Navigation { #Navigation {
display: none; display: none;
} }
} }
h5.requirement { h5.requirement {
padding: 12px 18px; padding: 12px 18px;
font-size: 14px; font-size: 14px;
@ -381,6 +437,7 @@ body {
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
background-color: #eee; background-color: #eee;
@include topGradient($gradientTop, $gradientBottom); @include topGradient($gradientTop, $gradientBottom);
span { span {
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
@ -391,15 +448,19 @@ body {
@include roundedCorners(2px, 2px, 2px, 2px); @include roundedCorners(2px, 2px, 2px, 2px);
@include boxShadow(0, 0, 2px, 0, $gradientBottom); @include boxShadow(0, 0, 2px, 0, $gradientBottom);
} }
&.good span { &.good span {
color: $good /* #359318 */; color: $good; // was #359318
} }
&.warning span { &.warning span {
color: $warning; color: $warning;
} }
&.error span { &.error span {
color: $error; color: $error;
} }
a { a {
font-size: 11px; font-size: 11px;
right: 9px; right: 9px;
@ -410,51 +471,63 @@ body {
text-decoration: none; text-decoration: none;
font-weight: normal; font-weight: normal;
padding-right: 21px; padding-right: 21px;
background: transparent url(../images/arrows.png) no-repeat right top; background: transparent url("../images/arrows.png") no-repeat right top;
&:hover { &:hover {
background: transparent url(../images/arrows.png) no-repeat right -40px; background: transparent url("../images/arrows.png") no-repeat right -40px;
} }
} }
} }
table.testResults { table.testResults {
border-top: none; border-top: 0;
margin-top: -1px; margin-top: -1px;
margin-bottom: 9px; margin-bottom: 9px;
@include boxShadow(0, 1px, 0, 0, #fff); @include boxShadow(0, 1px, 0, 0, #fff);
@include roundedCorners(3px, 3px, 3px, 3px); @include roundedCorners(3px, 3px, 3px, 3px);
overflow: hidden; overflow: hidden;
tr { tr {
&.good { &.good {
display: none; display: none;
border: none; border: 0;
td { td {
color: $good; color: $good;
} }
} }
&.warning { &.warning {
border: none; border: 0;
td { td {
color: $warning; color: $warning;
} }
} }
&.error { &.error {
border: none; border: 0;
color: $error; color: $error;
} }
} }
td { td {
border: 1px solid #ddd; border: 1px solid #ddd;
width: 50%; width: 50%;
} }
} }
#database_selection, #Themes {
#database_selection,
#Themes {
list-style: none; list-style: none;
margin: 0; margin: 0;
margin-bottom: 18px; margin-bottom: 18px;
padding-left: 0; padding-left: 0;
li { li {
clear: left; clear: left;
padding: 3px 0; padding: 3px 0;
.dbfields { .dbfields {
padding: 12px; padding: 12px;
border: 1px solid #ddd; border: 1px solid #ddd;
@ -466,16 +539,20 @@ body {
} }
} }
} }
ul#Themes { ul#Themes {
float: left; float: left;
width: 445px; width: 445px;
} }
.databaseError { .databaseError {
width: 422px; width: 422px;
} }
#Footer { #Footer {
margin-top: 67px; margin-top: 67px;
margin-bottom: 18px; margin-bottom: 18px;
p { p {
font-size: 12px; font-size: 12px;
color: #999; color: #999;
@ -483,31 +560,19 @@ body {
} }
} }
//PHP5 required screen // styles not tested
body {
#Header {
h1 {
margin-top: 45px;
margin-bottom: 27px;
}
h3 {
margin-top: -10px;
}
}
}
/* styles not tested */
#adminAcc, #adminAcc,
#devHelp, #devHelp,
#localeHelp { #localeHelp {
padding-top: 20px; padding-top: 20px;
} }
#devHelp, #devHelp,
#devSection { #devSection {
height: 18em; height: 18em;
} }
#use_environment_field { #use_environment_field {
margin-bottom: 25px; margin-bottom: 25px;
background-color: #FAFAFA; background-color: #FAFAFA;
@ -516,23 +581,29 @@ body {
box-shadow: 0 1px 0 0 white; box-shadow: 0 1px 0 0 white;
margin-bottom: 9px; margin-bottom: 9px;
padding: 10px 10px 8px; padding: 10px 10px 8px;
input { input {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
} }
} }
.databaseError { .databaseError {
ul { ul {
margin-bottom: 0; margin-bottom: 0;
} }
ul, li {
ul,
li {
margin-left: 0; margin-left: 0;
padding-left: 0; padding-left: 0;
} }
} }
#Layout p.goodInstall { #Layout p.goodInstall {
color: #359318; color: #359318;
} }
.goodInstall { .goodInstall {
padding: 0.5em; padding: 0.5em;
background-color: #e2fee1; background-color: #e2fee1;
@ -541,6 +612,7 @@ body {
overflow: hidden; overflow: hidden;
line-height: 18px; line-height: 18px;
padding: 10px; padding: 10px;
a { a {
float: right; float: right;
font-size: 18px; font-size: 18px;

View File

@ -101,14 +101,12 @@
// Readonlys should be converted to an input // Readonlys should be converted to an input
// scss-lint:disable all
.form__field-holder p.readonly, .form__field-holder p.readonly,
.form__field-holder input.readonly, .form__field-holder input.readonly,
.form__field-holder span.readonly, .form__field-holder span.readonly,
.readonly .form__field-holder > div { .readonly .form__field-holder > div {
@extend .form-control-static; @extend .form-control-static;
} }
// scss-lint:enable all
// Radio / Checkbox // Radio / Checkbox
@ -149,7 +147,6 @@ input.radio {
} }
} }
@mixin form-responsive($breakpoint-inline, $breakpoint-inline-limit-width, $breakpoint-inline-limit-width-max) { @mixin form-responsive($breakpoint-inline, $breakpoint-inline-limit-width, $breakpoint-inline-limit-width-max) {
@include media-breakpoint-up($breakpoint-inline) { @include media-breakpoint-up($breakpoint-inline) {
.form-group { .form-group {
@ -157,7 +154,6 @@ input.radio {
// Composite fields // Composite fields
// TODO reduce nesting // TODO reduce nesting
// scss-lint:disable SelectorDepth
.form__field-holder .form-group { .form__field-holder .form-group {
.form__field-holder, .form__field-holder,
.form__field-label { .form__field-label {
@ -176,7 +172,6 @@ input.radio {
@include make-col-offset(0); @include make-col-offset(0);
} }
} }
// scss-lint:enable SelectorDepth
&::after { &::after {
margin: $spacer-y $grid-gutter-width-half #{-$spacer-y}; margin: $spacer-y $grid-gutter-width-half #{-$spacer-y};

View File

@ -93,7 +93,9 @@
} }
@keyframes loading-icon { @keyframes loading-icon {
0%, 80%, 100% { 0%,
80%,
100% {
transform: scale(0); transform: scale(0);
} }

View File

@ -132,7 +132,7 @@
&:active, &:active,
&[class*="font-icon-"]:active, &[class*="font-icon-"]:active,
&:focus, &:focus,
&[class*="font-icon-"]:focus, { &[class*="font-icon-"]:focus {
background-color: darken($table-bg-tools, 6%); background-color: darken($table-bg-tools, 6%);
&::before { &::before {

View File

@ -10,9 +10,7 @@
} }
.arrow { .arrow {
// scss-lint:disable all
@extend .popover-arrow; // Temp uses Bootstrap 3 class name, until React Bootstrap has been updated to Bootstrap 4 @extend .popover-arrow; // Temp uses Bootstrap 3 class name, until React Bootstrap has been updated to Bootstrap 4
// scss-lint:enable all
} }
} }
@ -20,9 +18,7 @@
// Unable to use classes within the popover, so we use elements to style // Unable to use classes within the popover, so we use elements to style
ul { ul {
// scss-lint:disable ImportantRule
padding-left: 0 !important; // TODO remove important by removing nesting of lists padding-left: 0 !important; // TODO remove important by removing nesting of lists
// scss-lint:enable ImportantRule
list-style-type: none; list-style-type: none;
margin-left: -#{$popover-padding} + 1px; // minus border margin-left: -#{$popover-padding} + 1px; // minus border
margin-right: -#{$popover-padding} + 1px; margin-right: -#{$popover-padding} + 1px;

View File

@ -72,7 +72,7 @@
} }
.toolbar__back-button, .toolbar__back-button,
.cms_backlink .toolbar__back-button { // TEMP: Needed for anchor buttons to override legacy styles .cms-backlink .toolbar__back-button { // TEMP: Needed for anchor buttons to override legacy styles
float: left; float: left;
margin: $spacer-y * .625 $spacer-x / 2 $spacer-y * .625 #{-$spacer-x * .625}; margin: $spacer-y * .625 $spacer-x / 2 $spacer-y * .625 #{-$spacer-x * .625};
padding-left: $spacer-x / 4; padding-left: $spacer-x / 4;

View File

@ -14,257 +14,325 @@
[class^="font-icon-"]::before, [class^="font-icon-"]::before,
[class*=" font-icon-"]::before { [class*=" font-icon-"]::before {
// scss-lint:disable ImportantRule
font-family: "silverstripe" !important; font-family: "silverstripe" !important;
// scss-lint:disable ImportantRule
font-style: normal !important; font-style: normal !important;
// scss-lint:disable ImportantRule
font-weight: normal !important; font-weight: normal !important;
// scss-lint:disable ImportantRule
font-variant: normal !important; font-variant: normal !important;
// scss-lint:disable ImportantRule
text-transform: none !important; text-transform: none !important;
// scss-lint:enable ImportantRule
speak: none; speak: none;
line-height: 1; line-height: 1;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
// scss-lint:disable EmptyLineBetweenBlocks
.font-icon-search::before { .font-icon-search::before {
content: "\73"; content: "\73";
} }
.font-icon-sync::before { .font-icon-sync::before {
content: "\63"; content: "\63";
} }
.font-icon-print::before { .font-icon-print::before {
content: "\64"; content: "\64";
} }
.font-icon-list::before { .font-icon-list::before {
content: "\65"; content: "\65";
} }
.font-icon-plus-circled::before { .font-icon-plus-circled::before {
content: "\66"; content: "\66";
} }
.font-icon-check-mark-2::before { .font-icon-check-mark-2::before {
content: "\6b"; content: "\6b";
} }
.font-icon-book::before { .font-icon-book::before {
content: "\6e"; content: "\6e";
} }
.font-icon-book-open::before { .font-icon-book-open::before {
content: "\6f"; content: "\6f";
} }
.font-icon-plus::before { .font-icon-plus::before {
content: "\6a"; content: "\6a";
} }
.font-icon-tree::before { .font-icon-tree::before {
content: "\70"; content: "\70";
} }
.font-icon-flow-tree::before { .font-icon-flow-tree::before {
content: "\71"; content: "\71";
} }
.font-icon-info-circled::before { .font-icon-info-circled::before {
content: "\79"; content: "\79";
} }
.font-icon-chart-line::before { .font-icon-chart-line::before {
content: "\42"; content: "\42";
} }
.font-icon-graph-bar::before { .font-icon-graph-bar::before {
content: "\45"; content: "\45";
} }
.font-icon-torsos-all::before { .font-icon-torsos-all::before {
content: "\46"; content: "\46";
} }
.font-icon-torso::before { .font-icon-torso::before {
content: "\48"; content: "\48";
} }
.font-icon-picture::before { .font-icon-picture::before {
content: "\76"; content: "\76";
} }
.font-icon-chart-pie::before { .font-icon-chart-pie::before {
content: "\41"; content: "\41";
} }
.font-icon-sitemap::before { .font-icon-sitemap::before {
content: "\43"; content: "\43";
} }
.font-icon-globe-1::before { .font-icon-globe-1::before {
content: "\52"; content: "\52";
} }
.font-icon-chat::before { .font-icon-chat::before {
content: "\74"; content: "\74";
} }
.font-icon-comment::before { .font-icon-comment::before {
content: "\77"; content: "\77";
} }
.font-icon-logout::before { .font-icon-logout::before {
content: "\7a"; content: "\7a";
} }
.font-icon-cancel-circled::before { .font-icon-cancel-circled::before {
content: "\51"; content: "\51";
} }
.font-icon-left-open::before { .font-icon-left-open::before {
content: "\54"; content: "\54";
} }
.font-icon-right-open::before { .font-icon-right-open::before {
content: "\55"; content: "\55";
} }
.font-icon-check-mark::before { .font-icon-check-mark::before {
content: "\47"; content: "\47";
} }
.font-icon-check-mark-circle::before { .font-icon-check-mark-circle::before {
content: "\49"; content: "\49";
} }
.font-icon-back-in-time::before { .font-icon-back-in-time::before {
content: "\58"; content: "\58";
} }
.font-icon-cog::before { .font-icon-cog::before {
content: "\59"; content: "\59";
} }
.font-icon-fast-forward::before { .font-icon-fast-forward::before {
content: "\68"; content: "\68";
} }
.font-icon-install::before { .font-icon-install::before {
content: "\61"; content: "\61";
} }
.font-icon-down-circled::before { .font-icon-down-circled::before {
content: "\69"; content: "\69";
} }
.font-icon-eye::before { .font-icon-eye::before {
content: "\6c"; content: "\6c";
} }
.font-icon-columns::before { .font-icon-columns::before {
content: "\72"; content: "\72";
} }
.font-icon-edit-write::before { .font-icon-edit-write::before {
content: "\75"; content: "\75";
} }
.font-icon-monitor::before { .font-icon-monitor::before {
content: "\78"; content: "\78";
} }
.font-icon-mobile::before { .font-icon-mobile::before {
content: "\4a"; content: "\4a";
} }
.font-icon-tablet::before { .font-icon-tablet::before {
content: "\4b"; content: "\4b";
} }
.font-icon-pencil::before { .font-icon-pencil::before {
content: "\6d"; content: "\6d";
} }
.font-icon-trash::before { .font-icon-trash::before {
content: "\67"; content: "\67";
} }
.font-icon-edit::before { .font-icon-edit::before {
content: "\4e"; content: "\4e";
} }
.font-icon-tick::before { .font-icon-tick::before {
content: "\4f"; content: "\4f";
} }
.font-icon-upload::before { .font-icon-upload::before {
content: "\62"; content: "\62";
} }
.font-icon-folder-add::before { .font-icon-folder-add::before {
content: "\53"; content: "\53";
} }
.font-icon-silverstripe::before { .font-icon-silverstripe::before {
content: "\4d"; content: "\4d";
} }
.font-icon-thumbnails::before { .font-icon-thumbnails::before {
content: "\57"; content: "\57";
} }
.font-icon-down-open::before { .font-icon-down-open::before {
content: "\30"; content: "\30";
} }
.font-icon-up-open::before { .font-icon-up-open::before {
content: "\31"; content: "\31";
} }
.font-icon-link::before { .font-icon-link::before {
content: "\32"; content: "\32";
} }
.font-icon-level-up::before { .font-icon-level-up::before {
content: "\56"; content: "\56";
} }
.font-icon-image::before { .font-icon-image::before {
content: "\34"; content: "\34";
} }
.font-icon-trash-bin::before { .font-icon-trash-bin::before {
content: "\50"; content: "\50";
} }
.font-icon-code::before { .font-icon-code::before {
content: "\33"; content: "\33";
} }
.font-icon-left-open-big::before { .font-icon-left-open-big::before {
content: "\35"; content: "\35";
} }
.font-icon-down-open-big::before { .font-icon-down-open-big::before {
content: "\36"; content: "\36";
} }
.font-icon-up-open-big::before { .font-icon-up-open-big::before {
content: "\37"; content: "\37";
} }
.font-icon-right-open-big::before { .font-icon-right-open-big::before {
content: "\38"; content: "\38";
} }
.font-icon-dot-3::before { .font-icon-dot-3::before {
content: "\39"; content: "\39";
} }
.font-icon-save::before { .font-icon-save::before {
content: "\21"; content: "\21";
} }
.font-icon-rocket::before { .font-icon-rocket::before {
content: "\5a"; content: "\5a";
} }
.font-icon-cancel::before { .font-icon-cancel::before {
content: "\44"; content: "\44";
} }
.font-icon-happy::before { .font-icon-happy::before {
content: "\22"; content: "\22";
} }
.font-icon-sad::before { .font-icon-sad::before {
content: "\23"; content: "\23";
} }
.font-icon-angle-double-right::before { .font-icon-angle-double-right::before {
content: "\24"; content: "\24";
} }
.font-icon-angle-double-left::before { .font-icon-angle-double-left::before {
content: "\25"; content: "\25";
} }
.font-icon-angle-right::before { .font-icon-angle-right::before {
content: "\26"; content: "\26";
} }
.font-icon-angle-left::before { .font-icon-angle-left::before {
content: "\27"; content: "\27";
} }
.font-icon-caret-up-down::before { .font-icon-caret-up-down::before {
content: "\29"; content: "\29";
} }
.font-icon-caret-down-two::before { .font-icon-caret-down-two::before {
content: "\28"; content: "\28";
} }
.font-icon-caret-up-two::before { .font-icon-caret-up-two::before {
content: "\2a"; content: "\2a";
} }
.font-icon-right-dir::before { .font-icon-right-dir::before {
content: "\2b"; content: "\2b";
} }
.font-icon-down-dir::before { .font-icon-down-dir::before {
content: "\2c"; content: "\2c";
} }
.font-icon-link-broken::before { .font-icon-link-broken::before {
content: "\2d"; content: "\2d";
} }
.font-icon-switch::before { .font-icon-switch::before {
content: "\2e"; content: "\2e";
} }
.font-icon-resize::before { .font-icon-resize::before {
content: "\4c"; content: "\4c";
} }
.font-icon-menu::before { .font-icon-menu::before {
content: "\2f"; content: "\2f";
} }
.font-icon-edit-list::before { .font-icon-edit-list::before {
content: "\3a"; content: "\3a";
} }
// scss-lint:enable EmptyLineBetweenBlocks

View File

@ -54,11 +54,9 @@ h1 {
background: $table-bg-hover; background: $table-bg-hover;
} }
// scss-lint:disable SelectorDepth
tr:first-child td { tr:first-child td {
border-top: $table-border-width solid $border-color-light; border-top: $table-border-width solid $border-color-light;
} }
// scss-lint:enable SelectorDepth
} }
tfoot { tfoot {
@ -74,7 +72,7 @@ h1 {
.cms { .cms {
code { code {
font-family: 'Bitstream Vera Sans Mono','Courier', monospace; font-family: "Bitstream Vera Sans Mono", "Courier", monospace;
} }
} }
@ -109,11 +107,9 @@ th {
-ms-word-break: break-all; -ms-word-break: break-all;
word-break: break-word; word-break: break-word;
// scss-lint:disable VendorPrefix
-ms-hyphens: auto; -ms-hyphens: auto;
-moz-hyphens: auto; -moz-hyphens: auto;
-webkit-hyphens: auto; -webkit-hyphens: auto;
// scss-lint:enable VendorPrefix
hyphens: auto; hyphens: auto;
} }

View File

@ -327,18 +327,14 @@ $input-bg-disabled: $background-darker;
$input-color: $body-color-light; $input-color: $body-color-light;
$input-border-color: $border-color-dark; $input-border-color: $border-color-dark;
$input-btn-border-width: $border-width; // For form controls and buttons $input-btn-border-width: $border-width; // For form controls and buttons
// scss-lint:disable ColorVariable
$input-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); $input-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
// scss-lint:enable ColorVariable
$input-border-radius: $border-radius; $input-border-radius: $border-radius;
$input-border-radius-lg: $border-radius-lg; $input-border-radius-lg: $border-radius-lg;
$input-border-radius-sm: $border-radius-sm; $input-border-radius-sm: $border-radius-sm;
$input-border-focus: #66afe9; $input-border-focus: #66afe9;
// scss-lint:disable ColorVariable
$input-box-shadow-focus: rgba(102, 175, 233, .6); $input-box-shadow-focus: rgba(102, 175, 233, .6);
// scss-lint:enable ColorVariable
// $input-color-placeholder: #999; // $input-color-placeholder: #999;
// //
@ -726,7 +722,7 @@ $shadow-level-1: rgba(0, 0, 0, .1);
$shadow-level-2: rgba(0, 0, 0, .15); $shadow-level-2: rgba(0, 0, 0, .15);
$shadow-level-3: rgba(0, 0, 0, .2); $shadow-level-3: rgba(0, 0, 0, .2);
$shadow-level-4: rgba(0, 0, 0, .25); $shadow-level-4: rgba(0, 0, 0, .25);
$shadow-level-5: rgba(0, 0, 0, .30); $shadow-level-5: rgba(0, 0, 0, .3);
// TODO tidy all shadows cms wide (including AssetAdmin) // TODO tidy all shadows cms wide (including AssetAdmin)
$shadow-light: $shadow-level-3; $shadow-light: $shadow-level-3;

View File

@ -2,11 +2,11 @@
@import "variables"; @import "variables";
// Compatibilty with compass // Compatibilty with compass
@import "legacy/_compasscompat"; @import "legacy/compasscompat";
// Thirdparty // Thirdparty
@import "chosen"; @import "chosen";
@import "../../../../node_modules/bootstrap/scss/bootstrap.scss"; @import "../../../../node_modules/bootstrap/scss/bootstrap";
@import "../../../thirdparty/jquery-ui-themes/smoothness/jquery-ui.css"; @import "../../../thirdparty/jquery-ui-themes/smoothness/jquery-ui.css";
@import "../../../thirdparty/jstree/themes/apple/style.css"; @import "../../../thirdparty/jstree/themes/apple/style.css";
@import "../../../thirdparty/jquery-notice/jquery.notice.css"; @import "../../../thirdparty/jquery-notice/jquery.notice.css";

View File

@ -1,5 +1,3 @@
// scss-lint:disable all
/*<?php /*<?php
// ************* // *************
// Self-generating. Run with PHP on the command line to re-generate. // Self-generating. Run with PHP on the command line to re-generate.

View File

@ -1,5 +1,3 @@
// scss-lint:disable all
//** //**
// * This file contains mixins relating to specific functionality // * This file contains mixins relating to specific functionality
// * // *

View File

@ -63,8 +63,7 @@ body.cms {
.cms-content-fields, .cms-content-fields,
.cms-preview, .cms-preview,
.cms-preview iframe, .cms-preview iframe,
.cms-preview-controls .cms-preview-controls {
{
display: inline-block; display: inline-block;
} }
@ -75,7 +74,7 @@ body.cms {
z-index: 60; z-index: 60;
min-height: $toolbar-total-height; min-height: $toolbar-total-height;
background: { background: {
image: url(../images/textures/cms_content_header.png); image: url("../images/textures/cms_content_header.png");
repeat: repeat; repeat: repeat;
position: left bottom; position: left bottom;
color: $color-darker-bg; color: $color-darker-bg;
@ -116,7 +115,7 @@ body.cms {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.cms_backlink { .cms-backlink {
margin-top: -7px; margin-top: -7px;
float: left; float: left;
} }

View File

@ -1,14 +1,13 @@
/** // This file contains the default theme definitions for the admin interface.
* This file contains the default theme definitions for the admin interface. // Please put mostly SCSS variable definitions in here,
* Please put mostly SCSS variable definitions in here, // and leave the actual styling to _style.scss and auxilliary files.
* and leave the actual styling to _style.scss and auxilliary files.
*/
@import "../../variables.scss"; @import "../../variables";
//--------------------------------------------------
// Colours
//--------------------------------------------------
/** -----------------------------------------------
* Colours
* ------------------------------------------------ */
$color-base: #b0bec7 !default; $color-base: #b0bec7 !default;
$color-widget-bg: lighten($color-base, 20%) !default; $color-widget-bg: lighten($color-base, 20%) !default;
@ -28,7 +27,7 @@ $base-menu-icon: darken($base-menu, 26%);
$color-brand-bg: #005a93 !default; $color-brand-bg: #005a93 !default;
$color-brand: #43c7f4 !default; $color-brand: #43c7f4 !default;
/* Keep as solid colours transparent borders wont work in ie */ // Keep as solid colours transparent borders wont work in i
$color-darker-bg: #f0f2f4 !default; $color-darker-bg: #f0f2f4 !default;
$color-dark-bg: #142136 !default; $color-dark-bg: #142136 !default;
$color-dark-separator: #19435c !default; $color-dark-separator: #19435c !default;
@ -39,7 +38,7 @@ $color-light-separator: #D2D5D8 !default; // Horiontal dividers
$color-tab: #d9d9d9 !default; $color-tab: #d9d9d9 !default;
$color-dark-grey: #7B8C91 !default; $color-dark-grey: #7B8C91 !default;
/* Only for use as shadows as they wont work in older browsers */ // Only for use as shadows as they wont work in older browsers
$color-shadow-light: rgba(201, 205, 206, 0.8) !default; $color-shadow-light: rgba(201, 205, 206, 0.8) !default;
$color-shadow-dark: rgba(107, 120, 123, 0.5) !default; $color-shadow-dark: rgba(107, 120, 123, 0.5) !default;
$color-shadow-black: rgba(0, 0, 0, 0.6) !default; $color-shadow-black: rgba(0, 0, 0, 0.6) !default;
@ -55,7 +54,8 @@ $color-menu-background: #c6d7df !default;
$color-menu-border: #8c99a1 !default; $color-menu-border: #8c99a1 !default;
$color-panel-background: #c6d7df !default; $color-panel-background: #c6d7df !default;
$color-text-default: #4f5861 !default; /* new in SilverStripe 4 */ // new in SilverStripe 4
$color-text-default: #4f5861 !default;
$color-text: #66727d !default; $color-text: #66727d !default;
$color-text-light: white !default; $color-text-light: white !default;
$color-text-light-link: white !default; $color-text-light-link: white !default;
@ -83,30 +83,30 @@ $color-notice: #93CDE8 !default; // blue
$color-warning: #E9D104 !default; // yellow $color-warning: #E9D104 !default; // yellow
$color-error: #e68288 !default; // red $color-error: #e68288 !default; // red
$color-good: #72c34b !default; // green $color-good: #72c34b !default; // green
/*$color-optional: #a1d2eb !default; */ // orange // $color-optional: #a1d2eb !default; // orange
$color-cms-batchactions-menu-background: #f5f5f5 !default; $color-cms-batchactions-menu-background: #f5f5f5 !default;
$color-cms-batchactions-menu-selected-background: #fffcdc !default; $color-cms-batchactions-menu-selected-background: #fffcdc !default;
/** ----------------------------------------------- //--------------------------------------------------
* Textures // Textures
* ----------------------------------------------- */ //--------------------------------------------------
$tab-panel-texture-color: #f6f7f8 !default; $tab-panel-texture-color: #f6f7f8 !default;
$tab-panel-texture-background: $tab-panel-texture-color url(../images/textures/bg_cms_main_content.png) repeat top left !default; $tab-panel-texture-background: $tab-panel-texture-color url("../images/textures/bg_cms_main_content.png") repeat top left !default;
/** ----------------------------------------------- //--------------------------------------------------
* Grid Units (px) // Grid Units (px)
* //
* We have a vertical rhythm that the grid is based off // We have a vertical rhythm that the grid is based off
* both x (=horizontal) and y (=vertical). All internal padding and // both x (=horizontal) and y (=vertical). All internal padding and
* margins are scaled to this and accounting for paragraphs // margins are scaled to this and accounting for paragraphs
* ------------------------------------------------ */ //--------------------------------------------------
$grid-y: 8px !default; $grid-y: 8px !default;
$grid-x: 8px !default; $grid-x: 8px !default;
/** ----------------------------------------------- //--------------------------------------------------
* Application Logo (CMS Logo) Must be 24px x 24px // Application Logo (CMS Logo) Must be 24px x 24px
* ------------------------------------------------ */ //--------------------------------------------------
$application-logo-small: url("../images/logo_small.png") !default; $application-logo-small: url("../images/logo_small.png") !default;
$application-logo-small-2x: url("../images/logo_small@2x.png") !default; $application-logo-small-2x: url("../images/logo_small@2x.png") !default;

View File

@ -1,5 +1,5 @@
<% if $Backlink %> <% if $Backlink %>
<div class="cms_backlink"> <div class="cms-backlink">
<a class="btn btn-secondary font-icon-left-open-big toolbar__back-button btn--no-text" href="$Backlink"></a> <a class="btn btn-secondary font-icon-left-open-big toolbar__back-button btn--no-text" href="$Backlink"></a>
</div> </div>
<% end_if %> <% end_if %>

View File

@ -18,6 +18,7 @@ body {
// try to get the info above the template with z-index // try to get the info above the template with z-index
z-index: 9999; z-index: 9999;
h1 { h1 {
margin: 0 0 6px 0; margin: 0 0 6px 0;
padding: 0 32px 0 0; padding: 0 32px 0 0;
@ -26,7 +27,7 @@ body {
text-shadow: 0 1px darken(#003050, 5%); text-shadow: 0 1px darken(#003050, 5%);
line-height: 30px; line-height: 30px;
background: url(../images/logo_small.png) no-repeat right 3px; background: url("../images/logo_small.png") no-repeat right 3px;
} }
h3 { h3 {
@ -35,6 +36,7 @@ body {
line-height: 18px; line-height: 18px;
font-weight: normal; font-weight: normal;
} }
p { p {
margin: 0; margin: 0;
font-size: 14px; font-size: 14px;
@ -73,6 +75,7 @@ body {
// try to get the info above the template with z-index // try to get the info above the template with z-index
position: relative; position: relative;
z-index: 9999; z-index: 9999;
li { li {
font-size: 14px; font-size: 14px;
margin: 6px 0; margin: 6px 0;
@ -110,6 +113,7 @@ pre {
span { span {
color: #999; color: #999;
} }
.error { .error {
color: #f00; color: #f00;
} }
@ -138,11 +142,19 @@ fieldset {
} }
.pass { .pass {
margin-top:18px; padding:2px 20px 2px 40px; color:#006600; background:#E2F9E3; border: 1px solid #8DD38D; margin-top: 18px;
padding: 2px 20px 2px 40px;
color: #006600;
background: #E2F9E3;
border: 1px solid #8DD38D;
border-radius: 4px; border-radius: 4px;
} }
.fail { .fail {
margin-top:18px; padding:2px 20px 2px 40px; color:#C80700; background:#FFE9E9; margin-top: 18px;
border:1px solid #C80700; border-radius:4px; padding: 2px 20px 2px 40px;
color: #C80700;
background: #FFE9E9;
border: 1px solid #C80700;
border-radius: 4px;
} }