Skip to content

Commit 8eae206

Browse files
johndjamesonjohndjameson
committed
Merge pull request #291 from codeschool/style_cleanup
Style Cleanup
2 parents 0a97d08 + 3a267d1 commit 8eae206

31 files changed

+133
-125
lines changed

‎client/stylesheets/application.sass

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
// Vendor
6868
// -------------------------------------
6969
70+
@import 'vendor/animate'
7071
@import 'vendor/codemirror'
7172
@import 'vendor/codemirror-theme'
7273
@import 'vendor/tooltip'
@@ -75,18 +76,4 @@
7576
// Inbox
7677
// -------------------------------------
7778
78-
// Animations are handled using Angulars ng-animate which adds and
79-
// removes classes during various phases. If this doesn't work we can
80-
// do something different, but ng-animate is pretty crazy flexible in the timing
81-
// in code of where these happen if we need to tweak things.
82-
.animate--fade.ng-enter,
83-
.animate--fade.ng-leave
84-
// transition: all 1s ease-in-out
85-
.animate--fade.ng-enter,
86-
.animate--fade.ng-leave.ng-leave-active
87-
display: none
88-
// opacity: 0
89-
.animate--fade.ng-leave,
90-
.animate--fade.ng-enter.ng-enter-active
91-
display: block
92-
// opacity: 1
79+
// ...

‎client/stylesheets/components/_bucket.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Template (Haml)
99
// -------------------------------------
1010
//
11-
// .bucket[flag]
11+
// .bucket[flag l]
1212
//
1313
// .bucket-media
1414
// / ...
@@ -19,7 +19,7 @@
1919
// *************************************
2020
2121
.bucket
22-
@extend .group
22+
+group
2323

2424
// -------------------------------------
2525
// Modifiers

‎client/stylesheets/components/_button.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
// .has-btn
1212
//
13-
// .btn[a|b s|l block bordered|rounded success]
13+
// .btn[...]
1414
//
1515
// *************************************
1616

‎client/stylesheets/components/_cell.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Template (Haml)
88
// -------------------------------------
99
//
10-
// .cell[s]
10+
// .cell[s|m]
1111
// / ...
1212
//
1313
// *************************************

‎client/stylesheets/components/_form.sass

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
// %fieldset.form-field[inline]
1313
// .form-instruction
1414
// %label.form-label
15-
// %input.form-input[dark]
15+
// %input.form-input[dark](invalid)
1616
// %textarea.form-textarea
17+
// .form-btn
1718
//
1819
// *************************************
1920
@@ -125,8 +126,8 @@
125126
// ----- Textarea ----- //
126127
127128
.form-textarea
128-
resize: vertical
129129
max-height: 40vh // FIXME: Magic number!
130+
resize: vertical
130131

131132
+respond-to($g-m)
132133
max-height: none

‎client/stylesheets/components/_grid.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Template (Haml)
1010
// -------------------------------------
1111
//
12-
// .g
12+
// .g[xs|s]
1313
//
1414
// .g-b[center 1of2|...]
1515
// / ...
@@ -24,7 +24,7 @@
2424
// -------------------------------------
2525
2626
#{$g-selector}g
27-
@extend .group
27+
+group
2828
display: block
2929
margin-left: -$g-gutter
3030

‎client/stylesheets/components/_list.sass

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
// Template (Haml)
99
// -------------------------------------
1010
//
11-
// %ul.list[divided inline|object styled|styled--numbered]
11+
// %ul.list[[f|s|l] divided[f|s|l] inline[divided|dotted]|object styled|styled--numbered]
1212
// %li.list-item List Item
13+
// .list-item-header
1314
// %li.list-item List Item
1415
//
1516
// *************************************

‎client/stylesheets/components/_pillar.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Template (Haml)
88
// -------------------------------------
99
//
10-
// .pillar
10+
// .pillar[thin|thick l]
1111
// / ...
1212
//
1313
// *************************************

‎client/stylesheets/components/_sector.sass

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
// .has-sector
1111
//
1212
// .sector[a|b]
13+
// .sector-content
14+
//
1315
// .sector[a|b]
16+
// .sector-content
1417
//
1518
// *************************************
1619

‎client/stylesheets/components/_thumb.sass

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,9 @@
2020
// Modifiers
2121
// -------------------------------------
2222
23+
// ----- Sizes ----- //
24+
25+
// Medium
26+
2327
.thumb--m
2428
border-radius: $b-borderRadius

‎client/stylesheets/components/_underline.sass

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Template (Haml)
99
// -------------------------------------
1010
//
11-
// %a.underline[alt]
11+
// %a.underline[alt](active)
1212
//
1313
// *************************************
1414
@@ -35,9 +35,7 @@
3535
transition: transform $underline-color-transition-duration ease-in-out
3636
z-index: 1
3737

38-
&:active,
39-
&:focus,
40-
&:hover
38+
+state
4139
background: none
4240

4341
&::before

‎client/stylesheets/components/_well.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Template (Haml)
88
// -------------------------------------
99
//
10-
// .well[l|xs]
10+
// .well[s|l|m|xl]
1111
// / ...
1212
//
1313
// *************************************

‎client/stylesheets/foundation/_helpers.sass

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -95,26 +95,29 @@
9595
user-select: none
9696
white-space: nowrap
9797

98-
// ----- Font Face ----- //
99-
// -> https://github.com/thoughtbot/bourbon/edit/master/app/assets/stylesheets/css3/_font-face.scss#
100-
//
101-
// $family - the font-family
102-
// $path - the font path
103-
// $weight - the font-weight
104-
// $style - the font-style
105-
// $asset-pipeline - use the Rails asset pipeline (boolean)
106-
107-
=font-face($family, $path, $weight: normal, $style: normal, $asset-pipeline: true)
108-
@font-face
109-
font-family: $family
110-
font-style: $style
111-
font-weight: $weight
112-
@if $asset-pipeline == true
113-
src: font-url('#{$path}.eot')
114-
src: font-url('#{$path}.eot?#iefix') format('embedded-opentype'), font-url('#{$path}.woff') format('woff'), font-url('#{$path}.ttf') format('truetype'), font-url('#{$path}.svg##{$family}') format('svg')
115-
@else
116-
src: url('#{$path}.eot')
117-
src: url('#{$path}.eot?#iefix') format('embedded-opentype'), url('#{$path}.woff') format('woff'), url('#{$path}.ttf') format('truetype'), url('#{$path}.svg##{$family}') format('svg')
98+
// ----- Clearfix ----- //
99+
100+
=group
101+
&::after
102+
clear: both
103+
content: ''
104+
display: table
105+
106+
// ----- Faux Hide ----- //
107+
// -> Remove element visibility
108+
109+
=fauxHide
110+
opacity: 0
111+
overflow: hidden
112+
visibility: hidden
113+
114+
// ----- Faux Show ----- //
115+
// -> Restore element visibility
116+
117+
=fauxShow
118+
opacity: 1
119+
overflow: visible
120+
visibility: visible
118121

119122
// ----- List Reset ----- //
120123
// -> Removes default list styles
@@ -155,36 +158,8 @@
155158
156159
// ----- Clearfix ----- //
157160
158-
.group::after
159-
clear: both
160-
content: ''
161-
display: table
162-
163-
// ----- Ellipsis ----- //
164-
165-
.ellipsis
166-
overflow: hidden
167-
text-overflow: ellipsis
168-
white-space: nowrap
169-
170-
// ----- Faux Hide ----- //
171-
172-
.fauxHide
173-
opacity: 0
174-
overflow: hidden
175-
visibility: hidden
176-
177-
// ----- Faux Hide ----- //
178-
179-
.fauxShow
180-
opacity: 1
181-
overflow: visible
182-
visibility: visible
183-
184-
// ----- List Reset ----- //
185-
186-
.lr
187-
+list-reset
161+
.group
162+
+group
188163

189164
// ----- Semantic Hide ----- //
190165

‎client/stylesheets/structures/_alert.sass

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
// Template (Haml)
88
// -------------------------------------
99
//
10-
// .alert[error|success|warning]
10+
// .has-alert
11+
//
12+
// .alert[error|success|warning](dismissed)
1113
//
1214
// .alert-msg
1315
//
@@ -29,13 +31,18 @@
2931
3032
// ----- Types ----- //
3133
34+
// Error
35+
3236
.alert--error
3337
background: $c-error
3438

39+
// Success
40+
3541
.alert--success
3642
background: $c-success
3743

38-
.alert--info,
44+
// Warning
45+
3946
.alert--warning
4047
background: $c-warning
4148

@@ -59,8 +66,8 @@
5966
position: fixed
6067
right: 0
6168
top: 0
62-
z-index: 10
6369
width: 100%
70+
z-index: 10
6471

6572
+respond-to($g-m)
6673
width: em(300px)

‎client/stylesheets/structures/_completionList.sass

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
// -------------------------------------
99
//
1010
// %ul.completionList
11-
// %li.completionList-item
11+
// %li.completionList-item(active|completed)
12+
// .completionList-item-icon
1213
// %a.completionList-item-link
1314
//
1415
// *************************************
1516
1617
.completionList
17-
+list-reset()
18-
@extend .group
18+
+group
19+
+list-reset
1920

2021
// -------------------------------------
2122
// Scaffolding

‎client/stylesheets/structures/_courseLayout.sass

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
// Template (Haml)
88
// -------------------------------------
99
//
10-
// %html.courseLayout(active)
10+
// %html.courseLayout(active|loaded)
1111
//
1212
// .courseLayout-header
13+
// .courseLayout-header-content
1314
// .courseLayout-header-toggle
1415
//
1516
// .courseLayout-main

‎client/stylesheets/structures/_emblem.sass

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// -------------------------------------
99
//
1010
// .emblem
11+
// .emblem-content
1112
// .emblem-item
1213
//
1314
// *************************************

‎client/stylesheets/structures/_externalLink.sass

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
// Scaffolding
2525
// -------------------------------------
2626
27+
// ----- Icon ----- //
28+
2729
.externalLink-icon
2830
display: inline-block
2931
opacity: 0

‎client/stylesheets/structures/_footer.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
+respond-to($g-l)
2121
bottom: 0
2222
box-sizing: border-box
23-
left: 0
2423
height: $site-footer-height
24+
left: 0
2525
position: absolute
2626
right: 0
2727
width: 100%

‎client/stylesheets/structures/_heading.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Template (Haml)
88
// -------------------------------------
99
//
10-
// .h[1|2|3|4 light]
10+
// .h[1|2|3|4 light|semibold]
1111
//
1212
// *************************************
1313

‎client/stylesheets/structures/_hero.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
min-height: $hero-minHeight
2121

2222
&::before
23-
background: url('/images/img-hero.svg') center bottom no-repeat
2423
background-size: cover
24+
background: url('/images/img-hero.svg') center bottom no-repeat
2525
bottom: 0
2626
content: ''
2727
display: none

‎client/stylesheets/structures/_inlineConsole.sass

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
//
1010
// .inlineConsole(correct|incorrect)
1111
//
12-
// .inlineConsole-icon
13-
// .inlineConsole-input
12+
// .inlineConsole-btn
13+
// .inlineConsole-card
14+
// .inlineConsole-icon(caret|check)
15+
// %input.inlineConsole-input
1416
//
1517
// *************************************
1618

0 commit comments

Comments
 (0)