Skip to content

Commit ac28a9d

Browse files
authored
Merge pull request #315 from indentlabs/sidenav-ui
WIP UI Rework
2 parents ce7844d + a31224b commit ac28a9d

File tree

101 files changed

+2168
-1240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2168
-1240
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
$(document).ready(function() {
2+
$('.js-enable-content-type').click(function () {
3+
var content_type = $(this).data('content-type');
4+
var related_card = $(this).children('.card').first();
5+
var is_currently_active = related_card.hasClass('active');
6+
var ie_badge = $(this).find('.enabled-badge');
7+
8+
$.post('/customization/toggle_content_type', {
9+
content_type: content_type,
10+
active: is_currently_active ? 'off' : 'on'
11+
});
12+
13+
if (is_currently_active) {
14+
related_card.removeClass('active');
15+
ie_badge.attr('data-badge-caption', 'hidden');
16+
} else {
17+
related_card.addClass('active');
18+
ie_badge.attr('data-badge-caption', 'active');
19+
}
20+
21+
// Return false so we don't jump to the top of the page on link click
22+
return false;
23+
});
24+
});

app/assets/javascripts/navbar.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// $(document).ready(function () {
2+
// $('.tab-link').click(function() {
3+
// document.location = $(this).attr('href');
4+
// });
5+
// });

app/assets/javascripts/navbar.js.coffee

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

app/assets/stylesheets/autosave.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.autosave-bar {
2+
position: fixed;
3+
bottom: 0;
4+
left: 0;
5+
width: 100%;
6+
7+
margin: 0;
8+
padding: 4px 0;
9+
10+
text-align: center;
11+
background: white;
12+
border-top: 2px solid lightgrey;
13+
14+
i {
15+
font-size: 15px;
16+
}
17+
}

app/assets/stylesheets/btn-group.scss

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
.btn-group {
2+
position: relative;
3+
display: -ms-inline-flexbox;
4+
display: inline-flex;
5+
}
6+
7+
.btn-group.card {
8+
margin: 0;
9+
}
10+
11+
.btn-group>.btn:first-child:not(:last-child) {
12+
border-top-right-radius: 0;
13+
border-bottom-right-radius: 0;
14+
}
15+
16+
.btn-group>.btn:not(:first-child):not(:last-child) {
17+
border-radius: 0;
18+
border-left: 1px solid lightgrey;
19+
}
20+
21+
.btn-group>.btn:last-child:not(:first-child),
22+
.btn-group>.dropdown-toggle:not(:first-child) {
23+
border-top-left-radius: 0;
24+
border-bottom-left-radius: 0;
25+
border-left: 1px solid lightgrey;
26+
}
27+
28+
.btn-group>.btn-inactive {
29+
background-color: #607d8b;
30+
}
31+
32+
.btn-group>.btn {
33+
-webkit-box-shadow: 0 0px 0px 0 rgba(0, 0, 0, 0), 0 0px 0px 0px rgba(0, 0, 0, 0), 0 0px 0px 0 rgba(0, 0, 0, 0);
34+
box-shadow: 0 0px 0px 0 rgba(0, 0, 0, 0), 0 0px 0px 0px rgba(0, 0, 0, 0), 0 0px 0px 0 rgba(0, 0, 0, 0);
35+
}
36+
37+
.btn-group>.btn-inactive:hover {
38+
background-color: #728F9D;
39+
}
40+
41+
.btn-group>.btn:hover {
42+
-webkit-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2);
43+
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2);
44+
}

app/assets/stylesheets/content.css.scss

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ p.long-form {
1414
margin-bottom: 16px;
1515
}
1616

17-
.card-action {
18-
.green-text, .red-text {
19-
i {
20-
font-size: 90%;
21-
}
17+
.card-action.nice-icon-links {
18+
i {
19+
font-size: 90%;
20+
}
2221

23-
a {
24-
color: grey;
25-
}
22+
a {
23+
color: grey;
2624
}
2725
}
2826

@@ -127,3 +125,10 @@ p.long-form {
127125

128126
margin-bottom: 30px;
129127
}
128+
129+
.parallax-header {
130+
img {
131+
-webkit-filter: blur(3px); /* Safari 6.0 - 9.0 */
132+
filter: blur(3px);
133+
}
134+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.js-enable-content-type .card:not(.active) {
2+
-webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
3+
filter: grayscale(100%);
4+
5+
.card-image > img {
6+
-webkit-filter: blur(2px); /* Safari 6.0 - 9.0 */
7+
filter: blur(2px);
8+
}
9+
}
10+
11+
.js-enable-content-type .card:not(.active):hover {
12+
-webkit-filter: grayscale(75%); /* Safari 6.0 - 9.0 */
13+
filter: grayscale(75%);
14+
15+
.card-image > img {
16+
-webkit-filter: blur(0px); /* Safari 6.0 - 9.0 */
17+
filter: blur(0px);
18+
}
19+
}
20+
21+
.js-enable-content-type .enabled-badge {
22+
float: right;
23+
position: relative;
24+
top: -51px;
25+
right: 7px;
26+
z-index: 3;
27+
}

app/assets/stylesheets/dashboard.css.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
.card-image {
33
max-height: 200px;
44
}
5-
}
5+
}

app/assets/stylesheets/editor.css.scss

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,41 @@
22
min-height: 400px;
33
border: 1px solid #dedede;
44
padding: 5px 0;
5+
margin-bottom: 600px;
6+
7+
color: black;
58

69
p {
710
margin-top: 0;
811
}
12+
13+
/* PAGES */
14+
background: white;
15+
padding: 30px;
16+
border-bottom: 1px solid grey;
917
}
1018

1119
/* Materialize hacks */
1220
b, strong {
1321
font-weight: bolder !important;
1422
}
23+
24+
.document-name-bar {
25+
.input-field.inline {
26+
margin-bottom: 0;
27+
}
28+
29+
.row {
30+
margin-bottom: 0;
31+
}
32+
33+
margin-bottom: 40px;
34+
}
35+
36+
.smart-sidebar {
37+
opacity: 0.4;
38+
39+
&:hover {
40+
opacity: 1.0;
41+
}
42+
}

app/assets/stylesheets/footer.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ body {
77
main {
88
flex: 1 0 auto;
99
}
10+
11+
.stealth-page-footer {
12+
padding-bottom: 20px;
13+
}

0 commit comments

Comments
 (0)