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

General CMS typography swap to bootstrap

Browse Source 
Start of using bootstrap variables and typography styles, remove old
cms reset in favour of bootstrap reboot
This commit is contained in:
Paul Clarke 2016-04-05 11:40:37 +12:00 committed by Ingo Schommer
parent 74454a7557
commit e0fe90b3c8
6 changed files with 173 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/javascript/src/components/north-header/styles.scss
View File

@ -19,6 +19,7 @@
font-weight: normal; font-weight: normal;
line-height: 20px; line-height: 20px;
width: 100%; width: 100%;
margin: $spacer-y 0;
} }
// To hold things like search icon and view toggle // To hold things like search icon and view toggle

26
admin/javascript/src/styles/_layout.scss
View File

@ -33,7 +33,7 @@
height: 100%; height: 100%;
} }
// Preview panel // Preview panel
.pages-preview { .pages-preview {
display: block; display: block;
position: relative; position: relative;
@ -48,12 +48,18 @@
} }
} }
//.cms-south-actions { .cms-south-actions {
// height: $navbar-total-height; height: $navbar-total-height;
// position: absolute; position: absolute;
// bottom: 0; bottom: 0;
// width: 100%; width: 100%;
// border-top: 1px solid #ddd; border-top: 1px solid $border-color;
// background-color: #f6f7f8; background-color: $body-bg;
// padding: 8px 15px; padding: $spacer-y*.625 $spacer-x;
//}
.btn-toolbar {
// TODO Remove '.cms .btn-toolbar' override
margin-top: 0;
margin-bottom: 0;
}
}

142
admin/scss/_reset.scss
View File

@ -1,142 +0,0 @@
// Based on [Eric Meyer's reset 2.0](http://meyerweb.com/eric/tools/css/reset/index.html)
// Global reset rules.
// For more specific resets, use the reset mixins provided below
@mixin global-reset {
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
@include reset-box-model;
@include reset-font; }
// Unlike Eric's original reset, we reset the html element to be compatible
// with the vertical rhythm mixins.
html {
@include reset-body; }
ol, ul {
@include reset-list-style; }
table {
@include reset-table; }
caption, th, td {
@include reset-table-cell; }
q, blockquote {
@include reset-quotation; }
a img {
@include reset-image-anchor-border; }
@include reset-html5; }
// Reset all elements within some selector scope. To reset the selector itself,
// mixin the appropriate reset mixin for that element type as well. This could be
// useful if you want to style a part of your page in a dramatically different way.
@mixin nested-reset {
div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
@include reset-box-model;
@include reset-font; }
table {
@include reset-table; }
caption, th, td {
@include reset-table-cell; }
q, blockquote {
@include reset-quotation; }
a img {
@include reset-image-anchor-border; } }
// Reset the box model measurements.
@mixin reset-box-model {
margin: 0;
padding: 0;
border: 0; }
// Reset the font and vertical alignment.
@mixin reset-font {
vertical-align: baseline; }
// Resets the outline when focus.
// For accessibility you need to apply some styling in its place.
@mixin reset-focus {
outline: 0; }
// Reset a body element.
@mixin reset-body {
line-height: 1; }
// Reset the list style of an element.
@mixin reset-list-style {
list-style: none; }
// Reset a table
@mixin reset-table {
border-collapse: collapse;
border-spacing: 0; }
// Reset a table cell (`th`, `td`)
@mixin reset-table-cell {
text-align: left;
font-weight: normal;
vertical-align: middle; }
// Reset a quotation (`q`, `blockquote`)
@mixin reset-quotation {
quotes: none;
&:before, &:after {
content: "";
content: none; } }
// Resets the border.
@mixin reset-image-anchor-border {
border: none; }
// Unrecognized elements are displayed inline.
// This reset provides a basic reset for block html5 elements
// so they are rendered correctly in browsers that don't recognize them
// and reset in browsers that have default styles for them.
@mixin reset-html5 {
#{elements-of-type(html5-block)} {
display: block; } }
// Resets the display of inline and block elements to their default display
// according to their tag type. Elements that have a default display that varies across
// versions of html or browser are not handled here, but this covers the 90% use case.
// Usage Example:
//
// // Turn off the display for both of these classes
// .unregistered-only, .registered-only
// display: none
// // Now turn only one of them back on depending on some other context.
// body.registered
// +reset-display(".registered-only")
// body.unregistered
// +reset-display(".unregistered-only")
@mixin reset-display($selector: "", $important: false) {
#{append-selector(elements-of-type("inline"), $selector)} {
@if $important {
display: inline !important; }
@else {
display: inline; } }
#{append-selector(elements-of-type("block"), $selector)} {
@if $important {
display: block !important; }
@else {
display: block; } } }
@include global-reset;

71
admin/scss/_typography.scss
View File

@ -3,52 +3,39 @@
* *
* Contains the basic typography related styles for the admin interface. * Contains the basic typography related styles for the admin interface.
*/ */
body, html {
line-height: $grid-y * 2;
font-family: $font-family;
color: $color-text;
}
.cms { .cms {
h2, h3, h4, h5 {
font-weight: bold;
margin: $grid-y * 2 0 $grid-y * 2 0;
line-height: $grid-y * 2;
}
h2 {
line-height: $grid-y * 3;
}
p {
line-height: $grid-y * 2;
margin-bottom: $grid-y * 2;
}
em {
font-style: italic;
}
code { code {
font-family: 'Bitstream Vera Sans Mono','Courier', monospace; font-family: 'Bitstream Vera Sans Mono','Courier', monospace;
} }
pre {
}
table {
thead {
}
}
ol {
}
ul {
}
} }
// Used for long sentences where you would like to truncate them with an ellipsis (requires a set width)
.truncate {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
// Used for breaking text so it doesn't run horizontally, useful for breaking URLs
.break-string {
overflow-wrap: break-word;
word-wrap: break-word;
}
// Standard table styles
.table {
margin-top: 20px;
margin-bottom: $spacer-y * 2;
border-top: 0;
thead th {
font-size: 12px;
text-transform: uppercase;
font-weight: normal;
border-bottom: 1px solid #bbb;
border-top: 0;
}
}

253
admin/scss/bootstrap/_variables.scss
View File

@ -31,7 +31,7 @@ $gray: #55595c;
$gray-light: #d3d9dd; $gray-light: #d3d9dd;
$gray-lighter: #e8e9ea; $gray-lighter: #e8e9ea;
// $gray-lightest: #f7f7f9; // $gray-lightest: #f7f7f9;
// //
$brand-primary: #29abe2; //#0275d8; $brand-primary: #29abe2; //#0275d8;
$brand-success: #3fa142; $brand-success: #3fa142;
// $brand-info: #5bc0de; // $brand-info: #5bc0de;
@ -95,18 +95,20 @@ $border-width: 1px;
// //
// Settings for the `<body>` element. // Settings for the `<body>` element.
// $body-bg: #fff; $body-bg: #f6f7f8;
$body-color: $gray-dark; $body-color: $gray-dark;
$body-color-light: lighten($body-color,10);
$body-color-lighter: lighten($body-color,20);
// Links // Links
// //
// Style anchor elements. // Style anchor elements.
// $link-color: $brand-primary; $link-color: #0071c4;
// $link-decoration: none; $link-decoration: none;
// $link-hover-color: darken($link-color, 15%); $link-hover-color: darken($link-color, 15%);
// $link-hover-decoration: underline; $link-hover-decoration: underline;
// Grid breakpoints // Grid breakpoints
@ -114,30 +116,30 @@ $body-color: $gray-dark;
// Define the minimum and maximum dimensions at which your layout will change, // Define the minimum and maximum dimensions at which your layout will change,
// adapting to different screen sizes, for use in media queries. // adapting to different screen sizes, for use in media queries.
// $grid-breakpoints: ( $grid-breakpoints: (
// // Extra small screen / phone // Extra small screen / phone
// xs: 0, xs: 0,
// // Small screen / phone // Small screen / phone
// sm: 544px, sm: 544px,
// // Medium screen / tablet // Medium screen / tablet
// md: 768px, md: 768px,
// // Large screen / desktop // Large screen / desktop
// lg: 992px, lg: 992px,
// // Extra large screen / wide desktop // Extra large screen / wide desktop
// xl: 1200px xl: 1200px
// ); );
// Grid containers // Grid containers
// //
// Define the maximum width of `.container` for different screen sizes. // Define the maximum width of `.container` for different screen sizes.
// $container-max-widths: ( $container-max-widths: (
// sm: 576px, sm: 576px,
// md: 720px, md: 720px,
// lg: 940px, lg: 940px,
// xl: 1140px xl: 1140px
// ); );
// Grid columns // Grid columns
@ -177,7 +179,7 @@ $font-size-h6: 12px; /* 1rem; */
// $display2-size: 5.5rem; // $display2-size: 5.5rem;
// $display3-size: 4.5rem; // $display3-size: 4.5rem;
// $display4-size: 3.5rem; // $display4-size: 3.5rem;
// //
// $display1-weight: 300; // $display1-weight: 300;
// $display2-weight: 300; // $display2-weight: 300;
// $display3-weight: 300; // $display3-weight: 300;
@ -187,29 +189,29 @@ $line-height: 1.538; /* relative to font-size */
$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;
// $headings-font-weight: 500; $headings-font-weight: 500;
// $headings-line-height: 1.1; $headings-line-height: 1.3;
// $headings-color: inherit; $headings-color: inherit;
// //
// $lead-font-size: 1.25rem; // $lead-font-size: 1.25rem;
// $lead-font-weight: 300; // $lead-font-weight: 300;
// //
$text-muted: #7f8b97; $text-muted: #7f8b97;
// //
// $abbr-border-color: $gray-light; // $abbr-border-color: $gray-light;
// //
// $blockquote-small-color: $gray-light; // $blockquote-small-color: $gray-light;
// $blockquote-font-size: ($font-size-base * 1.25); // $blockquote-font-size: ($font-size-base * 1.25);
// $blockquote-border-color: $gray-lighter; // $blockquote-border-color: $gray-lighter;
// //
// $hr-border-color: rgba(0,0,0,.1); // $hr-border-color: rgba(0,0,0,.1);
// $hr-border-width: $border-width; // $hr-border-width: $border-width;
// //
// $dt-font-weight: bold; // $dt-font-weight: bold;
// //
// $nested-kbd-font-weight: bold; // $nested-kbd-font-weight: bold;
// //
// $list-inline-padding: 5px; // $list-inline-padding: 5px;
@ -219,14 +221,14 @@ $text-muted: #7f8b97;
// $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;
@ -235,16 +237,16 @@ $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: .75rem; $table-cell-padding: .75rem;
// $table-sm-cell-padding: .3rem; $table-sm-cell-padding: .3rem;
//
// $table-bg: transparent; $table-bg: transparent;
// $table-bg-accent: #f9f9f9; $table-bg-accent: #f9f9f9;
// $table-bg-hover: #f5f5f5; $table-bg-hover: #f5f5f5;
// $table-bg-active: $table-bg-hover; $table-bg-active: $table-bg-hover;
//
// $table-border-width: $border-width; $table-border-width: $border-width;
// $table-border-color: $gray-lighter; $table-border-color: $gray-lighter;
// Buttons // Buttons
@ -286,10 +288,10 @@ $btn-danger-bg: transparent;
$btn-danger-border: transparent; $btn-danger-border: transparent;
// $btn-link-disabled-color: $gray-light; // $btn-link-disabled-color: $gray-light;
// //
// $btn-padding-x-sm: .75rem; // $btn-padding-x-sm: .75rem;
// $btn-padding-y-sm: .25rem; // $btn-padding-y-sm: .25rem;
// //
// $btn-padding-x-lg: 1.25rem; // $btn-padding-x-lg: 1.25rem;
// $btn-padding-y-lg: .75rem; // $btn-padding-y-lg: .75rem;
@ -301,41 +303,41 @@ $btn-danger-border: transparent;
// Forms // Forms
// $input-padding-x: .75rem; $input-padding-x: .75rem;
// $input-padding-y: .375rem; $input-padding-y: .54rem; //.375rem;
//
// $input-bg: #fff; // $input-bg: #fff;
// $input-bg-disabled: $gray-lighter; // $input-bg-disabled: $gray-lighter;
// //
// $input-color: $gray; // $input-color: $gray;
// $input-border-color: #ccc; // $input-border-color: #ccc;
// $input-btn-border-width: $border-width; // For form controls and buttons // $input-btn-border-width: $border-width; // For form controls and buttons
// $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); // $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
// //
// $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;
// $input-box-shadow-focus: rgba(102,175,233,.6); // $input-box-shadow-focus: rgba(102,175,233,.6);
// //
// $input-color-placeholder: #999; // $input-color-placeholder: #999;
// //
// $input-padding-x-sm: .75rem; // $input-padding-x-sm: .75rem;
// $input-padding-y-sm: .275rem; // $input-padding-y-sm: .275rem;
// //
// $input-padding-x-lg: 1.25rem; // $input-padding-x-lg: 1.25rem;
// $input-padding-y-lg: .75rem; // $input-padding-y-lg: .75rem;
// //
// $input-height: (($font-size-base * $line-height) + ($input-padding-y * 2)); // $input-height: (($font-size-base * $line-height) + ($input-padding-y * 2));
// $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)); // $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2));
// $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)); // $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2));
// //
// $form-group-margin-bottom: $spacer-y; // $form-group-margin-bottom: $spacer-y;
// //
// $input-group-addon-bg: $gray-lighter; // $input-group-addon-bg: $gray-lighter;
// $input-group-addon-border-color: $input-border-color; // $input-group-addon-border-color: $input-border-color;
// //
// $cursor-disabled: not-allowed; // $cursor-disabled: not-allowed;
// Form validation icons // Form validation icons
@ -352,16 +354,16 @@ $btn-danger-border: transparent;
// $dropdown-border-color: rgba(0,0,0,.15); // $dropdown-border-color: rgba(0,0,0,.15);
// $dropdown-border-width: $border-width; // $dropdown-border-width: $border-width;
// $dropdown-divider-bg: #e5e5e5; // $dropdown-divider-bg: #e5e5e5;
// //
// $dropdown-link-color: $gray-dark; // $dropdown-link-color: $gray-dark;
// $dropdown-link-hover-color: darken($gray-dark, 5%); // $dropdown-link-hover-color: darken($gray-dark, 5%);
// $dropdown-link-hover-bg: #f5f5f5; // $dropdown-link-hover-bg: #f5f5f5;
// //
// $dropdown-link-active-color: $component-active-color; // $dropdown-link-active-color: $component-active-color;
// $dropdown-link-active-bg: $component-active-bg; // $dropdown-link-active-bg: $component-active-bg;
// //
// $dropdown-link-disabled-color: $gray-light; // $dropdown-link-disabled-color: $gray-light;
// //
// $dropdown-header-color: $gray-light; // $dropdown-header-color: $gray-light;
@ -384,16 +386,15 @@ $btn-danger-border: transparent;
$navbar-height: 52px; $navbar-height: 52px;
$navbar-total-height: 53px; $navbar-total-height: 53px;
$navbar-border-radius: 0;
$navbar-padding-horizontal: $spacer;
$navbar-padding-vertical: ($spacer / 2);
// $navbar-border-radius: $border-radius;
// $navbar-padding-horizontal: $spacer;
// $navbar-padding-vertical: ($spacer / 2);
//
// $navbar-dark-color: rgba(255,255,255,.5); // $navbar-dark-color: rgba(255,255,255,.5);
// $navbar-dark-hover-color: rgba(255,255,255,.75); // $navbar-dark-hover-color: rgba(255,255,255,.75);
// $navbar-dark-active-color: rgba(255,255,255,1); // $navbar-dark-active-color: rgba(255,255,255,1);
// $navbar-dark-disabled-color: rgba(255,255,255,.25); // $navbar-dark-disabled-color: rgba(255,255,255,.25);
// //
// $navbar-light-color: rgba(0,0,0,.3); // $navbar-light-color: rgba(0,0,0,.3);
// $navbar-light-hover-color: rgba(0,0,0,.6); // $navbar-light-hover-color: rgba(0,0,0,.6);
// $navbar-light-active-color: rgba(0,0,0,.8); // $navbar-light-active-color: rgba(0,0,0,.8);
@ -402,24 +403,24 @@ $navbar-total-height: 53px;
// Navs // Navs
// $nav-link-padding: .5em 1em; $nav-link-padding: 12px 8px;
// $nav-link-hover-bg: $gray-lighter; $nav-link-hover-bg: red; //$gray-lighter;
//
// $nav-disabled-link-color: $gray-light; $nav-disabled-link-color: $text-muted;
// $nav-disabled-link-hover-color: $gray-light; $nav-disabled-link-hover-color: $text-muted;
//
// $nav-tabs-border-color: #ddd; $nav-tabs-border-color: #d9dee2;
//
// $nav-tabs-link-border-width: $border-width; $nav-tabs-link-border-width: 0;
// $nav-tabs-link-hover-border-color: $gray-lighter; $nav-tabs-link-hover-border-color: green; //$gray-lighter;
//
// $nav-tabs-active-link-hover-bg: $body-bg; $nav-tabs-active-link-hover-bg: $body-bg;
// $nav-tabs-active-link-hover-color: $gray; $nav-tabs-active-link-hover-color: $body-color;
// $nav-tabs-active-link-hover-border-color: #ddd; $nav-tabs-active-link-hover-border-color: #ddd;
//
// $nav-tabs-justified-link-border-color: #ddd; $nav-tabs-justified-link-border-color: #ddd;
// $nav-tabs-justified-active-link-border-color: $body-bg; $nav-tabs-justified-active-link-border-color: $body-bg;
// //
// $nav-pills-border-radius: $border-radius; // $nav-pills-border-radius: $border-radius;
// $nav-pills-active-link-hover-bg: $component-active-bg; // $nav-pills-active-link-hover-bg: $component-active-bg;
// $nav-pills-active-link-hover-color: $component-active-color; // $nav-pills-active-link-hover-color: $component-active-color;
@ -433,21 +434,21 @@ $navbar-total-height: 53px;
// $pagination-padding-y-sm: .275rem; // $pagination-padding-y-sm: .275rem;
// $pagination-padding-x-lg: 1.5rem; // $pagination-padding-x-lg: 1.5rem;
// $pagination-padding-y-lg: .75rem; // $pagination-padding-y-lg: .75rem;
// //
// //
// $pagination-color: $link-color; // $pagination-color: $link-color;
// $pagination-bg: #fff; // $pagination-bg: #fff;
// $pagination-border-width: $border-width; // $pagination-border-width: $border-width;
// $pagination-border-color: #ddd; // $pagination-border-color: #ddd;
// //
// $pagination-hover-color: $link-hover-color; // $pagination-hover-color: $link-hover-color;
// $pagination-hover-bg: $gray-lighter; // $pagination-hover-bg: $gray-lighter;
// $pagination-hover-border: #ddd; // $pagination-hover-border: #ddd;
// //
// $pagination-active-color: #fff; // $pagination-active-color: #fff;
// $pagination-active-bg: $brand-primary; // $pagination-active-bg: $brand-primary;
// $pagination-active-border: $brand-primary; // $pagination-active-border: $brand-primary;
// //
// $pagination-disabled-color: $gray-light; // $pagination-disabled-color: $gray-light;
// $pagination-disabled-bg: #fff; // $pagination-disabled-bg: #fff;
// $pagination-disabled-border: #ddd; // $pagination-disabled-border: #ddd;
@ -459,12 +460,12 @@ $navbar-total-height: 53px;
// $pager-border-width: $border-width; // $pager-border-width: $border-width;
// $pager-border-color: $pagination-border-color; // $pager-border-color: $pagination-border-color;
// $pager-border-radius: 15px; // $pager-border-radius: 15px;
// //
// $pager-hover-bg: $pagination-hover-bg; // $pager-hover-bg: $pagination-hover-bg;
// //
// $pager-active-bg: $pagination-active-bg; // $pager-active-bg: $pagination-active-bg;
// $pager-active-color: $pagination-active-color; // $pager-active-color: $pagination-active-color;
// //
// $pager-disabled-color: $pagination-disabled-color; // $pager-disabled-color: $pagination-disabled-color;
@ -481,15 +482,15 @@ $navbar-total-height: 53px;
// $state-success-text: #3c763d; // $state-success-text: #3c763d;
// $state-success-bg: #dff0d8; // $state-success-bg: #dff0d8;
// $state-success-border: darken($state-success-bg, 5%); // $state-success-border: darken($state-success-bg, 5%);
// //
// $state-info-text: #31708f; // $state-info-text: #31708f;
// $state-info-bg: #d9edf7; // $state-info-bg: #d9edf7;
// $state-info-border: darken($state-info-bg, 7%); // $state-info-border: darken($state-info-bg, 7%);
// //
// $state-warning-text: #8a6d3b; // $state-warning-text: #8a6d3b;
// $state-warning-bg: #fcf8e3; // $state-warning-bg: #fcf8e3;
// $state-warning-border: darken($state-warning-bg, 5%); // $state-warning-border: darken($state-warning-bg, 5%);
// //
// $state-danger-text: #a94442; // $state-danger-text: #a94442;
// $state-danger-bg: #f2dede; // $state-danger-bg: #f2dede;
// $state-danger-border: darken($state-danger-bg, 5%); // $state-danger-border: darken($state-danger-bg, 5%);
@ -504,7 +505,7 @@ $navbar-total-height: 53px;
// $card-border-radius-inner: $card-border-radius; // $card-border-radius-inner: $card-border-radius;
// $card-cap-bg: #f5f5f5; // $card-cap-bg: #f5f5f5;
// $card-bg: #fff; // $card-bg: #fff;
// //
// $card-link-hover-color: #fff; // $card-link-hover-color: #fff;
@ -514,7 +515,7 @@ $navbar-total-height: 53px;
// $tooltip-color: #fff; // $tooltip-color: #fff;
// $tooltip-bg: #000; // $tooltip-bg: #000;
// $tooltip-opacity: .9; // $tooltip-opacity: .9;
// //
// $tooltip-arrow-width: 5px; // $tooltip-arrow-width: 5px;
// $tooltip-arrow-color: $tooltip-bg; // $tooltip-arrow-color: $tooltip-bg;
@ -525,12 +526,12 @@ $navbar-total-height: 53px;
// $popover-max-width: 276px; // $popover-max-width: 276px;
// $popover-border-width: $border-width; // $popover-border-width: $border-width;
// $popover-border-color: rgba(0,0,0,.2); // $popover-border-color: rgba(0,0,0,.2);
// //
// $popover-title-bg: darken($popover-bg, 3%); // $popover-title-bg: darken($popover-bg, 3%);
// //
// $popover-arrow-width: 10px; // $popover-arrow-width: 10px;
// $popover-arrow-color: $popover-bg; // $popover-arrow-color: $popover-bg;
// //
// $popover-arrow-outer-width: ($popover-arrow-width + 1); // $popover-arrow-outer-width: ($popover-arrow-width + 1);
// $popover-arrow-outer-color: fade-in($popover-border-color, 0.05); // $popover-arrow-outer-color: fade-in($popover-border-color, 0.05);
@ -543,7 +544,7 @@ $navbar-total-height: 53px;
// $label-info-bg: $brand-info; // $label-info-bg: $brand-info;
// $label-warning-bg: $brand-warning; // $label-warning-bg: $brand-warning;
// $label-danger-bg: $brand-danger; // $label-danger-bg: $brand-danger;
// //
// $label-color: #fff; // $label-color: #fff;
// $label-link-hover-color: #fff; // $label-link-hover-color: #fff;
// $label-font-weight: bold; // $label-font-weight: bold;
@ -553,18 +554,18 @@ $navbar-total-height: 53px;
// Padding applied to the modal body // Padding applied to the modal body
// $modal-inner-padding: 15px; // $modal-inner-padding: 15px;
// //
// $modal-title-padding: 15px; // $modal-title-padding: 15px;
// $modal-title-line-height: $line-height; // $modal-title-line-height: $line-height;
// //
// $modal-content-bg: #fff; // $modal-content-bg: #fff;
// $modal-content-border-color: rgba(0,0,0,.2); // $modal-content-border-color: rgba(0,0,0,.2);
// //
// $modal-backdrop-bg: #000; // $modal-backdrop-bg: #000;
// $modal-backdrop-opacity: .5; // $modal-backdrop-opacity: .5;
// $modal-header-border-color: #e5e5e5; // $modal-header-border-color: #e5e5e5;
// $modal-footer-border-color: $modal-header-border-color; // $modal-footer-border-color: $modal-header-border-color;
// //
// $modal-lg: 900px; // $modal-lg: 900px;
// $modal-md: 600px; // $modal-md: 600px;
// $modal-sm: 300px; // $modal-sm: 300px;
@ -578,19 +579,19 @@ $navbar-total-height: 53px;
// $alert-border-radius: $border-radius; // $alert-border-radius: $border-radius;
// $alert-link-font-weight: bold; // $alert-link-font-weight: bold;
// $alert-border-width: $border-width; // $alert-border-width: $border-width;
// //
// $alert-success-bg: $state-success-bg; // $alert-success-bg: $state-success-bg;
// $alert-success-text: $state-success-text; // $alert-success-text: $state-success-text;
// $alert-success-border: $state-success-border; // $alert-success-border: $state-success-border;
// //
// $alert-info-bg: $state-info-bg; // $alert-info-bg: $state-info-bg;
// $alert-info-text: $state-info-text; // $alert-info-text: $state-info-text;
// $alert-info-border: $state-info-border; // $alert-info-border: $state-info-border;
// //
// $alert-warning-bg: $state-warning-bg; // $alert-warning-bg: $state-warning-bg;
// $alert-warning-text: $state-warning-text; // $alert-warning-text: $state-warning-text;
// $alert-warning-border: $state-warning-border; // $alert-warning-border: $state-warning-border;
// //
// $alert-danger-bg: $state-danger-bg; // $alert-danger-bg: $state-danger-bg;
// $alert-danger-text: $state-danger-text; // $alert-danger-text: $state-danger-text;
// $alert-danger-border: $state-danger-border; // $alert-danger-border: $state-danger-border;
@ -601,7 +602,7 @@ $navbar-total-height: 53px;
// $progress-bg: #f5f5f5; // $progress-bg: #f5f5f5;
// $progress-bar-color: #fff; // $progress-bar-color: #fff;
// $progress-border-radius: $border-radius; // $progress-border-radius: $border-radius;
// //
// $progress-bar-bg: $brand-primary; // $progress-bar-bg: $brand-primary;
// $progress-bar-success-bg: $brand-success; // $progress-bar-success-bg: $brand-success;
// $progress-bar-warning-bg: $brand-warning; // $progress-bar-warning-bg: $brand-warning;
@ -615,17 +616,17 @@ $navbar-total-height: 53px;
// $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: #555; // $list-group-link-color: #555;
// $list-group-link-hover-color: $list-group-link-color; // $list-group-link-hover-color: $list-group-link-color;
// $list-group-link-heading-color: #333; // $list-group-link-heading-color: #333;
@ -654,15 +655,15 @@ $breadcrumb-divider: "/";
// Carousel // Carousel
// $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); // $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
// //
// $carousel-control-color: #fff; // $carousel-control-color: #fff;
// $carousel-control-width: 15%; // $carousel-control-width: 15%;
// $carousel-control-opacity: .5; // $carousel-control-opacity: .5;
// $carousel-control-font-size: 20px; // $carousel-control-font-size: 20px;
// //
// $carousel-indicator-active-bg: #fff; // $carousel-indicator-active-bg: #fff;
// $carousel-indicator-border-color: #fff; // $carousel-indicator-border-color: #fff;
// //
// $carousel-caption-color: #fff; // $carousel-caption-color: #fff;
@ -677,10 +678,10 @@ $breadcrumb-divider: "/";
// $code-color: #bd4147; // $code-color: #bd4147;
// $code-bg: #f7f7f9; // $code-bg: #f7f7f9;
// //
// $kbd-color: #fff; // $kbd-color: #fff;
// $kbd-bg: #333; // $kbd-bg: #333;
// //
// $pre-bg: #f7f7f9; // $pre-bg: #f7f7f9;
// $pre-color: $gray-dark; // $pre-color: $gray-dark;
// $pre-border-color: #ccc; // $pre-border-color: #ccc;

6
admin/scss/screen.scss
View File

@ -14,11 +14,6 @@
* * Footer must sit over the content as well so this in the 40 range * * Footer must sit over the content as well so this in the 40 range
*/ */
/** -----------------------------
* CSS reset
* ------------------------------ */
@import "reset.scss";
/** ----------------------------- /** -----------------------------
* Component base css * Component base css
* ------------------------------ */ * ------------------------------ */
@ -65,4 +60,3 @@
* Retina graphics * Retina graphics
* ----------------------------- */ * ----------------------------- */
@import "retina.scss"; @import "retina.scss";