Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHE-748: use colors and fonts from CheColorsConfig and index.styl for… #1042

Merged
merged 1 commit into from
Apr 14, 2016
Merged

CHE-748: use colors and fonts from CheColorsConfig and index.styl for… #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dashboard/src/app/colors/che-colors.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ $invalid-color = alpha($che-orange-color, 0.2)

$table-header-color = $light-gray-color;

$che-loader-active-title-color = $che-navy-color
$che-loader-background-color = darken($che-medium-blue-color, 75%)
$che-loader-logs-background-color = darken($stroke-color,65%)


// box shadows
box-shadow-simple()
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/app/ide/ide-loader/ide-loader.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.ide-loader
height 100%
width 100%
background-color #1c253f
background-color $che-loader-background-color

ide-loader#ide-loader.ng-hide-add
opacity 1
Expand Down
2 changes: 2 additions & 0 deletions dashboard/src/app/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ che-developers-face()
@import '../components/codemirror/codemirror'
@import 'projects/projects-config'

$che-logs-output-font = "Droid Sans Mono", monospace

.browsehappy
margin 0.2em 0
background #ccc
Expand Down
10 changes: 3 additions & 7 deletions dashboard/src/components/widget/accordion/che-accordion.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
$pane-title-color = #a5a5a5
$active-pane-title-color = #393939
$error-pane-title-color = brown

.che-accordion
.che-accordion-body, .che-accordion-title
display block
overflow hidden

.che-accordion-title
margin-top 10px
color $pane-title-color
color $clear-foggy-sky-color

cursor pointer

Expand All @@ -23,10 +19,10 @@ $error-pane-title-color = brown

.che-accordion.che-accordion-active
.che-accordion-title
color $active-pane-title-color
color $che-loader-active-title-color
.che-accordion.che-accordion-error
.che-accordion-title
color $error-pane-title-color !important
color $error-color !important

.che-accordion.che-accordion-closed
.che-accordion-title
Expand Down
6 changes: 2 additions & 4 deletions dashboard/src/components/widget/loader/che-loader-bottom-bar.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
$che-loader-bottom-bar-link-color = #a5a5a5

.che-loader .che-loader-bottom-bar
border-top 10px solid #31487b
background-color #1c253f
background-color $che-loader-background-color
position relative
bottom 0
left 0
Expand All @@ -12,5 +10,5 @@ $che-loader-bottom-bar-link-color = #a5a5a5
z-index 1

.che-link
color $che-loader-bottom-bar-link-color
color $clear-foggy-sky-color
text-decoration none
4 changes: 1 addition & 3 deletions dashboard/src/components/widget/loader/che-loader.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
$loader-background-color = #1c253f

.che-loader
position relative
height inherit
min-height 640px
width inherit
overflow hidden
background-color $loader-background-color
background-color $che-loader-background-color

.main-page
margin 0 auto
17 changes: 6 additions & 11 deletions dashboard/src/components/widget/logs-output/che-logs-output.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ $logs-output-text-offset-left = 3px
$output-height = $logs-output-height - $logs-output-title-height
$output-padding = 3px

$logs-output-front-side-color = #ececec
$logs-output-side-color = #d8d8d8
$logs-output-background-color = #373737
$logs-output-font = "Droid Sans Mono", monospace

.che-logs-output > div > div
float left
.che-logs-output > div:last-child
Expand All @@ -32,20 +27,20 @@ $logs-output-font = "Droid Sans Mono", monospace


.che-logs-output-top-border
background-color $logs-output-side-color
background-color $mouse-gray-color
height $logs-output-border-thickness
transform-origin bottom left
transform skewX(-($logs-output-border-angle))

.che-logs-output-right-border
background-color $logs-output-side-color
background-color $mouse-gray-color
height $logs-output-height
width $logs-output-border-thickness
transform-origin top left
transform skewY(-($logs-output-border-angle))

.che-logs-output-front-side
background-color $logs-output-front-side-color
background-color $light-gray-color
height $logs-output-height

.che-logs-output-title
Expand All @@ -64,16 +59,16 @@ $logs-output-font = "Droid Sans Mono", monospace
position absolute
top 0
left 0
background-color $logs-output-background-color
background-color $che-loader-logs-background-color
width 100%
min-height 100%
padding 3px
line-height 10px

code
font-family $logs-output-font
font-family $che-logs-output-font
font-size 0.7em
background-color $logs-output-background-color
background-color transparent
color white
margin 0
margin-bottom -3px
Expand Down