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.

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

Jeet Updated to 7.2.0 #2516

Merged
merged 2 commits into from
Feb 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions app/assets/stylesheets/_fonts.styl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
letter-spacing 1.29px

.description
col(3/5)
column(3/5)
text-align left
padding-bottom 30px
p
Expand All @@ -20,4 +20,3 @@

.red
color warning

2 changes: 1 addition & 1 deletion app/assets/stylesheets/_layout.styl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ body > .container

.container
center(1100px)
cf()
clearfix()
padding 0 10px
position relative
.container
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_shared.styl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "_variables"
@import "_easing"
@import "_utils"
@import "../../../node_modules/jeet/stylus/jeet"
@import "../../../node_modules/jeet/jeet.styl"
2 changes: 1 addition & 1 deletion app/assets/stylesheets/home.styl
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ body.home
margin-top 40px

+above(desktop)
col(1/2)
column(1/2)


/* Total stats */
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/modules/_overview.styl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.overview
.primary
+above(desktop)
col(0.674, gutter: 1.8)
column(2/3, gutter: 1.8)
.sidebar
input, select
width 100%
.pop select
width 190px
+above(desktop)
col(1/3)
column(1/3)
.section-header
display flex
margin-bottom 8px
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/modules/_timeline.styl
Original file line number Diff line number Diff line change
Expand Up @@ -292,14 +292,14 @@ h4.timeline-exercise
font-weight bold

.timeline__content
col(12/12)
column(12/12)

.timeline__week-nav
margin-top 16px
col(3/12, offset: 1/12)
column(3/12, offset: 1/12)

.timeline__weeks, .timeline__grading-container
col(8/12)
column(8/12)

.grading__grading-container
clear both
Expand Down
16 changes: 8 additions & 8 deletions app/assets/stylesheets/modules/_wizard.styl
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ wizard-width = 860px
width 100%
display inline-block
.left, .right
col(1/2)
column(1/2)
.wizard__option
border 1px solid mischka
cursor pointer
Expand All @@ -138,7 +138,7 @@ wizard-width = 860px
border-color transparent
&.half
+above(desktop)
col(1/2, cycle: 2)
column(1/2, cycle: 2)
> button
padding 20px 20px 55px 20px
width 100%
Expand Down Expand Up @@ -233,7 +233,7 @@ wizard-width = 860px
+above(880px)
left 0
.left, .right
col(1/2, cycle: 2)
column(1/2, cycle: 2)
a
color dove
margin 0 20px
Expand All @@ -250,13 +250,13 @@ wizard-width = 860px
padding 20px 0 0
width 100%
.left
col(1/3)
column(1/3)
padding 9px 0
text-align left
p
font-size 14px
.right
col(2/3)
column(2/3)
text-align right
div
display inline-block
Expand All @@ -271,9 +271,9 @@ p.red
.wizard__panel
.wizard__panel__controls
.left
col(3/5)
column(3/5)
.right
col(2/5)
column(2/5)
text-align right

.wizard__form.course-dates
Expand Down Expand Up @@ -344,7 +344,7 @@ p.red
margin-top 15px

.column
col(1/2)
column(1/2)


/* Cloned course modal styles */
Expand Down
6 changes: 2 additions & 4 deletions app/assets/stylesheets/styleguide.styl
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

.sg-section
center(1100px)
cf()
clearfix()
border-radius 2px
box-shadow 0px 1px 2px rgba(0,0,0,.2)
background #fff
padding 40px

.sg-section-title
center(1100px)
cf()
clearfix()
padding-top 40px
color #666

Expand Down Expand Up @@ -74,5 +74,3 @@

&:hover
background-color rgba(255,255,255,.2)


2 changes: 1 addition & 1 deletion app/assets/stylesheets/training.styl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fix-mqs ?= false
old-ie ?= false

@import "_reset"
@import "../../../node_modules/jeet/stylus/jeet"
@import "../../../node_modules/jeet/jeet.styl"
@import "_utils"
@import "_icons"
@import "_training_base"
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/training_modules/_layout.styl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ body > .container
padding-bottom 80px

.container
cf()
clearfix()
max-width 1100px
margin 0 auto
padding 0 10px
Expand Down
54 changes: 27 additions & 27 deletions app/assets/stylesheets/training_modules/_lists.styl
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
h4
color dove
.row__wrapper
cf()
clearfix()
flex-wrap wrap
padding 15px
position relative
Expand Down Expand Up @@ -132,21 +132,21 @@

.course-list__row
.course-list__row__title
col(1)
column(1)
+above(desktop)
col(2/6)
column(2/6)
.course-list__row__long_title
col(1)
column(1)
.course-list__row__revisions,
float left
+above(desktop)
col(1/4)
column(1/4)
span
display inline
.course-list__row__views, .course-list__row__characters
float left
+above(desktop)
col(1/6)
column(1/6)
span
display inline
.course-list__row__students
Expand All @@ -155,21 +155,21 @@
border-right none
padding-right 0
.course-list__row__revisions
col(1)
column(1)
+above(desktop)
col(1/6)
column(1/6)
.course-list__row__link
+above(desktop)
col(1/6)
column(1/6)
position static
div:not(.drawer)
min-height 40px

.user-list__row
.user-list__row__name
col(1)
column(1)
+above(desktop)
col(5/20)
column(5/20)
p.name
line-height 1
margin-top 13px
Expand All @@ -185,12 +185,12 @@
+above(desktop)
display none !important
.user-list__row__characters-ms
col(5/40)
column(5/40)
display none !important
+above(desktop)
display flex !important
.user-list__row__characters-us
col(5/40)
column(5/40)
display none !important
+above(desktop)
display flex !important
Expand All @@ -200,7 +200,7 @@
.user-list__row__reviewer
display none !important
+above(desktop)
col(5/20)
column(5/20)
display flex !important
span.article_rating
font-size 11px
Expand All @@ -216,53 +216,53 @@
font-size 16px
font-weight 100
+above(desktop)
col(2/20)
column(2/20)
position static
margin-top 0
.icon:before
font-weight normal
.user-list__row__spacer
col(0/20)
column(0/20)

.article-list__row
.article-list__row__rating
col(1/10)
column(1/10)
.article-list__row__title
col(1)
column(1)
+above(desktop)
col(6/20)
column(6/20)
.article-list__row__characters, .article-list__row__views
font-size 14px
+above(desktop)
col(6/40)
column(6/40)
span
display inline
.article-list__row__link
col(6/40)
column(6/40)

.revision-list__row
&.list__header
p, h6
font-size 14px
max-height 40px
.revision-list__row__title
col(1)
column(1)
+above(desktop)
col(9/40)
column(9/40)
.revision-list__row__date
col(9/40)
column(9/40)
.revision-list__row__characters
+above(desktop)
col(9/40)
column(9/40)
span
display inline-block
.revision-list__row__views
+above(desktop)
col(5/40)
column(5/40)
span
display inline-block
.revision-list__row__link
col(8/40)
column(8/40)


.avatar, .rating
Expand Down
14 changes: 7 additions & 7 deletions app/assets/stylesheets/training_modules/_training.styl
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
margin-top 50px

.training__intro
col(8/12)
column(8/12)

.training__toc-container
col(7/24, offset: (1/24))
column(7/24, offset: (1/24))
position relative
bottom 70px
padding 45px 25px 0 25px
Expand Down Expand Up @@ -91,7 +91,7 @@
list-style none
margin-left 0
padding-left 0
col(12/12)
column(12/12)
& > li
border-top 1px solid gray
padding 2em 0
Expand All @@ -100,7 +100,7 @@
width 100%

.training__category__header
col(4/12)
column(4/12)
h1
margin-bottom 10px
h2
Expand All @@ -114,7 +114,7 @@
font-size 10px

.training__categories__modules
col(8/12)
column(8/12)
list-style none
li
margin 0 0 30px
Expand All @@ -131,9 +131,9 @@

.training-libraries
margin-top 29px
col(12/12)
column(12/12)
.training-libraries__individual-library
col(6/12)
column(6/12)
width 48%
margin 0 2% 3% 0
display inline-block
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"history": "4.7.2",
"i18n-js": "^3.1.0",
"isomorphic-fetch": "^2.2.1",
"jeet": "^6.1.2",
"jeet": "^7.2.0",
"jest": "^23.6.0",
"jquery": "3.3.1",
"jquery-ui": "^1.10.5",
Expand Down
Loading