rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1036 from lvuch/lacssoify 

removing variables
This commit is contained in:
Vincent Fiduccia 2017-02-16 11:34:40 -07:00 committed by GitHub
parent 246704af02 5db917b92e
commit 506530ff81
15 changed files with 76 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/components/page-header/template.hbs
View File

@ -82,6 +82,16 @@
{{/each}}
</ul>
<!--quick add-->
<ul class="dropdown">
<li>
<a class="btn btn-sm dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" aria-label={{t 'nav.user.label' username=session.user}}>
Quick Add <i class="icon icon-plus"></i>
<span class="sr-only">{{t 'nav.srToggleDropdown'}}</span>
</a>
</li>
</ul>
<ul class="nav-user dropdown">
<li>
<a class="btn dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" aria-label={{t 'nav.user.label' username=session.user}}>

1
app/styles/abstracts/_variables.scss
View File

@ -55,6 +55,7 @@ $accent : $light-grey !default;
/// Container's maximum width
/// @type Length
$max-width : 1280px !default;
$min-width : 75% !default;
/// Breakpoints map
/// @prop {String} keys - Keys are identifiers mapped to a given length

4
app/styles/base/_base.scss
View File

@ -86,6 +86,6 @@ a {
hr {
border: 0;
height: 0;
border-top: 1px solid rgba(0, 0, 0, 0.1);
border-bottom: 1px solid rgba($mid-grey, 0.3);
border-top: 1px solid $border;
border-bottom: 1px solid $border;
}

1
app/styles/base/_helpers.scss
View File

@ -39,6 +39,7 @@
*/
.container {
max-width: $max-width; /* 1 */
min-width: $min-width;
margin-left: auto; /* 2 */
margin-right: auto; /* 2 */
padding-left: 20px; /* 3 */

2
app/styles/components/_forms.scss
View File

@ -27,7 +27,7 @@ form {
}
label {
color: $secondary;
color: $text-color;
}
input[type='checkbox'] {

2
app/styles/components/_pod.scss
View File

@ -19,7 +19,7 @@ $subpod-detail : $table-bg-accent;
}
.pod {
background : $well-bg;
background : $body-bg;
border : solid transparent;
position : relative;
padding : 5px;

10
app/styles/components/_tabs.scss
View File

@ -20,14 +20,14 @@
display: block;
padding: 8px 10px 10px 10px;
text-decoration: none;
border: 2px solid $light-grey;
border: 2px solid $tab-accent;
border-bottom: 0;
@extend .bg-default;
background-color: $tab-accent;
}
&.active {
a {
background-color: white;
background-color: $tab-active-bg;
}
}
}
@ -36,7 +36,7 @@
.tab-content {
padding: 20px;
border: 2px solid $light-grey;
background-color: white;
border: 2px solid $tab-accent;
background-color: $tab-bg;
}
}

4
app/styles/components/_tooltip.scss
View File

@ -22,10 +22,10 @@
position : fixed;
background : $primary;
color : white;
min-height : 20px;
// min-height : 20px;
max-width : 265px;
z-index : 1000;
padding : 3px;
// padding : 3px;
&.copy-clipboard {
text-align: center;

2
app/styles/layout/_header.scss
View File

@ -21,7 +21,7 @@ header {
}
.header {
border-bottom: solid 2px $accent-one;
border-bottom: solid 2px $border;
padding: 15px 0;
h1 {

60
app/styles/pages/_service-addtl-info.scss
View File

@ -32,7 +32,7 @@
font-size: 11px;
}
hr {
border-color: $page-header-border-color;
border-color: $accent-one;
margin: 5px 0;
}
.tabs {
@ -57,35 +57,35 @@
}
}
}
ul.nav-tabs {
position: absolute;
top: -38px;
left: 15px;
border-bottom: none;
li {
&.active {
background: $well-bg;
}
a {
max-width: 125px;
}
}
.close {
position: absolute;
top: -10px;
background: $error;
color: white;
height: 20px;
width: 20px;
border-radius: 50%;
text-align: center;
padding-top: 0.2em;
z-index: 10;
opacity: 1;
left: -10px;
font-size: 12px;
}
}
// ul.nav-tabs {
// position: absolute;
// top: -38px;
// left: 15px;
// border-bottom: none;
// li {
// &.active {
// background: $body-bg;
// }
// a {
// max-width: 125px;
// }
// }
// .close {
// position: absolute;
// top: -10px;
// background: $error;
// color: white;
// height: 20px;
// width: 20px;
// border-radius: 50%;
// text-align: center;
// padding-top: 0.2em;
// z-index: 10;
// opacity: 1;
// left: -10px;
// font-size: 12px;
// }
// }
.description {
@include clip;

4
app/styles/pages/_stack.scss
View File

@ -286,7 +286,7 @@ $singleCountWidth : 120px;
color: $text-color;
$dark: $accent-two;
$light: $well-bg;
$light: $body-bg;
background: $light; /* Old browsers */
background: -moz-linear-gradient(top, $dark 0%, $dark 50%, $light 51%, $light 100%); /* FF3.6+ */
@ -313,7 +313,7 @@ $singleCountWidth : 120px;
border-radius: initial;
tspan {
fill: $well-bg;
fill: $body-bg;
}
I.icon {

4
app/styles/pages/_welcome.scss
View File

@ -1,10 +1,10 @@
SECTION.welcome {
background-color: $well-bg ;
background-color: $body-bg ;
border-radius: 3px;
H2 {
border-bottom: solid 1px $page-header-border-color;
border-bottom: solid 1px $accent-one;
color: $info;
padding-bottom: 10px;
margin-bottom: 15px;

199
app/styles/themes/_dark.scss
View File

@ -2,6 +2,7 @@
$body-bg : $black;
//** Global text color on `<body>`.
$text-color : $light-grey;
$text-muted : darken($mid-grey, 20%);
$primary : $primary; //button non state
$primary-dark : darken($primary, 20%);
@ -26,7 +27,7 @@ $accent-three : darken($black, 20%);
/*header*/
$header : $mid-grey;
$header : rgba($primary, .75);
$header-link : $light-grey;
$header-link-active : $primary;
$user-btn : darken($header, 5%);
@ -34,6 +35,8 @@ $user-btn : darken($header, 5%);
/*footer*/
$footer : darken($black, 20%);
// Horizontal line color.
$border : $mid-grey;
/*shadow colors*/
$shadow : #000;
@ -105,7 +108,6 @@ $input-bg-hover : $light-grey;
$input-bg-disabled : #f3f4f8;
//** Text color for `<input>`s
$input-color : $text-color;
//** `<input>` border color
@ -158,65 +160,6 @@ $dropdown-header-color : $mid-grey;
$dropdown-caret-color : #000;
$navbar-default-color : #ecf0f1;
$navbar-default-bg : #3498db;
$navbar-default-border : darken($navbar-default-bg, 6.5%);
// Navbar links
$navbar-default-link-color : white;
$navbar-default-link-hover-color : white;
$navbar-default-link-hover-bg : darken($navbar-default-bg, 10%);
$navbar-default-link-active-color : $navbar-default-link-hover-color;
$navbar-default-link-active-bg : $navbar-default-link-hover-bg;
$navbar-default-link-disabled-color : $light-grey;
$navbar-default-link-disabled-bg : transparent;
// Navbar brand label
$navbar-default-brand-color : $navbar-default-link-color;
$navbar-default-brand-hover-color : white;
$navbar-default-brand-hover-bg : none;
// Navbar toggle
$navbar-default-toggle-hover-bg : $navbar-default-link-hover-bg;
$navbar-default-toggle-icon-bar-bg : white;
$navbar-default-toggle-border-color : transparent;
// Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color : white;
$navbar-inverse-bg : $primary;
$navbar-inverse-border : darken($navbar-inverse-bg, 10%);
// Inverted navbar links
$navbar-inverse-link-color : white;
$navbar-inverse-link-hover-color : white;
$navbar-inverse-link-hover-bg : darken($navbar-inverse-bg, 10%);
$navbar-inverse-link-active-color : $navbar-inverse-link-hover-color;
$navbar-inverse-link-active-bg : $navbar-inverse-link-hover-bg;
$navbar-inverse-link-disabled-color : white;
$navbar-inverse-link-disabled-bg : transparent;
// Inverted navbar brand label
$navbar-inverse-brand-color : $navbar-inverse-link-color;
$navbar-inverse-brand-hover-color : white;
$navbar-inverse-brand-hover-bg : none;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg : $navbar-inverse-link-hover-bg;
$navbar-inverse-toggle-icon-bar-bg : white;
$navbar-inverse-toggle-border-color : transparent;
$nav-disabled-link-color : $mid-grey;
$nav-disabled-link-hover-color : $mid-grey;
/*pills*/
$nav-pills-active-link-hover-bg : $component-active-bg;
$nav-pills-active-link-hover-color : $component-active-color;
/*Pagination*/
$pagination-color : $primary;
@ -296,27 +239,8 @@ $modal-header-border-color : #e5e5e5;
//** Modal footer border color
$modal-footer-border-color : $modal-header-border-color;
//** Popover body background color
$popover-bg : white;
//** Popover border color
$popover-border-color : rgba($black,.2);
//** Popover fallback border color
$popover-fallback-border-color : $light-grey;
//** Popover arrow color
$popover-arrow-color : $popover-bg;
//** Popover outer arrow color
$popover-arrow-outer-color : fadein($popover-border-color, 5%);
//** Popover outer arrow fallback color
$popover-arrow-outer-fallback-color : darken($popover-fallback-border-color, 20%);
//** Popover title background color
$popover-title-bg : darken($popover-bg, 3%);
/*Labels*/
//** Default label background color
$label-default-bg : #777;
//** Primary label background color
@ -358,7 +282,6 @@ $alert-danger-border : $state-danger-border;
/*Progress bars*/
//** Background color of the whole progress component
$progress-bg : $light-grey;
//** Progress bar text color
@ -378,85 +301,12 @@ $progress-bar-danger-bg : $error;
$progress-bar-info-bg : $info;
/*List group*/
//** Background color on `.list-group-item`
$list-group-bg : white;
//** `.list-group-item` border color
$list-group-border : #ddd;
//** List group border radius
$list-group-border-radius : 2px;
//** Background color of single list items on hover
$list-group-hover-bg : #f5f5f5;
//** Text color of active list items
$list-group-active-color : $component-active-color;
//** Background color of active list items
$list-group-active-bg : $component-active-bg;
//** Border color of active list elements
$list-group-active-border : $list-group-border;
//** Text color for content within active list items
$list-group-active-text-color : lighten($list-group-active-bg, 40%);
//** Text color of disabled list items
$list-group-disabled-color : $mid-grey;
//** Background color of disabled list items
$list-group-disabled-bg : $mid-grey;
//** Text color for content within disabled list items
$list-group-disabled-text-color : $list-group-disabled-color;
$list-group-link-color : #555;
$list-group-link-hover-color : $list-group-link-color;
$list-group-link-heading-color : #333;
$panel-bg : white;
//** Border color for elements within panels
$panel-inner-border : #ddd;
$panel-footer-bg : #f5f5f5;
$panel-default-text : $dark-grey;
$panel-default-border : #ddd;
$panel-default-heading-bg : #f5f5f5;
$panel-primary-text : white;
$panel-primary-border : $primary;
$panel-primary-heading-bg : $primary;
$panel-success-text : $state-success-text;
$panel-success-border : $state-success-border;
$panel-success-heading-bg : $state-success-bg;
$panel-info-text : $state-info-text;
$panel-info-border : $state-info-border;
$panel-info-heading-bg : $state-info-bg;
$panel-warning-text : $state-warning-text;
$panel-warning-border : $state-warning-border;
$panel-warning-heading-bg : $state-warning-bg;
$panel-danger-text : $state-danger-text;
$panel-danger-border : $state-danger-border;
$panel-danger-heading-bg : $state-danger-bg;
$thumbnail-bg : $body-bg;
//** Thumbnail border color
$thumbnail-border : #ddd;
//** Custom text color for thumbnail captions
$thumbnail-caption-color : $text-color;
/*Wells*/
$well-bg : darken($black, 20%);
$well-border : darken($well-bg, 7%);
/*Tabs*/
$tab-bg : $dark-grey;
$tab-active-bg : $well-bg;
$tab-bg : lighten($dark-grey, 5%);
$tab-active-bg : lighten($dark-grey, 5%);
$tab-hover : darken($primary, 5%);
$tab-color : $primary;
$tab-accent : $dark-grey;
/*badges*/
$badge-color : white;
@ -469,46 +319,13 @@ $badge-active-color : $link-color;
//** Badge background color in active nav link
$badge-active-bg : white;
/*carosel*/
$carousel-text-shadow : 0 1px 2px rgba($black,.6);
$carousel-control-color : white;
$carousel-control-opacity : .5;
$carousel-indicator-active-bg : white;
$carousel-indicator-border-color : white;
$carousel-caption-color : white;
$close-color : white;
$close-text-shadow : 0 1px 0 white;
/*Code*/
$code-color : #fcf2e9;
$code-bg : rgba(mix($warning, $error, 20%), .5);
$pre-bg : rgba($light-grey, .1);
$pre-color : $input-color;
$pre-border-color : $light-grey;
//** Text muted color
$text-muted : #999;
//** Abbreviations and acronyms border color
$abbr-border-color : $mid-grey;
//** Headings small color
$headings-small-color : $mid-grey;
//** Blockquote small color
$blockquote-small-color : $mid-grey;
//** Blockquote font size
$blockquote-font-size : ($base-font-size * 1.25);
//** Blockquote border color
$blockquote-border-color : $mid-grey;
//** Page header border color
$page-header-border-color : $dark-grey;
//** Width of horizontal description list titles
$dl-horizontal-offset : 10px;
//** Horizontal line color.
$hr-border : $mid-grey;
$pre-border-color : $light-grey;

201
app/styles/themes/_light.scss
View File

@ -3,6 +3,7 @@ $body-bg : white;
// Global text color on `<body>`.
$text-color : $secondary;
$text-muted : $mid-grey;
$primary : $primary; //button non state
$primary-dark : darken($primary, 20%);
@ -27,7 +28,6 @@ $accent-one : $light-grey;
$accent-two : $mid-grey;
$accent-three : $dark-grey;
// Header
$header : $secondary;
$header-link : $light-grey;
@ -35,6 +35,10 @@ $header-link-active : $primary;
$user-btn : darken($header, 10%);
$footer : $light-grey;
// Horizontal line color.
$border : $light-grey;
$shadow : rgba($mid-grey,.25);
// Default background color used for all tables.
@ -140,69 +144,6 @@ $dropdown-link-active-bg : $component-active-bg;
// Disabled dropdown menu item background color.
$dropdown-link-disabled-color : $light-grey;
// Text color for headers within dropdown menus.
$dropdown-header-color : $light-grey;
// Deprecated `$dropdown-caret-color` as of v3.1.0
$dropdown-caret-color : #000;
$navbar-default-color : #ecf0f1;
$navbar-default-bg : #3498db;
$navbar-default-border : darken($navbar-default-bg, 6.5%);
// Navbar links
$navbar-default-link-color : white;
$navbar-default-link-hover-color : white;
$navbar-default-link-hover-bg : darken($navbar-default-bg, 10%);
$navbar-default-link-active-color : $navbar-default-link-hover-color;
$navbar-default-link-active-bg : $navbar-default-link-hover-bg;
$navbar-default-link-disabled-color : $light-grey;
$navbar-default-link-disabled-bg : transparent;
// Navbar brand label
$navbar-default-brand-color : $navbar-default-link-color;
$navbar-default-brand-hover-color : white;
$navbar-default-brand-hover-bg : none;
// Navbar toggle
$navbar-default-toggle-hover-bg : $navbar-default-link-hover-bg;
$navbar-default-toggle-icon-bar-bg : white;
$navbar-default-toggle-border-color : transparent;
// Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color : white;
$navbar-inverse-bg : $primary;
$navbar-inverse-border : darken($navbar-inverse-bg, 10%);
// Inverted navbar links
$navbar-inverse-link-color : white;
$navbar-inverse-link-hover-color : white;
$navbar-inverse-link-hover-bg : darken($navbar-inverse-bg, 10%);
$navbar-inverse-link-active-color : $navbar-inverse-link-hover-color;
$navbar-inverse-link-active-bg : $navbar-inverse-link-hover-bg;
$navbar-inverse-link-disabled-color : white;
$navbar-inverse-link-disabled-bg : transparent;
// Inverted navbar brand label
$navbar-inverse-brand-color : $navbar-inverse-link-color;
$navbar-inverse-brand-hover-color : white;
$navbar-inverse-brand-hover-bg : none;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg : $navbar-inverse-link-hover-bg;
$navbar-inverse-toggle-icon-bar-bg : white;
$navbar-inverse-toggle-border-color : transparent;
$nav-disabled-link-color : $light-grey;
$nav-disabled-link-hover-color : $light-grey;
// Pills
$nav-pills-active-link-hover-bg : $component-active-bg;
$nav-pills-active-link-hover-color : $component-active-color;
// Pagination
$pagination-color : $primary;
$pagination-bg : #f5f5f5;
@ -280,27 +221,8 @@ $modal-header-border-color : #e5e5e5;
// Modal footer border color
$modal-footer-border-color : $modal-header-border-color;
// Popover body background color
$popover-bg : white;
// Popover border color
$popover-border-color : rgba(0,0,0,.2);
// Popover fallback border color
$popover-fallback-border-color : $light-grey;
// Popover arrow color
$popover-arrow-color : $popover-bg;
// Popover outer arrow color
$popover-arrow-outer-color : fadein($popover-border-color, 5%);
// Popover outer arrow fallback color
$popover-arrow-outer-fallback-color : darken($popover-fallback-border-color, 20%);
// Popover title background color
$popover-title-bg : darken($popover-bg, 3%);
// Labels
// Default label background color
$label-default-bg : #777;
// Primary label background color
@ -340,7 +262,7 @@ $alert-danger-bg : $state-danger-bg;
$alert-danger-text : $state-danger-text;
$alert-danger-border : $state-danger-border;
/*Progress bars*/
// Background color of the whole progress component
$progress-bg : $light-grey;
// Progress bar text color
@ -360,85 +282,12 @@ $progress-bar-danger-bg : $error;
$progress-bar-info-bg : $info;
// List Groups
// Background color on `.list-group-item`
$list-group-bg : white;
// `.list-group-item` border color
$list-group-border : #ddd;
// List group border radius
// $list-group-border-radius : $border-radius-base;
// Background color of single list items on hover
$list-group-hover-bg : #f5f5f5;
// Text color of active list items
$list-group-active-color : $component-active-color;
// Background color of active list items
$list-group-active-bg : $component-active-bg;
// Border color of active list elements
$list-group-active-border : $list-group-border;
// Text color for content within active list items
$list-group-active-text-color : lighten($list-group-active-bg, 40%);
// Text color of disabled list items
$list-group-disabled-color : $light-grey;
// Background color of disabled list items
$list-group-disabled-bg : $light-grey;
// Text color for content within disabled list items
$list-group-disabled-text-color : $list-group-disabled-color;
$list-group-link-color : #555;
$list-group-link-hover-color : $list-group-link-color;
$list-group-link-heading-color : #333;
$panel-bg : white;
// Border color for elements within panels
$panel-inner-border : #ddd;
$panel-footer-bg : #f5f5f5;
$panel-default-text : $dark-grey;
$panel-default-border : #ddd;
$panel-default-heading-bg : #f5f5f5;
$panel-primary-text : white;
$panel-primary-border : $primary;
$panel-primary-heading-bg : $primary;
$panel-success-text : $state-success-text;
$panel-success-border : $state-success-border;
$panel-success-heading-bg : $state-success-bg;
$panel-info-text : $state-info-text;
$panel-info-border : $state-info-border;
$panel-info-heading-bg : $state-info-bg;
$panel-warning-text : $state-warning-text;
$panel-warning-border : $state-warning-border;
$panel-warning-heading-bg : $state-warning-bg;
$panel-danger-text : $state-danger-text;
$panel-danger-border : $state-danger-border;
$panel-danger-heading-bg : $state-danger-bg;
$thumbnail-bg : $body-bg;
// Thumbnail border color
$thumbnail-border : #ddd;
// Custom text color for thumbnail captions
$thumbnail-caption-color : $text-color;
// Wells
$well-bg : white;
$well-border : darken($well-bg, 7%);
// Tabs
$tab-bg : $light-grey;
$tab-bg : white;
$tab-active-bg : white;
$tab-hover : $dark-grey;
$tab-color : $mid-grey;
$tab-accent : $light-grey;
// Badges
$badge-color : white;
@ -451,45 +300,13 @@ $badge-active-color : $link-color;
// Badge background color in active nav link
$badge-active-bg : white;
// Carousel
$carousel-text-shadow : 0 1px 2px rgba(0,0,0,.6);
$carousel-control-color : white;
$carousel-control-opacity : .5;
$carousel-indicator-active-bg : white;
$carousel-indicator-border-color : white;
$carousel-caption-color : white;
$close-color : white;
$close-text-shadow : 0 1px 0 white;
// Code
$code-color : mix($warning, $error, 20%);
$code-bg : #fcf2e9;
$pre-bg : #f5f5f5;
$pre-color : $dark-grey;
$pre-border-color : $light-grey;
// Text muted color
$text-muted : #999;
// Abbreviations and acronyms border color
$abbr-border-color : $light-grey;
// Headings small color
$headings-small-color : $mid-grey;
// Blockquote small color
$blockquote-small-color : $mid-grey;
// Blockquote font size
$blockquote-font-size : ($base-font-size * 1.25);
// Blockquote border color
$blockquote-border-color : $light-grey;
// Page header border color
$page-header-border-color : $light-grey;
// Width of horizontal description list titles
$dl-horizontal-offset : 10px;
// Horizontal line color.
$hr-border : $light-grey;
$pre-border-color : $light-grey;

2
app/styles/vendors/_bootstrap-tweak.scss vendored
View File

@ -407,7 +407,7 @@ fieldset[disabled] .btn {
}
.well {
background-color: $well-bg;
background-color: $body-bg;
box-shadow: none;
padding: 20px;
border-radius: $border-radius-base;