Skip to content

Commit 5ad5da4

Browse files
Rokt33rRokt33r
committed
set theme Solarized dark
1 parent 5c02ab2 commit 5ad5da4

16 files changed

Lines changed: 193 additions & 139 deletions

‎src/controllers/directives/SideNavController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ angular.module('codexen')
99
if (vm.isAuthenticated) {
1010
User.me().success(function (data) {
1111
console.log('currentUser', data)
12-
vm.currentUser = data.user
12+
vm.currentUser = data
1313
})
1414
}
1515
}

src/styles/bootstrap.styl renamed to src/styles/_bootstrap.styl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Core variables and mixins
2-
@import 'vars'
3-
@import 'mixins'
2+
@import '../../node_modules/bootstrap-styl/bootstrap/variables'
3+
@import '../../node_modules/bootstrap-styl/bootstrap/mixins'
44

55
// Utilities
66
@import '../../node_modules/bootstrap-styl/bootstrap/utilities'

‎src/styles/_index.styl‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
html
3+
overflow: hidden
4+
height: 100%
5+
6+
body
7+
height: 100%
8+
overflow: auto
9+
font-family: "Lato", sans-serif
10+
color $textColor
11+
background-color: $appBackgroundColor
12+
13+
label
14+
font-family: "Lato", sans-serif
15+
color $textColor
16+
17+
h1, h2, h3, h4, h5
18+
color $textColorHighlight
19+
margin 0
20+
21+
textarea
22+
resize: vertical
23+
24+
#side-view
25+
position:absolute
26+
top: 0
27+
bottom: 0
28+
left: 0
29+
width: 200px
30+
background-color: $baseBackgroundColor
31+
border-right solid 1px $baseBorderColor
32+
box-sizing: border-box
33+
padding: 10px 0 10px 10px
34+
35+
#main-view
36+
position:absolute
37+
top: 0
38+
bottom: 0
39+
left: 200px
40+
right: 0
41+
overflow-x: hidden
42+
overflow-y: auto
43+
background-color $bgDarker

‎src/styles/_shared.styl‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.alert
2+
margin: 5px 0
3+
4+
.inline-form-control
5+
@extend .form-control
6+
width: auto
7+
display: inline-block
8+
9+
10+
textarea.form-control, .ace_editor
11+
border-radius $input-border-radius
12+
13+
.ace_editor
14+
border solid 1px $input-border
15+
box-shadow inset 0 1px 1px rgba(0, 0, 0, .075)
16+
font-family: 'Lucida Grande'
17+
18+
.ace_editor.ace_focus
19+
controlGlow()
20+
21+
.modal-content
22+
background-color $bg
23+
24+
.jumbotron
25+
padding 48px 10px

‎src/styles/_vars.styl‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
// Basic Vars(MUST BE CAMELCASED ATOM VARS)
2+
$textColor= #99B2B8
3+
$textColorHighlight= #D5DFE2
4+
$textColorSelected = #FFFFFF
5+
6+
$textColorInfo= #6494ED
7+
$textColorSuccess= #73C990
8+
$textColorWarning= #E2C08D
9+
$textColorError= #FF6347
10+
11+
$backgroundColorHighlight= #003B4A
12+
$backgroundColorSelected= #004B5F
13+
$appBackgroundColor= #001F27
14+
15+
$baseBackgroundColor= #002B36
16+
$baseBorderColor= #001A20
17+
18+
$inputBackgroundColor= #00222B
19+
$inputBorderColor= #001A20
20+
21+
$buttonBackgroundColor= #004355
22+
$buttonBackgroundColorHover= #004B5F
23+
$buttonBackgroundColorSelected= #52DCFF
24+
$buttonBorderColor= $baseBorderColor
25+
26+
$block= #00222B
27+
28+
//buttons
29+
$btnPrimary= #088CFF
30+
$btnInfo= #5BDEFF
31+
$btnSuccess= #22BD89
32+
$btnWarning= #CD8737
33+
$btnError= #DA2828
34+
35+
36+
// Bootstrap Overrides(MUST BE BUILT WITH BASIC VALUE ONLY)
37+
$brand-primary= $btnPrimary
38+
$brand-info= $btnInfo
39+
$brand-success= $btnSuccess
40+
$brand-warning= $btnWarning
41+
$brand-danger= $btnError
42+
43+
$btn-default-bg= $buttonBackgroundColor
44+
$btn-default-color= $textColor
45+
$btn-default-border= $buttonBorderColor
46+
47+
$link-color= $textColorHighlight
48+
49+
$nav-link-active-link-hover-bg= $backgroundColorHighlight
50+
$nav-pills-active-link-hover-color= $textColorHighlight
51+
$nav-link-hover-bg= $backgroundColorHighlight
52+
53+
$input-bg= $backgroundColorHighlight
54+
$input-border= $baseBorderColor
55+
$input-border-focus= $buttonBackgroundColorSelected
56+
$input-color= $textColorSelected
57+
58+
$dropdown-bg= $baseBackgroundColor
59+
$dropdown-border= $baseBorderColor
60+
$dropdown-link-color= $textColor
61+
$dropdown-link-hover-bg= $backgroundColorSelected
62+
$dropdown-link-hover-color= $textColorSelected
63+
64+
$modal-content-bg= $baseBackgroundColor
65+
$modal-content-border-color= $modal-header-border-color= $modal-footer-border-color= $baseBorderColor
66+
67+
$jumbotron-bg= $backgroundColorHighlight

‎src/styles/directives/side-nav.styl‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
$side-view-link-hover-color= $gray-dark
2-
$side-view-link-active-color= $link-color
3-
$side-view-link-active-bg= $body-bg
1+
#side-view
2+
.nav-control-group
3+
margin 0 5px
4+
ul.nav.nav-pills
5+
li hr
6+
margin: 5px 0
7+
border-top none
8+
border-bottom solid 1px $baseBorderColor
49

5-
#side-view ul.nav.nav-pills
6-
li hr
7-
margin: 5px 0
8-
border-color: lighten($gray-dark, 20%)
9-
10-
11-
li a
12-
color: white
13-
&:hover
14-
color: $side-view-link-hover-color
15-
16-
17-
18-
li.active a
19-
color:$side-view-link-active-color
20-
background-color: $side-view-link-active-bg
10+
li a
11+
border-top-right-radius 0
12+
border-bottom-right-radius 0
13+
transition 0.2s
14+
li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus{
15+
background-color: $backgroundColorSelected
16+
}

‎src/styles/directives/ui-select.styl‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ body > .select2-container.open
8686

8787
.ui-select-bootstrap .ui-select-toggle
8888
position: relative
89+
border-radius $input-border-radius
8990

9091

9192
.ui-select-bootstrap .ui-select-toggle > .caret
@@ -112,6 +113,7 @@ body > .select2-container.open
112113
/* Instead of center because of .btn */
113114
text-align: left !important
114115
padding-right: 25px
116+
border-radius $input-border-radius
115117

116118

117119
.ui-select-bootstrap > .ui-select-match > .caret
@@ -135,7 +137,13 @@ body > .ui-select-bootstrap.open
135137

136138
.ui-select-multiple.ui-select-bootstrap
137139
height: auto
138-
padding: 3px 3px 0 3px
140+
padding: 3px 3px 0 10px
141+
142+
143+
.ui-select-multiple.ui-select-bootstrap.open
144+
border-color $input-border-focus
145+
outline 0
146+
box-shadow inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(red($input-border-focus), green($input-border-focus), blue($input-border-focus), .6)
139147

140148

141149
.ui-select-multiple.ui-select-bootstrap input.ui-select-search
@@ -186,21 +194,21 @@ body > .ui-select-bootstrap.open
186194
clear: both
187195
font-weight: 400
188196
line-height: 1.42857143
189-
color: #333
197+
color: $dropdown-link-color
190198
white-space: nowrap
191199

192200

193201
.ui-select-bootstrap .ui-select-choices-row>a:hover, .ui-select-bootstrap .ui-select-choices-row>a:focus
194202
text-decoration: none
195-
color: #262626
196-
background-color: #f5f5f5
203+
color: $dropdown-link-hover-color
204+
background-color: $dropdown-link-hover-bg
197205

198206

199207
.ui-select-bootstrap .ui-select-choices-row.active>a
200-
color: #fff
208+
color: $dropdown-link-hover-color
201209
text-decoration: none
202210
outline: 0
203-
background-color: #428bca
211+
background-color: $dropdown-link-hover-bg
204212

205213

206214
.ui-select-bootstrap .ui-select-choices-row.disabled>a,

‎src/styles/main.styl‎

Lines changed: 7 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,11 @@
1-
@import 'bootstrap'
1+
@import '_vars'
2+
@import 'mixins/*'
3+
4+
@import '_bootstrap'
5+
6+
@import '_index'
7+
@import '_shared'
28

39
@import 'modals/*'
410
@import 'directives/*'
511
@import 'states/*'
6-
// @import 'mixins/*'
7-
8-
html
9-
overflow: hidden
10-
height: 100%
11-
12-
body
13-
height: 100%
14-
overflow: auto
15-
font-family: "Lato", sans-serif
16-
color $color
17-
background-color: $bg
18-
19-
// body:before
20-
// content ''
21-
// background-image url('http://img10.deviantart.net/f372/i/2014/283/8/3/blue_pattern_design_free_vector_by_vecree-d829oba.jpg')
22-
// filter blur(5px)
23-
// opacity 1
24-
// position absolute
25-
// left 0
26-
// top 0
27-
// bottom 0
28-
// right 0
29-
30-
label
31-
font-family: "Lato", sans-serif
32-
color $color
33-
34-
textarea
35-
resize: vertical
36-
37-
38-
#side-view
39-
position:absolute
40-
top: 0
41-
bottom: 0
42-
left: 0
43-
width: 200px
44-
background-color: $bgDarker
45-
border-right solid 2px $borderEdge
46-
box-sizing: border-box
47-
padding: 10px 0 10px 10px
48-
.nav.nav-pills>li
49-
&.active>a{
50-
background-color $bg
51-
}
52-
53-
.nav.nav-pills>li>a
54-
color white
55-
border-top-right-radius: 0
56-
border-bottom-right-radius: 0
57-
58-
59-
.alert
60-
margin: 5px 0
61-
62-
63-
#main-view
64-
position:absolute
65-
top: 0
66-
bottom: 0
67-
left: 200px
68-
right: 0
69-
overflow-x: hidden
70-
overflow-y: auto
71-
background-color $bg
72-
73-
74-
.inline-form-control
75-
@extend .form-control
76-
width: auto
77-
display: inline-block

‎src/styles/mixins.styl‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/styles/mixins/control-glow.styl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
controlGlow($color = $input-border-focus)
2+
$color-rgba = rgba(red($color), green($color), blue($color), .6)
3+
border-color $color
4+
outline 0
5+
box-shadow inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px $color-rgba

0 commit comments

Comments
 (0)