Skip to content

Commit b67d3bf

Browse files
committed
Merge pull request #39 from markusjura/styling-updates
WIP - DO NOT MERGE - Documentation overhaul
2 parents b5a5aae + c8eb0c1 commit b67d3bf

File tree

17 files changed

+296
-198
lines changed

17 files changed

+296
-198
lines changed

app/assets/css/main.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Make sure the charset is set appropriately
77
88
@import foundation/functions
9-
$row-width: rem-calc(1200)
9+
$row-width: rem-calc(1000)
1010
$small-range: (0em, 55em)
1111
$medium-range: (55.063em, 64em)
1212
$large-range: (64.063em, 90em)

app/assets/css/modules/_base.sass

Lines changed: 84 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
body
33
background: $navy
44
padding: 0
5-
margin: 0
5+
margin: 0
66

77
.fw-wrapper
88
padding: 60px 0px
@@ -30,6 +30,8 @@ body
3030
background-color: $slate-tt
3131
h1,h2,h3,h4,p,a
3232
color: $white
33+
&.white
34+
background-color: $white
3335
&.white-ltr
3436
background-color: $white-ltr
3537
&.white-dkr
@@ -76,17 +78,15 @@ body
7678
&.scala
7779
background-color: $scala-red
7880
h1,h2,h3,h4,p,a
79-
color: $white
81+
color: $white
8082

8183
#site-header
8284
background: $white
8385
margin: 0px 0 5px 0
8486
height: 75px
8587
border-top: 5px solid $navy
86-
position: fixed
8788
display: block
8889
width: 100%
89-
z-index: 9999
9090
box-shadow: 0 0 8px rgba(black,.5)
9191
&.fw-wrapper
9292
padding: 0
@@ -125,7 +125,7 @@ body
125125
height: 70px
126126
line-height: 70px
127127
padding: 0 30px
128-
color: navy
128+
color: slate-text
129129
border-left: 1px solid $white-dkr
130130
font-weight: bold
131131
font-stretch: condensed
@@ -134,14 +134,14 @@ body
134134
transition: all 150ms ease-in-out
135135
text-transform: uppercase
136136
&:link, &:visited
137-
color: $navy
137+
color: $slate-text
138138
&:hover
139139
background: rgba(#f0f3f6,0.2)
140-
box-shadow: inset 0 4px 0 $navy,inset 0 0 1px $grey-ltr
140+
box-shadow: inset 0 4px 0 $slate-text,inset 0 0 1px $grey-ltr
141141
transition: all 150ms ease-in-out
142142
text-decoration: none
143143
&:active
144-
color: $navy
144+
color: $slate-text
145145
.svg-icon-typesafe-full-color
146146
width: 100px
147147
height: 40px
@@ -151,8 +151,8 @@ body
151151
float: left
152152

153153
.page-title
154-
min-height: 140px
155-
padding: 100px 0 20px 0
154+
height: 65px
155+
padding: 25px 0 20px 0
156156
background: transparent url(../images/conductr-bg-strip.png) repeat-x bottom left
157157
h3
158158
color: $white
@@ -163,7 +163,7 @@ body
163163
font-style: italic
164164

165165
.page-content
166-
background: $white-ltr
166+
background: $white
167167
min-height: 600px
168168

169169
.left-off-canvas-menu
@@ -205,7 +205,7 @@ body
205205
text-decoration: none
206206
&.active
207207
background: $white-dkr
208-
color: $navy
208+
color: $slate-text
209209
padding: 3px 3px 3px 10px
210210
border-radius: $br
211211
&:after
@@ -214,66 +214,75 @@ body
214214
font-weight: 700
215215
float: right
216216

217-
.in-page-toc
217+
#sidebar
218218
padding: 0
219219
background: $white
220220
background: linear-gradient(left,0% $white-ltr,5% $white)
221221
box-shadow: shadow
222222
border-radius: $br
223223
border: 1px solid $white-dkr
224224
border-bottom: 3px solid $white-dkr
225-
h3, h3 a
226-
color: $navy
227-
&:hover
228-
text-decoration: none
229-
color: $blue-text
230-
&.active
231-
color: $blue-text
232-
aside > ul
233-
padding-top: 14px
234-
ul
235-
margin: 0
236-
padding: 0
237-
line-height: 2em
238-
> li
239-
list-style-type: none
240-
font-size: 1.4em
241-
padding-left: 20px
242-
a
243-
display: block
244-
margin-left: -20px
225+
#toolbar
226+
padding: 1em 20px .5em
227+
margin-bottom: 1em
228+
border-bottom: 1px solid $white-ltr
229+
h3
230+
display: inline-block
231+
font-weight: 500
232+
.versionNumber
233+
float: right
234+
#toc
235+
h3, h3 a
236+
color: $slate-text
237+
&:hover
238+
text-decoration: none
239+
color: $blue-text
240+
&.active
241+
color: $blue-text
242+
ul
243+
padding-top: 14px
244+
margin: 0
245+
padding: 0
246+
line-height: 2em
247+
> li
248+
list-style-type: none
249+
font-size: 1.4em
245250
padding-left: 20px
246-
border-bottom: 1px solid $white-ltr
247-
transition: $anime
248-
&.active
249-
border-left: 10px solid $blue
250-
border-bottom: none
251-
background: $white-dkr
252-
font-weight: 700
253-
transition: $anime
254-
color: $navy
255-
&:hover
256-
background: $white-ltr
257-
text-decoration: none
251+
a
252+
display: block
253+
margin-left: -20px
254+
padding-left: 20px
255+
border-bottom: 1px solid $white-ltr
258256
transition: $anime
259-
> ul li
260-
font-size: 0.8em
261-
padding-left: 0
257+
&.active
258+
border-left: 10px solid $blue
259+
border-bottom: none
260+
background: $white-ltr
261+
font-weight: 700
262+
transition: $anime
263+
color: $slate-text
264+
&:hover
265+
background: $white-ltr
266+
text-decoration: none
267+
transition: $anime
268+
> ul li
269+
font-size: 0.9em
270+
padding-left: 0
262271

263272
#site-footer
264273
color: $white
265-
.footer-toc aside > ul > li
266-
border-top: 1px solid $white-dkr
267-
padding-top: 4px
268-
margin: 0 0 10px 0
269-
float: left
270-
width: 100%
274+
.footer-toc a:hover
275+
text-decoration: none
276+
color: $blue-text
277+
.footer-toc h2
278+
font-size: 1em
279+
font-weight: 700
271280
text-transform: uppercase
272-
@media only screen and (min-width: $medium)
273-
width: 29%
274-
margin-right: 2%
281+
margin-bottom: .2rem
275282
> a
276-
color: white
283+
color: $red
284+
.footer-toc ul > li > a
285+
color: $white
277286

278287
.footer-toc ul
279288
margin: 0
@@ -284,18 +293,6 @@ body
284293
>ul li
285294
padding-left: 0
286295
text-transform: none
287-
a.active
288-
background: $white-dkr
289-
display: inline-block
290-
padding: 2px 15px 2px 6px
291-
color: $navy
292-
border-radius: $br
293-
&:hover
294-
text-decoration: none
295-
&:before
296-
content: "\203A"
297-
margin-right: 5px
298-
font-weight: 700
299296

300297
.logo-copyright
301298
height: 30px
@@ -327,7 +324,7 @@ body
327324
text-decoration: none
328325

329326
.next-prev-nav
330-
background: $white-dkr
327+
background: $white-ltr
331328
padding: 2em
332329
border-radius: $br
333330
p
@@ -364,5 +361,19 @@ body
364361
margin-right: 6px
365362

366363
body .support-detail a:hover
367-
color: #ffffff
368-
text-decoration: underline
364+
color: $blue
365+
text-decoration: none
366+
367+
.section-marker
368+
position: absolute
369+
width: 1em
370+
margin-left: -1em
371+
display: block
372+
text-decoration: none
373+
visibility: hidden
374+
text-align: center
375+
font-weight: normal
376+
h1:hover > a, h2:hover > a, h3:hover > a, h4:hover > a, h5:hover > a
377+
visibility: visible
378+
color: inherit
379+
text-decoration: none

app/assets/css/modules/_tables.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
table
33
color: $navy
44
thead tr th
5-
background: $blue
5+
background: $navy
66
color: $white
77
tr td
88
color: $navy

0 commit comments

Comments
 (0)