Skip to content

WIP UI Rework #315

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

Merged
merged 91 commits into from
Jan 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
73e2d3c
Fix sidenav hamburger menu and hiding and stuff
drusepth Dec 4, 2018
a76e950
sidenav rework
drusepth Dec 5, 2018
f8a3dc6
navbar wip
drusepth Dec 5, 2018
272e2d4
move universe picker to sidenav
drusepth Dec 5, 2018
af76f05
wip
drusepth Dec 5, 2018
6364616
qip
drusepth Dec 5, 2018
943d0ad
fix universe picker in sidenav
drusepth Dec 6, 2018
089792d
fix navbar widths
drusepth Dec 6, 2018
f87da5a
starting to look nice
drusepth Dec 6, 2018
16f7838
dynamic colors/actions
drusepth Dec 6, 2018
6611af2
dynamic colors for content controller
drusepth Dec 6, 2018
0df20d9
wip
drusepth Dec 6, 2018
1b32ac8
dynamic discussions links for content
drusepth Dec 6, 2018
74a2ff8
prefer native js functionality
drusepth Dec 6, 2018
f19775b
add hex colors + redesign content_types page
drusepth Dec 12, 2018
5087104
add ajax to toggle page types on/off
drusepth Dec 12, 2018
7d93a5e
wrap up customization page
drusepth Dec 12, 2018
e9ba77e
jk that was the last of it
drusepth Dec 12, 2018
1c8f3df
navbar hex coloring & sidenav expansion
drusepth Dec 12, 2018
b38430e
add customization cta to dashboard
drusepth Dec 12, 2018
c0be172
minor tweaks
drusepth Dec 12, 2018
861081d
dashboard polish
drusepth Dec 12, 2018
c74b2de
sidenav expansion for writing
drusepth Dec 12, 2018
96a614d
revert previous forums changes
drusepth Dec 12, 2018
d70ffa7
documents#index pt. 1
drusepth Dec 12, 2018
96897a1
documents index pt. 2: electric boogaloo
drusepth Dec 12, 2018
a8306c7
filter bar
drusepth Dec 13, 2018
4ac3e5b
content#index work
drusepth Dec 13, 2018
6721082
Merge branch 'master' into sidenav-ui
drusepth Dec 13, 2018
11f67f5
content cover headers
drusepth Dec 13, 2018
32478a0
notice/alert toasts
drusepth Dec 13, 2018
2cf4b28
prompts page pt. 1
drusepth Dec 14, 2018
5fc5a09
subtler footer
drusepth Dec 14, 2018
d94c06a
p2
drusepth Dec 14, 2018
6001787
conditionally show footer & some document editor work
drusepth Dec 18, 2018
2917c89
dat document view tho
drusepth Dec 18, 2018
81b970d
move document delete link from index to edit
drusepth Dec 18, 2018
46dff2d
add fake view links to docu index
drusepth Dec 18, 2018
0327247
documents#show
drusepth Dec 18, 2018
9448908
style prompts a bit
drusepth Dec 18, 2018
456e776
nice content tooltip text + more prompts polish
drusepth Dec 18, 2018
6a20524
general polishes
drusepth Dec 19, 2018
b1f0aed
fix invalid scs
drusepth Dec 19, 2018
99e5f56
forums fix
drusepth Dec 19, 2018
9e7d7a4
thredded overrides for index
drusepth Dec 19, 2018
6d3809d
fix forums fab
drusepth Dec 19, 2018
c5c5a27
testing view for forum board index
drusepth Dec 19, 2018
93d2f69
more forums tweaks
drusepth Dec 19, 2018
5e07c71
denser threads
drusepth Dec 19, 2018
ba452bf
thread#show polishing
drusepth Dec 19, 2018
f35b770
no clue if this will work
drusepth Dec 19, 2018
17b3709
may as well push again
drusepth Dec 19, 2018
f4b0487
OBVIOUSLY YOU CAN'T CONSTANTIZE SYMBOLS
drusepth Dec 19, 2018
c120156
thug life
drusepth Dec 19, 2018
7f06b7a
lol it works now
drusepth Dec 19, 2018
9e9639c
reorder nav header opts
drusepth Dec 19, 2018
ed64c55
ok this seems fine
drusepth Dec 19, 2018
dc37a50
some spacing
drusepth Dec 19, 2018
4a087a4
answer
drusepth Dec 20, 2018
1364dcf
fix navbar when logged out
drusepth Jan 2, 2019
d61943c
more logged-out polish
drusepth Jan 3, 2019
d311444
more cleanup / don't bother with wrangling regi bug
drusepth Jan 3, 2019
e7706b7
add last login time/ip
drusepth Jan 3, 2019
d42a495
exclude documents from export controller logic
drusepth Jan 3, 2019
a0e87a5
recent content page
drusepth Jan 3, 2019
6c52e3e
make some room on profiles
drusepth Jan 3, 2019
e3e994b
dont stretch images on dashboard
drusepth Jan 3, 2019
3b8e49d
#show-specific actions
drusepth Jan 3, 2019
5a96324
break changelog into its own page & clean up routes
drusepth Jan 3, 2019
e6d31cd
beef up profiles
drusepth Jan 3, 2019
9061c13
indecisiveness for years
drusepth Jan 3, 2019
4554227
restore quick reference on serendipitous cards
drusepth Jan 4, 2019
4249110
add these stupid badges because ie doesn't support filters
drusepth Jan 5, 2019
ed47d6b
fix image issues on login
drusepth Jan 5, 2019
6686fb0
add new forum links
drusepth Jan 5, 2019
ed232b3
always cache user universes
drusepth Jan 5, 2019
8c9b0fa
show log in/up links on mobile
drusepth Jan 6, 2019
db90156
remove redundant ui
drusepth Jan 6, 2019
85ef9cb
fix universe linking in quick reference
drusepth Jan 6, 2019
e431220
add dashboard link to mobile/tablet navbar
drusepth Jan 6, 2019
3e40d2a
fix discussions link activeness in navbar
drusepth Jan 6, 2019
34b8bde
fix parallax attributes partial
drusepth Jan 6, 2019
4584f6c
(gasp) recolor religions to indigo
drusepth Jan 6, 2019
9b515d8
create AN item, not create a item
drusepth Jan 6, 2019
7439192
tooltip for universe focus
drusepth Jan 6, 2019
740f8b7
prompts polish wrt universe scope
drusepth Jan 6, 2019
8ed53cb
automatically add new content to scoped universe
drusepth Jan 6, 2019
74e13dd
mock disabled redirection to subscription path on cant_create(content…
drusepth Jan 6, 2019
f26dae6
avoid some extra db calls
drusepth Jan 6, 2019
60b4aae
fix for universes as @content
drusepth Jan 6, 2019
a31224b
remove unused partial
drusepth Jan 6, 2019
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
24 changes: 24 additions & 0 deletions app/assets/javascripts/content_types.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
$(document).ready(function() {
$('.js-enable-content-type').click(function () {
var content_type = $(this).data('content-type');
var related_card = $(this).children('.card').first();
var is_currently_active = related_card.hasClass('active');
var ie_badge = $(this).find('.enabled-badge');

$.post('/customization/toggle_content_type', {
content_type: content_type,
active: is_currently_active ? 'off' : 'on'
});

if (is_currently_active) {
related_card.removeClass('active');
ie_badge.attr('data-badge-caption', 'hidden');
} else {
related_card.addClass('active');
ie_badge.attr('data-badge-caption', 'active');
}

// Return false so we don't jump to the top of the page on link click
return false;
});
});
5 changes: 5 additions & 0 deletions app/assets/javascripts/navbar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// $(document).ready(function () {
// $('.tab-link').click(function() {
// document.location = $(this).attr('href');
// });
// });
1 change: 0 additions & 1 deletion app/assets/javascripts/navbar.js.coffee

This file was deleted.

17 changes: 17 additions & 0 deletions app/assets/stylesheets/autosave.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.autosave-bar {
position: fixed;
bottom: 0;
left: 0;
width: 100%;

margin: 0;
padding: 4px 0;

text-align: center;
background: white;
border-top: 2px solid lightgrey;

i {
font-size: 15px;
}
}
44 changes: 44 additions & 0 deletions app/assets/stylesheets/btn-group.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.btn-group {
position: relative;
display: -ms-inline-flexbox;
display: inline-flex;
}

.btn-group.card {
margin: 0;
}

.btn-group>.btn:first-child:not(:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

.btn-group>.btn:not(:first-child):not(:last-child) {
border-radius: 0;
border-left: 1px solid lightgrey;
}

.btn-group>.btn:last-child:not(:first-child),
.btn-group>.dropdown-toggle:not(:first-child) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left: 1px solid lightgrey;
}

.btn-group>.btn-inactive {
background-color: #607d8b;
}

.btn-group>.btn {
-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);
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);
}

.btn-group>.btn-inactive:hover {
background-color: #728F9D;
}

.btn-group>.btn:hover {
-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);
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);
}
21 changes: 13 additions & 8 deletions app/assets/stylesheets/content.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@ p.long-form {
margin-bottom: 16px;
}

.card-action {
.green-text, .red-text {
i {
font-size: 90%;
}
.card-action.nice-icon-links {
i {
font-size: 90%;
}

a {
color: grey;
}
a {
color: grey;
}
}

Expand Down Expand Up @@ -127,3 +125,10 @@ p.long-form {

margin-bottom: 30px;
}

.parallax-header {
img {
-webkit-filter: blur(3px); /* Safari 6.0 - 9.0 */
filter: blur(3px);
}
}
27 changes: 27 additions & 0 deletions app/assets/stylesheets/content_types.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.js-enable-content-type .card:not(.active) {
-webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
filter: grayscale(100%);

.card-image > img {
-webkit-filter: blur(2px); /* Safari 6.0 - 9.0 */
filter: blur(2px);
}
}

.js-enable-content-type .card:not(.active):hover {
-webkit-filter: grayscale(75%); /* Safari 6.0 - 9.0 */
filter: grayscale(75%);

.card-image > img {
-webkit-filter: blur(0px); /* Safari 6.0 - 9.0 */
filter: blur(0px);
}
}

.js-enable-content-type .enabled-badge {
float: right;
position: relative;
top: -51px;
right: 7px;
z-index: 3;
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/dashboard.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
.card-image {
max-height: 200px;
}
}
}
28 changes: 28 additions & 0 deletions app/assets/stylesheets/editor.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,41 @@
min-height: 400px;
border: 1px solid #dedede;
padding: 5px 0;
margin-bottom: 600px;

color: black;

p {
margin-top: 0;
}

/* PAGES */
background: white;
padding: 30px;
border-bottom: 1px solid grey;
}

/* Materialize hacks */
b, strong {
font-weight: bolder !important;
}

.document-name-bar {
.input-field.inline {
margin-bottom: 0;
}

.row {
margin-bottom: 0;
}

margin-bottom: 40px;
}

.smart-sidebar {
opacity: 0.4;

&:hover {
opacity: 1.0;
}
}
4 changes: 4 additions & 0 deletions app/assets/stylesheets/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ body {
main {
flex: 1 0 auto;
}

.stealth-page-footer {
padding-bottom: 20px;
}
10 changes: 7 additions & 3 deletions app/assets/stylesheets/materialize-overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
@media only screen and (min-width: 1024px) {
.fixed-card-content
{
height: 8em;
height: 8em;
}
}

@media only screen and (max-width: 1024px) {
.fixed-card-content
{
height: 10em;
height: 10em;
}
}
}

body {
background: #f4f4f4;
}
35 changes: 28 additions & 7 deletions app/assets/stylesheets/navbar.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
.dropdown-content {
min-width: 300px !important;
min-width: 400px !important;
}

.navbar-fixed {
margin-bottom: 15px;
z-index: 1000 !important;
@media only screen and (min-width: 993px) {
body.has-fixed-sidenav {
padding-left: 300px !important;
}

nav.navbar.logged-in {
width: calc(100% - 300px);
}
}

@media only screen and (max-width: 993px) {
body.has-fixed-sidenav {
padding-left: 0 !important;
}
}

@media only screen and (min-width: 601px) {
nav, nav .nav-wrapper i, nav a.sidenav-trigger, nav a.sidenav-trigger i {
height: 64px;
line-height: 64px;
}
}

.universe-filter-active {
background: purple;
height: 100%;
nav.navbar {
z-index: 10;
transition: box-shadow .3s, background-color .3s;
padding: 0 20px;
background-color: #fff;
color: rgba(0,0,0,0.87);
}
47 changes: 38 additions & 9 deletions app/assets/stylesheets/sidenav.css.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,43 @@
.sidenav {
padding-top: 64px;
li {
display: block;
}

.logo-container {
padding: 0 16px;
height: 64px;
line-height: 64px;
font-size: 24px;
border-bottom: 1px solid rgba(0,0,0,0.2);
box-sizing: content-box;

i.material-icons.right {
position: relative;
top: 8px;
left: 26px;
}
}

.header {
background: #10B6FF;
color: white;
margin: 0;
text-align: center;
.collapsible .collapsible-header {
text-transform: uppercase;
height: 64px;
line-height: 64px;

.material-icons.left {
margin-top: 8px;
}
}

.collapsible .collapsible-header .chevron {
float: right;
height: 24px;
width: 24px;
line-height: 24px;
margin: 20px 0 0 0;
transition: transform .2s;
}

font-size: 12px;
height: 20px;
line-height: 20px;
.collapsible>.active .collapsible-header .chevron {
transform: rotate(-90deg);
}
}
Loading