Skip to content
This repository was archived by the owner on Jan 6, 2020. It is now read-only.

Commit 337dcab

Browse files
roobottomroobottom
committed
Updates
1 parent bb498ba commit 337dcab

11 files changed

Lines changed: 104 additions & 53 deletions

File tree

‎_examples/markbook.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
layout: standalone
44
---
55

6+
{% assign num = 10 %}
7+
68
<div class="ff-ui-heading">
79
<h1>Markbook</h1>
810
<div class="ff-ui-actions">
@@ -27,7 +29,7 @@ <h1>Markbook</h1>
2729
</div>
2830
</div>
2931

30-
<div class="ff-mark-grid" data-ff-mark-grid-tasks="100">
32+
<div class="ff-mark-grid" data-ff-mark-grid-tasks="{{ num }}">
3133

3234
<div class="ff-mark-grid-students">
3335

@@ -69,13 +71,11 @@ <h1>Markbook</h1>
6971
</ul>
7072
</div>
7173

72-
{% assign num = 100 %}
73-
7474
<div class="ff-mark-grid-header">
7575
<ol>
7676
{% for i in (1..num) %}
7777
<li id="ff-mark-grid-task-uid1" {% if i == 2 %}class="ff-mark-grid-highlight"{% endif %}>
78-
{% include_relative markbook_includes/task-header.html date=i %}
78+
{% include_relative markbook_includes/task-header.html date=i title="Write 500 a word on the process of quantum interactions within the chloroplasts of plants" %}
7979
</li>
8080
{% endfor %}
8181
</ol>

‎_examples/markbook_includes/task-header.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<div class="ff-popover-trigger">
2-
<time class="ff-mark-grid-date">{{ include.date }}</time>
2+
<div class="ff-mark-grid-task-title">
3+
{{ include.title }}
4+
<time class="ff-mark-grid-date">{{ include.date }}</time>
5+
</div>
36
<div class="ff-popover">
47
<div class="ff-popover-header">
58
An example task title, they're all the same here as I didn't want to manually add them

‎_patterns/01a-dropdowns/ff-button-with-dropdown.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
notes:
55
---
66

7-
<div class="ff-button-with-dropdown">
8-
<a href="#" class="ff-primary-action ff-button ff-button-add ff-icon ff-icon-task-add"><span>Set a New Task</span></a>
9-
<ul class="ff-dropdown ff-button ff-button-dropdown ff-secondary-actions">
7+
<div class="ff-ui-button-with-dropdown">
8+
<a href="#" class="ff-ui-button ff-icon ff-icon-task-add ff-primary-action"><span>Set a New Task</span></a>
9+
<ul class="ff-ui-dropdown ff-ui-button ff-secondary-actions">
1010
<li class="ff-icon-dropdown"><span class="ff-dropdown-label">More Options</span>
1111
<ul class="ff-dropdown-items ff-secondary-actions-dropdown">
1212
<li><a href="#" class="ff-icon ff-icon-archive"><span>Bulk Archive</span></a></li>

‎_patterns/01a-dropdowns/ff-dropdown.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
notes:
55
---
66

7-
<ul class="ff-dropdown ff-button ff-button-dropdown ff-button-bookmark">
7+
<ul class="ff-ui-dropdown ff-ui-button">
88
<li class="ff-icon ff-icon-bookmark ff-icon-dropdown"><span class="ff-dropdown-label">Bookmark</span>
99
<ul class="ff-dropdown-items">
1010
<li class="ff-button-unbookmark-page"><a href="#"><span>UnBookmark Page</span></a></li>

‎config.codekit‎

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -619,15 +619,6 @@
619619
"outputPathIsOutsideProject": 0,
620620
"outputPathIsSetByUser": 0
621621
},
622-
"\/_site\/css\/styles.css": {
623-
"fileType": 16,
624-
"ignore": 1,
625-
"ignoreWasSetByUser": 0,
626-
"inputAbbreviatedPath": "\/_site\/css\/styles.css",
627-
"outputAbbreviatedPath": "No Output Path",
628-
"outputPathIsOutsideProject": 0,
629-
"outputPathIsSetByUser": 0
630-
},
631622
"\/_site\/examples\/bookmarks.html": {
632623
"fileType": 8192,
633624
"ignore": 0,
@@ -817,36 +808,47 @@
817808
},
818809
"\/_site\/js\/jquery-1.11.2.min.js": {
819810
"fileType": 64,
820-
"ignore": 1,
811+
"ignore": 0,
821812
"ignoreWasSetByUser": 0,
822813
"inputAbbreviatedPath": "\/_site\/js\/jquery-1.11.2.min.js",
823814
"outputAbbreviatedPath": "\/_site\/js\/min\/jquery-1.11.2.min-min.js",
824815
"outputPathIsOutsideProject": 0,
825816
"outputPathIsSetByUser": 0,
826817
"outputStyle": 1,
827-
"syntaxCheckerStyle": 0
818+
"syntaxCheckerStyle": 1
819+
},
820+
"\/_site\/js\/mark-grid.js": {
821+
"fileType": 64,
822+
"ignore": 0,
823+
"ignoreWasSetByUser": 0,
824+
"inputAbbreviatedPath": "\/_site\/js\/mark-grid.js",
825+
"outputAbbreviatedPath": "\/_site\/js\/min\/mark-grid-min.js",
826+
"outputPathIsOutsideProject": 0,
827+
"outputPathIsSetByUser": 0,
828+
"outputStyle": 1,
829+
"syntaxCheckerStyle": 1
828830
},
829831
"\/_site\/js\/pattern-library.js": {
830832
"fileType": 64,
831-
"ignore": 1,
833+
"ignore": 0,
832834
"ignoreWasSetByUser": 0,
833835
"inputAbbreviatedPath": "\/_site\/js\/pattern-library.js",
834836
"outputAbbreviatedPath": "\/_site\/js\/min\/pattern-library-min.js",
835837
"outputPathIsOutsideProject": 0,
836838
"outputPathIsSetByUser": 0,
837839
"outputStyle": 1,
838-
"syntaxCheckerStyle": 0
840+
"syntaxCheckerStyle": 1
839841
},
840842
"\/_site\/js\/scroll.js": {
841843
"fileType": 64,
842-
"ignore": 1,
844+
"ignore": 0,
843845
"ignoreWasSetByUser": 0,
844846
"inputAbbreviatedPath": "\/_site\/js\/scroll.js",
845847
"outputAbbreviatedPath": "\/_site\/js\/min\/scroll-min.js",
846848
"outputPathIsOutsideProject": 0,
847849
"outputPathIsSetByUser": 0,
848850
"outputStyle": 1,
849-
"syntaxCheckerStyle": 0
851+
"syntaxCheckerStyle": 1
850852
},
851853
"\/_site\/less\/default-settings.less": {
852854
"allowInsecureImports": 0,
@@ -1610,6 +1612,26 @@
16101612
"strictMath": 0,
16111613
"strictUnits": 0
16121614
},
1615+
"\/less\/_ff-ui-button-with-dropdown.less": {
1616+
"allowInsecureImports": 0,
1617+
"createSourceMap": 0,
1618+
"disableJavascript": 0,
1619+
"fileType": 1,
1620+
"ieCompatibility": 1,
1621+
"ignore": 1,
1622+
"ignoreWasSetByUser": 0,
1623+
"inputAbbreviatedPath": "\/less\/_ff-ui-button-with-dropdown.less",
1624+
"outputAbbreviatedPath": "\/css\/_ff-ui-button-with-dropdown.css",
1625+
"outputPathIsOutsideProject": 0,
1626+
"outputPathIsSetByUser": 0,
1627+
"outputStyle": 0,
1628+
"relativeURLS": 0,
1629+
"shouldRunAutoprefixer": 0,
1630+
"shouldRunBless": 0,
1631+
"strictImports": 0,
1632+
"strictMath": 0,
1633+
"strictUnits": 0
1634+
},
16131635
"\/less\/_ff-ui-button.less": {
16141636
"allowInsecureImports": 0,
16151637
"createSourceMap": 0,

‎css/styles.css‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,7 @@ table {
877877
position: absolute;
878878
width: 100%;
879879
right: -1px;
880+
min-width: 160px;
880881
top: 100%;
881882
border: 1px solid #b4b4b4;
882883
background: #def1fa;
@@ -965,26 +966,26 @@ table {
965966
overflow-x: auto;
966967
-webkit-overflow-scrolling: touch;
967968
}
968-
.ff-mark-grid .ff-mark-grid-results .ff-mark-grid-results-body {
969+
.ff-mark-grid .ff-mark-grid-results .ff-mark-grid-header {
969970
overflow: hidden;
970971
}
971972
.ff-mark-grid .ff-mark-grid-results .ff-mark-grid-header ol > li {
972973
display: block;
973974
float: left;
974-
width: 60px;
975-
width: 3.75rem;
976-
max-width: 60px;
977-
max-width: 3.75rem;
975+
width: 160px;
976+
width: 10rem;
977+
max-width: 160px;
978+
max-width: 10rem;
978979
}
979980
.ff-mark-grid .ff-mark-grid-results .ff-mark-grid-results-body ol {
980981
float: left;
981982
}
982983
.ff-mark-grid .ff-mark-grid-results .ff-mark-grid-results-body ol > li {
983984
display: block;
984-
width: 60px;
985-
width: 3.75rem;
986-
max-width: 60px;
987-
max-width: 3.75rem;
985+
width: 160px;
986+
width: 10rem;
987+
max-width: 160px;
988+
max-width: 10rem;
988989
}
989990
.ff-mark-grid .ff-mark-grid-student {
990991
font-size: 16px;
@@ -1730,7 +1731,7 @@ table {
17301731
border-width: 0 12px 12px 0;
17311732
border-color: transparent #edeb56 transparent transparent;
17321733
}
1733-
.ff-mark-grid .ff-mark-grid-date {
1734+
.ff-mark-grid .ff-mark-grid-task-title {
17341735
text-align: center;
17351736
display: block;
17361737
cursor: context-menu;
@@ -1743,7 +1744,7 @@ table {
17431744
-webkit-background-clip: padding-box;
17441745
background-clip: padding-box;
17451746
}
1746-
.ff-mark-grid .ff-mark-grid-date:hover {
1747+
.ff-mark-grid .ff-mark-grid-task-title:hover {
17471748
color: #366797;
17481749
}
17491750
.ff-mark-grid .ff-mark-grid-student {
@@ -1947,18 +1948,18 @@ table {
19471948
.ff-summary .ff-summary-excerpt {
19481949
cursor: help;
19491950
}
1950-
.ff-button-with-dropdown {
1951+
.ff-ui-button-with-dropdown {
19511952
zoom: 1;
19521953
}
1953-
.ff-button-with-dropdown:after,
1954-
.ff-button-with-dropdown:before {
1954+
.ff-ui-button-with-dropdown:after,
1955+
.ff-ui-button-with-dropdown:before {
19551956
content: "";
19561957
display: table;
19571958
}
1958-
.ff-button-with-dropdown:after {
1959+
.ff-ui-button-with-dropdown:after {
19591960
clear: both;
19601961
}
1961-
.ff-button-with-dropdown .ff-primary-action {
1962+
.ff-ui-button-with-dropdown .ff-primary-action {
19621963
float: left;
19631964
border-right: none;
19641965
-webkit-border-top-right-radius: 0;
@@ -1977,7 +1978,7 @@ table {
19771978
-webkit-background-clip: padding-box;
19781979
background-clip: padding-box;
19791980
}
1980-
.ff-button-with-dropdown .ff-secondary-actions {
1981+
.ff-ui-button-with-dropdown .ff-secondary-actions {
19811982
float: left;
19821983
-webkit-border-top-right-radius: 2px;
19831984
-webkit-border-bottom-right-radius: 2px;
@@ -1995,7 +1996,7 @@ table {
19951996
-webkit-background-clip: padding-box;
19961997
background-clip: padding-box;
19971998
}
1998-
.ff-button-with-dropdown .ff-secondary-actions.ff-dropdown .ff-dropdown-label {
1999+
.ff-ui-button-with-dropdown .ff-secondary-actions.ff-ui-dropdown .ff-dropdown-label {
19992000
display: none;
20002001
}
20012002
.ff-nav-filter {

‎js/mark-grid.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
---
88
*/
99

10+
var ffMarkGrid_markBlockWidth = 160;
11+
1012
var ffMarkGrid__isSmall = function(obj)
1113
{
1214
var breakpoint = 800;
@@ -42,7 +44,7 @@ var ffMarkGrid__fixHeader = function(obj)
4244
var objHeight = obj.outerHeight(false);
4345
var headerWidth = $('.ff-mark-grid-results',obj).outerWidth(false);
4446
var totalTasks = obj.attr('data-ff-mark-grid-tasks');
45-
var tasksWidth = 60 * totalTasks;
47+
var tasksWidth = ffMarkGrid_markBlockWidth * totalTasks;
4648
if ($(window).scrollTop() > aboveHeight && $(window).scrollTop() < (aboveHeight + objHeight)) //fix header
4749
{
4850
obj.addClass('ff-mark-grid-fixed-header');
@@ -76,7 +78,7 @@ var ffMarkGrid__fixHeader = function(obj)
7678
var ffMarkGrid__setWidth = function(obj)
7779
{
7880
totalTasks = obj.attr('data-ff-mark-grid-tasks');
79-
width = 60 * totalTasks;
81+
width = ffMarkGrid_markBlockWidth * totalTasks;
8082
$('.ff-mark-grid-results-wrapper').css('width',width);
8183
}
8284
var ffMarkGrid__releaseWidth = function(obj)
@@ -137,7 +139,7 @@ var ffMarkGrid__syncScrollPosition = function(obj)
137139
var ffMarkGrid__scrollTo = function(obj,direction,distance)
138140
{
139141
var target = $('.ff-mark-grid-results',obj);
140-
var markWidth = 60;
142+
var markWidth = ffMarkGrid_markBlockWidth;
141143
if(direction == 'forward')
142144
{
143145
target.animate({

‎less/_ff-mark-grid.less‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@ff_markbook_header_height: 80;
2-
@ff_makrbook_cell_width: 60;
2+
@ff_makrbook_cell_width: 160;
33

44

55
@ff_markbok_cell_height: 54;
@@ -58,13 +58,11 @@
5858
//width: 6000px;//set by js
5959
}
6060

61-
.ff-mark-grid-results-body {
62-
overflow: hidden;
63-
}
64-
6561
//header wrapper
6662
.ff-mark-grid-header {
6763

64+
overflow: hidden;
65+
6866
ol > li {
6967
display: block;
7068
float: left;
@@ -241,8 +239,8 @@
241239
}
242240

243241

244-
//date box
245-
.ff-mark-grid-date {
242+
//task title box
243+
.ff-mark-grid-task-title {
246244
text-align: center;
247245
display: block;
248246
cursor: context-menu;

‎less/_ff-ui-button-with-dropdown.less‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// ------------------------------------------------------------- //
2+
// .ff-button-with-dropdown
3+
// ------------------------------------------------------------- //
4+
5+
.ff-ui-button-with-dropdown {
6+
#ff > .clearfix();
7+
8+
.ff-primary-action {
9+
float: left;
10+
border-right: none;
11+
#ff > .border-radius(0,0,@ff_dashboard_rounded,@ff_dashboard_rounded);
12+
}
13+
14+
.ff-secondary-actions {
15+
float: left;
16+
#ff > .border-radius(@ff_dashboard_rounded,@ff_dashboard_rounded,0,0);
17+
18+
&.ff-ui-dropdown .ff-dropdown-label {
19+
display: none;
20+
}
21+
22+
}
23+
24+
}

‎less/_ff-ui-dropdown.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
position: absolute;
2222
width: 100%;
2323
right:-1px;
24+
min-width: 160px;
2425
top:100%;
2526
border:1px solid @ff_dashboard_c_border;
2627
background: @ff_dashboard_c_bg_secondary;

0 commit comments

Comments
 (0)